Merge branch 'pulls/98'

scala · May 30, 2014 · 2c64160 · 2c64160
2 parents 1da562e + 6a1b6bf
commit 2c64160
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/main/java/jline/TerminalFactory.java b/src/main/java/jline/TerminalFactory.java
@@ -42,7 +42,7 @@ public class TerminalFactory
 
     public static final String FALSE = "false";
 
-    private static final InheritableThreadLocal<Terminal> holder = new InheritableThreadLocal<Terminal>();
+    private static Terminal term = null;
 
     public static synchronized Terminal create() {
         if (Log.TRACE) {
@@ -109,11 +109,11 @@ else if (tmp.equals(NONE) || tmp.equals(OFF) || tmp.equals(FALSE)) {
     }
 
     public static synchronized void reset() {
-        holder.remove();
+        term = null;
     }
 
     public static synchronized void resetIf(final Terminal t) {
-        if (holder.get() == t) {
+        if(t == term) {
             reset();
         }
     }
@@ -154,12 +154,10 @@ public static enum Flavor
     }
 
     public static synchronized Terminal get() {
-        Terminal t = holder.get();
-        if (t == null) {
-            t = create();
-            holder.set(t);
+        if (term == null) {
+            term = create();
         }
-        return t;
+        return term;
     }
 
     public static Terminal getFlavor(final Flavor flavor) throws Exception {