[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'rc/jon3.2.0.GA' - modules/enterprise
From:       Simeon Pinder <spinder () fedoraproject ! org>
Date:       2013-12-12 16:22:43
Message-ID: 20131212162243.2AF1A60DCE () fedorahosted ! org
[Download RAW message or body]

 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java \
|    2 +-  1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 734bd56667d7619fd69810eecde4957866f3e939
Author: Jirka Kremser <jkremser@redhat.com>
Date:   Thu Dec 12 16:51:31 2013 +0100

    [BZ 1040928] - User with default permissions sees his assigned resources as DOWN \
- using the subjectManager.getOverlord() instead of the actual subject, because the \
live resource availability should not require the MANAGE_SETTINGS permission.  \
(cherry picked from commit 60d6b811fd4e2d56f2f591dbc77d4d592fdfab5b)

diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
 index 8a78995..2351f08 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
                
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
 @@ -2452,7 +2452,7 @@ public class ResourceManagerBean implements \
ResourceManagerLocal, ResourceManage  
         try {
             // first, quickly see if we can even ping the agent, if not, don't \
                bother trying to get the resource avail
-            Agent agent = agentManager.getAgentByResourceId(subject, resourceId);
+            Agent agent = \
agentManager.getAgentByResourceId(subjectManager.getOverlord(), resourceId);  if \
(agent == null) {  if (log.isDebugEnabled()) {
                     log.debug("Resource [" + resourceId + "] does not exist or has \
no agent assigned");


_______________________________________________
rhq-commits mailing list
rhq-commits@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/rhq-commits


[prev in list] [next in list] [prev in thread] [next in thread]