Author: ivaynberg
Date: Tue Mar  8 08:14:25 2011
New Revision: 1079289

URL: http://svn.apache.org/viewvc?rev=1079289&view=rev
Log:
applying pedro's patch
Issue: WICKET-3488

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=1079289&r1=1079288&r2=1079289&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
 Tue Mar  8 08:14:25 2011
@@ -773,6 +773,7 @@ public class Form<T> extends WebMarkupCo
        {
                // save the page in case the component is removed during submit
                final Page page = getPage();
+               String hiddenFieldId = getHiddenFieldId();
 
                if (!isEnabledInHierarchy() || !isVisibleInHierarchy())
                {
@@ -822,7 +823,7 @@ public class Form<T> extends WebMarkupCo
                                        
parameters.remove(formComponent.getInputName());
                                }
                        });
-                       parameters.remove(getHiddenFieldId());
+                       parameters.remove(hiddenFieldId);
                        if (submittingComponent instanceof AbstractSubmitLink)
                        {
                                AbstractSubmitLink submitLink = 
(AbstractSubmitLink)submittingComponent;

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java?rev=1079289&r1=1079288&r2=1079289&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
 Tue Mar  8 08:14:25 2011
@@ -63,6 +63,16 @@ public class FormTest extends WicketTest
        }
 
        /**
+        * WICKET-3488
+        */
+       public void testFormReplacement()
+       {
+               tester.startPage(TestPage.class);
+               tester.newFormTester("form").submit();
+               tester.assertRenderedPage(TestPage.class);
+       }
+
+       /**
         * 
         */
        public void testActionUrlNotDoubleEscaped()


Reply via email to