[rhq] modules/enterprise

lkrejci lkrejci at fedoraproject.org
Tue Aug 14 11:38:25 UTC 2012


 modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java |   11 ++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit bbdcaee2ca23717a53277fe0bb479f761f46025e
Author: Lukas Krejci <lkrejci at redhat.com>
Date:   Tue Aug 14 13:38:06 2012 +0200

    [BZ 847804] - make sure to fetch the latest known resource config through
    the proxy factory.

diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index 10ee612..0199c77 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -491,10 +491,13 @@ public class ResourceClientProxy {
         public Configuration getResourceConfiguration() {
             if (!LazyLoadScenario.isShouldLoad())
                 return null;
-
-            return remoteClient.getProxy(ConfigurationManagerRemote.class).getResourceConfiguration(
-                remoteClient.getSubject(),
-                resourceClientProxy.resourceId);
+            
+            //make sure to fetch the latest known resource config. This ensures that
+            //the server goes out to the agent if there is no known config yet and thus
+            //giving the scripting user an always up-to-date info.
+            ResourceConfigurationUpdate update = remoteClient.getProxy(ConfigurationManagerRemote.class).getLatestResourceConfigurationUpdate(
+                remoteClient.getSubject(), resourceClientProxy.resourceId);
+            return update == null ? null : update.getConfiguration();
         }
 
         public ConfigurationDefinition getResourceConfigurationDefinition() {




More information about the rhq-commits mailing list