---

ajaaym · web-flow · commit 38224ce4c21d · 2019-01-04T13:30:59.000-05:00
yaml --- r: 12607 b: refs/heads/master c: ca7054e h: refs/heads/master i: 12605: 8835c10 12603: fd15d1c 12599: bd2077d 12591: a157fba 12575: 478a810 12543: 5414ccd
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6d56b8cb0bef844a9adca34951b61cf5dce11907
+refs/heads/master: ca7054e8a887ff9f542a8bda6344b5111902f299
 refs/heads/gh-pages: ab77ca69261397678c6addc69a7f9dd7c17c7b08
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
diff --git a/trunk/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/trunk/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;`