jsalvata 2004/02/11 09:27:43
Modified: src/core/org/apache/jmeter/gui/tree JMeterTreeNode.java
Log:
Avoid NPE when a TestBean has no icon.
Revision Changes Path
1.18 +6 -3
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
Index: JMeterTreeNode.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JMeterTreeNode.java 11 Feb 2004 14:40:51 -0000 1.17
+++ JMeterTreeNode.java 11 Feb 2004 17:27:43 -0000 1.18
@@ -54,6 +54,7 @@
*/
package org.apache.jmeter.gui.tree;
+import java.awt.Image;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -121,9 +122,11 @@
{
try
{
- return new ImageIcon(Introspector.getBeanInfo(
+ Image img= Introspector.getBeanInfo(
createTestElement().getClass())
- .getIcon(BeanInfo.ICON_COLOR_16x16));
+ .getIcon(BeanInfo.ICON_COLOR_16x16);
+ if (img == null) return null;
+ return new ImageIcon(img);
}
catch (IntrospectionException e1)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
