Author: coheigea
Date: Fri Oct 23 14:37:32 2015
New Revision: 1710226
URL: http://svn.apache.org/viewvc?rev=1710226&view=rev
Log:
Minor cleanup
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1710226&r1=1710225&r2=1710226&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
Fri Oct 23 14:37:32 2015
@@ -944,11 +944,7 @@ public class Merlin extends CryptoBase {
return null;
}
- X509Certificate[] x509certs = new X509Certificate[certs.length];
- for (int i = 0; i < certs.length; i++) {
- x509certs[i] = (X509Certificate) certs[i];
- }
- return x509certs;
+ return Arrays.copyOf(certs, certs.length, X509Certificate[].class);
}
/**
@@ -1025,11 +1021,7 @@ public class Merlin extends CryptoBase {
return null;
}
- X509Certificate[] x509certs = new X509Certificate[certs.length];
- for (int i = 0; i < certs.length; i++) {
- x509certs[i] = (X509Certificate) certs[i];
- }
- return x509certs;
+ return Arrays.copyOf(certs, certs.length, X509Certificate[].class);
}
/**
@@ -1101,11 +1093,7 @@ public class Merlin extends CryptoBase {
return null;
}
- X509Certificate[] x509certs = new X509Certificate[certs.length];
- for (int i = 0; i < certs.length; i++) {
- x509certs[i] = (X509Certificate) certs[i];
- }
- return x509certs;
+ return Arrays.copyOf(certs, certs.length, X509Certificate[].class);
}
/**
@@ -1185,11 +1173,7 @@ public class Merlin extends CryptoBase {
return null;
}
- X509Certificate[] x509certs = new X509Certificate[certs.length];
- for (int i = 0; i < certs.length; i++) {
- x509certs[i] = (X509Certificate) certs[i];
- }
- return x509certs;
+ return Arrays.copyOf(certs, certs.length, X509Certificate[].class);
}
/**
@@ -1232,11 +1216,7 @@ public class Merlin extends CryptoBase {
throw new
WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e, "keystore");
}
- X509Certificate[] x509certs = new X509Certificate[certs.length];
- for (int i = 0; i < certs.length; i++) {
- x509certs[i] = (X509Certificate) certs[i];
- }
- return x509certs;
+ return Arrays.copyOf(certs, certs.length, X509Certificate[].class);
}
/**
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java?rev=1710226&r1=1710225&r2=1710226&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
Fri Oct 23 14:37:32 2015
@@ -253,11 +253,7 @@ public class MerlinAKI extends Merlin {
return null;
}
- X509Certificate[] x509certs = new X509Certificate[certs.length];
- for (int i = 0; i < certs.length; i++) {
- x509certs[i] = (X509Certificate) certs[i];
- }
- return x509certs;
+ return Arrays.copyOf(certs, certs.length, X509Certificate[].class);
}
private Certificate[] getCertificates(
