Merge pull request #201 from davco01a/issue625

NPE fix for issue 625
kabanero-io · Jun 4, 2020 · 35c671d · 35c671d
2 parents c5b6faf + e911d87
commit 35c671d
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/java/application/rest/StackUtils.java b/src/main/java/application/rest/StackUtils.java
@@ -442,9 +442,16 @@ public static String digestCheck(String kabDigest, String imageDigest, String st
 			System.out.println("Could not find one of the digests.  Kab digest="+kabDigest+", imageDigest="+imageDigest);
 			digestCheck="unknown";
 		}
-
-		status=status.substring(0, 6);  
-		if (!"active".contentEquals(status)) {
+		if (status!=null) {
+			if (status.contains("active")) {
+				status=status.substring(0, 6);  
+				if (!"active".contentEquals(status)) {
+					digestCheck = "NA";
+				}
+			} else {
+				digestCheck = "NA";
+			}
+		} else {
 			digestCheck = "NA";
 		}
 		return digestCheck;