Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-collections.git

This commit is contained in:
Gary Gregory 2018-07-27 08:48:26 -06:00
parent 3e7d4ff5a2 ea305b0851
commit 0dad34216c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/changes/changes.xml
View File

@ -21,6 +21,9 @@
</properties> </properties>
<body> <body>
<release version="4.3" date="2018-MM-DD" description="Bug fixes, and small changes."> <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"> <action issue="COLLECTIONS-688" dev="ggregory" type="update">
Update platform requirement from Java 7 to 8. Update platform requirement from Java 7 to 8.
</action> </action>

2
src/main/java/org/apache/commons/collections4/list/GrowthList.java
View File

@ -153,7 +153,7 @@ public class GrowthList<E> extends AbstractSerializableListDecorator<E> {
decorated().addAll(Collections.<E>nCopies(index - size, null)); decorated().addAll(Collections.<E>nCopies(index - size, null));
result = true; result = true;
} }
return decorated().addAll(index, coll) | result; return decorated().addAll(index, coll) || result;
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------