Index: ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java (revision 1002799) +++ ql/src/java/org/apache/hadoop/hive/ql/io/IOContext.java (working copy) @@ -29,12 +29,10 @@ */ public class IOContext { - private static ThreadLocal threadLocal = new ThreadLocal(); - static { - if (threadLocal.get() == null) { - threadLocal.set(new IOContext()); - } - } + private static ThreadLocal threadLocal = new ThreadLocal(){ + @Override + protected synchronized IOContext initialValue() { return new IOContext(); } + }; public static IOContext get() { return IOContext.threadLocal.get();