Skip to content

Make Cluster digester rules fully conditional on ha and tribes JARs #1021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsoumis wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −14
Open

Make Cluster digester rules fully conditional on ha and tribes JARs #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions java/org/apache/catalina/startup/Catalina.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,8 +597,15 @@ private void addClusterRuleSet(Digester digester, String prefix) {
Constructor<?> constructor;
try {
clazz = Class.forName("org.apache.catalina.ha.ClusterRuleSet");
Class.forName("org.apache.catalina.tribes.Channel");
constructor = clazz.getConstructor(String.class);
RuleSet ruleSet = (RuleSet) constructor.newInstance(prefix);

String clusterPrefix = prefix.substring(0, prefix.length() - 1);
digester.addObjectCreate(clusterPrefix, null, "className");
digester.addSetProperties(clusterPrefix);
digester.addSetNext(clusterPrefix, "setCluster", "org.apache.catalina.Cluster");

digester.addRuleSet(ruleSet);
} catch (Exception e) {
if (!clusterUnavailabilityLogged) {
Expand Down
7 changes: 0 additions & 7 deletions java/org/apache/catalina/startup/EngineRuleSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,6 @@ public void addRuleInstances(Digester digester) {
new LifecycleListenerRule("org.apache.catalina.startup.EngineConfig", "engineConfigClass"));
digester.addSetNext(prefix + "Engine", "setContainer", "org.apache.catalina.Engine");

// Cluster configuration start
digester.addObjectCreate(prefix + "Engine/Cluster", null, // MUST be specified in the element
"className");
digester.addSetProperties(prefix + "Engine/Cluster");
digester.addSetNext(prefix + "Engine/Cluster", "setCluster", "org.apache.catalina.Cluster");
// Cluster configuration end

digester.addObjectCreate(prefix + "Engine/Listener", null, // MUST be specified in the element
"className");
digester.addSetProperties(prefix + "Engine/Listener");
Expand Down
7 changes: 0 additions & 7 deletions java/org/apache/catalina/startup/HostRuleSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,6 @@ public void addRuleInstances(Digester digester) {

digester.addCallMethod(prefix + "Host/Alias", "addAlias", 0);

// Cluster configuration start
digester.addObjectCreate(prefix + "Host/Cluster", null, // MUST be specified in the element
"className");
digester.addSetProperties(prefix + "Host/Cluster");
digester.addSetNext(prefix + "Host/Cluster", "setCluster", "org.apache.catalina.Cluster");
// Cluster configuration end

digester.addObjectCreate(prefix + "Host/Listener", null, // MUST be specified in the element
"className");
digester.addSetProperties(prefix + "Host/Listener");
Expand Down
8 changes: 8 additions & 0 deletions webapps/docs/changelog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,14 @@
detailed error information (message, description, stack trace) is
suppressed from error responses. (dsoumis)
</add>
<fix>
Avoid a <code>NoClassDefFoundError</code> at startup when
<code>catalina-tribes.jar</code> is removed but
<code>catalina-ha.jar</code> is present and the
<code>Cluster</code> element is enabled in
<code>server.xml</code>. Cluster digester rules are now fully
conditional on both JARs being available. (dsoumis)
</fix>
</changelog>
</subsection>
<subsection name="Coyote">
Expand Down
Loading