Allow nullable on Util.close (#5224)

yschimke · web-flow · commit 321791908a30 · 2019-06-25T07:24:40.000+01:00
Enforce null check in java with any mutable nullable closable
diff --git a/mockwebserver/src/test/java/okhttp3/mockwebserver/internal/http2/Http2Server.java b/mockwebserver/src/test/java/okhttp3/mockwebserver/internal/http2/Http2Server.java
@@ -76,10 +76,14 @@ private void run() throws Exception {
         connection.start();
       } catch (IOException e) {
         logger.log(Level.INFO, "Http2Server connection failure: " + e);
-        closeQuietly(socket);
+        if (socket != null) {
+          closeQuietly(socket);
+        }
       } catch (Exception e) {
         logger.log(Level.WARNING, "Http2Server unexpected failure", e);
-        closeQuietly(socket);
+        if (socket != null) {
+          closeQuietly(socket);
+        }
       }
     }
   }
diff --git a/okhttp-tls/src/test/java/okhttp3/tls/HandshakeCertificatesTest.java b/okhttp-tls/src/test/java/okhttp3/tls/HandshakeCertificatesTest.java
@@ -164,8 +164,12 @@ private Future<Handshake> doServerHandshake(HandshakeCertificates server) {
         sslSocket.startHandshake();
         return Handshake.get(sslSocket.getSession());
       } finally {
-        closeQuietly(rawSocket);
-        closeQuietly(sslSocket);
+        if (rawSocket != null) {
+          closeQuietly(rawSocket);
+        }
+        if (sslSocket != null) {
+          closeQuietly(sslSocket);
+        }
       }
     });
   }
@@ -183,7 +187,9 @@ private Future<Handshake> doClientHandshake(
         return Handshake.get(sslSocket.getSession());
       } finally {
         closeQuietly(rawSocket);
-        closeQuietly(sslSocket);
+        if (sslSocket != null) {
+          closeQuietly(sslSocket);
+        }
       }
     });
   }
diff --git a/okhttp/src/main/java/okhttp3/internal/Util.kt b/okhttp/src/main/java/okhttp3/internal/Util.kt
@@ -474,7 +474,7 @@ fun <K, V> Map<K, V>.toImmutableMap(): Map<K, V> {
   }
 }
 
-/** Closes this, ignoring any checked exceptions. Does nothing if this is null. */
+/** Closes this, ignoring any checked exceptions. */
 fun Closeable.closeQuietly() {
   try {
     close()
@@ -484,7 +484,7 @@ fun Closeable.closeQuietly() {
   }
 }
 
-/** Closes this, ignoring any checked exceptions. Does nothing if this is null. */
+/** Closes this, ignoring any checked exceptions. */
 fun Socket.closeQuietly() {
   try {
     close()
@@ -496,7 +496,7 @@ fun Socket.closeQuietly() {
   }
 }
 
-/** Closes this, ignoring any checked exceptions. Does nothing if this is null. */
+/** Closes this, ignoring any checked exceptions.  */
 fun ServerSocket.closeQuietly() {
   try {
     close()
diff --git a/okhttp/src/test/java/okhttp3/internal/http2/MockHttp2Peer.java b/okhttp/src/test/java/okhttp3/internal/http2/MockHttp2Peer.java
@@ -183,8 +183,12 @@ public Socket openSocket() throws IOException {
 
   @Override public synchronized void close() throws IOException {
     executor.shutdown();
-    closeQuietly(socket);
-    closeQuietly(serverSocket);
+    if (socket != null) {
+      closeQuietly(socket);
+    }
+    if (serverSocket != null) {
+      closeQuietly(serverSocket);
+    }
   }
 
   @Override public String toString() {

Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,14 @@ private void run() throws Exception {`
`76`	`76`	`connection.start();`
`77`	`77`	`} catch (IOException e) {`
`78`	`78`	`logger.log(Level.INFO, "Http2Server connection failure: " + e);`
`79`		`- closeQuietly(socket);`
	`79`	`+ if (socket != null) {`
	`80`	`+ closeQuietly(socket);`
	`81`	`+ }`
`80`	`82`	`} catch (Exception e) {`
`81`	`83`	`logger.log(Level.WARNING, "Http2Server unexpected failure", e);`
`82`		`- closeQuietly(socket);`
	`84`	`+ if (socket != null) {`
	`85`	`+ closeQuietly(socket);`
	`86`	`+ }`
`83`	`87`	`}`
`84`	`88`	`}`
`85`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ fun <K, V> Map<K, V>.toImmutableMap(): Map<K, V> {`
`474`	`474`	`}`
`475`	`475`	`}`
`476`	`476`
`477`		`-/** Closes this, ignoring any checked exceptions. Does nothing if this is null. */`
	`477`	`+/** Closes this, ignoring any checked exceptions. */`
`478`	`478`	`fun Closeable.closeQuietly() {`
`479`	`479`	`try {`
`480`	`480`	`close()`
`@@ -484,7 +484,7 @@ fun Closeable.closeQuietly() {`
`484`	`484`	`}`
`485`	`485`	`}`
`486`	`486`
`487`		`-/** Closes this, ignoring any checked exceptions. Does nothing if this is null. */`
	`487`	`+/** Closes this, ignoring any checked exceptions. */`
`488`	`488`	`fun Socket.closeQuietly() {`
`489`	`489`	`try {`
`490`	`490`	`close()`
`@@ -496,7 +496,7 @@ fun Socket.closeQuietly() {`
`496`	`496`	`}`
`497`	`497`	`}`
`498`	`498`
`499`		`-/** Closes this, ignoring any checked exceptions. Does nothing if this is null. */`
	`499`	`+/** Closes this, ignoring any checked exceptions. */`
`500`	`500`	`fun ServerSocket.closeQuietly() {`
`501`	`501`	`try {`
`502`	`502`	`close()`