Merge remote-tracking branch 'origin/jetty-9.2.x'

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java

1 files changed, 2 insertions, 6 deletions

diff --git a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
index 8e0a5f7d19..e170c0ddbc 100644
--- a/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
+++ b/jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
@@ -211,7 +211,6 @@ public class ContextFactory implements ObjectFactory
         return (Context)__contextMap.get(loader);
     }
 
-
     /**
      * Associate the given Context with the current thread.
      * disassociate method should be called to reset the context.
@@ -227,10 +226,9 @@ public class ContextFactory implements ObjectFactory
 
     public static void disassociateContext(final Context ctx)
     {
-        __threadContext.remove();
+        __threadContext.set(null);
     }
     
-    
     public static ClassLoader associateClassLoader(final ClassLoader loader)
     {
         ClassLoader prev = (ClassLoader)__threadClassLoader.get();
@@ -238,10 +236,9 @@ public class ContextFactory implements ObjectFactory
         return prev;
     }
     
-    
     public static void disassociateClassLoader ()
     {
-        __threadClassLoader.remove();
+        __threadClassLoader.set(null);
     }
 
     public static void dump(Appendable out, String indent) throws IOException
@@ -259,5 +256,4 @@ public class ContextFactory implements ObjectFactory
             context.dump(out,indent+(last?"    ":" |  "));
         }
     }
-
 }