svn commit: r1858258 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java

[surajk]

Author: surajk
Date: Sat Apr 27 09:00:20 2019
New Revision: 1858258

URL: http://svn.apache.org/viewvc?rev=1858258&view=rev
Log:
Applied fix from trunk for revision: 1858256
===

Fixed: Unable to add survey product to cart in order entry form.
(OFBIZ-10735)
It was due to incorrect usage of param map, used UtilHttp.getCombinedMap instead with some code improvements.
Thanks Amit Gadaley for reporting the issue and providing the patch.

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 27 09:00:20 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java?rev=1858258&r1=1858257&r2=1858258&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyEvents.java Sat Apr 27 09:00:20 2019
@@ -18,6 +18,7 @@
  *******************************************************************************/
 package org.apache.ofbiz.content.survey;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -25,6 +26,7 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.ofbiz.base.util.Debug;
 import org.apache.ofbiz.base.util.UtilHttp;
+import org.apache.ofbiz.service.*;
 import org.apache.ofbiz.webapp.control.ConfigXMLReader;
 import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap;
 import org.apache.ofbiz.webapp.control.RequestHandler;
@@ -39,29 +41,25 @@ public class SurveyEvents {
     public static final String module = SurveyEvents.class.getName();
 
     public static String createSurveyResponseAndRestoreParameters(HttpServletRequest request, HttpServletResponse response) {
-        // Call createSurveyResponse as an event, easier to setup and ensures parameter security
-        ConfigXMLReader.Event createSurveyResponseEvent = new ConfigXMLReader.Event("service", null, "createSurveyResponse", true);
-        RequestHandler rh = (RequestHandler) request.getAttribute("_REQUEST_HANDLER_");
-        ConfigXMLReader.ControllerConfig controllerConfig = rh.getControllerConfig();
-        String requestUri = (String) request.getAttribute("thisRequestUri");
-        RequestMap requestMap = null;
-        try {
-            requestMap = controllerConfig.getRequestMapMap().get(requestUri);
-        } catch (WebAppConfigurationException e) {
-            Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
-        }
-        String eventResponse = null;
+        LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
+        DispatchContext dctx = dispatcher.getDispatchContext();
+
+        Map<String, Object> combinedMap = UtilHttp.getCombinedMap(request);
+
         try {
-            eventResponse = rh.runEvent(request, response, createSurveyResponseEvent, requestMap, null);
-        } catch (EventHandlerException e) {
+            Map<String, Object> surveyResponseMap = dctx.makeValidContext("createSurveyResponse", ModelService.IN_PARAM, combinedMap);
+            Map<String, Object> surveyResponseResult = dispatcher.runSync("createSurveyResponse", surveyResponseMap);
+            if (ServiceUtil.isError(surveyResponseResult)) {
+                Debug.logError(ServiceUtil.getErrorMessage(surveyResponseResult), module);
+                return "error";
+            }
+            request.setAttribute("surveyResponseId", surveyResponseResult.get("surveyResponseId"));
+        } catch (GenericServiceException e) {
             Debug.logError(e, module);
             return "error";
         }
-        if (!"success".equals(eventResponse)) {
-            return eventResponse;
-        }
+
         // Check for an incoming _ORIG_PARAM_MAP_ID_, if present get the session stored parameter map and insert it's entries as request attributes
-        Map<String, Object> combinedMap = UtilHttp.getCombinedMap(request);
         if (combinedMap.containsKey("_ORIG_PARAM_MAP_ID_")) {
             String origParamMapId = (String) combinedMap.get("_ORIG_PARAM_MAP_ID_");
             UtilHttp.restoreStashedParameterMap(request, origParamMapId);