You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2018/07/25 09:27:06 UTC
[1/3] commons-collections git commit: [COLLECTIONS-691] add
changes.xml entry
Repository: commons-collections
Updated Branches:
refs/heads/master 4bcd8c12e -> ea305b085
[COLLECTIONS-691] add changes.xml entry
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/e12b9fac
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/e12b9fac
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/e12b9fac
Branch: refs/heads/master
Commit: e12b9fac5c0f2ecde282dd30e7c0350158bdd3e6
Parents: 9a6e252
Author: Bruno P. Kinoshita <ki...@apache.org>
Authored: Wed Jul 25 21:23:20 2018 +1200
Committer: Bruno P. Kinoshita <ki...@apache.org>
Committed: Wed Jul 25 21:23:50 2018 +1200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/e12b9fac/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index efa2c8d..9530412 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,6 +21,9 @@
</properties>
<body>
<release version="4.3" date="2018-MM-DD" description="Bug fixes, and small changes.">
+ <action issue="COLLECTIONS-691" dev="kinow" type="fix" due-to="Eitan Adler">
+ Use boolean operator for boolean result
+ </action>
<action issue="COLLECTIONS-688" dev="ggregory" type="update">
Update platform requirement from Java 7 to 8.
</action>
[3/3] commons-collections git commit: Merge branch 'pr-45'
Posted by ki...@apache.org.
Merge branch 'pr-45'
This closes #45
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/ea305b08
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/ea305b08
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/ea305b08
Branch: refs/heads/master
Commit: ea305b08516979ff3e5688cd5268e8f7a7a1234e
Parents: 4bcd8c1 e12b9fa
Author: Bruno P. Kinoshita <ki...@apache.org>
Authored: Wed Jul 25 21:24:04 2018 +1200
Committer: Bruno P. Kinoshita <ki...@apache.org>
Committed: Wed Jul 25 21:24:04 2018 +1200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
.../java/org/apache/commons/collections4/list/GrowthList.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] commons-collections git commit: [COLLECTIONS-691] Use boolean
operator for boolean result
Posted by ki...@apache.org.
[COLLECTIONS-691] Use boolean operator for boolean result
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/9a6e2523
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/9a6e2523
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/9a6e2523
Branch: refs/heads/master
Commit: 9a6e25230eccfa131d40eefbc4f48a13ac31d640
Parents: 4bcd8c1
Author: Eitan Adler <li...@eitanadler.com>
Authored: Mon Jul 23 00:34:21 2018 -0700
Committer: Bruno P. Kinoshita <ki...@apache.org>
Committed: Wed Jul 25 21:23:50 2018 +1200
----------------------------------------------------------------------
src/main/java/org/apache/commons/collections4/list/GrowthList.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/9a6e2523/src/main/java/org/apache/commons/collections4/list/GrowthList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/GrowthList.java b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
index b81802e..ca329f9 100644
--- a/src/main/java/org/apache/commons/collections4/list/GrowthList.java
+++ b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
@@ -153,7 +153,7 @@ public class GrowthList<E> extends AbstractSerializableListDecorator<E> {
decorated().addAll(Collections.<E>nCopies(index - size, null));
result = true;
}
- return decorated().addAll(index, coll) | result;
+ return decorated().addAll(index, coll) || result;
}
//-----------------------------------------------------------------------