This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6e3827031fda6642c133acccc3b2cd75505a2d82 Author: remm <[email protected]> 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 954aa1e7c6..22062e6547 100644 --- a/java/org/apache/catalina/storeconfig/ManagerSF.java +++ b/java/org/apache/catalina/storeconfig/ManagerSF.java @@ -122,7 +122,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: [email protected] For additional commands, e-mail: [email protected]
