Author: markt
Date: Tue Jan 12 22:15:31 2010
New Revision: 898551
URL: http://svn.apache.org/viewvc?rev=898551&view=rev
Log:
Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
Better fix to follow
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=898551&r1=898550&r2=898551&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Jan 12
22:15:31 2010
@@ -2181,31 +2181,11 @@
} 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
