---

ajaaym · web-flow · commit 9c8a9d3e8549 · 2019-01-04T13:30:59.000-05:00
yaml --- r: 13117 b: refs/heads/autosynth-spanner c: ca7054e h: refs/heads/master i: 13115: 0c2961e
diff --git a/[refs] b/[refs]
@@ -140,7 +140,7 @@ refs/heads/autosynth-os-login: daa910328b954bbe87068f684a3088ed910f1ddf
 refs/heads/autosynth-redis: 4c68cb0fbc599124e717ab3f24bd8a8a5d085ca9
 refs/heads/autosynth-scheduler: 2f0fe714a8541dc72f88b45bddd8748e5f21cf29
 refs/heads/autosynth-securitycenter: 8e95447ccb176c3648880ee0cb926cd1f4065156
-refs/heads/autosynth-spanner: 6d56b8cb0bef844a9adca34951b61cf5dce11907
+refs/heads/autosynth-spanner: ca7054e8a887ff9f542a8bda6344b5111902f299
 refs/heads/autosynth-speech: 631df42a628621fe42eb4974c9eb725b2fe8e473
 refs/heads/autosynth-tasks: afc9f4da54964dea5e7f3a9b164db282fc35db5c
 refs/heads/autosynth-texttospeech: a447278ab2ec3975aab3b641549c6780eac0a07a
diff --git a/branches/autosynth-spanner/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/branches/autosynth-spanner/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;`