---

Ajay Kannan · Ajay Kannan · commit 3650cd311c9c · 2015-10-08T10:26:52.000-07:00
yaml --- r: 6215 b: refs/heads/tswast-patch-1 c: b8923f4 h: refs/heads/master i: 6213: ce0a56f 6211: 7cedd10 6207: f35ce4e
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: e1a50bc0063c25a4bfa729c8b305f06e061f0497
+refs/heads/tswast-patch-1: b8923f4765277e8420d31ca2b88d312f8d58061d
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -32,6 +32,7 @@
 import com.google.api.services.datastore.client.DatastoreException;
 import com.google.api.services.datastore.client.DatastoreFactory;
 import com.google.api.services.datastore.client.DatastoreOptions.Builder;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.datastore.DatastoreOptions;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
@@ -78,12 +79,9 @@ public DefaultDatastoreRpc(DatastoreOptions options) {
   private static String normalizeHost(String host) {
     host = host.toLowerCase();
     if (includesScheme(host)) {
-      if (host.startsWith("https://") && isLocalHost(host)) {
-        throw new IllegalArgumentException(
-            "\"https\" is not supported for localhost.  Use \"http\" instead.");
-      } else {
-        return host;
-      }
+      Preconditions.checkArgument(!(host.startsWith("https://") && isLocalHost(host)), 
+          "\"https\" is not supported for localhost.  Use \"http\" instead.");
+      return host;
     }
     return "http://" + host;
   }
