You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by wg...@apache.org on 2007/03/14 21:50:46 UTC
svn commit: r518319 -
/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java
Author: wglass
Date: Wed Mar 14 13:50:45 2007
New Revision: 518319
URL: http://svn.apache.org/viewvc?view=rev&rev=518319
Log:
prevent NPE - data will be null if user ignores deprecated method setRunData
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java?view=diff&rev=518319&r1=518318&r2=518319
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java Wed Mar 14 13:50:45 2007
@@ -24,6 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.ServerData;
import org.apache.turbine.util.pool.Recyclable;
import org.apache.turbine.util.uri.DataURI;
import org.apache.turbine.util.uri.URI;
@@ -151,7 +152,7 @@
String enc = request.getCharacterEncoding();
setCharacterEncoding(enc != null ? enc : "US-ASCII");
- cookiePath = new DataURI(data);
+ cookiePath = new DataURI(new ServerData(request));
Cookie[] cookies = request.getCookies();
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org