| commit | 5f48e577f0569de8a4c370e1d9673dd211c55690 | [log] [tgz] |
|---|---|---|
| author | Christian van Spaandonk <christian@apache.org> | Tue Apr 01 10:18:10 2008 +0000 |
| committer | Christian van Spaandonk <christian@apache.org> | Tue Apr 01 10:18:10 2008 +0000 |
| tree | f33832e53ecf5205edc941b5ec59356723ff8dcc | |
| parent | bd39ab50a05ac18558b51d7b1815953bea1b0a4d [diff] |
Fixed issue preventing bundles from being updated correctly if their file/entry-name changes between versions. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@643351 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java b/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java index 61133bf..ce74ba7 100644 --- a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java +++ b/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java
@@ -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 {
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java b/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java index c8897e3..f94eb30 100644 --- a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java +++ b/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java
@@ -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"); } } }