struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [12/14] git commit: https://issues.apache.org/jira/browse/WW-4299 - do not assign value to id parameter if tryId value is null this prevents overwriting a parameter with a name of id used with the component tag
Date Wed, 19 Mar 2014 07:52:37 GMT
https://issues.apache.org/jira/browse/WW-4299 - do not assign value to id parameter if tryId
value is null this prevents overwriting a parameter with a name of id used with the component
tag

Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cb9f0f56
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cb9f0f56
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cb9f0f56

Branch: refs/heads/feature/WW-4187-correctly-identify-protocols
Commit: cb9f0f5645d05b2f1c7c66640716acff61c4425f
Parents: 3ceb3b9
Author: phillips1021 <phillips1021@hotmail.com>
Authored: Tue Mar 18 09:46:36 2014 -0500
Committer: phillips1021 <phillips1021@hotmail.com>
Committed: Tue Mar 18 09:46:36 2014 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/struts2/components/UIBean.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/cb9f0f56/core/src/main/java/org/apache/struts2/components/UIBean.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 9418a6e..51b7e79 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -1024,8 +1024,13 @@ public abstract class UIBean extends Component {
         } else {
             tryId = generatedId;
         }
-        addParameter("id", tryId);
-        addParameter("escapedId", escape(tryId));
+        
+        //fix for https://issues.apache.org/jira/browse/WW-4299
+        //do not assign value to id if tryId is null
+        if (tryId != null) {
+          addParameter("id", tryId);
+          addParameter("escapedId", escape(tryId));
+        }
     }
 
     /**


Mime
View raw message