Merge pull request #608 from watson-developer-cloud/resolve-167

add check for javax.naming.InitialContext
watson-developer-cloud · Mar 8, 2017 · 4cf2760 · 4cf2760
2 parents fd752d5 + bba1bed
commit 4cf2760
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/java/com/ibm/watson/developer_cloud/util/CredentialUtils.java b/core/src/main/java/com/ibm/watson/developer_cloud/util/CredentialUtils.java
@@ -112,7 +112,7 @@ private CredentialUtils() {
    * @return The encoded API Key
    */
   private static String getKeyUsingJNDI(String serviceName) {
-    if (!isClassAvailable("javax.naming.Context")) {
+    if (!isClassAvailable("javax.naming.Context") || !isClassAvailable("javax.naming.InitialContext")) {
       log.info("JNDI string lookups is not available.");
       return null;
     }