--- a/src/ch/ethz/ssh2/channel/RemoteAcceptThread.java	Wed Jul 30 12:09:51 2014 -0700
+++ b/src/ch/ethz/ssh2/channel/RemoteAcceptThread.java	Wed Jul 30 14:16:58 2014 -0700
@@ -15,91 +15,74 @@
  * @author Christian Plattner
  * @version $Id: RemoteAcceptThread.java 119 2014-04-12 20:30:58Z dkocher@sudo.ch $
  */
-public class RemoteAcceptThread extends Thread
-{
-	private static final Logger log = Logger.getLogger(RemoteAcceptThread.class);
+public class RemoteAcceptThread extends Thread {
+    private static final Logger log = Logger.getLogger(RemoteAcceptThread.class);
 
-	Channel c;
+    Channel c;
 
-	String remoteConnectedAddress;
-	int remoteConnectedPort;
-	String remoteOriginatorAddress;
-	int remoteOriginatorPort;
-	String targetAddress;
-	int targetPort;
-
-	Socket s;
+    String remoteConnectedAddress;
+    int remoteConnectedPort;
+    String remoteOriginatorAddress;
+    int remoteOriginatorPort;
+    String targetAddress;
+    int targetPort;
 
-	public RemoteAcceptThread(Channel c, String remoteConnectedAddress, int remoteConnectedPort,
-							  String remoteOriginatorAddress, int remoteOriginatorPort, String targetAddress, int targetPort)
-	{
-		this.c = c;
-		this.remoteConnectedAddress = remoteConnectedAddress;
-		this.remoteConnectedPort = remoteConnectedPort;
-		this.remoteOriginatorAddress = remoteOriginatorAddress;
-		this.remoteOriginatorPort = remoteOriginatorPort;
-		this.targetAddress = targetAddress;
-		this.targetPort = targetPort;
+    Socket s;
 
-		log.debug("RemoteAcceptThread: " + remoteConnectedAddress + "/" + remoteConnectedPort + ", R: "
-				+ remoteOriginatorAddress + "/" + remoteOriginatorPort);
-	}
-
-	@Override
-	public void run()
-	{
-		try
-		{
-			c.cm.sendOpenConfirmation(c);
-
-			s = new Socket(targetAddress, targetPort);
-
-			StreamForwarder r2l = new StreamForwarder(c, null, null, c.getStdoutStream(), s.getOutputStream(),
-					"RemoteToLocal");
-			StreamForwarder l2r = new StreamForwarder(c, null, null, s.getInputStream(), c.getStdinStream(),
-					"LocalToRemote");
+    public RemoteAcceptThread(Channel c, String remoteConnectedAddress, int remoteConnectedPort,
+                              String remoteOriginatorAddress, int remoteOriginatorPort, String targetAddress, int targetPort) {
+        this.c = c;
+        this.remoteConnectedAddress = remoteConnectedAddress;
+        this.remoteConnectedPort = remoteConnectedPort;
+        this.remoteOriginatorAddress = remoteOriginatorAddress;
+        this.remoteOriginatorPort = remoteOriginatorPort;
+        this.targetAddress = targetAddress;
+        this.targetPort = targetPort;
+        log.debug("RemoteAcceptThread: " + remoteConnectedAddress + "/" + remoteConnectedPort + ", R: "
+                  + remoteOriginatorAddress + "/" + remoteOriginatorPort);
+    }
 
-			/* No need to start two threads, one can be executed in the current thread */
-
-			r2l.setDaemon(true);
-			r2l.start();
-			l2r.run();
+    @Override
+    public void run() {
+        try {
+            c.cm.sendOpenConfirmation(c);
+            s = new Socket(targetAddress, targetPort);
+            StreamForwarder r2l = new StreamForwarder(c, null, null, c.getStdoutStream(), s.getOutputStream(),
+                    "RemoteToLocal");
+            StreamForwarder l2r = new StreamForwarder(c, null, null, s.getInputStream(), c.getStdinStream(),
+                    "LocalToRemote");
+            /* No need to start two threads, one can be executed in the current thread */
+            r2l.setDaemon(true);
+            r2l.start();
+            l2r.run();
 
-			while (r2l.isAlive())
-			{
-				try
-				{
-					r2l.join();
-				}
-				catch (InterruptedException ignored)
-				{
-				}
-			}
-
-			/* If the channel is already closed, then this is a no-op */
+            while (r2l.isAlive()) {
+                try {
+                    r2l.join();
+                }
+                catch (InterruptedException ignored) {
+                }
+            }
 
-			c.cm.closeChannel(c, "EOF on both streams reached.", true);
-			s.close();
-		}
-		catch (IOException e)
-		{
-			log.warning("IOException in proxy code: " + e.getMessage());
+            /* If the channel is already closed, then this is a no-op */
+            c.cm.closeChannel(c, "EOF on both streams reached.", true);
+            s.close();
+        }
+        catch (IOException e) {
+            log.warning("IOException in proxy code: " + e.getMessage());
 
-			try
-			{
-				c.cm.closeChannel(c, e, true);
-			}
-			catch (IOException ignored)
-			{
-			}
-			try
-			{
-				if (s != null)
-					s.close();
-			}
-			catch (IOException ignored)
-			{
-			}
-		}
-	}
+            try {
+                c.cm.closeChannel(c, e, true);
+            }
+            catch (IOException ignored) {
+            }
+
+            try {
+                if (s != null)
+                    s.close();
+            }
+            catch (IOException ignored) {
+            }
+        }
+    }
 }