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 2014/01/22 19:01:39 UTC
svn commit: r1560442 - in /cxf/trunk:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
Author: coheigea
Date: Wed Jan 22 18:01:39 2014
New Revision: 1560442
URL: http://svn.apache.org/r1560442
Log:
Refining a recent merge for security errors
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java?rev=1560442&r1=1560441&r2=1560442&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java Wed Jan 22 18:01:39 2014
@@ -260,6 +260,9 @@ public final class WSS4JUtils {
errorMessage = SECURITY_TOKEN_UNAVAILABLE_ERR;
} else if (WSConstants.MESSAGE_EXPIRED.equals(faultCode)) {
errorMessage = MESSAGE_EXPIRED_ERR;
+ } else {
+ // Default
+ errorMessage = INVALID_SECURITY_ERR;
}
return errorMessage;
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java?rev=1560442&r1=1560441&r2=1560442&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java Wed Jan 22 18:01:39 2014
@@ -558,9 +558,7 @@ public class BindingPropertiesTest exten
port.doubleIt(25);
fail("Failure expected on not enabling SignatureConfirmation");
} catch (javax.xml.ws.soap.SOAPFaultException ex) {
- String error = "Check Signature confirmation";
- assertTrue(ex.getMessage().contains(error)
- || ex.getMessage().contains("SignatureConfirmation must be present"));
+ // expected
}
((java.io.Closeable)port).close();