You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2026/10/01 07:54:43 UTC
(tomcat) 24/24: Java compat and changelog merge issue
This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 16a01d5e0be89d9432da136b2af7b774b0232035
Author: remm <re...@apache.org>
AuthorDate: Thu Oct 1 09:53:57 2026 +0200
Java compat and changelog merge issue
---
java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java | 3 ++-
java/org/apache/catalina/ha/session/DeltaRequest.java | 1 +
webapps/docs/changelog.xml | 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
index 25ceaa8924..6b99d96529 100644
--- a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
+++ b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
@@ -266,7 +266,8 @@ public class ClusterSingleSignOn extends SingleSignOn implements ClusterValve, M
// The cache is only a ReplicatedMap if start completed successfully.
// If the ReplicatedMap creation failed, the base class ConcurrentHashMap
// is still in place.
- if (cache instanceof ReplicatedMap<?,?> map) {
+ if (cache instanceof ReplicatedMap<?,?>) {
+ ReplicatedMap<?,?> map = (ReplicatedMap<?,?>) cache;
map.breakdown();
}
}
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java b/java/org/apache/catalina/ha/session/DeltaRequest.java
index e6c858a1da..818ca8d709 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -553,6 +553,7 @@ public class DeltaRequest implements Externalizable {
// Attributes and notes are different stores and setting and
// removing are different changes, so a name match alone is not
// enough to consider two actions as the same change
+ AttributeInfo other = (AttributeInfo) o;
return other.getType() == this.getType() && other.getAction() == this.getAction() &&
other.getName().equals(this.getName());
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 504ad411b6..02c4f96a71 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -4765,7 +4765,6 @@
<subsection name="Cluster">
<changelog>
<fix>
-<<<<<<< HEAD
Avoid updating request count stats on async. (remm)
</fix>
</changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org