Cleaning up some Exception handling in SSLSocketFactory

relates #1018
elastic · Jul 19, 2017 · 56582fd · 56582fd
1 parent 4e1e6a1
commit 56582fd
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/mr/src/main/java/org/elasticsearch/hadoop/rest/commonshttp/SSLSocketFactory.java b/mr/src/main/java/org/elasticsearch/hadoop/rest/commonshttp/SSLSocketFactory.java
@@ -183,12 +183,18 @@ private KeyStore loadKeyStore(String location, char[] pass) throws GeneralSecuri
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Loading keystore located at [" + location + "]");
             }
-            in = IOUtils.open(location);
-            if (in == null) {
+
+            try {
+                in = IOUtils.open(location);
+                if (in == null) {
+                    throw new EsHadoopIllegalArgumentException(String.format("Could not locate [%s] on classpath", location));
+                }
+            } catch (Exception e) {
                 throw new EsHadoopIllegalArgumentException(String.format("Expected to find keystore file at [%s] but " +
                         "was unable to. Make sure that it is available on the classpath, or if not, that you have " +
                         "specified a valid URI.", location));
             }
+
             keyStore.load(in, pass);
         }
         finally {