Fix version in LocalGcdHelper and check for null values when removing URL scheme

Ajay Kannan · Ajay Kannan · commit e0aaaba87196 · 2015-10-05T09:27:23.000-07:00
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -89,10 +89,12 @@ private static boolean includesScheme(String url) {
   }
 
   private static String removeScheme(String url) {
-    if (url.startsWith("https://")) {
-      return url.substring("https://".length());
-    } else if (url.startsWith("http://")) {
-      return url.substring("http://".length());
+    if (url != null) {
+      if (url.startsWith("https://")) {
+        return url.substring("https://".length());
+      } else if (url.startsWith("http://")) {
+        return url.substring("http://".length());
+      }
     }
     return url;
   }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java
@@ -309,8 +309,7 @@ public static void main(String... args) throws IOException, InterruptedException
   public static boolean isActive(String projectId) {
     try {
       StringBuilder urlBuilder = new StringBuilder("http://localhost:").append(PORT);
-      urlBuilder.append("/datastore/" + com.google.datastore.v1beta3.client.DatastoreFactory.VERSION
-          + "/projects/").append(projectId).append(":lookup");
+      urlBuilder.append("/datastore/v1beta3/projects/").append(projectId).append(":lookup");
       URL url = new URL(urlBuilder.toString());
       try (BufferedReader reader =
                new BufferedReader(new InputStreamReader(url.openStream(), UTF_8))) {

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,12 @@ private static boolean includesScheme(String url) {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`private static String removeScheme(String url) {`
`92`		`- if (url.startsWith("https://")) {`
`93`		`- return url.substring("https://".length());`
`94`		`- } else if (url.startsWith("http://")) {`
`95`		`- return url.substring("http://".length());`
	`92`	`+ if (url != null) {`
	`93`	`+ if (url.startsWith("https://")) {`
	`94`	`+ return url.substring("https://".length());`
	`95`	`+ } else if (url.startsWith("http://")) {`
	`96`	`+ return url.substring("http://".length());`
	`97`	`+ }`
`96`	`98`	`}`
`97`	`99`	`return url;`
`98`	`100`	`}`