From 1c6aeff7944ec8bb4f530096203b11f899755ca5 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 18 Dec 2009 09:28:01 +0000
Subject: [PATCH] Move test for null outside of classloader fun and games so we
 can exit earlier if there is no session

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

diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index e8543fe11..70e3d17d5 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2182,6 +2182,8 @@ public class Request
             // Can't find the session 
         }
 
+        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
@@ -2195,7 +2197,7 @@ public class Request
 
         boolean result = false;
         try {
-            if ((session != null) && session.isValid()) {
+            if (session.isValid()) {
                 result = true;
             }
         } finally {
-- 
2.11.0