This is an automated email from the ASF dual-hosted git repository.
remm 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 739c47ba6b Fix failure trying to persist configuration
739c47ba6b is described below
commit 739c47ba6b4f6915a7791a22efd0db345f7bf507
Author: remm <[email protected]>
AuthorDate: Wed Jul 12 15:44:11 2023 +0200
Fix failure trying to persist configuration
The internal credential handler is private and should be skipped (it is
added on start).
---
java/org/apache/catalina/storeconfig/RealmSF.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/storeconfig/RealmSF.java
b/java/org/apache/catalina/storeconfig/RealmSF.java
index a4ad84e364..1463ba3a63 100644
--- a/java/org/apache/catalina/storeconfig/RealmSF.java
+++ b/java/org/apache/catalina/storeconfig/RealmSF.java
@@ -85,7 +85,8 @@ public class RealmSF extends StoreFactoryBase {
}
// Store nested <CredentialHandler> element
CredentialHandler credentialHandler = ((Realm)
aRealm).getCredentialHandler();
- if (credentialHandler != null) {
+ if (credentialHandler != null
+ &&
!(credentialHandler.getClass().getName().equals("org.apache.catalina.realm.CombinedRealm$CombinedRealmCredentialHandler")))
{
storeElement(aWriter, indent, credentialHandler);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
