svn commit: r292616 - in /beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow: NullActionForm.java PageFlowRequestProcessor.java

[ri...@apache.org]

Author: rich
Date: Thu Sep 29 20:40:23 2005
New Revision: 292616

URL: http://svn.apache.org/viewcvs?rev=292616&view=rev
Log:
This is not the full fix for http://issues.apache.org/jira/browse/BEEHIVE-947, but it mitigates the damage.  I'm removing NullActionForm because it was doing more harm than good.  See the bug for more details.

tests: bvt in netui (WinXP)
BB: bvt in netui (linux)


Removed:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/NullActionForm.java
Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?rev=292616&r1=292615&r2=292616&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java Thu Sep 29 20:40:23 2005
@@ -118,7 +118,6 @@
     private static final String REDIRECT_REQUEST_ATTRS_PREFIX = InternalConstants.ATTR_PREFIX + "requestAttrs:";
     private static final String REDIRECT_REQUEST_ATTRS_PARAM = "forceRedirect";
     private static final String FLOW_CONTROLLER_ACTION_CLASSNAME = FlowControllerAction.class.getName();
-    private static final NullActionForm NULL_ACTION_FORM = new NullActionForm();
 
 
     private Map/*< String, Class >*/ _formBeanClasses = new HashMap/*< String, Class >*/();
@@ -377,11 +376,13 @@
         //
         if ( !alreadyCalledInRequest || form != null )
         {
-            //
             // If this request was forwarded by a button-override of the main form action, then ensure that there are
             // no databinding errors when the override action does not use a form bean.
-            //
-            if ( form == null && requestWrapper.isForwardedByButton() ) form = NULL_ACTION_FORM;
+            if ( form == null && requestWrapper.isForwardedByButton() )
+            {
+                // This is currently TODO; I removed the use of NullActionForm.
+                // See http://issues.apache.org/jira/browse/BEEHIVE-947 .
+            }
 
             ProcessPopulate.populate( request, response, form, alreadyCalledInRequest );
         }