---

ajaaym · web-flow · commit 481f226ce399 · 2019-01-04T13:30:59.000-05:00
yaml --- r: 15385 b: refs/heads/autosynth-containeranalysis c: ca7054e h: refs/heads/master i: 15383: 864dd88
diff --git a/[refs] b/[refs]
@@ -128,7 +128,7 @@ refs/heads/autosynth-bigquerydatatransfer: a6667617707608b1dbfb02d59c22b5152f208
 refs/heads/autosynth-bigquerystorage: 14ab055598b943ae3f33f484e9fb1653355d08e7
 refs/heads/autosynth-bigtable: 2fbcb15847e0e89e79d6dc07420e28d7dfcea894
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
-refs/heads/autosynth-containeranalysis: 6d56b8cb0bef844a9adca34951b61cf5dce11907
+refs/heads/autosynth-containeranalysis: ca7054e8a887ff9f542a8bda6344b5111902f299
 refs/heads/autosynth-datastore: af1fb76aa3eee02fe6f31f8fa1c72a4f048d149b
 refs/heads/autosynth-dialogflow: ebdd13c445b9674ff9ad4601f78d7ecd6f9c3660
 refs/heads/autosynth-errorreporting: 3d0566d6bebcc187f148bbed463b5a8e75b1edf6
diff --git a/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
@@ -43,7 +43,7 @@ public static String getProjectId() {
 
   public static String getZone() {
     String zoneId = getAttribute("instance/zone");
-    if (zoneId.contains("/")) {
+    if (zoneId != null && zoneId.contains("/")) {
       return zoneId.substring(zoneId.lastIndexOf('/') + 1);
     }
     return zoneId;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static String getProjectId() {`
`43`	`43`
`44`	`44`	`public static String getZone() {`
`45`	`45`	`String zoneId = getAttribute("instance/zone");`
`46`		`- if (zoneId.contains("/")) {`
	`46`	`+ if (zoneId != null && zoneId.contains("/")) {`
`47`	`47`	`return zoneId.substring(zoneId.lastIndexOf('/') + 1);`
`48`	`48`	`}`
`49`	`49`	`return zoneId;`