You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/11/04 16:23:43 UTC

svn commit: r1636605 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueManager.java

Author: cziegeler
Date: Tue Nov  4 15:23:43 2014
New Revision: 1636605

URL: http://svn.apache.org/r1636605
Log:
SLING-4130 : Potential NPE on startup of queue manager

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

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueManager.java?rev=1636605&r1=1636604&r2=1636605&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueManager.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/QueueManager.java Tue Nov  4 15:23:43 2014
@@ -126,7 +126,6 @@ public class QueueManager
     @Activate
     protected void activate(final Map<String, Object> props) {
         logger.info("Apache Sling Queue Manager started on instance {}", Environment.APPLICATION_ID);
-        this.configuration.addListener(this);
         this.queueServices = new QueueServices();
         queueServices.configuration = this.configuration;
         queueServices.eventAdmin = this.eventAdmin;
@@ -134,6 +133,7 @@ public class QueueManager
         queueServices.scheduler = this.scheduler;
         queueServices.threadPoolManager = this.threadPoolManager;
         queueServices.statisticsManager = statisticsManager;
+        this.configuration.addListener(this);
     }
 
     /**