This is an automated email from the ASF dual-hosted git repository.

rmaucher pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 2fa6015df2 Restore default authenticator to null in Tomcat Ant tasks
2fa6015df2 is described below

commit 2fa6015df203e1ae431ab1bbc8de2167d16b015b
Author: remm <[email protected]>
AuthorDate: Wed May 20 09:55:50 2026 +0200

    Restore default authenticator to null in Tomcat Ant tasks
---
 java/org/apache/catalina/ant/AbstractCatalinaTask.java | 5 +++++
 webapps/docs/changelog.xml                             | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index fbf163731f..d465432257 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -317,6 +317,11 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
                 handleErrorOutput(e.getMessage());
             }
         } finally {
+            try {
+                Authenticator.setDefault(null);
+            } catch (Exception e) {
+                // Ignore
+            }
             closeRedirector();
             if (reader != null) {
                 try {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 343225aa23..54b62f0b6e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -203,6 +203,10 @@
       <fix>
         Wrong references to jakarta instead of javax. (remm)
       </fix>
+      <fix>
+        Restore default authenticator to nullafter executing an Ant task.
+        (remm)
+      </fix>
     </changelog>
   </subsection>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to