Author: dkulp
Date: Wed Jun 1 15:58:15 2011
New Revision: 1130199
URL: http://svn.apache.org/viewvc?rev=1130199&view=rev
Log:
[WSS-292] Fix concurrency issue with EnvelopeIdResolver
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/EnvelopeIdResolver.java
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecDKSign.java
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecSignature.java
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSignEnvelope.java
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/SignatureProcessor.java
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/EnvelopeIdResolver.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/EnvelopeIdResolver.java?rev=1130199&r1=1130198&r2=1130199&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/EnvelopeIdResolver.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/EnvelopeIdResolver.java
Wed Jun 1 15:58:15 2011
@@ -55,15 +55,17 @@ public class EnvelopeIdResolver extends
* <p/>
*
* @return TODO
+ * @deprecated
*/
public synchronized static ResourceResolverSpi getInstance() {
if (resolver == null) {
- resolver = new EnvelopeIdResolver();
+ resolver = new EnvelopeIdResolver(null);
}
return resolver;
}
- private EnvelopeIdResolver() {
+ public EnvelopeIdResolver(WSDocInfo wsDocInfo) {
+ this.wsDocInfo = wsDocInfo;
}
/**
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecDKSign.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecDKSign.java?rev=1130199&r1=1130198&r2=1130199&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecDKSign.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecDKSign.java
Wed Jun 1 15:58:15 2011
@@ -151,7 +151,7 @@ public class WSSecDKSign extends WSSecDe
}
}
- sig.addResourceResolver(EnvelopeIdResolver.getInstance());
+ sig.addResourceResolver(new EnvelopeIdResolver(wsDocInfo));
String sigUri = wssConfig.getIdAllocator().createId("Signature-", sig);
sig.setId(sigUri);
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecSignature.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecSignature.java?rev=1130199&r1=1130198&r2=1130199&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecSignature.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSecSignature.java
Wed Jun 1 15:58:15 2011
@@ -375,8 +375,7 @@ public class WSSecSignature extends WSSe
}
}
- EnvelopeIdResolver resolver =
(EnvelopeIdResolver)EnvelopeIdResolver.getInstance();
- resolver.setWsDocInfo(wsDocInfo);
+ EnvelopeIdResolver resolver = new EnvelopeIdResolver(wsDocInfo);
sig.addResourceResolver(resolver);
sig.setId(wssConfig.getIdAllocator().createId("Signature-", sig));
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSignEnvelope.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSignEnvelope.java?rev=1130199&r1=1130198&r2=1130199&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSignEnvelope.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/WSSignEnvelope.java
Wed Jun 1 15:58:15 2011
@@ -475,7 +475,7 @@ public class WSSignEnvelope extends WSBa
}
}
- sig.addResourceResolver(EnvelopeIdResolver.getInstance());
+ sig.addResourceResolver(new EnvelopeIdResolver(wsDocInfo));
WSSecurityUtil.prependChildElement(securityHeader, sig.getElement());
if (tlog.isDebugEnabled()) {
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/SignatureProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/SignatureProcessor.java?rev=1130199&r1=1130198&r2=1130199&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/SignatureProcessor.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/processor/SignatureProcessor.java
Wed Jun 1 15:58:15 2011
@@ -227,7 +227,7 @@ public class SignatureProcessor implemen
);
}
- sig.addResourceResolver(EnvelopeIdResolver.getInstance());
+ sig.addResourceResolver(new EnvelopeIdResolver(wsDocInfo));
KeyInfo info = sig.getKeyInfo();
UsernameToken ut = null;
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSecSignatureSAML.java?rev=1130199&r1=1130198&r2=1130199&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
Wed Jun 1 15:58:15 2011
@@ -352,8 +352,7 @@ public class WSSecSignatureSAML extends
}
}
- EnvelopeIdResolver resolver =
(EnvelopeIdResolver)EnvelopeIdResolver.getInstance();
- resolver.setWsDocInfo(wsDocInfo);
+ EnvelopeIdResolver resolver = new EnvelopeIdResolver(wsDocInfo);
sig.addResourceResolver(resolver);
String sigUri = wssConfig.getIdAllocator().createId("Signature-", sig);
sig.setId(sigUri);
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java?rev=1130199&r1=1130198&r2=1130199&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
Wed Jun 1 15:58:15 2011
@@ -346,7 +346,7 @@ public class WSSignSAMLEnvelope extends
"noXMLSig", null, e1);
}
- sig.addResourceResolver(EnvelopeIdResolver.getInstance());
+ sig.addResourceResolver(new EnvelopeIdResolver(wsDocInfo));
/*
* The order to prepend is: - signature - BinarySecurityToken (depends
