---

aozarov · aozarov · commit 9cc1d75eb78f · 2015-11-23T19:46:42.000-08:00
yaml --- r: 6559 b: refs/heads/tswast-patch-1 c: a23d8f9 h: refs/heads/master i: 6557: d799370 6555: 312b4d6 6551: b1d4569 6543: 1edcd0a 6527: 81ca046
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: 8808c54c09a1d80060d8ea804164dc26ee4ce229
+refs/heads/tswast-patch-1: a23d8f9773334a2698eb5770deaee3e6d140f751
 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
@@ -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`	`}`