Author: dfs Date: Thu May 26 19:00:13 2005 New Revision: 178726 URL: http://svn.apache.org/viewcvs?rev=178726&view=rev Log: Backed out change made in r161466 in response to issue #32859, effectively reverting to r155429. The patch from the issue reporter has no effect other than to break TFTPClient.sendFile by removing a final packet send. If a corrected patch and verifying test case are submitted the change can be reapplied.
Modified: jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java Modified: jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java?rev=178726&r1=178725&r2=178726&view=diff ============================================================================== --- jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java (original) +++ jakarta/commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java Thu May 26 19:00:13 2005 @@ -372,7 +372,6 @@ dataLength = lastBlock = hostPort = bytesRead = 0; block = 0; - boolean lastAckWait = false; if (mode == TFTP.ASCII_MODE) input = new ToNetASCIIInputStream(input); @@ -456,10 +455,7 @@ if (lastBlock == block) { ++block; - if (lastAckWait) - break _sendPacket; - else - break _receivePacket; + break _receivePacket; } else { @@ -505,8 +501,9 @@ data.setData(_sendBuffer, 4, offset - 4); sent = data; } - while (dataLength == 0 || lastAckWait); + while (dataLength == 0); + bufferedSend(sent); endBufferedOps(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]