From: <sc...@hy...> - 2010-03-29 20:57:45
|
Author: scottmf Date: 2010-03-29 13:57:36 -0700 (Mon, 29 Mar 2010) New Revision: 14434 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14434 Modified: trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java Log: [HHQ-3815] corrected bad merge. should have been part of r14433 Modified: trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java 2010-03-29 18:46:47 UTC (rev 14433) +++ trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java 2010-03-29 20:57:36 UTC (rev 14434) @@ -566,45 +566,6 @@ wasUpdated = true; } return wasUpdated; - - if (wasUpdated) { - if (sendConfigEvent) { - List events = new ArrayList(); - events.add(new ResourceUpdatedZevent(subject, appdefID)); - - if (appdefID.isPlatform()) { - try { - Platform p = getPlatformManagerLocal().findPlatformById(appdefID.getId()); - for (Iterator i = p.getServers().iterator(); i.hasNext() ;) { - Server s = (Server)i.next(); - events.add(new ResourceUpdatedZevent(subject, s.getEntityId())); - for (Iterator it = s.getServices().iterator(); it.hasNext();) { - Service svc = (Service)it.next(); - events.add(new ResourceUpdatedZevent(subject, svc.getEntityId())); - } - } - } catch (org.hyperic.hq.appdef.shared.PlatformNotFoundException e) { - log.warn("Error sending config event for: " + appdefID, e); - } - } else if (appdefID.isServer()) { - try { - Server s = getServerManagerLocal().findServerById(appdefID.getId()); - for (Iterator i = s.getServices().iterator(); i.hasNext();) { - Service svc = (Service)i.next(); - events.add(new ResourceUpdatedZevent(subject, svc.getEntityId())); - } - } catch (org.hyperic.hq.appdef.shared.ServerNotFoundException e) { - log.warn("Error sending config event for: " + appdefID, e); - } - } - - ZeventManager.getInstance().enqueueEventsAfterCommit(events); - } - - return appdefID; - } else { - return null; - } } /** Update the appdef entities based on TypeInfo |