remm 2004/02/28 02:56:53
Modified: catalina/src/share/org/apache/catalina/core
ApplicationHttpRequest.java
Log:
- NPE fix if there's no local session.
- Bug 27309.
Revision Changes Path
1.20 +3 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ApplicationHttpRequest.java 27 Feb 2004 14:58:42 -0000 1.19
+++ ApplicationHttpRequest.java 28 Feb 2004 10:56:52 -0000 1.20
@@ -496,7 +496,6 @@
try {
localSession =
context.getManager().findSession(other.getId());
- localSession.access();
} catch (IOException e) {
// Ignore
}
@@ -508,6 +507,8 @@
localSession.setMaxInactiveInterval
(context.getManager().getMaxInactiveInterval());
localSession.setId(other.getId());
+ } else {
+ localSession.access();
}
session = localSession;
return session.getSession();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
