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 946eb10aae312260595d5c03d3a1989497b73dc8
Author: John Mazzitelli <mazz(a)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) {
Show replies by date