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/09 10:36:13 UTC
(tomcat) 14/14: Java compat
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 ef8bd606e2a66b9423be56ea828132f841a19caf
Author: remm <re...@apache.org>
AuthorDate: Fri Oct 9 12:35:36 2026 +0200
Java compat
---
java/org/apache/catalina/storeconfig/ManagerSF.java | 3 ++-
.../tribes/group/interceptors/MessageDispatchInterceptor.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/storeconfig/ManagerSF.java b/java/org/apache/catalina/storeconfig/ManagerSF.java
index df351240b1..ce9bb5799e 100644
--- a/java/org/apache/catalina/storeconfig/ManagerSF.java
+++ b/java/org/apache/catalina/storeconfig/ManagerSF.java
@@ -131,7 +131,8 @@ public class ManagerSF extends StoreFactoryBase {
!StandardSessionIdGenerator.class.equals(sessionIdGenerator.getClass())) {
return false;
}
- if (sessionIdGenerator instanceof SessionIdGeneratorBase sigBase) {
+ if (sessionIdGenerator instanceof SessionIdGeneratorBase) {
+ SessionIdGeneratorBase sigBase = (SessionIdGeneratorBase) sessionIdGenerator;
// The manager propagates its jvmRoute to the generator when it starts,
// so a value matching the manager's is runtime state, not configuration
String sigJvmRoute = sigBase.getJvmRoute();
diff --git a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
index ae08a76dd4..129f7c6d88 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
@@ -115,12 +115,12 @@ public class MessageDispatchInterceptor extends ChannelInterceptorBase implement
// add to queue
if (useDeepClone) {
msg = (ChannelMessage) msg.deepclone();
- } else if (msg instanceof ChannelData channelData) {
+ } else if (msg instanceof ChannelData) {
// The caller of sendMessage() may reuse the buffer that backs the
// message as soon as this method returns, e.g. GroupChannel.send()
// returns it to the BufferPool. Clone, which copies the message
// data, so the queued message is independent of that buffer.
- msg = channelData.clone();
+ msg = ((ChannelData) msg).clone();
}
if (!addToQueue(msg, destination, payload)) {
throw new ChannelException(sm.getString("messageDispatchInterceptor.unableAdd.queue"));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org