From 636f8968503ba9b80cea077d17a65eb331a3be8e Mon Sep 17 00:00:00 2001 From: Jeroen van Erp Date: Fri, 10 Feb 2017 09:43:12 +0100 Subject: [PATCH] Cleaned up some code --- .../sshj/connection/channel/AbstractChannel.java | 2 +- .../sshj/connection/channel/ChannelOutputStream.java | 12 ++++++------ src/main/java/net/schmizz/sshj/sftp/SFTPClient.java | 1 - .../channel/forwarded/RemotePortForwarderTest.java | 5 ++++- .../keepalive/KeepAliveThreadTerminationTest.java | 3 +-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java b/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java index 2698d251..779932fe 100644 --- a/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java +++ b/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java @@ -189,7 +189,7 @@ public abstract class AbstractChannel default: gotUnknown(msg, buf); - + break; } } diff --git a/src/main/java/net/schmizz/sshj/connection/channel/ChannelOutputStream.java b/src/main/java/net/schmizz/sshj/connection/channel/ChannelOutputStream.java index 9610dd39..d9005561 100644 --- a/src/main/java/net/schmizz/sshj/connection/channel/ChannelOutputStream.java +++ b/src/main/java/net/schmizz/sshj/connection/channel/ChannelOutputStream.java @@ -71,7 +71,8 @@ public final class ChannelOutputStream extends OutputStream implements ErrorNoti } boolean flush(int bufferSize, boolean canAwaitExpansion) throws TransportException, ConnectionException { - while (bufferSize > 0) { + int dataLeft = bufferSize; + while (dataLeft > 0) { long remoteWindowSize = win.getSize(); if (remoteWindowSize == 0) { if (canAwaitExpansion) { @@ -85,7 +86,7 @@ public final class ChannelOutputStream extends OutputStream implements ErrorNoti // a) how much data we have // b) the max packet size // c) what the current window size will allow - final int writeNow = Math.min(bufferSize, (int) Math.min(win.getMaxPacketSize(), remoteWindowSize)); + final int writeNow = Math.min(dataLeft, (int) Math.min(win.getMaxPacketSize(), remoteWindowSize)); packet.wpos(headerOffset); packet.putMessageID(Message.CHANNEL_DATA); @@ -93,7 +94,7 @@ public final class ChannelOutputStream extends OutputStream implements ErrorNoti packet.putUInt32(writeNow); packet.wpos(dataOffset + writeNow); - final int leftOverBytes = bufferSize - writeNow; + final int leftOverBytes = dataLeft - writeNow; if (leftOverBytes > 0) { leftOvers.putRawBytes(packet.array(), packet.wpos(), leftOverBytes); } @@ -109,7 +110,7 @@ public final class ChannelOutputStream extends OutputStream implements ErrorNoti leftOvers.clear(); } - bufferSize = leftOverBytes; + dataLeft = leftOverBytes; } return true; @@ -178,8 +179,7 @@ public final class ChannelOutputStream extends OutputStream implements ErrorNoti * @throws IOException */ @Override - public synchronized void flush() - throws IOException { + public synchronized void flush() throws IOException { checkClose(); buffer.flush(true); } diff --git a/src/main/java/net/schmizz/sshj/sftp/SFTPClient.java b/src/main/java/net/schmizz/sshj/sftp/SFTPClient.java index 03ae541a..5610bbc3 100644 --- a/src/main/java/net/schmizz/sshj/sftp/SFTPClient.java +++ b/src/main/java/net/schmizz/sshj/sftp/SFTPClient.java @@ -19,7 +19,6 @@ import net.schmizz.sshj.xfer.FilePermission; import net.schmizz.sshj.xfer.LocalDestFile; import net.schmizz.sshj.xfer.LocalSourceFile; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.Closeable; import java.io.IOException; diff --git a/src/test/java/com/hierynomus/sshj/connection/channel/forwarded/RemotePortForwarderTest.java b/src/test/java/com/hierynomus/sshj/connection/channel/forwarded/RemotePortForwarderTest.java index a99a2dde..dc05613d 100644 --- a/src/test/java/com/hierynomus/sshj/connection/channel/forwarded/RemotePortForwarderTest.java +++ b/src/test/java/com/hierynomus/sshj/connection/channel/forwarded/RemotePortForwarderTest.java @@ -30,6 +30,8 @@ import org.apache.sshd.server.forward.AcceptAllForwardingFilter; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -39,6 +41,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; public class RemotePortForwarderTest { + private static final Logger log = LoggerFactory.getLogger(RemotePortForwarderTest.class); private static final PortRange RANGE = new PortRange(9000, 9999); private static final InetSocketAddress HTTP_SERVER_SOCKET_ADDR = new InetSocketAddress("127.0.0.1", 8080); @@ -125,7 +128,7 @@ public class RemotePortForwarderTest { private int httpGet(String server, int port) throws IOException { HttpClient client = HttpClientBuilder.create().build(); String urlString = "http://" + server + ":" + port; - System.out.println("Trying: GET " + urlString); + log.info("Trying: GET " + urlString); HttpResponse execute = client.execute(new HttpGet(urlString)); return execute.getStatusLine().getStatusCode(); } diff --git a/src/test/java/com/hierynomus/sshj/keepalive/KeepAliveThreadTerminationTest.java b/src/test/java/com/hierynomus/sshj/keepalive/KeepAliveThreadTerminationTest.java index 9a539fa9..fe9cc4f2 100644 --- a/src/test/java/com/hierynomus/sshj/keepalive/KeepAliveThreadTerminationTest.java +++ b/src/test/java/com/hierynomus/sshj/keepalive/KeepAliveThreadTerminationTest.java @@ -61,8 +61,7 @@ public class KeepAliveThreadTerminationTest { for (long l : threadMXBean.getAllThreadIds()) { ThreadInfo threadInfo = threadMXBean.getThreadInfo(l); if (threadInfo.getThreadName().equals("keep-alive") && threadInfo.getThreadState() != Thread.State.TERMINATED) { - System.err.println("Found thread in state " + threadInfo.getThreadState()); - throw new RuntimeException("Found alive keep-alive thread"); + fail("Found alive keep-alive thread in state " + threadInfo.getThreadState()); } } }