---

ajaaym · web-flow · commit 603efd84df67 · 2019-01-04T13:30:59.000-05:00
yaml --- r: 16355 b: refs/heads/autosynth-iot c: ca7054e h: refs/heads/master i: 16353: e1535ff 16351: 8b49500
diff --git a/[refs] b/[refs]
@@ -133,7 +133,7 @@ refs/heads/autosynth-datastore: 9acd400b484d6691a080c9152a331d88d24fefc1
 refs/heads/autosynth-dialogflow: d7477419376eac9b6dcc7dbcede581152527351d
 refs/heads/autosynth-errorreporting: 9891e73a56af7c097829ca7a521b0e862ba6af30
 refs/heads/autosynth-firestore: ddb29f8ee445a938fc40be8227dea87b3f508ab3
-refs/heads/autosynth-iot: 6d56b8cb0bef844a9adca34951b61cf5dce11907
+refs/heads/autosynth-iot: ca7054e8a887ff9f542a8bda6344b5111902f299
 refs/heads/autosynth-kms: dcc6e15d68759010c8735cc868135bd7e6c1cc5f
 refs/heads/autosynth-language: 8972866b016473559702424205ce5569de47b34d
 refs/heads/autosynth-os-login: daa910328b954bbe87068f684a3088ed910f1ddf
diff --git a/branches/autosynth-iot/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/branches/autosynth-iot/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;`