You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/01/10 20:14:48 UTC
svn commit: r1229692 - in /commons/proper/net/trunk/src: changes/changes.xml
main/java/org/apache/commons/net/tftp/TFTPClient.java
Author: sebb
Date: Tue Jan 10 19:14:47 2012
New Revision: 1229692
URL: http://svn.apache.org/viewvc?rev=1229692&view=rev
Log:
NET-410 Apache Commons TFTP does not handle RFC 783 retransmits
Modified:
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1229692&r1=1229691&r2=1229692&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Tue Jan 10 19:14:47 2012
@@ -59,6 +59,9 @@ The <action> type attribute can be add,u
<release version="3.1-SNAPSHOT" date="TBA" description="
TBA
">
+ <action issue="NET-410" dev="sebb" type="fix" due-to="Chuck Wolber">
+ Apache Commons TFTP does not handle RFC 783 retransmits
+ </action>
<action issue="NET-437" dev="sebb" type="fix" due-to="Gavin Camp">
TelnetInputStream doesn't support non-blocking IO when reader thread is not enabled
</action>
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPClient.java?rev=1229692&r1=1229691&r2=1229692&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/tftp/TFTPClient.java Tue Jan 10 19:14:47 2012
@@ -164,7 +164,7 @@ _receivePacket:
endBufferedOps();
throw new IOException("Connection timed out.");
}
- continue;
+ continue _sendPacket;
}
catch (InterruptedIOException e)
{
@@ -173,7 +173,7 @@ _receivePacket:
endBufferedOps();
throw new IOException("Connection timed out.");
}
- continue;
+ continue _sendPacket;
}
catch (TFTPPacketException e)
{
@@ -416,7 +416,7 @@ _receivePacket:
endBufferedOps();
throw new IOException("Connection timed out.");
}
- continue;
+ continue _sendPacket;
}
catch (InterruptedIOException e)
{
@@ -425,7 +425,7 @@ _receivePacket:
endBufferedOps();
throw new IOException("Connection timed out.");
}
- continue;
+ continue _sendPacket;
}
catch (TFTPPacketException e)
{