svn commit: r1204778 - in /jmeter/trunk: src/core/org/apache/jmeter/testbeans/TestBeanHelper.java xdocs/changes.xml

[se...@apache.org]

Author: sebb
Date: Tue Nov 22 02:05:31 2011
New Revision: 1204778

URL: http://svn.apache.org/viewvc?rev=1204778&view=rev
Log:
Bug 52224 - TestBeanHelper does not support NOT_UNDEFINED == Boolean.FALSE

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java?rev=1204778&r1=1204777&r2=1204778&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java Tue Nov 22 02:05:31 2011
@@ -25,11 +25,13 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.LinkedList;
 
+import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
 import org.apache.jmeter.testbeans.gui.TableEditor;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.MultiProperty;
+import org.apache.jmeter.testelement.property.NullProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jorphan.logging.LoggingManager;
@@ -118,6 +120,10 @@ public class TestBeanHelper {
         {
             value = unwrapCollection((MultiProperty)jprop,(String)desc.getValue(TableEditor.CLASSNAME));
         }
+        else if (jprop instanceof NullProperty && Boolean.FALSE.equals(desc.getValue(GenericTestBeanCustomizer.NOT_UNDEFINED)))  // value was not provided, and this is allowed
+        {    
+            value=null;
+        }
         else value = Converter.convert(jprop.getStringValue(), type);
         return value;
     }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1204778&r1=1204777&r2=1204778&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Nov 22 02:05:31 2011
@@ -152,6 +152,7 @@ This behaviour can be changed with prope
 <li>Bug 52216 - TableVisualizer : currentData field is badly synchronized</li>
 <li>Bug 52217 - ViewResultsFullVisualizer : Synchronization issues on root and treeModel</li>
 <li>Bug 43294 - XPath Extractor namespace problems</li>
+<li>Bug 52224 - TestBeanHelper does not support NOT_UNDEFINED == Boolean.FALSE</li>
 </ul>
 
 <!-- =================== Improvements =================== -->