Merge pull request #33 from aozarov/patch-1

shinfan · shinfan · commit 6386e6f052b4 · 2016-03-27T17:17:49.000-07:00
Fix a bug that cause local test helper to fail when searching an emulator with an older cloud SDK
diff --git a/src/main/java/com/google/api/gax/testing/GCloudEmulatorRunner.java b/src/main/java/com/google/api/gax/testing/GCloudEmulatorRunner.java
@@ -81,7 +81,7 @@ private boolean isGCloudInstalled() {
   private boolean isEmulatorUpdateToDate()
       throws IOException, InterruptedException {
     String currentVersion = installedEmulatorVersion(versionPrefix);
-    return currentVersion.compareTo(minVersion) >= 0;
+    return currentVersion != null && currentVersion.compareTo(minVersion) >= 0;
   }
 
   private String installedEmulatorVersion(String versionPrefix)

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ private boolean isGCloudInstalled() {`
`81`	`81`	`private boolean isEmulatorUpdateToDate()`
`82`	`82`	`throws IOException, InterruptedException {`
`83`	`83`	`String currentVersion = installedEmulatorVersion(versionPrefix);`
`84`		`- return currentVersion.compareTo(minVersion) >= 0;`
	`84`	`+ return currentVersion != null && currentVersion.compareTo(minVersion) >= 0;`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`private String installedEmulatorVersion(String versionPrefix)`