modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
New commits: commit 1920039d8044dab0e404048024ed75311cc407d0 Merge: 68cff96 946eb10 Author: John Mazzitelli mazz@redhat.com Date: Sat Mar 23 00:25:00 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
commit 946eb10aae312260595d5c03d3a1989497b73dc8 Author: John Mazzitelli mazz@redhat.com Date: Sat Mar 23 00:05:21 2013 -0400
revert this change - it broke several tests.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java index 5003a7f..ba5fd3d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java @@ -76,7 +76,6 @@ import org.rhq.enterprise.server.authz.PermissionException; import org.rhq.enterprise.server.content.ContentManagerHelper; import org.rhq.enterprise.server.content.ContentManagerLocal; import org.rhq.enterprise.server.core.AgentManagerLocal; -import org.rhq.enterprise.server.rest.ResourceHandlerBean;
/** * Bean to handle interaction with the resource factory subsystem of the plugin container. !! Warning, the factory @@ -685,11 +684,9 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, DeleteResourceRequest request = new DeleteResourceRequest(persistedHistory.getId(), resourceId);
try { - if (agent.getName() == null || !agent.getName().startsWith(ResourceHandlerBean.DUMMY_AGENT_NAME_PREFIX)) { // synthetic agent? We can't do anything at the moment - AgentClient agentClient = agentManager.getAgentClient(agent); - ResourceFactoryAgentService resourceFactoryAgentService = agentClient.getResourceFactoryAgentService(); - resourceFactoryAgentService.deleteResource(request); - } + AgentClient agentClient = agentManager.getAgentClient(agent); + ResourceFactoryAgentService resourceFactoryAgentService = agentClient.getResourceFactoryAgentService(); + resourceFactoryAgentService.deleteResource(request);
return persistedHistory; } catch (CannotConnectException e) {
commit 23cbdd1dca3dbe69daae924c5d931e18ddb3dda4 Author: John Mazzitelli mazz@redhat.com Date: Fri Mar 22 21:36:33 2013 -0400
get the tests to pass
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java index b1d0f3a..5003a7f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java @@ -685,7 +685,7 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, DeleteResourceRequest request = new DeleteResourceRequest(persistedHistory.getId(), resourceId);
try { - if (!agent.getName().startsWith(ResourceHandlerBean.DUMMY_AGENT_NAME_PREFIX)) { // synthetic agent? We can't do anything at the moment + if (agent.getName() == null || !agent.getName().startsWith(ResourceHandlerBean.DUMMY_AGENT_NAME_PREFIX)) { // synthetic agent? We can't do anything at the moment AgentClient agentClient = agentManager.getAgentClient(agent); ResourceFactoryAgentService resourceFactoryAgentService = agentClient.getResourceFactoryAgentService(); resourceFactoryAgentService.deleteResource(request); 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 d375b16..e6a9333 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 @@ -404,11 +404,13 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage // but not if this is a synthetic agent that was created in the REST-api // See org.rhq.enterprise.server.rest.ResourceHandlerBean.createPlatformInternal() // See also https://docs.jboss.org/author/display/RHQ/Virtual+platforms+and+synthetic+ag... - if (agentClient != null && !agentClient.getAgent().getName().startsWith(ResourceHandlerBean.DUMMY_AGENT_NAME_PREFIX)) { // don't do that on "REST-agents" - try { - agentClient.getDiscoveryAgentService().uninventoryResource(resourceId); - } catch (Exception e) { - log.warn(" Unable to inform agent of inventory removal for resource [" + resourceId + "]", e); + if (agentClient != null) { + if (agentClient.getAgent() == null || agentClient.getAgent().getName() == null || !agentClient.getAgent().getName().startsWith(ResourceHandlerBean.DUMMY_AGENT_NAME_PREFIX)) { // don't do that on "REST-agents" + try { + agentClient.getDiscoveryAgentService().uninventoryResource(resourceId); + } catch (Exception e) { + log.warn(" Unable to inform agent of inventory removal for resource [" + resourceId + "]", e); + } } }