From 0bd07a1397d3a0c1140b43cd08c29cc2042c13a9 Mon Sep 17 00:00:00 2001
From: Richard Hightower <rhightower@gmail.com>
Date: Thu, 9 Jul 2015 17:23:57 -0700
Subject: [PATCH] fixed service context so that it is never null for queue
 callbacks.

---
 .../qbit/service/health/ServiceHealthListener.java             | 2 +-
 .../advantageous/qbit/service/impl/BaseServiceQueueImpl.java   | 3 ++-
 2 files changed, 3 insertions(+), 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
index b2ac7686..047ed011 100644
--- 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
index d9bb4d84..6b5ca5b4 100644
--- 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();