BCJSSE: Add finalizers to socket classes

neverdup · May 7, 2019 · 002bd0a · 002bd0a
1 parent f68ad61
commit 002bd0a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLSocketDirect.java b/tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLSocketDirect.java
@@ -182,6 +182,30 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException
         notifyConnected();
     }
 
+    @Override
+    protected void finalize() throws Throwable
+    {
+        try
+        {
+            close();
+        }
+        catch (IOException e1)
+        {
+            try
+            {
+                super.close();
+            }
+            catch (IOException e2)
+            {
+                // Ignore
+            }
+        }
+        finally
+        {
+            super.finalize();
+        }
+    }
+
     // An SSLSocket method from JDK 9, but also a BCSSLSocket method
     public synchronized String getApplicationProtocol()
     {

diff --git a/tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLSocketWrap.java b/tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLSocketWrap.java
@@ -183,6 +183,23 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException
         throw new SocketException("Wrapped socket should already be connected");
     }
 
+    @Override
+    protected void finalize() throws Throwable
+    {
+        try
+        {
+            close();
+        }
+        catch (IOException e)
+        {
+            // Ignore
+        }
+        finally
+        {
+            super.finalize();
+        }
+    }
+
     // An SSLSocket method from JDK 9, but also a BCSSLSocket method
     public synchronized String getApplicationProtocol()
     {