---

Ajay Kannan · Ajay Kannan · commit 662efa8a5349 · 2015-10-05T09:27:23.000-07:00
yaml --- r: 3777 b: refs/heads/pubsub-alpha c: e0aaaba h: refs/heads/master i: 3775: 862e1eb
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 36a62ef856d199f8efd09501b5ba65c422c01f23
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 7406918e071dd2c5677a638ae2a06e7592b6542c
-refs/heads/pubsub-alpha: 4d2fe25b88f32abb9cc4c3d4bc01fbfde1221a79
+refs/heads/pubsub-alpha: e0aaaba871960a006fb82dc5972c015ea987c980
 refs/heads/update-datastore: 47aae517c2cb33f1dccd909adaced73ec9d0f4df
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
diff --git a/branches/pubsub-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/branches/pubsub-alpha/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/branches/pubsub-alpha/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LocalGcdHelper.java b/branches/pubsub-alpha/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`	`}`