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

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


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

commit 9ab4c67b9b9ae626865c9a35ad5f820ce3e8689f
Author: remm <[email protected]>
AuthorDate: Wed May 20 09:45:05 2026 +0200

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

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 311377cc6d..901e58bcd5 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -225,8 +225,10 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
             throws BuildException {
 
         InputStreamReader reader = null;
+        Authenticator defaultAuthenticator = null;
         try {
             // Set up authorization with our credentials
+            defaultAuthenticator = Authenticator.getDefault();
             Authenticator.setDefault(new TaskAuthenticator(username, 
password));
 
             // Create a connection for this command
@@ -312,6 +314,11 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
                 handleErrorOutput(e.getMessage());
             }
         } finally {
+            try {
+                Authenticator.setDefault(defaultAuthenticator);
+            } catch (Exception e) {
+                // Ignore
+            }
             closeRedirector();
             if (reader != null) {
                 try {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e68c08289f..daaba3a57e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -202,6 +202,13 @@
       </add>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        Restore default authenticator after executing an Ant task. (remm)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 10.1.55 (schultz)" rtext="2026-05-11">
   <subsection name="Catalina">


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

Reply via email to