You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/12/12 16:43:34 UTC
svn commit: r1420782 -
/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Author: coheigea
Date: Wed Dec 12 15:43:34 2012
New Revision: 1420782
URL: http://svn.apache.org/viewvc?rev=1420782&view=rev
Log:
Merged revisions 1420757 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1420757 | coheigea | 2012-12-12 15:25:07 +0000 (Wed, 12 Dec 2012) | 10 lines
Merged revisions 1420739 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1420739 | coheigea | 2012-12-12 15:09:40 +0000 (Wed, 12 Dec 2012) | 2 lines
Moving security processing boolean to the end of handleMessage
........
........
Modified:
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1420782&r1=1420781&r2=1420782&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Wed Dec 12 15:43:34 2012
@@ -199,7 +199,6 @@ public class WSS4JInInterceptor extends
if (msg.containsKey(SECURITY_PROCESSED) || isGET(msg)) {
return;
}
- msg.put(SECURITY_PROCESSED, Boolean.TRUE);
boolean utWithCallbacks =
MessageUtils.getContextualBoolean(msg, SecurityConstants.VALIDATE_TOKEN, true);
@@ -325,6 +324,7 @@ public class WSS4JInInterceptor extends
if (doDebug) {
LOG.fine("WSS4JInInterceptor: exit handleMessage()");
}
+ msg.put(SECURITY_PROCESSED, Boolean.TRUE);
} catch (WSSecurityException e) {
LOG.log(Level.WARNING, "", e);