When clearing the current thread's Channel, remove the ThreadLocal

jenkinsci · Jun 10, 2015 · fa8cd95 · fa8cd95
1 parent b6f1d07
commit fa8cd95
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/hudson/remoting/Channel.java b/src/main/java/hudson/remoting/Channel.java
@@ -1425,7 +1425,11 @@ private void updateLastHeard() {
 
     /*package*/ static Channel setCurrent(Channel channel) {
         Channel old = CURRENT.get();
-        CURRENT.set(channel);
+        if (channel == null) {
+            CURRENT.remove();
+        } else {
+            CURRENT.set(channel);
+        }
         return old;
     }