Fix failure trying to persist configuration

The internal credential handler is private and should be skipped (it is added on start).
apache · Jul 12, 2023 · 7e76d04 · 7e76d04
1 parent 52ed442
commit 7e76d04
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/java/org/apache/catalina/storeconfig/RealmSF.java b/java/org/apache/catalina/storeconfig/RealmSF.java
@@ -85,7 +85,8 @@ public void storeChildren(PrintWriter aWriter, int indent, Object aRealm,
         }
         // 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);
         }
     }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -115,6 +115,10 @@
         Make parsing of <code>ExtendedAccessLogValve</code> patterns more
         robust. (markt)
       </fix>
+      <fix>
+        Fix failure trying to persist configuration for an internal credential
+        handler. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">