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 2017/10/14 11:58:41 UTC
[1/3] commons-io git commit: Make code style of hasBOM() consistent
with getBOMCharsetName()
Repository: commons-io
Updated Branches:
refs/heads/master 39bfb4645 -> 5f8807995
Make code style of hasBOM() consistent with getBOMCharsetName()
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/46a2c6be
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/46a2c6be
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/46a2c6be
Branch: refs/heads/master
Commit: 46a2c6bebe30989d51d59e14def38a82e8edfd78
Parents: 733dc26
Author: Michael Ernst <me...@cs.washington.edu>
Authored: Fri Sep 15 11:19:18 2017 -0700
Committer: Michael Ernst <me...@cs.washington.edu>
Committed: Fri Sep 15 11:19:18 2017 -0700
----------------------------------------------------------------------
src/main/java/org/apache/commons/io/input/BOMInputStream.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/46a2c6be/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 02b4f2f..d01ba9c 100644
--- a/src/main/java/org/apache/commons/io/input/BOMInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
@@ -202,7 +202,8 @@ public class BOMInputStream extends ProxyInputStream {
if (!boms.contains(bom)) {
throw new IllegalArgumentException("Stream not configure to detect " + bom);
}
- return byteOrderMark != null && getBOM().equals(bom);
+ getBOM();
+ return byteOrderMark != null && byteOrderMark.equals(bom);
}
/**
[2/3] commons-io git commit: IO-553: Add changes.xml entry
Posted by br...@apache.org.
IO-553: Add changes.xml entry
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/9543f75f
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/9543f75f
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/9543f75f
Branch: refs/heads/master
Commit: 9543f75f4601278abcfd0a16cfea977399b89052
Parents: 46a2c6b
Author: Benedikt Ritter <br...@apache.org>
Authored: Sat Oct 14 13:57:28 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 13:57:28 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/9543f75f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 551b27b..2e69545 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,9 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<!-- The release date is the date RC is cut -->
<release version="2.6" date="2017-MM-DD" description="New features and bug fixes.">
+ <action issue="IO-553" dev="britter" type="update" due-to="Michael Ernst">
+ Make code style of hasBOM() consistent with getBOMCharsetName()
+ </action>
<action issue="IO-550" dev="kinow" type="fix" due-to="Jimi Adrian">
Documentation issue, fix 404 Javadoc issues in the description page
</action>
[3/3] commons-io git commit: Merge branch 'IO-553'
Posted by br...@apache.org.
Merge branch 'IO-553'
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/5f880799
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/5f880799
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/5f880799
Branch: refs/heads/master
Commit: 5f88079956ba7fc4551a5fc51dc28d82e33dc65f
Parents: 39bfb46 9543f75
Author: Benedikt Ritter <br...@apache.org>
Authored: Sat Oct 14 13:58:29 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 13:58:29 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
src/main/java/org/apache/commons/io/input/BOMInputStream.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/5f880799/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index bfc9c25,2e69545..1628982
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -47,12 -47,9 +47,15 @@@ The <action> type attribute can be add,
<body>
<!-- The release date is the date RC is cut -->
<release version="2.6" date="2017-MM-DD" description="New features and bug fixes.">
+ <action issue="IO-553" dev="britter" type="update" due-to="Michael Ernst">
+ Make code style of hasBOM() consistent with getBOMCharsetName()
+ </action>
+ <action issue="IO-546" dev="pschumacher" type="fix" due-to="Tomas Celaya">
+ ClosedOutputStream#flush should throw
+ </action>
+ <action issue="IO-551" dev="britter" type="add">
+ Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility
+ </action>
<action issue="IO-550" dev="kinow" type="fix" due-to="Jimi Adrian">
Documentation issue, fix 404 Javadoc issues in the description page
</action>
http://git-wip-us.apache.org/repos/asf/commons-io/blob/5f880799/src/main/java/org/apache/commons/io/input/BOMInputStream.java
----------------------------------------------------------------------