[tomcat] branch 8.5.x updated: Use consistent method for manager access

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new d6e8805524 Use consistent method for manager access
d6e8805524 is described below

commit d6e8805524c9f9bc61bf9862e562bac5005534a2
Author: remm <r...@apache.org>
AuthorDate: Fri Sep 8 10:56:14 2023 +0200

    Use consistent method for manager access
    
    Found by coverity (for wrong reasons, but there's no reason not to
    change it).
---
 java/org/apache/catalina/ha/session/JvmRouteBinderValve.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java 
b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index 195f7f0965..28e1d5992d 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -301,7 +301,7 @@ public class JvmRouteBinderValve extends ValveBase 
implements ClusterValve {
      */
     protected void changeSessionID(Request request, String sessionId, String 
newSessionID, Session catalinaSession) {
         fireLifecycleEvent("Before session migration", catalinaSession);
-        catalinaSession.getManager().changeSessionId(catalinaSession, 
newSessionID);
+        getManager(request).changeSessionId(catalinaSession, newSessionID);
         changeRequestSessionID(request, sessionId, newSessionID);
         changeSessionAuthenticationNote(sessionId, newSessionID, 
catalinaSession);
         fireLifecycleEvent("After session migration", catalinaSession);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org