Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/ThreadLocalData.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/ThreadLocalData.java	(revision 2730)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/ThreadLocalData.java	(revision 2731)
@@ -29,24 +29,20 @@
  */
 public class ThreadLocalData {
-	private static ThreadLocal<HttpServletRequest> request = null;
-	private static ThreadLocal<Context> context = null;
+	private static ThreadLocal<HttpServletRequest> request = new ThreadLocal<HttpServletRequest>();
+	private static ThreadLocal<Context> context = new ThreadLocal<Context>();
 	
 	public static void beginRequest(final HttpServletRequest request) {
 		if (request == null)
 			throw new IllegalArgumentException();
-		if (ThreadLocalData.request == null)
-			ThreadLocalData.request = new ThreadLocal<HttpServletRequest>();
 		ThreadLocalData.request.set(request);
-		if (ThreadLocalData.context == null)
-			ThreadLocalData.context = new ThreadLocal<Context>();
 		ThreadLocalData.context.set(new Context(request));
 	}
 	
 	public static HttpServletRequest getRequest() {
-		return (request == null) ? null : request.get();
+		return request.get();
 	}
 	
 	 public static Context getContext() {
-		 return (context == null) ? null : context.get();
+		 return context.get();
 	 }
 	
@@ -57,6 +53,6 @@
 	 */
 	public static void endRequest() {
-		request.set(null);
-		context.set(null);
+		request.remove();
+		context.remove();
 	}
 }