Author: coheigea
Date: Wed Nov 27 12:08:44 2013
New Revision: 1546010
URL: http://svn.apache.org/r1546010
Log:
Updating backmerge
Modified:
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
Modified:
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java?rev=1546010&r1=1546009&r2=1546010&view=diff
==============================================================================
---
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
(original)
+++
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
Wed Nov 27 12:08:44 2013
@@ -138,8 +138,8 @@ public class SAMLTokenProcessor implemen
KeyInfo keyInfo = sig.getKeyInfo();
if (keyInfo == null) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILURE,
"invalidSAMLsecurity",
- "cannot get certificate or key"
+ WSSecurityException.FAILURE, "invalidSAMLsecurity",
+ new Object[]{"cannot get certificate or key"}
);
}
SAMLKeyInfo samlKeyInfo =
Modified:
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java?rev=1546010&r1=1546009&r2=1546010&view=diff
==============================================================================
---
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
(original)
+++
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
Wed Nov 27 12:08:44 2013
@@ -535,8 +535,8 @@ public class AssertionWrapper {
KeyInfo keyInfo = sig.getKeyInfo();
if (keyInfo == null) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILURE,
"invalidSAMLsecurity",
- "cannot get certificate or key"
+ WSSecurityException.FAILURE, "invalidSAMLsecurity",
+ new Object[]{"cannot get certificate or key"}
);
}
SAMLKeyInfo samlKeyInfo =
