Author: sebb
Date: Thu Aug 30 17:50:48 2007
New Revision: 571351
URL: http://svn.apache.org/viewvc?rev=571351&view=rev
Log:
Fix NPE in unit tests (previously unseen because null != evt.getSource())
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=571351&r1=571350&r2=571351&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
Thu Aug 30 17:50:48 2007
@@ -574,8 +574,9 @@
// evt will be null only when called from
TestBeanGUI.modifyTestElement()
// TODO - is the propertyChange event needed, now that
modifyTestElement calls this?
for (int i = 0; i < editors.length; i++) {
- if (evt == null || editors[i] == evt.getSource()) {
- Object value = editors[i].getValue();
+ PropertyEditor propertyEditor=editors[i]; // might be
null in testing
+ if (propertyEditor != null && (evt == null ||
propertyEditor == evt.getSource())) {
+ Object value = propertyEditor.getValue();
String name = descriptors[i].getName();
if (value == null) {
propertyMap.remove(name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
