Author: kinow
Date: Sun Dec 14 18:22:06 2014
New Revision: 1645483
URL: http://svn.apache.org/r1645483
Log:
LANG-1073 Read wrong component type of array in add in ArrayUtils
Modified:
commons/proper/lang/trunk/src/changes/changes.xml
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ArrayUtils.java
Modified: commons/proper/lang/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/changes/changes.xml?rev=1645483&r1=1645482&r2=1645483&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/lang/trunk/src/changes/changes.xml [utf-8] Sun Dec 14
18:22:06 2014
@@ -22,6 +22,7 @@
<body>
<release version="3.4" date="tba" description="tba">
+ <action issue="LANG-1073" type="fix" dev="kinow" due-to="haiyang li">Read
wrong component type of array in add in ArrayUtils</action>
<action issue="LANG-1077" type="fix" dev="kinow" due-to="haiyang
li">StringUtils.ordinalIndexOf("aaaaaa", "aa", 2) != 3 in StringUtils</action>
<action issue="LANG-1072" type="fix" dev="sebb" due-to="haiyang
li">Duplicated "0x" check in createBigInteger in NumberUtils</action>
<action issue="LANG-1064" type="fix" dev="djones" due-to="B.J.
Herbison">StringUtils.abbreviate description doesn't agree with the
examples</action>
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ArrayUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ArrayUtils.java?rev=1645483&r1=1645482&r2=1645483&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ArrayUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ArrayUtils.java
Sun Dec 14 18:22:06 2014
@@ -4008,7 +4008,7 @@ public class ArrayUtils {
public static <T> T[] add(final T[] array, final T element) {
Class<?> type;
if (array != null){
- type = array.getClass();
+ type = array.getClass().getComponentType();
} else if (element != null) {
type = element.getClass();
} else {
