Author: cziegeler Date: Tue Aug 31 09:44:09 2010 New Revision: 991133 URL: http://svn.apache.org/viewvc?rev=991133&view=rev Log: SLING-1560 : If something goes wrong add tasks to next cycle.
Modified: sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleInstallTask.java sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleUpdateTask.java Modified: sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleInstallTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleInstallTask.java?rev=991133&r1=991132&r2=991133&view=diff ============================================================================== --- sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleInstallTask.java (original) +++ sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleInstallTask.java Tue Aug 31 09:44:09 2010 @@ -82,7 +82,7 @@ public class BundleInstallTask extends O return; } catch (Exception ex) { // if something goes wrong we simply try it again - ctx.addTaskToCurrentCycle(this); + ctx.addTaskToNextCycle(this); return; } } Modified: sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleUpdateTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleUpdateTask.java?rev=991133&r1=991132&r2=991133&view=diff ============================================================================== --- sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleUpdateTask.java (original) +++ sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/tasks/BundleUpdateTask.java Tue Aug 31 09:44:09 2010 @@ -116,7 +116,7 @@ public class BundleUpdateTask extends Os this.creator.saveInstalledBundleInfo(b.getSymbolicName(), resource.getDigest(), newVersion.toString()); } catch (Exception e) { if ( canRetry ) { - ctx.addTaskToCurrentCycle(this); + ctx.addTaskToNextCycle(this); return; } Logger.logWarn("Removing failing tasks - unable to retry: " + this, e);