Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Auge2015-10-30 18:24:53 +0000
committerRaymond Auge2015-10-30 18:24:53 +0000
commit4c74098f4b74931fb5a5163d68560cf7cac1bc9c (patch)
tree30f0a66de0bb01202ae05d8b68070092e8ccfaae /bundles/org.eclipse.equinox.http.servlet
parent8f777a88368f9872f5cc6d5f5336418529511d96 (diff)
downloadrt.equinox.bundles-4c74098f4b74931fb5a5163d68560cf7cac1bc9c.tar.gz
rt.equinox.bundles-4c74098f4b74931fb5a5163d68560cf7cac1bc9c.tar.xz
rt.equinox.bundles-4c74098f4b74931fb5a5163d68560cf7cac1bc9c.zip
Bug 479115 - [http] NPE in HttpServletRequestWrapperImpl.getContextPath/getRequestURII20151103-0800
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
Diffstat (limited to 'bundles/org.eclipse.equinox.http.servlet')
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestWrapperImpl.java11
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 c00ad4f2..dd98b265 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

Back to the top