modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
| 2 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
| 12 +++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 23cbdd1dca3dbe69daae924c5d931e18ddb3dda4
Author: John Mazzitelli <mazz(a)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...
- 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);
+ }
}
}