Author: sergeyb
Date: Wed Feb 27 11:38:15 2013
New Revision: 1450748
URL: http://svn.apache.org/r1450748
Log:
Merged revisions 1450744 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1450744 | sergeyb | 2013-02-27 11:30:41 +0000 (Wed, 27 Feb 2013) | 1 line
[CXF-4860] Keeping redirection status as HTTP attribute instead of parameter
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1450744
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1450748&r1=1450747&r2=1450748&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Wed Feb 27 11:38:15 2013
@@ -233,7 +233,7 @@ public abstract class AbstractHTTPDestin
LOG.fine("Get the message from the request for processing");
}
- copyKnownRequestParameters(req, inMessage);
+ copyKnownRequestAttributes(req, inMessage);
try {
incomingObserver.onMessage(inMessage);
@@ -247,8 +247,8 @@ public abstract class AbstractHTTPDestin
}
- private void copyKnownRequestParameters(HttpServletRequest request,
Message message) {
- message.put(SERVICE_REDIRECTION,
request.getParameter(SERVICE_REDIRECTION));
+ private void copyKnownRequestAttributes(HttpServletRequest request,
Message message) {
+ message.put(SERVICE_REDIRECTION,
request.getAttribute(SERVICE_REDIRECTION));
}
protected void setupMessage(Message inMessage,
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java?rev=1450748&r1=1450747&r2=1450748&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
Wed Feb 27 11:38:15 2013
@@ -353,11 +353,11 @@ public abstract class AbstractHTTPServle
}
@Override
- public String getParameter(String name) {
+ public Object getAttribute(String name) {
if (AbstractHTTPDestination.SERVICE_REDIRECTION.equals(name)) {
return "true";
}
- return super.getParameter(name);
+ return super.getAttribute(name);
}
}