You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/01/10 22:40:22 UTC
svn commit: r610940 - in /tomcat/tc6.0.x/trunk: STATUS.txt
java/org/apache/catalina/connector/CoyoteAdapter.java
Author: markt
Date: Thu Jan 10 13:40:21 2008
New Revision: 610940
URL: http://svn.apache.org/viewvc?rev=610940&view=rev
Log:
Fix possible NPE in previous fix for bug 43839.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=610940&r1=610939&r2=610940&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 10 13:40:21 2008
@@ -31,12 +31,6 @@
+1: jfclere
-1: fhanik - Can we add the 'package' directive to make the package match the dir structure
- Fix possible NPE in previous fix for
- http://issues.apache.org/bugzilla/show_bug.cgi?id=43839
- http://svn.apache.org/viewvc?rev=609003&view=rev
- +1: markt, fhanik, pero
- -1:
-
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43743
Correctly handle nest tag files packaged in a jar.
http://svn.apache.org/viewvc?rev=609803&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=610940&r1=610939&r2=610940&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Jan 10 13:40:21 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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org