Author: markt
Date: Fri Jan 7 11:24:36 2011
New Revision: 1056264
URL: http://svn.apache.org/viewvc?rev=1056264&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50552
Avoid NPE that hides error when using Ant tasks (schultz)
Modified:
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=1056264&r1=1056263&r2=1056264&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java Fri
Jan 7 11:24:36 2011
@@ -263,7 +263,7 @@ public abstract class BaseRedirectorHelp
*/
protected void closeRedirector() {
try {
- if (redirectOutput) {
+ if (redirectOutput && redirectOutPrintStream != null) {
redirector.complete();
}
} catch (IOException ioe) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1056264&r1=1056263&r2=1056264&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 7 11:24:36 2011
@@ -305,6 +305,10 @@
<bug>14416</bug>: Make <code>TagLibraryInfo.getTag()</code> more robust
at handling <code>null</code>s. (markt)
</fix>
+ <fix>
+ <bug>50552</bug>: Avoid NPE that hides error message when using Ant
+ tasks. (schultz)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
