Bug 479115 - [http] NPE in HttpServletRequestWrapperImpl.getContextPath/getRequestURII20151103-0800

Signed-off-by: Raymond Auge <raymond.auge@liferay.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestWrapperImpl.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestWrapperImpl.java
index c00ad4f2c..dd98b2653 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestWrapperImpl.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestWrapperImpl.java
@@ -129,12 +129,7 @@ public class HttpServletRequestWrapperImpl extends HttpServletRequestWrapper {
 		RequestDispatcher.INCLUDE_SERVLET_PATH
 	};
 
-	private final ThreadLocal<Deque<State>> state = new ThreadLocal<Deque<State>>() {
-		@Override
-		protected Deque<State> initialValue() {
-			return new ArrayDeque<State>();
-		}
-	};
+	private final Deque<State> state = new ArrayDeque<State>();
 
 	private final HttpServletRequest request;
 
@@ -167,7 +162,7 @@ public class HttpServletRequestWrapperImpl extends HttpServletRequestWrapper {
 	}
 
 	public void destroy() {
-		state.remove();
+		state.clear();
 	}
 
 	public String getAuthType() {
@@ -455,7 +450,7 @@ public class HttpServletRequestWrapperImpl extends HttpServletRequestWrapper {
 	}
 
 	private Deque<State> getState() {
-		return state.get();
+		return state;
 	}
 
 }
\ No newline at end of file