[Jboss-cvs] JBossAS SVN: r55933 - branches/Branch_4_0/system/src/main/org/jboss/deployment

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

Author: vicky.kak at jboss.com
Date: 2006-08-15 05:44:15 -0400 (Tue, 15 Aug 2006)
New Revision: 55933

Modified:
   branches/Branch_4_0/system/src/main/org/jboss/deployment/MainDeployer.java
Log:
Changed Done for JBAS-3503
(Removing JBAS-2904 changes)

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