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 15:44:25 UTC
svn commit: r1229563 - in /commons/proper/net/trunk/src: changes/changes.xml
main/java/org/apache/commons/net/telnet/TelnetInputStream.java
Author: sebb
Date: Tue Jan 10 14:44:25 2012
New Revision: 1229563
URL: http://svn.apache.org/viewvc?rev=1229563&view=rev
Log:
NET-437 TelnetInputStream doesn't support non-blocking IO when reader thread is not enabled
Modified:
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.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=1229563&r1=1229562&r2=1229563&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Tue Jan 10 14:44:25 2012
@@ -59,7 +59,10 @@ The <action> type attribute can be add,u
<release version="3.1-SNAPSHOT" date="TBA" description="
TBA
">
- <action issue="NET346" dev="sebb" type="add" due-to="Kevin Samuel">
+ <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>
+ <action issue="NET-346" dev="sebb" type="add" due-to="Kevin Samuel">
FTP should support reporting NATed external IP address
</action>
<action issue="NET-433" dev="sebb" type="add">
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java?rev=1229563&r1=1229562&r2=1229563&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java Tue Jan 10 14:44:25 2012
@@ -543,7 +543,7 @@ final class TelnetInputStream extends Bu
// Critical section because run() may change __bytesAvailable
synchronized (__queue)
{
- return __bytesAvailable;
+ return __bytesAvailable + super.available();
}
}