svn commit: r1599680 - in /webservices/wss4j/trunk: ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java

[co...@apache.org]

Author: coheigea
Date: Tue Jun  3 16:46:51 2014
New Revision: 1599680

URL: http://svn.apache.org/r1599680
Log:
Removed WSSecurityEngine object from WSHandler

Modified:
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java?rev=1599680&r1=1599679&r2=1599680&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java Tue Jun  3 16:46:51 2014
@@ -36,7 +36,6 @@ import javax.security.auth.callback.Call
 
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSSConfig;
-import org.apache.wss4j.dom.WSSecurityEngine;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.action.Action;
 import org.apache.wss4j.common.EncryptionActionToken;
@@ -63,7 +62,6 @@ import org.w3c.dom.Document;
 public abstract class WSHandler {
     private static final org.slf4j.Logger LOG = 
         org.slf4j.LoggerFactory.getLogger(WSHandler.class);
-    protected WSSecurityEngine secEngine = new WSSecurityEngine();
     protected Map<String, Crypto> cryptos = new ConcurrentHashMap<String, Crypto>();
 
     private boolean doDebug = LOG.isDebugEnabled();
@@ -89,11 +87,11 @@ public abstract class WSHandler {
 
         WSSConfig wssConfig = reqData.getWssConfig();
         if (wssConfig == null) {
-            wssConfig = secEngine.getWssConfig();
+            wssConfig = WSSConfig.getNewInstance();
+            reqData.setWssConfig(wssConfig);
         }
         wssConfig.setPasswordsAreEncoded(decodeUseEncodedPasswords(reqData));
         wssConfig.setPrecisionInMilliSeconds(decodeTimestampPrecision(reqData));
-        reqData.setWssConfig(wssConfig);
 
         Object mc = reqData.getMsgContext();
         String actor = getString(WSHandlerConstants.ACTOR, mc);
@@ -304,7 +302,8 @@ public abstract class WSHandler {
 
         WSSConfig wssConfig = reqData.getWssConfig();
         if (wssConfig == null) {
-            wssConfig = secEngine.getWssConfig();
+            wssConfig = WSSConfig.getNewInstance();
+            reqData.setWssConfig(wssConfig);
         }
         boolean enableSigConf = decodeEnableSignatureConfirmation(reqData);
         wssConfig.setEnableSignatureConfirmation(
@@ -335,7 +334,6 @@ public abstract class WSHandler {
         if (!bspCompliant) {
             reqData.setDisableBSPEnforcement(true);
         }
-        reqData.setWssConfig(wssConfig);
         
         // Load CallbackHandler
         if (reqData.getCallbackHandler() == null) {

Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java?rev=1599680&r1=1599679&r2=1599680&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java Tue Jun  3 16:46:51 2014
@@ -25,6 +25,7 @@ import org.apache.wss4j.common.ext.WSSec
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSSConfig;
+import org.apache.wss4j.dom.WSSecurityEngine;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.dom.handler.HandlerAction;
@@ -481,10 +482,14 @@ public abstract class AbstractTestBase e
              * Get and check the Signature specific parameters first because they
              * may be used for encryption too.
              */
+            WSSConfig wssConfig = WSSConfig.getNewInstance();
+            reqData.setWssConfig(wssConfig);
             doReceiverAction(actions, reqData);
 
             Element elem = WSSecurityUtil.getSecurityHeader(doc, actor);
 
+            WSSecurityEngine secEngine = new WSSecurityEngine();
+            secEngine.setWssConfig(wssConfig);
             List<WSSecurityEngineResult> wsResult = null;
             try {
                 wsResult = secEngine.processSecurityHeader(elem, reqData);