svn commit: r1352951 - /cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java

[coheigea]

Author: coheigea
Date: Fri Jun 22 16:19:51 2012
New Revision: 1352951

URL: http://svn.apache.org/viewvc?rev=1352951&view=rev
Log:
Merged revisions 1352948 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1352948 | coheigea | 2012-06-22 17:16:42 +0100 (Fri, 22 Jun 2012) | 2 lines

  Translate message properties onto the message context instead of storing as 
properties (WSS4JInInterceptor is a singleton when using WS-SecurityPolicy)

........

Modified:
    
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java

Modified: 
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java?rev=1352951&r1=1352950&r2=1352951&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
 Fri Jun 22 16:19:51 2012
@@ -161,12 +161,12 @@ public abstract class AbstractWSS4JInter
     protected void translateProperties(SoapMessage msg) {
         String bspCompliant = 
(String)msg.getContextualProperty(SecurityConstants.IS_BSP_COMPLIANT);
         if (bspCompliant != null) {
-            setProperty(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
+            msg.setContextualProperty(WSHandlerConstants.IS_BSP_COMPLIANT, 
bspCompliant);
         }
         String futureTTL = 
             
(String)msg.getContextualProperty(SecurityConstants.TIMESTAMP_FUTURE_TTL);
         if (futureTTL != null) {
-            setProperty(WSHandlerConstants.TTL_FUTURE_TIMESTAMP, futureTTL);
+            msg.setContextualProperty(WSHandlerConstants.TTL_FUTURE_TIMESTAMP, 
futureTTL);
         }
     }