From 28e690e402a4abef29f868a75f5c6363063f6b14 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Thu, 25 Dec 2008 14:54:53 +0000
Subject: [PATCH] Fixed some performance issues in FTPClient

---
 src/zutil/network/FTPClient.java | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/zutil/network/FTPClient.java b/src/zutil/network/FTPClient.java
index cd6c8e6..43e37f0 100644
--- a/src/zutil/network/FTPClient.java
+++ b/src/zutil/network/FTPClient.java
@@ -25,7 +25,7 @@ import zutil.MultiPrintStream;
  * TODO: file info, rename, Active mode
  */
 public class FTPClient extends Thread{
-	public static boolean DEBUG = false;
+	public static boolean DEBUG = true;
 	
 	public static final int FTP_ACTIVE = 0;
 	public static final int FTP_PASSIVE = 1;
@@ -51,7 +51,7 @@ public class FTPClient extends Thread{
 
 	public static void main(String[] args){
 		try {
-			FTPClient client = new FTPClient("koc.se", 21, "kth", "****", FTP_PASSIVE);
+			FTPClient client = new FTPClient("koc.se", 21, "ziver", "****", FTP_PASSIVE);
 			client.createDir("./ziver/lol");
 			client.removeDir("./ziver/lol");
 			
@@ -60,7 +60,7 @@ public class FTPClient extends Thread{
 			MultiPrintStream.out.dump(client.getFileList("./ziver"));
 			
 			MultiPrintStream.out.dump(client.getFile("./ziver/test.txt"));
-			client.readCommand(true);
+			client.readCommand(DEBUG);
 			
 			MultiPrintStream.out.println(client.getFileInfo("./ziver/test.txt"));
 			
@@ -89,9 +89,9 @@ public class FTPClient extends Thread{
 		in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
 		out = new PrintStream(socket.getOutputStream());
 		
-		readCommand(true);
+		readCommand(DEBUG);
 		sendCommand("USER "+user);
-		sendNoReplyCommand("PASS "+pass, false);
+		sendNoReplyCommand("PASS "+pass, DEBUG);
 		if(DEBUG)System.out.println("PASS ***");
 		String tmp = readMultipleCommands(DEBUG);
 		if(parseReturnCode(tmp) == FTPC_LOGIN_NO){
@@ -153,7 +153,7 @@ public class FTPClient extends Thread{
 	private synchronized String readCommand(boolean print) throws IOException{
 		String tmp = in.readLine();
 		if(print)System.out.println(tmp);
-		//if(parseReturnCode(tmp) >= 400 ) throw new IOException(tmp);
+		if(parseReturnCode(tmp) >= 400 ) throw new IOException(tmp);
 		
 		return tmp;
 	}
@@ -167,6 +167,12 @@ public class FTPClient extends Thread{
 	 * @throws IOException
 	 */
 	private synchronized String readMultipleCommands(boolean print) throws IOException{
+		String tmp = readCommand(print);
+		while(!tmp.substring(3, 4).equalsIgnoreCase(" ")){
+			tmp = readCommand(print);
+		}
+		
+		/*
 		String tmp = in.readLine();
 		if(print)System.out.println(tmp);
 		try{ Thread.sleep(500); }catch(Exception e){}
@@ -175,7 +181,7 @@ public class FTPClient extends Thread{
 			if(print)System.out.println(tmp);
 			try{ Thread.sleep(500); }catch(Exception e){}
 		}
-		
+		*/
 		return tmp;
 	}