svn commit: r643351 - in /felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi: DropBundleCommand.java StartBundleCommand.java

[christian]

Author: christian
Date: Tue Apr  1 03:18:10 2008
New Revision: 643351

URL: http://svn.apache.org/viewvc?rev=643351&view=rev
Log:
Fixed issue preventing bundles from being updated correctly if their 
file/entry-name changes between versions.

Modified:
    
felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java
    
felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java

Modified: 
felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java?rev=643351&r1=643350&r2=643351&view=diff
==============================================================================
--- 
felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java
 (original)
+++ 
felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java
 Tue Apr  1 03:18:10 2008
@@ -41,7 +41,7 @@
         BundleInfoImpl[] orderedTargetBundles = target.getOrderedBundleInfos();
         for (int i = orderedTargetBundles.length - 1; i >= 0; i--) {
             BundleInfoImpl bundleInfo = orderedTargetBundles[i];
-            if (!bundleInfo.isCustomizer() && 
source.getBundleInfoByPath(bundleInfo.getPath()) == null) {
+            if (!bundleInfo.isCustomizer() && 
source.getBundleInfoByName(bundleInfo.getSymbolicName()) == null) {
                 // stale bundle, save a copy for rolling back and uninstall it
                 String symbolicName = bundleInfo.getSymbolicName();
                 try {

Modified: 
felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java?rev=643351&r1=643350&r2=643351&view=diff
==============================================================================
--- 
felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java
 (original)
+++ 
felix/trunk/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java
 Tue Apr  1 03:18:10 2008
@@ -63,7 +63,7 @@
                     }
                 }
                 else {
-                       log.log(LogService.LOG_WARNING, "Could not start bundle 
'" + bundleInfoImpl.getSymbolicName() + "' because it is no defined in the 
framework");
+                       log.log(LogService.LOG_WARNING, "Could not start bundle 
'" + bundleInfoImpl.getSymbolicName() + "' because it is not defined in the 
framework");
                 }
             }
         }