Author: markt
Date: Fri Jan 4 12:59:59 2008
New Revision: 609003
URL: http://svn.apache.org/viewvc?rev=609003&view=rev
Log:
Fix possible NPE when no ROOT application is deployed in fix for bug 43839.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=609003&r1=609002&r2=609003&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Jan
4 12:59:59 2008
@@ -551,7 +551,8 @@
// context, don't go looking for a session ID in a cookie as a cookie
// from a parent context with a session ID may be present which would
// overwrite the valid session ID encoded in the URL
- if (!((Context)request.getMappingData().context).getCookies())
+ Context context = (Context) request.getMappingData().context;
+ if (context != null && !context.getCookies())
return;
// Parse session id from cookies
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
