[jboss-svn-commits] JBL Code SVN: r29915 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies.

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2009-11-03 12:35:20 -0500 (Tue, 03 Nov 2009)
New Revision: 29915

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierController.java
Log:
https://jira.jboss.org/jira/browse/JBESB-2870
war/esb archive deployment dependencies/ordering not guaranteed

Removed generic type on JMX Server query - breaks on JDK 1.6

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierController.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierController.java	2009-11-03 16:37:32 UTC (rev 29914)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierController.java	2009-11-03 17:35:20 UTC (rev 29915)
@@ -23,7 +23,6 @@
 import org.jboss.system.ServiceMBean;
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.logging.Logger;
-import org.jboss.mx.server.ServerObjectInstance;
 
 import javax.management.*;
 import java.util.*;
@@ -122,7 +121,7 @@
 
     private void registerExistingDeployment() {
         try {
-            Set<ServerObjectInstance> existingDeployments = getServer().queryMBeans(wsObjectName, null);
+            Set existingDeployments = getServer().queryMBeans(wsObjectName, null);
 
             if(existingDeployments != null && !existingDeployments.isEmpty()) {
                 // It's already deployed.  Add the Barrier...