svn commit: r1482130 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

[doogie]

Author: doogie
Date: Mon May 13 22:31:04 2013
New Revision: 1482130

URL: http://svn.apache.org/r1482130
Log:
FEATURE: Allow events to return "none"; they can already return null,
which stops processing.

Modified:
    
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

Modified: 
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1482130&r1=1482129&r2=1482130&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java 
(original)
+++ 
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java 
Mon May 13 22:31:04 2013
@@ -442,7 +442,14 @@ public class RequestHandler {
 
         // Process the eventReturn
         // at this point eventReturnString is finalized, so get the 
RequestResponse
-        ConfigXMLReader.RequestResponse eventReturnBasedRequestResponse = 
eventReturn == null ? null : requestMap.requestResponseMap.get(eventReturn);
+        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) {
             //String eventReturnBasedResponse = requestResponse.value;
             if (Debug.verboseOn()) Debug.logVerbose("[Response Qualified]: " + 
eventReturnBasedRequestResponse.name + ", " + 
eventReturnBasedRequestResponse.type + ":" + 
eventReturnBasedRequestResponse.value + " sessionId=" + 
UtilHttp.getSessionId(request), module);