Merge pull request #80 from adkumar3/future

handled null pointer

Author: shamirwasia

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

@@ -200,7 +200,7 @@ private static Document soapWrapAndSign(
         Document resultDocument = null;
 
         SecurityUtil.loadMerchantP12File(mc,logger);
-        logger.log(Logger.LT_INFO, "Client, End of loadMerchantP12File   ", true);       
+        logger.log(Logger.LT_INFO, "Client, End of loading Merchant Certificates ", true);       
 
         // sign Document object
         resultDocument = SecurityUtil.createSignedDoc(wrappedDoc, mc.getMerchantID(), mc.getKeyPassword(), logger);

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

@@ -286,6 +286,9 @@ public static void readJdkCert(MerchantConfig merchantConfig, Logger logger) thr
             String merchantKeyAlias = null;
             try {
                 Enumeration enumKeyStore = keystore.aliases();
+		if(!enumKeyStore.hasMoreElements()){
+                	throw new SignException("Empty Keystore or Missing Certificate ");
+                }
                 while (enumKeyStore.hasMoreElements()) {
                     KeyStore.PrivateKeyEntry keyEntry = null;
                     merchantKeyAlias = (String) enumKeyStore.nextElement();
@@ -332,7 +335,9 @@ private static void loadJavaKeystore(String keystore_location, MerchantConfig me
             Identity identity;
 
             java.security.cert.Certificate[] cert = keystore.getCertificateChain(merchantConfig.getKeyAlias());
-            
+            if (cert == null) {
+                throw new SignException("Empty Keystore or Missing Certificate ");
+            }
             PrivateKey key = null;
             try {
                 key = (PrivateKey)keystore.getKey(merchantConfig.getKeyAlias(), merchantConfig.getKeyAlias().toCharArray());
@@ -361,6 +366,9 @@ private static void loadJavaKeystore(String keystore_location, MerchantConfig me
                 }
             }
             java.security.cert.Certificate serverCert = keystore.getCertificate(SERVER_ALIAS);
+	    if(serverCert == null){
+                	throw new SignException("Missing Server Certificate ");
+                }
             identity = new Identity(merchantConfig,
                                     (X509Certificate) serverCert);
             localKeyStoreHandler

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

@@ -342,7 +342,7 @@ private static Document soapWrapAndSign(
         Document resultDocument = null;
 
         SecurityUtil.loadMerchantP12File(mc,logger);
-        logger.log(Logger.LT_INFO, "Client, End of loadMerchantP12File   ", true);       
+        logger.log(Logger.LT_INFO, "Client, End of loading Merchant Certificate   ", true);       
 
         // sign Document object
         resultDocument = SecurityUtil.createSignedDoc(wrappedDoc,mc.getMerchantID(),mc.getKeyPassword(),logger);