You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/06/30 10:17:35 UTC
svn commit: r1355663 - in /ofbiz/branches/release10.04: ./
framework/base/src/org/ofbiz/base/util/UtilHttp.java
Author: jleroux
Date: Sat Jun 30 08:17:34 2012
New Revision: 1355663
URL: http://svn.apache.org/viewvc?rev=1355663&view=rev
Log:
"Applied fix from trunk for revision: 1355660"
------------------------------------------------------------------------
r1355660 | jleroux | 2012-06-30 10:15:42 +0200 (sam., 30 juin 2012) | 10 lines
"Login out on a cluster handled by DeltaManager causes a NPE" https://issues.apache.org/jira/browse/OFBIZ-4289
Uses a HashMap instead of a FastMap here because else we get this kind of error when OFBiz is shut down:
2012-06-12 10:35:29,921 (OFBiz_Shutdown_Hook) [ StandardSession.java:1567:WARN ] Cannot serialize session attribute LAST_VIEW_PARAMS for session 00C48D0D76821C98403482FAE8B77C24.jvm1
java.io.NotSerializableException: net.sf.json.JSONObject
at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1164)
at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:330)
at javolution.util.FastMap.writeObject(FastMap.java:1513)
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilHttp.java
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1355660
Modified: ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=1355663&r1=1355662&r2=1355663&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original)
+++ ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilHttp.java Sat Jun 30 08:17:34 2012
@@ -112,7 +112,7 @@ public class UtilHttp {
*/
public static Map<String, Object> getParameterMap(HttpServletRequest request, Set<? extends String> nameSet, Boolean onlyIncludeOrSkip) {
boolean onlyIncludeOrSkipPrim = onlyIncludeOrSkip == null ? true : onlyIncludeOrSkip.booleanValue();
- Map<String, Object> paramMap = FastMap.newInstance();
+ Map<String, Object> paramMap = new HashMap<String, Object>();
// add all the actual HTTP request parameters
Enumeration<String> e = UtilGenerics.cast(request.getParameterNames());