Author: oheger
Date: Sun May 25 14:57:03 2014
New Revision: 1597432
URL: http://svn.apache.org/r1597432
Log:
[BEANUTILS-458] Added a check for null result objects.
A null input object should be accepted by a converted without throwing a
ConversionException. Thanks to Manuel Dominguez Sarmiento for the proposed fix.
Added:
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java
Modified:
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java
Modified:
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java?rev=1597432&r1=1597431&r2=1597432&view=diff
==============================================================================
---
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java
(original)
+++
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java
Sun May 25 14:57:03 2014
@@ -281,6 +281,10 @@ public abstract class BaseLocaleConverte
T temp = (T) result;
return temp;
}
+
+ if (result == null) {
+ return null;
+ }
if (type.isInstance(result)) {
return type.cast(result);
}
Added:
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java?rev=1597432&view=auto
==============================================================================
---
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java
(added)
+++
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java
Sun May 25 14:57:03 2014
@@ -0,0 +1,57 @@
+/*
+ * 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.Locale;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.beanutils.Converter;
+import org.apache.commons.beanutils.locale.converters.IntegerLocaleConverter;
+
+/**
+ * BaseLocaleConverter.checkConversionResult() fails with ConversionException
when result
+ * is null when it should not.
+ *
+ * @version $Id$
+ * @see <a
href="https://issues.apache.org/jira/browse/BEANUTILS-458";>https://issues.apache.org/jira/browse/BEANUTILS-458</a>
+ */
+public class Jira458TestCase extends TestCase {
+ /**
+ * Helper method for testing a conversion with null as default.
+ *
+ * @param input the input string
+ */
+ private void checkConversionWithNullDefault(String input) {
+ Converter converter = new IntegerLocaleConverter(null, Locale.US);
+ assertNull("Wrong result", converter.convert(Integer.class, input));
+ }
+
+ /**
+ * Tests a conversion passing in null.
+ */
+ public void testConversionWithNullDefaultNullInput() {
+ checkConversionWithNullDefault(null);
+ }
+
+ /**
+ * Tests a conversion passing in an empty string.
+ */
+ public void testConversionWithNullDefaultEmptyString() {
+ checkConversionWithNullDefault("");
+ }
+}
