Author: ay
Date: Tue Jan 24 16:23:27 2012
New Revision: 1235330
URL: http://svn.apache.org/viewvc?rev=1235330&view=rev
Log:
Merged revisions 1235327 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1235327 | ay | 2012-01-24 17:17:53 +0100 (Tue, 24 Jan 2012) | 1 line
[CXF-4060] oneway camel scenario is accessing the user principal too late,
resulting in IllegalStateException
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 24 16:23:27 2012
@@ -1 +1 @@
-/cxf/trunk:1235050
+/cxf/trunk:1235050,1235327
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1235330&r1=1235329&r2=1235330&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Tue Jan 24 16:23:27 2012
@@ -300,8 +300,9 @@ public abstract class AbstractHTTPDestin
inMessage.put(Message.FIXED_PARAMETER_ORDER, isFixedParameterOrder());
inMessage.put(Message.ASYNC_POST_RESPONSE_DISPATCH, Boolean.TRUE);
inMessage.put(SecurityContext.class, new SecurityContext() {
+ private Principal pp = req.getUserPrincipal();
public Principal getUserPrincipal() {
- return req.getUserPrincipal();
+ return pp;
}
public boolean isUserInRole(String role) {
return req.isUserInRole(role);