You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/10/24 11:31:59 UTC
svn commit: r1188058 - in /webservices/wss4j/trunk: pom.xml
src/main/java/org/apache/ws/security/components/crypto/Merlin.java
src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
Author: coheigea
Date: Mon Oct 24 09:31:59 2011
New Revision: 1188058
URL: http://svn.apache.org/viewvc?rev=1188058&view=rev
Log:
Upgrading to Santuario 1.4.6 + fixing a test failure with JDK 1.7
Modified:
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1188058&r1=1188057&r2=1188058&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Mon Oct 24 09:31:59 2011
@@ -353,7 +353,7 @@
</profiles>
<properties>
- <xmlsec.version>1.4.5</xmlsec.version>
+ <xmlsec.version>1.4.6</xmlsec.version>
<opensaml.version>2.5.1-1</opensaml.version>
<xml.apis.version>1.3.04</xml.apis.version>
<bcprov.version>1.46</bcprov.version>
Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java?rev=1188058&r1=1188057&r2=1188058&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java Mon Oct 24 09:31:59 2011
@@ -844,6 +844,12 @@ public class Merlin extends CryptoBase {
WSSecurityException.FAILURE, "certpath",
new Object[] { e.getMessage() }, e
);
+ } catch (NullPointerException e) {
+ // NPE thrown by JDK 1.7 for one of the test cases
+ throw new WSSecurityException(
+ WSSecurityException.FAILURE, "certpath",
+ new Object[] { e.getMessage() }, e
+ );
}
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java?rev=1188058&r1=1188057&r2=1188058&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java Mon Oct 24 09:31:59 2011
@@ -137,7 +137,8 @@ public class SignatureCRLTest extends or
String errorMessage = ex.getMessage();
// Different errors using different JDKs...
assertTrue(errorMessage.contains("Certificate has been revoked")
- || errorMessage.contains("Certificate revocation"));
+ || errorMessage.contains("Certificate revocation")
+ || errorMessage.contains("Error during certificate path validation"));
}
}