From 9c4003a950168cbefc7cbed725fa8d254b7978d6 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 23 Mar 2010 18:43:19 +0000
Subject: [PATCH] TCK failures: Fix session expiry on cross-context requests.
 Need to test the local session is valid before calling access() which will
 make it valid again.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@926716 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/ApplicationHttpRequest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index 2267b11f1..27416dd99 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -553,6 +553,9 @@ class ApplicationHttpRequest extends HttpServletRequestWrapper {
                 try {
                     localSession =
                         context.getManager().findSession(other.getId());
+                    if (localSession != null && !localSession.isValid()) {
+                        localSession = null;
+                    }
                 } catch (IOException e) {
                     // Ignore
                 }
-- 
2.11.0