Author: marrs
Date: Fri Nov 15 18:01:43 2013
New Revision: 1542352
URL: http://svn.apache.org/r1542352
Log:
FELIX-4184 Fixed the issue that was already identified, which also makes the
test pass.
Modified:
felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StopBundleCommand.java
Modified:
felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StopBundleCommand.java
URL:
http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StopBundleCommand.java?rev=1542352&r1=1542351&r2=1542352&view=diff
==============================================================================
---
felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StopBundleCommand.java
(original)
+++
felix/trunk/deploymentadmin/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StopBundleCommand.java
Fri Nov 15 18:01:43 2013
@@ -85,7 +85,7 @@ public class StopBundleCommand extends C
private boolean omitBundleStop(DeploymentSessionImpl session, String
symbolicName) {
boolean result = false;
BundleInfoImpl sourceBundleInfo =
session.getSourceAbstractDeploymentPackage().getBundleInfoByName(symbolicName);
- BundleInfoImpl targetBundleInfo =
session.getSourceAbstractDeploymentPackage().getBundleInfoByName(symbolicName);
+ BundleInfoImpl targetBundleInfo =
session.getTargetAbstractDeploymentPackage().getBundleInfoByName(symbolicName);
boolean fixPackageMissing = sourceBundleInfo != null &&
sourceBundleInfo.isMissing();
boolean sameVersion = (targetBundleInfo != null &&
sourceBundleInfo != null &&
targetBundleInfo.getVersion().equals(sourceBundleInfo.getVersion()));
if (fixPackageMissing || sameVersion) {
