svn commit: r1528541 - /ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

Author: jleroux
Date: Wed Oct  2 16:20:36 2013
New Revision: 1528541

URL: http://svn.apache.org/r1528541
Log:
"Applied fix from trunk for revision: 1527754"
------------------------------------------------------------------------
r1527754 | doogie | 2013-09-30 21:57:13 +0200 (lun., 30 sept. 2013) | 5 lines

There are some controller.xml entries that have a name of "none"; those
should be preferred as valid responses, instead of always assuming that
none means do nothing.

This fixes the issue reported in OFBIZ-5304.
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

Modified: ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1528541&r1=1528540&r2=1528541&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Wed Oct  2 16:20:36 2013
@@ -451,10 +451,11 @@ public class RequestHandler {
         ConfigXMLReader.RequestResponse eventReturnBasedRequestResponse;
         if (eventReturn == null) {
             eventReturnBasedRequestResponse = null;
-        } else if (eventReturn.equals("none")) {
-            eventReturnBasedRequestResponse = ConfigXMLReader.emptyNoneRequestResponse;
         } else {
             eventReturnBasedRequestResponse = requestMap.requestResponseMap.get(eventReturn);
+            if (eventReturnBasedRequestResponse == null && eventReturn.equals("none")) {
+                eventReturnBasedRequestResponse = ConfigXMLReader.emptyNoneRequestResponse;
+            }
         }
         if (eventReturnBasedRequestResponse != null) {
             //String eventReturnBasedResponse = requestResponse.value;