implement Utils.closeQuietly()

mythz · mythz · commit 1e71c33c6ff2 · 2017-03-05T00:10:15.000-05:00
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java
@@ -176,7 +176,7 @@ public HttpURLConnection createRequest(String requestUrl, String httpMethod, byt
                 DataOutputStream wr = new DataOutputStream(req.getOutputStream());
                 wr.write(requestBody);
                 wr.flush();
-                wr.close();
+                Utils.closeQuietly(wr);
             }
 
             return req;
@@ -391,10 +391,10 @@ public <TResponse> TResponse send(String requestUrl, String httpMethod, byte[] r
             else {
                 BufferedReader reader = new BufferedReader(new InputStreamReader(is));
                 TResponse response = resClass != null
-                        ? (TResponse) getGson().fromJson(reader, resClass)
-                        : (TResponse) getGson().fromJson(reader, resType);
+                    ? (TResponse) getGson().fromJson(reader, resClass)
+                    : (TResponse) getGson().fromJson(reader, resType);
 
-                reader.close();
+                Utils.closeQuietly(reader);
                 return response;
             }
         } catch (IOException e) {
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java
@@ -13,6 +13,7 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -524,7 +525,7 @@ public static String readToEnd(InputStream stream, final String charsetName) thr
         }
 
         String text = sb.toString();
-        reader.close();
+        closeQuietly(reader);
         return text;
     }
 
@@ -557,7 +558,7 @@ public static byte[] readBytesToEnd(InputStream stream) throws IOException {
             }
             return bytes.toByteArray();
         } finally {
-            bufferedStream.close();
+            closeQuietly(bufferedStream);
         }
     }
 
@@ -912,4 +913,14 @@ public static String unescapeHtml(String html){
             .replace("&#39;","\'")
             .replace("&quot;","\"");
     }
+
+    public static void closeQuietly(Closeable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            } catch (RuntimeException rethrown) {
+                throw rethrown;
+            } catch (Exception ignored) {}
+        }
+    }
 }
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java
@@ -176,7 +176,7 @@ public HttpURLConnection createRequest(String requestUrl, String httpMethod, byt
                 DataOutputStream wr = new DataOutputStream(req.getOutputStream());
                 wr.write(requestBody);
                 wr.flush();
-                wr.close();
+                Utils.closeQuietly(wr);
             }
 
             return req;
@@ -391,10 +391,10 @@ public <TResponse> TResponse send(String requestUrl, String httpMethod, byte[] r
             else {
                 BufferedReader reader = new BufferedReader(new InputStreamReader(is));
                 TResponse response = resClass != null
-                        ? (TResponse) getGson().fromJson(reader, resClass)
-                        : (TResponse) getGson().fromJson(reader, resType);
+                    ? (TResponse) getGson().fromJson(reader, resClass)
+                    : (TResponse) getGson().fromJson(reader, resType);
 
-                reader.close();
+                Utils.closeQuietly(reader);
                 return response;
             }
         } catch (IOException e) {
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java
@@ -13,6 +13,7 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -524,7 +525,7 @@ public static String readToEnd(InputStream stream, final String charsetName) thr
         }
 
         String text = sb.toString();
-        reader.close();
+        closeQuietly(reader);
         return text;
     }
 
@@ -557,7 +558,7 @@ public static byte[] readBytesToEnd(InputStream stream) throws IOException {
             }
             return bytes.toByteArray();
         } finally {
-            bufferedStream.close();
+            closeQuietly(bufferedStream);
         }
     }
 
@@ -912,4 +913,14 @@ public static String unescapeHtml(String html){
             .replace("&#39;","\'")
             .replace("&quot;","\"");
     }
+
+    public static void closeQuietly(Closeable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            } catch (RuntimeException rethrown) {
+                throw rethrown;
+            } catch (Exception ignored) {}
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import java.io.BufferedInputStream;`
`14`	`14`	`import java.io.BufferedReader;`
`15`	`15`	`import java.io.ByteArrayOutputStream;`
	`16`	`+import java.io.Closeable;`
`16`	`17`	`import java.io.IOException;`
`17`	`18`	`import java.io.InputStream;`
`18`	`19`	`import java.io.InputStreamReader;`
`@@ -524,7 +525,7 @@ public static String readToEnd(InputStream stream, final String charsetName) thr`
`524`	`525`	`}`
`525`	`526`
`526`	`527`	`String text = sb.toString();`
`527`		`- reader.close();`
	`528`	`+ closeQuietly(reader);`
`528`	`529`	`return text;`
`529`	`530`	`}`
`530`	`531`
`@@ -557,7 +558,7 @@ public static byte[] readBytesToEnd(InputStream stream) throws IOException {`
`557`	`558`	`}`
`558`	`559`	`return bytes.toByteArray();`
`559`	`560`	`} finally {`
`560`		`- bufferedStream.close();`
	`561`	`+ closeQuietly(bufferedStream);`
`561`	`562`	`}`
`562`	`563`	`}`
`563`	`564`
`@@ -912,4 +913,14 @@ public static String unescapeHtml(String html){`
`912`	`913`	`.replace("'","\'")`
`913`	`914`	`.replace(""","\"");`
`914`	`915`	`}`
	`916`	`+`
	`917`	`+ public static void closeQuietly(Closeable closeable) {`
	`918`	`+ if (closeable != null) {`
	`919`	`+ try {`
	`920`	`+ closeable.close();`
	`921`	`+ } catch (RuntimeException rethrown) {`
	`922`	`+ throw rethrown;`
	`923`	`+ } catch (Exception ignored) {}`
	`924`	`+ }`
	`925`	`+ }`
`915`	`926`	`}`