[jboss-cvs] JBossAS SVN: r112176 - branches/JBPAPP_5_1_JBPAPP-6716/system-jmx/src/main/org/jboss/deployment.

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

Author: bmaxwell
Date: 2011-08-31 01:26:26 -0400 (Wed, 31 Aug 2011)
New Revision: 112176

Modified:
   branches/JBPAPP_5_1_JBPAPP-6716/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
Log:
[JBPAPP-6716]] removed commented out temp code

Modified: branches/JBPAPP_5_1_JBPAPP-6716/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- branches/JBPAPP_5_1_JBPAPP-6716/system-jmx/src/main/org/jboss/deployment/MainDeployer.java	2011-08-31 05:20:44 UTC (rev 112175)
+++ branches/JBPAPP_5_1_JBPAPP-6716/system-jmx/src/main/org/jboss/deployment/MainDeployer.java	2011-08-31 05:26:26 UTC (rev 112176)
@@ -275,14 +275,8 @@
     * @jmx.managed-operation
     */
    public Collection listDeployed()
-   {
-//      synchronized (deploymentList)
-//      {
-//         log.debug("deployment list string: " + deploymentList);
-//         return new ArrayList(deploymentList);
-//      }
-      
-      return getDeployed();
+   {      
+      return getAllDeployments();
    }
 
    /**
@@ -294,35 +288,7 @@
     */
    public Collection listDeployedModules()
    {
-      log.debug("listDeployedModules");
-
-//      HashMap map = new HashMap();
-//      synchronized (deploymentList)
-//      {
-//         Collection col = new ArrayList(deploymentList);
-//
-//         // create a map entry for each deployment
-//         for (Iterator it = col.iterator(); it.hasNext();)
-//         {
-//            DeploymentInfo info = (DeploymentInfo) it.next();
-//            map.put(info.url, new SerializableDeploymentInfo(info));
-//            // assign parent and sub deployments
-//            fillParentAndChildrenSDI(info, map);
-//         }
-//      }
-//
-//      // map.values is not serializable, so we copy
-//      return new ArrayList(map.values());
-//      Collection<DeploymentInfo> deploymentInfos = getDeployed();
-//      List<SerializableDeploymentInfo> serializedDeploymentInfos = new ArrayList<SerializableDeploymentInfo>(deploymentInfos.size());
-//      
-//      for(DeploymentInfo di : deploymentInfos)
-//      {
-//         serializedDeploymentInfos.add(new SerializableDeploymentInfo(di));
-//      }
-//      
-//      return serializedDeploymentInfos;
-      return getDeployed();
+      return getAllDeployments();
    }
 
    /**
@@ -1664,7 +1630,7 @@
       return di;
    }
    
-   private Collection getDeployed()
+   private Collection getAllDeployments()
    {
       List<ManagedDeployment> managedDeployments = getManagedDeployments();
       List<DeploymentInfo> deploymentInfos = new ArrayList<DeploymentInfo>(managedDeployments.size() + contextMap.size());