Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50552

Avoid NPE that hides error when using Ant tasks (schultz)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1056264 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java b/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
index c093232..26685b3 100644 (file)
--- a/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
+++ b/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
@@ -263,7 +263,7 @@ public abstract class BaseRedirectorHelperTask extends Task {
      */
     protected void closeRedirector() {
         try {
-            if (redirectOutput) {
+            if (redirectOutput && redirectOutPrintStream != null) {
                 redirector.complete();
             }
         } catch (IOException ioe) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8fdaaff..2a89d92 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>