You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2012/07/18 08:57:47 UTC

svn commit: r1362787 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks: BundleRemoveTask.java BundleTaskCreator.java

Author: cziegeler
Date: Wed Jul 18 06:57:46 2012
New Revision: 1362787

URL: http://svn.apache.org/viewvc?rev=1362787&view=rev
Log:
SLING-2537 : Removed artifact might not be removed from OSGi installer list

Modified:
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java

Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java?rev=1362787&r1=1362786&r2=1362787&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java Wed Jul 18 06:57:46 2012
@@ -47,7 +47,7 @@ public class BundleRemoveTask extends Ab
         final Bundle b = BundleInfo.getMatchingBundle(this.getBundleContext(), symbolicName, version);
         if (b == null) {
             // nothing to do, so just stop
-            this.setFinishedState(ResourceState.IGNORED);
+            this.setFinishedState(ResourceState.UNINSTALLED);
             return;
         }
         final int state = b.getState();

Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java?rev=1362787&r1=1362786&r2=1362787&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java Wed Jul 18 06:57:46 2012
@@ -210,7 +210,7 @@ public class BundleTaskCreator
 		    } else {
 	            logger.debug("Bundle {}:{} is not installed anymore - nothing to remove.", symbolicName,
 	                    toActivate.getAttribute(Constants.BUNDLE_VERSION));
-	            result = new ChangeStateTask(resourceList, ResourceState.IGNORED);
+	            result = new ChangeStateTask(resourceList, ResourceState.UNINSTALLED);
 	        }
 
 		// Install