You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2015/03/14 09:52:55 UTC
svn commit: r1666642 -
/ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/content/ContentWorker.java
Author: deepak
Date: Sat Mar 14 08:52:54 2015
New Revision: 1666642
URL: http://svn.apache.org/r1666642
Log:
Applied fix from trunk r#1666633.
=========================================
Fixed incorrect tempTemplateContext assignment for renderContentAsText method, as UtilMisc.<String,Object>toMap method creating tempTemplateContext via call by reference mechanism, hence all the request parameters copy to original templateContext. In this case UtilMisc.toMap calling the UtilGenerics.checkMap().
Modified:
ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/content/ContentWorker.java
Modified: ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1666642&r1=1666641&r2=1666642&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/branches/release13.07/applications/content/src/org/ofbiz/content/content/ContentWorker.java Sat Mar 14 08:52:54 2015
@@ -23,6 +23,7 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.sql.Timestamp;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -193,8 +194,9 @@ public class ContentWorker implements or
ModelService service = dctx.getModelService(serviceName);
if (service != null) {
//put all requestParameters into templateContext to use them as IN service parameters
- Map<String,Object> tempTemplateContext = UtilMisc.<String,Object>toMap(templateContext);
+ Map<String,Object> tempTemplateContext = new HashMap<String, Object>();
tempTemplateContext.putAll(UtilGenerics.<String,Object>checkMap(templateContext.get("requestParameters")));
+ tempTemplateContext.putAll(templateContext);
Map<String,Object> serviceCtx = service.makeValid(tempTemplateContext, ModelService.IN_PARAM);
Map<String,Object> serviceRes;
try {