This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 69f9861766 Restore default authenticator in Tomcat Ant tasks
69f9861766 is described below
commit 69f9861766dd62b7465c56a0679442c46624073a
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 e3440e6388..9c3ea7ce80 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 a8a3953ffb..d0bf4cc43e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -209,6 +209,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 11.0.22 (markt)" rtext="2026-05-05">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
