tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1356867 - /tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Date Tue, 03 Jul 2012 18:50:04 GMT
Author: markt
Date: Tue Jul  3 18:50:03 2012
New Revision: 1356867

URL: http://svn.apache.org/viewvc?rev=1356867&view=rev
Log:
Fix NPE triggered by r1356852

Modified:
    tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1356867&r1=1356866&r2=1356867&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Tue Jul  3 18:50:03
2012
@@ -304,7 +304,7 @@ public abstract class TomcatBaseTest ext
 
             @Override
             public int available() {
-                if (done) return 0;
+                if (done || body == null) return 0;
                 else return body.length;
             }
         };



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message