---

ajaaym · web-flow · commit f14c6292ec72 · 2019-01-04T13:30:59.000-05:00
yaml --- r: 15791 b: refs/heads/autosynth-dialogflow c: ca7054e h: refs/heads/master i: 15789: 3408c8c 15787: a79ce8d 15783: a3567f8 15775: 1e7e5c4
diff --git a/[refs] b/[refs]
@@ -130,7 +130,7 @@ refs/heads/autosynth-bigtable: 2fbcb15847e0e89e79d6dc07420e28d7dfcea894
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 039ca5b8db725c76c16a965ff26b2774322b8ef8
 refs/heads/autosynth-datastore: 9acd400b484d6691a080c9152a331d88d24fefc1
-refs/heads/autosynth-dialogflow: 6d56b8cb0bef844a9adca34951b61cf5dce11907
+refs/heads/autosynth-dialogflow: ca7054e8a887ff9f542a8bda6344b5111902f299
 refs/heads/autosynth-errorreporting: 3d0566d6bebcc187f148bbed463b5a8e75b1edf6
 refs/heads/autosynth-firestore: 92b27fbc8855c9902168695abb0a8f1f433b750b
 refs/heads/autosynth-iot: 9d732be07d99843d8cb53d34ec0837328a807fce
diff --git a/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/branches/autosynth-dialogflow/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;`