Author: coheigea
Date: Fri Oct 23 15:23:11 2015
New Revision: 1710235
URL: http://svn.apache.org/viewvc?rev=1710235&view=rev
Log:
Minor cleanup
Modified:
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
Modified:
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1710235&r1=1710234&r2=1710235&view=diff
==============================================================================
---
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
(original)
+++
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
Fri Oct 23 15:23:11 2015
@@ -1054,11 +1054,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);
}
/**
@@ -1138,11 +1134,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);
}
/**
@@ -1218,11 +1210,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);
}
/**
@@ -1305,11 +1293,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);
}
/**
@@ -1352,11 +1336,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/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java?rev=1710235&r1=1710234&r2=1710235&view=diff
==============================================================================
---
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
(original)
+++
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
Fri Oct 23 15:23:11 2015
@@ -282,11 +282,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(
