Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-2498 Minor change to avoid NPE when parseContent attribute is missing on dojo tags or in the context. Defaults to false if null.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@629326 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeromy Evans
2008-02-20 02:52:27 +00:00
parent a0c5ea1944
commit b95f8dfc50
8 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
+2 -1
View File
@@ -110,8 +110,9 @@ public abstract class AbstractRemoteBean extends ClosingUIBean implements Remote
else
addParameter("parseContent", true);
// generate a random ID if not explicitly set and not parsing the content
Boolean parseContent = (Boolean)stack.getContext().get(Head.PARSE_CONTENT);
boolean generateId = (parseContent != null ? !parseContent : false);
boolean generateId = (parseContent != null ? !parseContent : true);
addParameter("pushId", generateId);
if ((this.id == null || this.id.length() == 0) && generateId) {
plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
+4 -1
View File
@@ -324,7 +324,10 @@ public class Autocompleter extends ComboBox {
if (resultsLimit != null)
addParameter("searchLimit", findString(resultsLimit));
boolean generateId = !(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
// generate a random ID if not explicitly set and not parsing the content
Boolean parseContent = (Boolean)stack.getContext().get(Head.PARSE_CONTENT);
boolean generateId = (parseContent != null ? !parseContent : true);
addParameter("pushId", generateId);
if ((this.id == null || this.id.length() == 0) && generateId) {
// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs
plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
+4 -1
View File
@@ -264,7 +264,10 @@ public class DateTimePicker extends UIBean {
}
}
boolean generateId = !(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
// generate a random ID if not explicitly set and not parsing the content
Boolean parseContent = (Boolean)stack.getContext().get(Head.PARSE_CONTENT);
boolean generateId = (parseContent != null ? !parseContent : true);
addParameter("pushId", generateId);
if ((this.id == null || this.id.length() == 0) && generateId) {
// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs
plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
+5 -2
View File
@@ -236,8 +236,11 @@ public class Submit extends FormButton implements RemoteBean {
if (ajaxAfterValidation != null)
addParameter("ajaxAfterValidation", findValue(ajaxAfterValidation, Boolean.class));
boolean generateId = !(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
// generate a random ID if not explicitly set and not parsing the content
Boolean parseContent = (Boolean)stack.getContext().get(Head.PARSE_CONTENT);
boolean generateId = (parseContent != null ? !parseContent : true);
addParameter("pushId", generateId);
if ((this.id == null || this.id.length() == 0) && generateId) {
// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs
plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java
+4 -1
View File
@@ -128,7 +128,10 @@ public class TabbedPanel extends ClosingUIBean {
addParameter("useSelectedTabCookie", findString(useSelectedTabCookie));
}
boolean generateId = !(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
// generate a random ID if not explicitly set and not parsing the content
Boolean parseContent = (Boolean)stack.getContext().get(Head.PARSE_CONTENT);
boolean generateId = (parseContent != null ? !parseContent : true);
addParameter("pushId", generateId);
if ((this.id == null || this.id.length() == 0) && generateId) {
// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs
plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea.java
+4 -1
View File
@@ -47,7 +47,10 @@ public class TextArea extends org.apache.struts2.components.TextArea {
public void evaluateExtraParams() {
super.evaluateExtraParams();
boolean generateId = !(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
// generate a random ID if not explicitly set and not parsing the content
Boolean parseContent = (Boolean)stack.getContext().get(Head.PARSE_CONTENT);
boolean generateId = (parseContent != null ? !parseContent : true);
addParameter("pushId", generateId);
if ((this.id == null || this.id.length() == 0) && generateId) {
// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs
plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java
+5 -2
View File
@@ -253,8 +253,11 @@ public class Tree extends ClosingUIBean {
addParameter("href", findString(href));
if (errorNotifyTopics != null)
addParameter("errorNotifyTopics", findString(errorNotifyTopics));
boolean generateId = !(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
// generate a random ID if not explicitly set and not parsing the content
Boolean parseContent = (Boolean)stack.getContext().get(Head.PARSE_CONTENT);
boolean generateId = (parseContent != null ? !parseContent : true);
addParameter("pushId", generateId);
if ((this.id == null || this.id.length() == 0) && generateId) {
// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs
plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java
+4 -1
View File
@@ -115,7 +115,10 @@ public class TreeNode extends ClosingUIBean {
protected void evaluateExtraParams() {
super.evaluateExtraParams();
boolean generateId = !(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
// generate a random ID if not explicitly set and not parsing the content
Boolean parseContent = (Boolean)stack.getContext().get(Head.PARSE_CONTENT);
boolean generateId = (parseContent != null ? !parseContent : true);
addParameter("pushId", generateId);
if ((this.id == null || this.id.length() == 0) && generateId) {
// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs