From 9ec274946fe9fac8d9b16f6cb0af5d876d7364f0 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 12 Jan 2010 22:15:31 +0000 Subject: [PATCH] Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47774 Better fix to follow git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@898551 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/Request.java | 28 ++++--------------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index 384fffc62..db1f7ecbc 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -2181,31 +2181,11 @@ public class Request } catch (IOException e) { // Can't find the session } + if ((session != null) && session.isValid()) + return (true); + else + return (false); - if (session == null) return false; - - // The call to session.isValid() can trigger session listeners so make - // sure we are using the webapp's class loader in case the listeners are - // triggered - ClassLoader oldTccl = null; - if (context.getLoader() != null && - context.getLoader().getClassLoader() != null) { - oldTccl = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader( - context.getLoader().getClassLoader()); - } - - boolean result = false; - try { - if (session.isValid()) { - result = true; - } - } finally { - if (oldTccl != null) { - Thread.currentThread().setContextClassLoader(oldTccl); - } - } - return result; } -- 2.11.0