merge of '1d77e0a89198e422acfb66d9310fad7b0b290e38'

     and '5271eb82ac21ebc1a96dd31c462a14e2aaa0c89e'

apps/sam/java/src/net/i2p/sam/SAMHandler.java

@@ -102,8 +102,8 @@ public abstract class SAMHandler implements Runnable {
     }
     
     static public void writeBytes(ByteBuffer data, SocketChannel out) throws IOException {
-    	while (data.hasRemaining()) out.write(data);           
-    	out.socket().getOutputStream().flush();
+        while (data.hasRemaining()) out.write(data);           
+        out.socket().getOutputStream().flush();
     }
     
     /**