sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1054067 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Date Fri, 31 Dec 2010 08:56:41 GMT
Author: cziegeler
Date: Fri Dec 31 08:56:41 2010
New Revision: 1054067

URL: http://svn.apache.org/viewvc?rev=1054067&view=rev
Log:
SLING-1909 : Don't uninstall bundles not installed by the installer

Modified:
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java

Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1054067&r1=1054066&r2=1054067&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
(original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Fri Dec 31 08:56:41 2010
@@ -328,8 +328,7 @@ 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.IGNORED)
{
+                                               ||  r.getState() == RegisteredResource.State.INSTALL)
) {
                                          r.setState(RegisteredResource.State.UNINSTALL);
                                     } else {
                                         toRemove.add(r);



Mime
View raw message