polx 2005/01/12 00:59:16
Modified:
jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing
ComponentTag.java
Log:
Slightly better tolerance for null component when invoking toString().
paul
Revision Changes Path
1.23 +3 -2
jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
Index: ComponentTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ComponentTag.java 12 Sep 2004 15:34:32 -0000 1.22
+++ ComponentTag.java 12 Jan 2005 08:59:16 -0000 1.23
@@ -83,8 +83,9 @@
}
public String toString() {
- String componentName = getComponent().getName();
- if (componentName == null || componentName.length() == 0)
+ Component comp = getComponent();
+ String componentName = (comp!=null) ? comp.getName() : null;
+ if (comp!=null && (componentName == null || componentName.length()
== 0))
componentName = getComponent().toString();
return "ComponentTag with bean " + componentName;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
