---

aozarov · aozarov · commit d0a4630fd9a8 · 2015-11-23T19:46:42.000-08:00
yaml --- r: 1981 b: refs/heads/pubsub-alpha c: a23d8f9 h: refs/heads/master i: 1979: 0e257b9
diff --git a/[refs] b/[refs]
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
-refs/heads/pubsub-alpha: 8808c54c09a1d80060d8ea804164dc26ee4ce229
+refs/heads/pubsub-alpha: a23d8f9773334a2698eb5770deaee3e6d140f751
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
 refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
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
@@ -42,9 +42,7 @@
 import org.json.JSONTokener;
 
 import java.net.InetAddress;
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -95,7 +93,7 @@ private static boolean isLocalHost(String host) {
         }
         InetAddress hostAddr = InetAddress.getByName(new URL(normalizedHost).getHost());
         return hostAddr.isAnyLocalAddress() || hostAddr.isLoopbackAddress();
-      } catch (UnknownHostException | MalformedURLException e) {
+      } catch (Exception e) {
         // ignore
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,7 @@`
`42`	`42`	`import org.json.JSONTokener;`
`43`	`43`
`44`	`44`	`import java.net.InetAddress;`
`45`		`-import java.net.MalformedURLException;`
`46`	`45`	`import java.net.URL;`
`47`		`-import java.net.UnknownHostException;`
`48`	`46`	`import java.util.HashMap;`
`49`	`47`	`import java.util.Map;`
`50`	`48`
`@@ -95,7 +93,7 @@ private static boolean isLocalHost(String host) {`
`95`	`93`	`}`
`96`	`94`	`InetAddress hostAddr = InetAddress.getByName(new URL(normalizedHost).getHost());`
`97`	`95`	`return hostAddr.isAnyLocalAddress() \|\| hostAddr.isLoopbackAddress();`
`98`		`- } catch (UnknownHostException \| MalformedURLException e) {`
	`96`	`+ } catch (Exception e) {`
`99`	`97`	`// ignore`
`100`	`98`	`}`
`101`	`99`	`}`