forward port from 6.0

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@561328 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index 478d28f..7c695d1 100644 (file)
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -1411,6 +1411,8 @@ public class DeltaManager extends ClusterManagerBase{
         session.setValid(true);
         session.setPrimarySession(false);
         session.setCreationTime(msg.getTimestamp());
+        // use container maxInactiveInterval so that session will expire correctly in case of primary transfer
+        session.setMaxInactiveInterval(getMaxInactiveInterval());
         session.access();
         if(notifySessionListenersOnReplication)
             session.setId(msg.getSessionID());