[jboss-cvs] JBossAS SVN: r89472 - projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal.

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

Author: thomas.diesler at jboss.com
Date: 2009-05-27 11:33:29 -0400 (Wed, 27 May 2009)
New Revision: 89472

Modified:
   projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerHelper.java
Log:
Process old before new

Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerHelper.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerHelper.java	2009-05-27 15:31:37 UTC (rev 89471)
+++ projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerHelper.java	2009-05-27 15:33:29 UTC (rev 89472)
@@ -61,28 +61,13 @@
    {
       List<BundleInfo> currScan = Arrays.asList(scanner.getBundles());
       
+      processOldDeployments(currScan);
+      
       processNewDeployments(currScan);
-      processOldDeployments(currScan);
 
       lastScan = currScan;
    }
 
-   static Bundle getInstalledBundle(BundleContext context, String symbolicName)
-   {
-      Bundle bundle = null;
-
-      for (Bundle aux : context.getBundles())
-      {
-         if (aux.getSymbolicName().equals(symbolicName))
-         {
-            bundle = aux;
-            break;
-         }
-      }
-
-      return bundle;
-   }
-
    private void processNewDeployments(List<BundleInfo> currScan)
    {
       List<BundleInfo> diff = new ArrayList<BundleInfo>();
@@ -150,4 +135,20 @@
          }
       }
    }
+
+   static Bundle getInstalledBundle(BundleContext context, String symbolicName)
+   {
+      Bundle bundle = null;
+
+      for (Bundle aux : context.getBundles())
+      {
+         if (aux.getSymbolicName().equals(symbolicName))
+         {
+            bundle = aux;
+            break;
+         }
+      }
+
+      return bundle;
+   }
 }
\ No newline at end of file