1 files changed, 11 insertions, 10 deletions
diff --git a/lib/src/main/java/com/trilead/ssh2/channel/StreamForwarder.java b/lib/src/main/java/com/trilead/ssh2/channel/StreamForwarder.java
index 376a3a0..7e54efb 100644
--- a/lib/src/main/java/com/trilead/ssh2/channel/StreamForwarder.java
+++ b/lib/src/main/java/com/trilead/ssh2/channel/StreamForwarder.java
@@ -17,13 +17,13 @@ import java.net.Socket;
  */
 public class StreamForwarder extends Thread
 {
-	OutputStream os;
-	InputStream is;
-	byte[] buffer = new byte[Channel.CHANNEL_BUFFER_SIZE];
-	Channel c;
-	StreamForwarder sibling;
-	Socket s;
-	String mode;
+	final OutputStream os;
+	final InputStream is;
+	final byte[] buffer = new byte[Channel.CHANNEL_BUFFER_SIZE];
+	final Channel c;
+	final StreamForwarder sibling;
+	final Socket s;
+	final String mode;
 
 	StreamForwarder(Channel c, StreamForwarder sibling, Socket s, InputStream is, OutputStream os, String mode)
 			throws IOException
@@ -97,11 +97,12 @@ public class StreamForwarder extends Thread
 				catch (IOException e3)
 				{
 				}
+			}
 
+			if (s != null) {
 				try
 				{
-					if (s != null)
-						s.close();
+					s.close();
 				}
 				catch (IOException e1)
 				{
@@ -109,4 +110,4 @@ public class StreamForwarder extends Thread
 			}
 		}
 	}
-}
-\ No newline at end of file
+}