svn commit: r1750042 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java

[cziegeler]

Author: cziegeler
Date: Fri Jun 24 04:53:06 2016
New Revision: 1750042

URL: http://svn.apache.org/viewvc?rev=1750042&view=rev
Log:
SLING-5805 : NPE in JobSchedulerImpl when shutting down instance

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

Modified: 
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java?rev=1750042&r1=1750041&r2=1750042&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java
 Fri Jun 24 04:53:06 2016
@@ -261,7 +261,8 @@ public class JobSchedulerImpl
      * @param info The scheduling info
      */
     private void stopScheduledJob(final ScheduledJobInfoImpl info) {
-        if ( this.active.get() ) {
+        final Scheduler localScheduler = this.scheduler;
+        if ( localScheduler != null ) {
             this.configuration.getAuditLogger().debug("SCHEDULED STOP name={}, 
topic={}, properties={} : {}",
                     new Object[] {info.getName(),
                                   info.getJobTopic(),
@@ -269,7 +270,7 @@ public class JobSchedulerImpl
                                   info.getSchedules()});
             for(int index = 0; index<info.getSchedules().size(); index++) {
                 final String name = info.getSchedulerJobId() + "-" + 
String.valueOf(index);
-                this.scheduler.unschedule(name);
+                localScheduler.unschedule(name);
             }
         }
     }