This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 233bc2e88e Restore default authenticator in Tomcat Ant tasks
233bc2e88e is described below
commit 233bc2e88e40807412e912d7d2c7cad1eb434e6e
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 | 3 +++
2 files changed, 10 insertions(+)
diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index e3440e6388..82e9d48059 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 ioe) {
+ // Ignore
+ }
closeRedirector();
if (reader != null) {
try {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 65367a8afb..d714e4edc3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -428,6 +428,9 @@
to make it easier to see when it's not used by the suite. (csutherl)
</add>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <fix>
+ Restore default authenticator after executing an Ant task. (remm)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
