You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2016/09/18 16:01:58 UTC
[1/3] [lang] LANG-1261: ArrayUtils#contains and ArrayUtils#indexOf
should compare objects with different types
Repository: commons-lang
Updated Branches:
refs/heads/master 72bbbbc55 -> 42f2058c8
LANG-1261: ArrayUtils#contains and ArrayUtils#indexOf should compare objects with different types
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/1f56bd10
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/1f56bd10
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/1f56bd10
Branch: refs/heads/master
Commit: 1f56bd103d53c8c6ba7502c6586c26be01bfdb80
Parents: f30c460
Author: pascalschumacher <pa...@gmx.net>
Authored: Tue Aug 23 19:22:55 2016 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Tue Aug 30 22:00:37 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/commons/lang3/ArrayUtils.java | 2 +-
.../org/apache/commons/lang3/ArrayUtilsTest.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1f56bd10/src/main/java/org/apache/commons/lang3/ArrayUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index 1d33fcf..b2f019e 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -3184,7 +3184,7 @@ public class ArrayUtils {
return i;
}
}
- } else if (array.getClass().getComponentType().isInstance(objectToFind)) {
+ } else {
for (int i = startIndex; i < array.length; i++) {
if (objectToFind.equals(array[i])) {
return i;
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/1f56bd10/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index a50ed1a..2d137c8 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -2953,7 +2953,23 @@ public class ArrayUtilsTest {
assertTrue(ArrayUtils.contains(array, null));
assertFalse(ArrayUtils.contains(array, "notInArray"));
}
-
+
+ @Test
+ public void testContains_LANG_1261() {
+ class LANG1261ParentObject {
+ @Override
+ public boolean equals(Object o) {
+ return true;
+ }
+ }
+ class LANG1261ChildObject extends LANG1261ParentObject {
+ }
+
+ Object[] array = new LANG1261ChildObject[] { new LANG1261ChildObject() };
+
+ assertTrue(ArrayUtils.contains(array, new LANG1261ParentObject()));
+ }
+
//-----------------------------------------------------------------------
@Test
public void testIndexOfLong() {
[2/3] [lang] Add LANG-1261 to changes.xml
Posted by br...@apache.org.
Add LANG-1261 to changes.xml
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/556d0fe1
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/556d0fe1
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/556d0fe1
Branch: refs/heads/master
Commit: 556d0fe10ff9d2ffd75185866dc78e259b71d035
Parents: 1f56bd1
Author: Benedikt Ritter <br...@apache.org>
Authored: Sun Sep 18 18:01:02 2016 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sun Sep 18 18:01:02 2016 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/556d0fe1/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c038ad8..5bd9589 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="3.5" date="tba" description="tba">
+ <action issue="LANG-1261" type="fix" dev="pschumacher" >ArrayUtils.contains returns false for instances of subtypes</action>
<action issue="LANG-1230" type="fix" dev="pschumacher" due-to="Philippe Marschall">Remove unnecessary synchronization from registry lookup in EqualsBuilder and HashCodeBuilder</action>
<action issue="LANG-1224" type="add" dev="pschumacher" due-to="Caleb Cushing">Extend RandomStringUtils with methods that generate strings between a min and max length</action>
<action issue="LANG-1214" type="fix" dev="pschumacher" due-to="Henry Tung">Handle "void" in ClassUtils.getClass()</action>
[3/3] [lang] Add LANG-1261 to changes.xml
Posted by br...@apache.org.
Add LANG-1261 to changes.xml
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/42f2058c
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/42f2058c
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/42f2058c
Branch: refs/heads/master
Commit: 42f2058c83f256d8654b349d5249d6f59920f88b
Parents: 72bbbbc 556d0fe
Author: Benedikt Ritter <br...@apache.org>
Authored: Sun Sep 18 18:01:43 2016 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sun Sep 18 18:01:43 2016 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 1 +
.../java/org/apache/commons/lang3/ArrayUtils.java | 2 +-
.../org/apache/commons/lang3/ArrayUtilsTest.java | 18 +++++++++++++++++-
3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/42f2058c/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index 4f06362,5bd9589..d3a52fe
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -45,10 -45,8 +45,11 @@@ The <action> type attribute can be add,
</properties>
<body>
- <release version="3.5" date="tba" description="tba">
+ <release version="3.5" date="tba" description="New features including Java 9 detection">
+ <action issue="LANG-1261" type="fix" dev="pschumacher" >ArrayUtils.contains returns false for instances of subtypes</action>
+ <action issue="LANG-1197" type="update" dev="pschumacher" >Prepare Java 9 detection</action>
+ <action issue="LANG-1252" type="fix" dev="chtompki" due-to="Rob Tompkins">Rename NumberUtils.isNumber, isCreatable to better reflect createNumber. Also, accommodated for "+" symbol as prefix in isCreatable and isNumber.</action>
+ <action issue="LANG-1262" type="update" dev="pschumacher" due-to="Ruslan Cheremin">CompareToBuilder.append(Object, Object, Comparator) method is too big to be inlined</action>
<action issue="LANG-1230" type="fix" dev="pschumacher" due-to="Philippe Marschall">Remove unnecessary synchronization from registry lookup in EqualsBuilder and HashCodeBuilder</action>
<action issue="LANG-1224" type="add" dev="pschumacher" due-to="Caleb Cushing">Extend RandomStringUtils with methods that generate strings between a min and max length</action>
<action issue="LANG-1214" type="fix" dev="pschumacher" due-to="Henry Tung">Handle "void" in ClassUtils.getClass()</action>
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/42f2058c/src/main/java/org/apache/commons/lang3/ArrayUtils.java
----------------------------------------------------------------------