You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2012/04/16 20:41:12 UTC

svn commit: r1326732 - in /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components: LinkSubmit.java Submit.java

Author: hlship
Date: Mon Apr 16 18:41:11 2012
New Revision: 1326732

URL: http://svn.apache.org/viewvc?rev=1326732&view=rev
Log:
TAP5-1906: Interaction between client-side validation and submit buttons can result in a server-side error parsing JSON array

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java?rev=1326732&r1=1326731&r2=1326732&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java Mon Apr 16 18:41:11 2012
@@ -21,6 +21,7 @@ import org.apache.tapestry5.annotations.
 import org.apache.tapestry5.annotations.SupportsInformalParameters;
 import org.apache.tapestry5.corelib.SubmitMode;
 import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
 import org.apache.tapestry5.json.JSONArray;
 import org.apache.tapestry5.json.JSONObject;
 import org.apache.tapestry5.services.FormSupport;
@@ -125,7 +126,7 @@ public class LinkSubmit implements Clien
 
         String raw = request.getParameter(Form.SUBMITTING_ELEMENT_ID);
 
-        if (raw != null && new JSONArray(raw).getString(0).equals(clientId))
+        if (InternalUtils.isNonBlank(raw) && new JSONArray(raw).getString(0).equals(clientId))
         {
             Runnable notification = new Runnable()
             {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java?rev=1326732&r1=1326731&r2=1326732&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java Mon Apr 16 18:41:11 2012
@@ -22,6 +22,7 @@ import org.apache.tapestry5.annotations.
 import org.apache.tapestry5.corelib.SubmitMode;
 import org.apache.tapestry5.internal.InternalConstants;
 import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
 import org.apache.tapestry5.json.JSONArray;
 import org.apache.tapestry5.services.FormSupport;
 import org.apache.tapestry5.services.Heartbeat;
@@ -216,7 +217,7 @@ public class Submit implements ClientEle
 
         String raw = request.getParameter(Form.SUBMITTING_ELEMENT_ID);
 
-        if (raw != null &&
+        if (InternalUtils.isNonBlank(raw) &&
                 new JSONArray(raw).getString(0).equals(clientId))
         {
             return true;