svn commit: r1022895 - in /commons/proper/net/trunk: RELEASE-NOTES.txt src/changes/changes.xml src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java

[se...@apache.org]

Author: sebb
Date: Fri Oct 15 12:46:25 2010
New Revision: 1022895

URL: http://svn.apache.org/viewvc?rev=1022895&view=rev
Log:
NET-334:  FromNetASCIIInputStream can throw a NullPointerException 

Modified:
    commons/proper/net/trunk/RELEASE-NOTES.txt
    commons/proper/net/trunk/src/changes/changes.xml
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java

Modified: commons/proper/net/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/RELEASE-NOTES.txt?rev=1022895&r1=1022894&r2=1022895&view=diff
==============================================================================
--- commons/proper/net/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/net/trunk/RELEASE-NOTES.txt Fri Oct 15 12:46:25 2010
@@ -23,6 +23,7 @@ o NET-263:  SubnetUtils / SubNetInfo toS
 o Javadoc fixes, improvements, and refactoring. 
 
 Fixed Bugs:
+o NET-334:  FromNetASCIIInputStream can throw a NullPointerException 
 o NET-341:  FTPClient.remoteAppend(String filename) uses STOR instead of APPE 
 o NET-339:  Incorrect parsing of timestamp on Windows CE
             Fix parsing to allow for new-style DOS listing using 24hr clock rather than AM/PM 

Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1022895&r1=1022894&r2=1022895&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Fri Oct 15 12:46:25 2010
@@ -61,6 +61,9 @@ This is primarily a maintenance release,
  
   TO BE COMPLETED
 ">
+            <action issue="NET-334" dev="sebb" type="fix">
+            FromNetASCIIInputStream can throw a NullPointerException
+            </action>
             <action issue="NET-341" dev="sebb" type="fix">
             FTPClient.remoteAppend(String filename) uses STOR instead of APPE
             </action>

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java?rev=1022895&r1=1022894&r2=1022895&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java Fri Oct 15 12:46:25 2010
@@ -190,6 +190,7 @@ public final class FromNetASCIIInputStre
 
 
     // PushbackInputStream in JDK 1.1.3 returns the wrong thing
+    // TODO - can we delete this override now?
     /***
      * Returns the number of bytes that can be read without blocking EXCEPT
      * when newline conversions have to be made somewhere within the
@@ -200,6 +201,9 @@ public final class FromNetASCIIInputStre
     @Override
     public int available() throws IOException
     {
+        if (in == null) {
+            throw new IOException("Stream closed");
+        }
         return (buf.length - pos) + in.available();
     }