Kill thread local leak

jasontedor · jasontedor · commit 5396672c27d6 · 2016-04-22T08:34:15.000-04:00
This commit backports commit 21b1da1 from master to 1.7. Relates elastic#17921
diff --git a/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java b/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java
@@ -62,11 +62,7 @@ class InjectorImpl implements Injector, Lookups {
         if (parent != null) {
             localContext = parent.localContext;
         } else {
-            localContext = new ThreadLocal<Object[]>() {
-                protected Object[] initialValue() {
-                    return new Object[1];
-                }
-            };
+            localContext = new ThreadLocal<>();
         }
     }
 
@@ -817,13 +813,17 @@ public <T> T getInstance(Class<T> type) {
         return getProvider(type).get();
     }
 
-    final ThreadLocal<Object[]> localContext;
+    private final ThreadLocal<Object[]> localContext;
 
     /**
      * Looks up thread local context. Creates (and removes) a new context if necessary.
      */
     <T> T callInContext(ContextualCallable<T> callable) throws ErrorsException {
         Object[] reference = localContext.get();
+        if (reference == null) {
+            reference = new Object[1];
+            localContext.set(reference);
+        }
         if (reference[0] == null) {
             reference[0] = new InternalContext();
             try {
