[rhq] Branch 'release/jon3.1.x' - modules/enterprise

lkrejci lkrejci at fedoraproject.org
Tue Aug 14 11:46:55 UTC 2012


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

New commits:
commit e789b4e53ee6989e2f1abeb9b006eb56e725a900
Author: Lukas Krejci <lkrejci at redhat.com>
Date:   Tue Aug 14 13:44:58 2012 +0200

    [BZ 847804] - make sure to fetch the latest known resource config through
    the proxy factory.
    (cherry picked from commit bbdcaee2ca23717a53277fe0bb479f761f46025e)

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 ff39171..f1393f9 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
@@ -480,9 +480,13 @@ public class ResourceClientProxy {
         public Configuration getResourceConfiguration() {
             if (!LazyLoadScenario.isShouldLoad())
                 return null;
-
-            return remoteClient.getConfigurationManager().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.getConfigurationManager().getLatestResourceConfigurationUpdate(
+                remoteClient.getSubject(), resourceClientProxy.resourceId);
+            return update == null ? null : update.getConfiguration();
         }
 
         public ConfigurationDefinition getResourceConfigurationDefinition() {




More information about the rhq-commits mailing list