Merge pull request #455 from yu-shiba/fix-npe-for-env_home-returns-null

NPE System.getenv(ENV_HOME) returns null on Windows
kubernetes-client · Dec 6, 2018 · e750b98 · e750b98
2 parents 43a48b0 + cbce44e
commit e750b98
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/util/src/main/java/io/kubernetes/client/util/ClientBuilder.java b/util/src/main/java/io/kubernetes/client/util/ClientBuilder.java
@@ -118,9 +118,12 @@ private static File findConfigFromEnv() {
   }
 
   private static File findHomeDir() {
-    final File config = new File(System.getenv(ENV_HOME));
-    if (config.exists()) {
-      return config;
+    final String envHome = System.getenv(ENV_HOME);
+    if (envHome != null && envHome.length() > 0) {
+      final File config = new File(envHome);
+      if (config.exists()) {
+        return config;
+      }
     }
     if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
       String homeDrive = System.getenv("HOMEDRIVE");