Merge pull request #136 from mahendya1002/future

back to normal for loop

Author: mahendya1002

java/src/main/java/com/cybersource/ws/client/SecurityUtil.java

@@ -344,13 +344,13 @@ private static void loadJavaKeystore(MerchantConfig merchantConfig, Logger logge
 				throw new SignException(e);
 			}
 
-            for (Certificate certificate : cert) {
-                if (merchantConfig.getKeyAlias().equals(keystore.getCertificateAlias(certificate))) {
-                    identity = new Identity(merchantConfig, (X509Certificate) certificate, key, logger);
+            for (int i = 0; i < cert.length; i++) {
+                if (merchantConfig.getKeyAlias().equals(keystore.getCertificateAlias(cert[i]))) {
+                    identity = new Identity(merchantConfig, (X509Certificate) cert[i], key, logger);
                     localKeyStoreHandler.addIdentityToKeyStore(identity, logger);
                     identities.put(identity.getKeyAlias(), identity);
                 } else {
-                    identity = new Identity(merchantConfig, (X509Certificate) certificate, logger);
+                    identity = new Identity(merchantConfig, (X509Certificate) cert[i], logger);
                     localKeyStoreHandler.addIdentityToKeyStore(identity, logger);
                     identities.put(identity.getName(), identity);
                 }

java/src/main/java/com/cybersource/ws/client/XMLClient.java

@@ -305,14 +305,14 @@ private static void setVersionInformation(Document request, String nsURI) {
         }
 
         // for each of the version fields...
-        for (String versionField : VERSION_FIELDS) {
+        for (int i = 0; i < VERSION_FIELDS.length; ++i) {
             // if the current element is not null, compare it with
             // the current version field in the loop
             if (currElem != null) {
                 // if they match, save the element next to it, delete
                 // the current element and make the saved element the current
                 // element
-                if (versionField.equals(currElem.getNodeName())) {
+                if (VERSION_FIELDS[i].equals(currElem.getNodeName())) {
                     save = currElem.getNextSibling();
                     requestMessage.removeChild(currElem);
                     currElem = save;