Fix version in LocalGcdHelper and check for null values when removing…

… URL scheme
googleapis · Oct 5, 2015 · e0aaaba · e0aaaba
1 parent 4d2fe25
commit e0aaaba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
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))) {