You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by wo...@apache.org on 2014/09/11 07:18:42 UTC
svn commit: r1624196 - in
/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy:
filter/ servlet/
Author: woonsan
Date: Thu Sep 11 05:18:42 2014
New Revision: 1624196
URL: http://svn.apache.org/r1624196
Log:
APA-66: renaming and setting proxyContext in the thread local
Added:
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/GenericReverseProxyFilter.java
- copied, changed from r1624192, portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/DefaultReverseProxyFilter.java
Removed:
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/DefaultReverseProxyFilter.java
Modified:
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/SimpleReverseProxyFilter.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/GenericReverseProxyServlet.java
Copied: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/GenericReverseProxyFilter.java (from r1624192, portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/DefaultReverseProxyFilter.java)
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/GenericReverseProxyFilter.java?p2=portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/GenericReverseProxyFilter.java&p1=portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/DefaultReverseProxyFilter.java&r1=1624192&r2=1624196&rev=1624196&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/DefaultReverseProxyFilter.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/GenericReverseProxyFilter.java Thu Sep 11 05:18:42 2014
@@ -46,7 +46,7 @@ import org.apache.portals.applications.w
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DefaultReverseProxyFilter implements Filter
+public class GenericReverseProxyFilter implements Filter
{
private static final Set<String> AVAILABLE_HTTP_METHOD_SET =
@@ -58,7 +58,7 @@ public class DefaultReverseProxyFilter i
HttpOptions.METHOD_NAME,
HttpTrace.METHOD_NAME));
- private static Logger log = LoggerFactory.getLogger(DefaultReverseProxyFilter.class);
+ private static Logger log = LoggerFactory.getLogger(GenericReverseProxyFilter.class);
private FilterConfig filterConfig;
@@ -66,7 +66,7 @@ public class DefaultReverseProxyFilter i
private String filterPath;
- public DefaultReverseProxyFilter()
+ public GenericReverseProxyFilter()
{
}
@@ -118,6 +118,7 @@ public class DefaultReverseProxyFilter i
requestContext.setRequestBasePath(requestBasePath);
ProxyContext proxyContext = new ProxyContext(requestContext);
+ ProxyContext.setCurrentProxyContext(proxyContext);
proxyService.invoke(proxyContext);
}
catch (ReverseProxyException e)
@@ -148,6 +149,10 @@ public class DefaultReverseProxyFilter i
{
throw new ServletException(e);
}
+ finally
+ {
+ ProxyContext.removeCurrentProxyContext();
+ }
}
}
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/SimpleReverseProxyFilter.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/SimpleReverseProxyFilter.java?rev=1624196&r1=1624195&r2=1624196&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/SimpleReverseProxyFilter.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/filter/SimpleReverseProxyFilter.java Thu Sep 11 05:18:42 2014
@@ -30,7 +30,7 @@ import org.apache.portals.applications.w
import org.apache.portals.applications.webcontent2.proxy.util.ProxyCommandUtils;
import org.apache.portals.applications.webcontent2.proxy.util.YamlConfigUtils;
-public class SimpleReverseProxyFilter extends DefaultReverseProxyFilter
+public class SimpleReverseProxyFilter extends GenericReverseProxyFilter
{
public static final String MAPPINGS_PARAM_NAME = "mappings";
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/GenericReverseProxyServlet.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/GenericReverseProxyServlet.java?rev=1624196&r1=1624195&r2=1624196&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/GenericReverseProxyServlet.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/GenericReverseProxyServlet.java Thu Sep 11 05:18:42 2014
@@ -88,6 +88,7 @@ public class GenericReverseProxyServlet
{
ServletRequestContext requestContext = new ServletRequestContext(request, response);
ProxyContext proxyContext = new ProxyContext(requestContext);
+ ProxyContext.setCurrentProxyContext(proxyContext);
getProxyService().invoke(proxyContext);
}
catch (ReverseProxyException e)
@@ -118,6 +119,10 @@ public class GenericReverseProxyServlet
{
throw new ServletException(e);
}
+ finally
+ {
+ ProxyContext.removeCurrentProxyContext();
+ }
}
}