You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2017/06/03 17:29:44 UTC
commons-io git commit: [IO-537] BOMInputStream shouldn't sort array
of BOMs in-place.
Repository: commons-io
Updated Branches:
refs/heads/master f7a11c993 -> d4f28d7ff
[IO-537] BOMInputStream shouldn't sort array of BOMs in-place.
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/d4f28d7f
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/d4f28d7f
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/d4f28d7f
Branch: refs/heads/master
Commit: d4f28d7ff397386b208823c577180938e15769d3
Parents: f7a11c9
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Jun 3 10:29:41 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Jun 3 10:29:41 2017 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
src/main/java/org/apache/commons/io/input/BOMInputStream.java | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/d4f28d7f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a395005..dd97dc6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -83,6 +83,9 @@ The <action> type attribute can be add,update,fix,remove.
<action issue="IO-503" dev="ggregory" type="fix">
Update platform requirement to Java 7.
</action>
+ <action issue="IO-537" dev="ggregory" type="fix" due-to="Borys Zibrov">
+ BOMInputStream shouldn't sort array of BOMs in-place.
+ </action>
<action issue="IO-506" dev="ggregory" type="update" due-to="Christian Schulte">
Deprecate methods FileSystemUtils.freeSpaceKb().
</action>
http://git-wip-us.apache.org/repos/asf/commons-io/blob/d4f28d7f/src/main/java/org/apache/commons/io/input/BOMInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/input/BOMInputStream.java b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
index f53e061..02b4f2f 100644
--- a/src/main/java/org/apache/commons/io/input/BOMInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
@@ -21,6 +21,7 @@ import static org.apache.commons.io.IOUtils.EOF;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -168,9 +169,10 @@ public class BOMInputStream extends ProxyInputStream {
throw new IllegalArgumentException("No BOMs specified");
}
this.include = include;
+ List<ByteOrderMark> list = Arrays.asList(boms);
// Sort the BOMs to match the longest BOM first because some BOMs have the same starting two bytes.
- Arrays.sort(boms, ByteOrderMarkLengthComparator);
- this.boms = Arrays.asList(boms);
+ Collections.sort(list, ByteOrderMarkLengthComparator);
+ this.boms = list;
}