Author: mrdon
Date: Sat Feb 16 06:12:14 2008
New Revision: 628302
URL: http://svn.apache.org/viewvc?rev=628302&view=rev
Log:
Fix NPE when PARSE_CONTENT parameter not in context
WW-2398
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java?rev=628302&r1=628301&r2=628302&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
Sat Feb 16 06:12:14 2008
@@ -109,8 +109,10 @@
addParameter("parseContent", findValue(parseContent,
Boolean.class));
else
addParameter("parseContent", true);
+
+ Boolean parseContent =
(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
+ boolean generateId = (parseContent != null ? !parseContent : false);
- boolean generateId =
!(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
addParameter("pushId", generateId);
if ((this.id == null || this.id.length() == 0) && generateId) {
// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs
