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 2010/09/14 08:20:50 UTC
svn commit: r996763 -
/sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java
Author: cziegeler
Date: Tue Sep 14 06:20:49 2010
New Revision: 996763
URL: http://svn.apache.org/viewvc?rev=996763&view=rev
Log:
SLING-1737 : Add state management for resources - Make sure to always uninstall resources
Modified:
sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java
Modified: sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java?rev=996763&r1=996762&r2=996763&view=diff
==============================================================================
--- sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java (original)
+++ sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java Tue Sep 14 06:20:49 2010
@@ -315,7 +315,8 @@ public class OsgiInstallerImpl
if ( !found) {
logger.debug("Resource {} seems to be removed.", r);
if ( first && (r.getState() == RegisteredResource.State.INSTALLED
- || r.getState() == RegisteredResource.State.INSTALL)) {
+ || r.getState() == RegisteredResource.State.INSTALL)
+ || r.getState() == RegisteredResource.State.IGNORED) {
r.setState(RegisteredResource.State.UNINSTALL);
} else {
toRemove.add(r);