Author: niallp Date: Tue Aug 4 01:25:28 2009 New Revision: 800648 URL: http://svn.apache.org/viewvc?rev=800648&view=rev Log: BEANUTILS-339 BeanUtilsBean.setProperty throws IllegalArgumentException if value is null - thanks to Alan Escreet
Added: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira339TestCase.java (with props) Modified: commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java Modified: commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java?rev=800648&r1=800647&r2=800648&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java (original) +++ commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java Tue Aug 4 01:25:28 2009 @@ -1000,7 +1000,7 @@ newValue = convert(value, type.getComponentType()); } } else { // Value into scalar - if ((value instanceof String) || (value == null)) { + if (value instanceof String) { newValue = getConvertUtils().convert((String) value, type); } else if (value instanceof String[]) { newValue = getConvertUtils().convert(((String[]) value)[0], Added: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira339TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira339TestCase.java?rev=800648&view=auto ============================================================================== --- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira339TestCase.java (added) +++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira339TestCase.java Tue Aug 4 01:25:28 2009 @@ -0,0 +1,125 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.beanutils.bugs; + +import java.util.Comparator; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * See https://issues.apache.org/jira/browse/BEANUTILS-339 + * <p /> + * + * @version $Revision$ $Date$ + */ +public class Jira339TestCase extends TestCase { + + private Log log = LogFactory.getLog(Jira339TestCase.class); + + /** + * Create a test case with the specified name. + * + * @param name The name of the test + */ + public Jira339TestCase(String name) { + super(name); + } + + /** + * Run the Test. + * + * @param args Arguments + */ + public static void main(String[] args) { + junit.textui.TestRunner.run(suite()); + } + + /** + * Create a test suite for this test. + * + * @return a test suite + */ + public static Test suite() { + return (new TestSuite(Jira339TestCase.class)); + } + + /** + * Set up. + * + * @throws java.lang.Exception + */ + protected void setUp() throws Exception { + super.setUp(); + } + + /** + * Tear Down. + * + * @throws java.lang.Exception + */ + protected void tearDown() throws Exception { + super.tearDown(); + } + + /** + * Test {...@link PropertyUtils#getProperty(Object, String)} + */ + public void testIssue_BEANUTILS_339_BeanUtilsBean_setProperty() { + + TestBean bean = new TestBean(); + try { + BeanUtils.setProperty(bean, "comparator", null); + } catch (Throwable t) { + log.error("Failed: " + t.getMessage(), t); + fail("Threw exception: " + t); + } + assertNull("TestBean comparator should be null", bean.getComparator()); + } + + /** + * Test Bean. + */ + public static class TestBean { + private Comparator comparator; + + /** + * Return the comparator. + * + * @return the comparator + */ + public Comparator getComparator() { + return comparator; + } + + /** + * Set the comparator. + * + * @param comparator the comparator + */ + public void setComparator(Comparator comparator) { + this.comparator = comparator; + } + + } +} Propchange: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira339TestCase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira339TestCase.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL