svn commit: r1506039 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java

[cziegeler]

Author: cziegeler
Date: Tue Jul 23 13:33:33 2013
New Revision: 1506039

URL: http://svn.apache.org/r1506039
Log:
Prevent NPE if the topology is not established on startup

Modified:
    
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java

Modified: 
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java?rev=1506039&r1=1506038&r2=1506039&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java
 (original)
+++ 
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/MaintenanceTask.java
 Tue Jul 23 13:33:33 2013
@@ -323,23 +323,25 @@ public class MaintenanceTask {
             this.processJobsFromPreviousVersions(topologyCapabilities, 
queueManager);
         }
 
-        // Clean up
-        final String cleanUpAssignedPath;;
-        if ( topologyCapabilities != null && topologyCapabilities.isLeader() ) 
{
-            cleanUpAssignedPath = this.configuration.getUnassignedJobsPath();
-        } else {
-            cleanUpAssignedPath = null;
-        }
-
-        if ( cleanUpCounter % 60 == 0 ) { // full clean up is done every hour
-            this.fullEmptyFolderCleanup(topologyCapabilities, 
this.configuration.getLocalJobsPath());
-            if ( cleanUpAssignedPath != null ) {
-                this.fullEmptyFolderCleanup(topologyCapabilities, 
cleanUpAssignedPath);
-            }
-        } else if ( cleanUpCounter % 5 == 0 ) { // simple clean up every 5 
minutes
-            this.simpleEmptyFolderCleanup(topologyCapabilities, 
this.configuration.getLocalJobsPath());
-            if ( cleanUpAssignedPath != null ) {
-                this.simpleEmptyFolderCleanup(topologyCapabilities, 
cleanUpAssignedPath);
+        if ( topologyCapabilities != null ) {
+            // Clean up
+            final String cleanUpAssignedPath;;
+            if ( topologyCapabilities.isLeader() ) {
+                cleanUpAssignedPath = 
this.configuration.getUnassignedJobsPath();
+            } else {
+                cleanUpAssignedPath = null;
+            }
+
+            if ( cleanUpCounter % 60 == 0 ) { // full clean up is done every 
hour
+                this.fullEmptyFolderCleanup(topologyCapabilities, 
this.configuration.getLocalJobsPath());
+                if ( cleanUpAssignedPath != null ) {
+                    this.fullEmptyFolderCleanup(topologyCapabilities, 
cleanUpAssignedPath);
+                }
+            } else if ( cleanUpCounter % 5 == 0 ) { // simple clean up every 5 
minutes
+                this.simpleEmptyFolderCleanup(topologyCapabilities, 
this.configuration.getLocalJobsPath());
+                if ( cleanUpAssignedPath != null ) {
+                    this.simpleEmptyFolderCleanup(topologyCapabilities, 
cleanUpAssignedPath);
+                }
             }
         }