Author: cziegeler
Date: Mon Jun 27 05:56:42 2016
New Revision: 1750277
URL: http://svn.apache.org/viewvc?rev=1750277&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=1750277&r1=1750276&r2=1750277&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
Mon Jun 27 05:56:42 2016
@@ -280,6 +280,10 @@ public class JobSchedulerImpl
*/
@Override
public void execute(final JobContext context) {
+ if ( !active.get() ) {
+ // not active anymore, simply return
+ return;
+ }
final ScheduledJobInfoImpl info = (ScheduledJobInfoImpl)
context.getConfiguration().get(PROPERTY_READ_JOB);
if ( info.isSuspended() ) {
