Skip to content

Remove Java 7 backport Socket utilities #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hierynomus merged 1 commit into from
Jul 17, 2023
Merged

Remove Java 7 backport Socket utilities #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 0 additions & 78 deletions src/main/java/com/hierynomus/sshj/backport/Jdk7HttpProxySocket.java
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions src/main/java/com/hierynomus/sshj/backport/Sockets.java
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions src/main/java/net/schmizz/sshj/connection/channel/SocketStreamCopyMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -43,7 +41,7 @@ public void run() {
await(y);
} catch (IOException ignored) {
} finally {
IOUtils.closeQuietly(channel, asCloseable(socket));
IOUtils.closeQuietly(channel, socket);
}
}

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/net/schmizz/sshj/connection/channel/direct/LocalPortForwarder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
}
Expand Down