[Jboss-cvs] JBossAS SVN: r55161 - trunk/system/src/main/org/jboss/deployment

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

Author: vicky.kak at jboss.com
Date: 2006-08-04 02:19:52 -0400 (Fri, 04 Aug 2006)
New Revision: 55161

Modified:
   trunk/system/src/main/org/jboss/deployment/MainDeployer.java
Log:
Changes done for JBAS-2194 

Modified: trunk/system/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- trunk/system/src/main/org/jboss/deployment/MainDeployer.java	2006-08-04 06:16:16 UTC (rev 55160)
+++ trunk/system/src/main/org/jboss/deployment/MainDeployer.java	2006-08-04 06:19:52 UTC (rev 55161)
@@ -641,7 +641,9 @@
    {
       // Stop all sub-deployments
       ArrayList reverseSortedSubs = new ArrayList(di.subDeployments);
-      Collections.sort(reverseSortedSubs, infoSorter);
+	  boolean isSorted = di.sortedSubDeployments;
+	  if(!isSorted)
+		  Collections.sort(reverseSortedSubs, infoSorter);
       Collections.reverse(reverseSortedSubs);
       for (Iterator subs = reverseSortedSubs.iterator(); subs.hasNext();)
       {
@@ -677,7 +679,9 @@
       // Destroy all sub-deployments
       ArrayList reverseSortedSubs = new ArrayList(di.subDeployments);
       Collections.sort(reverseSortedSubs, infoSorter);
-      Collections.reverse(reverseSortedSubs);
+	  boolean isSorted = di.sortedSubDeployments;
+	  if(!isSorted)
+			Collections.reverse(reverseSortedSubs);
       for (Iterator subs = reverseSortedSubs.iterator(); subs.hasNext();)
       {
          DeploymentInfo sub = (DeploymentInfo) subs.next();
@@ -875,7 +879,10 @@
          log.debug("found " + deployment.subDeployments.size() + " subpackages of " + deployment.url);
          // get sorted subDeployments
          ArrayList sortedSubs = new ArrayList(deployment.subDeployments);
-         Collections.sort(sortedSubs, infoSorter);
+		 boolean isSorted = deployment.sortedSubDeployments;
+		 if(!isSorted){
+			Collections.sort(sortedSubs, infoSorter);
+		 }
          for (Iterator lt = sortedSubs.listIterator(); lt.hasNext();)
          {
             init((DeploymentInfo) lt.next());
@@ -937,7 +944,9 @@
       try
       {
          ArrayList sortedSubs = new ArrayList(deployment.subDeployments);
-         Collections.sort(sortedSubs, infoSorter);
+ 		 boolean isSorted = deployment.sortedSubDeployments;
+		 if(!isSorted)
+			Collections.sort(sortedSubs, infoSorter);
          for (Iterator lt = sortedSubs.listIterator(); lt.hasNext();)
          {
             create((DeploymentInfo) lt.next());
@@ -991,7 +1000,9 @@
       try
       {
          ArrayList sortedSubs = new ArrayList(deployment.subDeployments);
-         Collections.sort(sortedSubs, infoSorter);
+		 boolean isSorted = deployment.sortedSubDeployments;
+		 if(!isSorted)
+			Collections.sort(sortedSubs, infoSorter);
          for (Iterator lt = sortedSubs.listIterator(); lt.hasNext();)
          {
             start((DeploymentInfo) lt.next());