sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1590657 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Date Mon, 28 Apr 2014 14:33:42 GMT
Author: cziegeler
Date: Mon Apr 28 14:33:42 2014
New Revision: 1590657

URL: http://svn.apache.org/r1590657
Log:
SLING-3522 : NPE on startup in ChangeStateTask.getSortKey

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=1590657&r1=1590656&r2=1590657&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
Mon Apr 28 14:33:42 2014
@@ -1020,7 +1020,6 @@ implements OsgiInstaller, ResourceChange
                 }
                 if ( updated || created ) {
                     this.persistentList.save();
-                    this.scheduleRetry();
                 }
 
             }
@@ -1059,7 +1058,6 @@ implements OsgiInstaller, ResourceChange
                         // if it has been ignored before, we activate it now again!
                         ((RegisteredResourceImpl)tr).setState(ResourceState.INSTALL);
                         this.persistentList.save();
-                        this.scheduleRetry();
                     } else if ( tr.getState() == ResourceState.UNINSTALLED ) {
                         // it has already been removed - nothing do to
                     } else {
@@ -1082,7 +1080,6 @@ implements OsgiInstaller, ResourceChange
                             }
                         }
                         this.persistentList.save();
-                        this.scheduleRetry();
                     }
                 }
             }



Mime
View raw message