Removed Java 7 backport Socket utilities (hierynomus#880)

exceptionfactory · Jul 17, 2023 · ec69d10 · ec69d10
1 parent f35c2bd
commit ec69d10
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 125 deletions.
diff --git a/src/main/java/com/hierynomus/sshj/backport/Jdk7HttpProxySocket.java b/src/main/java/com/hierynomus/sshj/backport/Jdk7HttpProxySocket.java
diff --git a/src/main/java/com/hierynomus/sshj/backport/Sockets.java b/src/main/java/com/hierynomus/sshj/backport/Sockets.java
diff --git a/src/main/java/net/schmizz/sshj/connection/channel/SocketStreamCopyMonitor.java b/src/main/java/net/schmizz/sshj/connection/channel/SocketStreamCopyMonitor.java
@@ -22,8 +22,6 @@
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
 
-import static com.hierynomus.sshj.backport.Sockets.asCloseable;
-
 public class SocketStreamCopyMonitor
         extends Thread {
 
@@ -43,7 +41,7 @@ public void run() {
                     await(y);
                 } catch (IOException ignored) {
                 } finally {
-                    IOUtils.closeQuietly(channel, asCloseable(socket));
+                    IOUtils.closeQuietly(channel, socket);
                 }
             }
 

diff --git a/src/main/java/net/schmizz/sshj/connection/channel/direct/LocalPortForwarder.java b/src/main/java/net/schmizz/sshj/connection/channel/direct/LocalPortForwarder.java
@@ -29,8 +29,6 @@
 import java.net.SocketException;
 import java.util.concurrent.TimeUnit;
 
-import static com.hierynomus.sshj.backport.Sockets.asCloseable;
-
 public class LocalPortForwarder {
 
     public static class ForwardedChannel
@@ -78,7 +76,7 @@ private void startChannel(Socket socket) throws IOException {
             chan.open();
             chan.start();
         } catch (IOException e) {
-            IOUtils.closeQuietly(chan, asCloseable(socket));
+            IOUtils.closeQuietly(chan, socket);
             throw e;
         }
     }