Author: craigmcc
Date: Mon Nov 7 15:14:02 2005
New Revision: 331636
URL: http://svn.apache.org/viewcvs?rev=331636&view=rev
Log:
[37384] Avoid NPEs in toString() method of state impl classes when not wired
(specifically, when enabling debug logging, which causes these objects to be
printed as they are instantiated).
Submitted by: Ronald Holshausen <uglyog AT gmail.com>
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ActionStateImpl.java
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/EndStateImpl.java
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/SubdialogStateImpl.java
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ViewStateImpl.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ActionStateImpl.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ActionStateImpl.java?rev=331636&r1=331635&r2=331636&view=diff
==============================================================================
---
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ActionStateImpl.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ActionStateImpl.java
Mon Nov 7 15:14:02 2005
@@ -60,7 +60,8 @@
*/
public String toString() {
- return "ActionState[dialog=" + getDialog().getName() +
+ return "ActionState[dialog=" +
+ ((getDialog() != null) ? getDialog().getName() : "<null>") +
",name=" + getName() +
",method=" + getMethod() +
"]";
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/EndStateImpl.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/EndStateImpl.java?rev=331636&r1=331635&r2=331636&view=diff
==============================================================================
---
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/EndStateImpl.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/EndStateImpl.java
Mon Nov 7 15:14:02 2005
@@ -36,7 +36,8 @@
*/
public String toString() {
- return "EndState[dialog=" + getDialog().getName() +
+ return "EndState[dialog=" +
+ ((getDialog() != null) ? getDialog().getName() : "<null>") +
",name=" + getName() +
",viewId=" + getViewId() + "]";
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/SubdialogStateImpl.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/SubdialogStateImpl.java?rev=331636&r1=331635&r2=331636&view=diff
==============================================================================
---
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/SubdialogStateImpl.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/SubdialogStateImpl.java
Mon Nov 7 15:14:02 2005
@@ -58,7 +58,8 @@
*/
public String toString() {
- return "SubdialogState[dialog=" + getDialog().getName() +
+ return "SubdialogState[dialog=" +
+ ((getDialog() != null) ? getDialog().getName() : "<null>") +
",name=" + getName() +
",dialogName=" + this.dialogName + "]";
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ViewStateImpl.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ViewStateImpl.java?rev=331636&r1=331635&r2=331636&view=diff
==============================================================================
---
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ViewStateImpl.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/ViewStateImpl.java
Mon Nov 7 15:14:02 2005
@@ -59,7 +59,8 @@
*/
public String toString() {
- return "ViewState[dialog=" + getDialog().getName() +
+ return "ViewState[dialog=" +
+ ((getDialog() != null) ? getDialog().getName() : "<null>") +
",name=" + getName() +
",viewId=" + this.viewId + "]";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
