lets avoid NPE for #53

fabric8io · Sep 5, 2017 · 0e6f8ab · 0e6f8ab
1 parent 653aca7
commit 0e6f8ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/io/fabric8/forge/generator/github/GithubImportPickRepositoriesStep.java b/src/main/java/io/fabric8/forge/generator/github/GithubImportPickRepositoriesStep.java
@@ -104,6 +104,10 @@ public void validate(UIValidationContext context) {
         }
         Iterator<GitRepositoryDTO> it = value.iterator();
         String userNameSpace = KubernetesClientHelper.findDefaultNamespace(namespaces);
+        if (userNameSpace == null ) {
+            // Tenant not yet initialised properly!
+            return;
+        }
         while (it.hasNext()) {
             GitRepositoryDTO repo = it.next();
             if (repo != null && repo.getName() != null) {
@@ -115,6 +119,7 @@ public void validate(UIValidationContext context) {
             }
         }
 
+
     }
 
     @Override

diff --git a/src/main/java/io/fabric8/forge/generator/kubernetes/KubernetesClientHelper.java b/src/main/java/io/fabric8/forge/generator/kubernetes/KubernetesClientHelper.java
@@ -260,6 +260,9 @@ public static String findDefaultNamespace(List<String> namespaces) {
                 return namespace;
             }
         }
+        if (namespaces.isEmpty()) {
+            return null;
+        }
         return namespaces.get(0);
     }