fixed service context so that it is never null for queue callbacks.

advantageous · Jul 10, 2015 · 0bd07a1 · 0bd07a1
1 parent 57d2dc2
commit 0bd07a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/qbit/core/src/main/java/io/advantageous/qbit/service/health/ServiceHealthListener.java b/qbit/core/src/main/java/io/advantageous/qbit/service/health/ServiceHealthListener.java
@@ -49,7 +49,7 @@ private void check() {
         if (duration > checkInIntervalMS) {
             lastCheckTime = now;
 
-            ServiceQueue serviceQueue = ServiceContext.serviceContext().currentService();
+            final ServiceQueue serviceQueue = ServiceContext.serviceContext().currentService();
 
             boolean failing = serviceQueue.failing();
 

diff --git a/qbit/core/src/main/java/io/advantageous/qbit/service/impl/BaseServiceQueueImpl.java b/qbit/core/src/main/java/io/advantageous/qbit/service/impl/BaseServiceQueueImpl.java
@@ -403,7 +403,6 @@ public void init() {
                 serviceThreadLocal.set(BaseServiceQueueImpl.this);
                 queueCallBackHandler.queueInit();
                 serviceMethodHandler.init();
-                serviceThreadLocal.set(null);
             }
 
             @Override
@@ -447,6 +446,8 @@ public void shutdown() {
 
             @Override
             public void idle() {
+
+                serviceThreadLocal.set(BaseServiceQueueImpl.this);
                 handle();
                 serviceMethodHandler.idle();
                 queueCallBackHandler.queueIdle();