You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2017/10/17 11:42:31 UTC
svn commit: r1812391 - in
/santuario/xml-security-java/branches/2.0.x-fixes/src:
main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
Author: coheigea
Date: Tue Oct 17 11:42:31 2017
New Revision: 1812391
URL: http://svn.apache.org/viewvc?rev=1812391&view=rev
Log:
Fixing merge
Modified:
santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java?rev=1812391&r1=1812390&r2=1812391&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java Tue Oct 17 11:42:31 2017
@@ -153,7 +153,13 @@ public class SignatureAlgorithm extends
throw new XMLSignatureException("algorithms.NoSuchAlgorithmNoEx", exArgs);
}
return implementingClass.newInstance();
- } catch (IllegalAccessException | InstantiationException | NullPointerException ex) {
+ } catch (IllegalAccessException ex) {
+ Object exArgs[] = { algorithmURI, ex.getMessage() };
+ throw new XMLSignatureException(ex, "algorithms.NoSuchAlgorithm", exArgs);
+ } catch (InstantiationException ex) {
+ Object exArgs[] = { algorithmURI, ex.getMessage() };
+ throw new XMLSignatureException(ex, "algorithms.NoSuchAlgorithm", exArgs);
+ } catch (NullPointerException ex) {
Object exArgs[] = { algorithmURI, ex.getMessage() };
throw new XMLSignatureException(ex, "algorithms.NoSuchAlgorithm", exArgs);
}
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java?rev=1812391&r1=1812390&r2=1812391&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java Tue Oct 17 11:42:31 2017
@@ -322,7 +322,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<>();
+ List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA3_224_MGF1, document, localNames, rsaKeyPair.getPrivate());
@@ -341,7 +341,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<>();
+ List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA3_256_MGF1, document, localNames, rsaKeyPair.getPrivate());
@@ -360,7 +360,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<>();
+ List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA3_384_MGF1, document, localNames, rsaKeyPair.getPrivate());
@@ -379,7 +379,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<>();
+ List<String> localNames = new ArrayList<String>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA3_512_MGF1, document, localNames, rsaKeyPair.getPrivate());