Merge branch 'IO-553'

britter · britter · commit 5f88079956ba · 2017-10-14T13:58:29.000+02:00
diff --git 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-546" dev="pschumacher" type="fix" due-to="Tomas Celaya">
         ClosedOutputStream#flush should throw
       </action>
diff --git 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 boolean hasBOM(final ByteOrderMark bom) throws IOException {
         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);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,8 @@ public boolean hasBOM(final ByteOrderMark bom) throws IOException {`
`202`	`202`	`if (!boms.contains(bom)) {`
`203`	`203`	`throw new IllegalArgumentException("Stream not configure to detect " + bom);`
`204`	`204`	`}`
`205`		`- return byteOrderMark != null && getBOM().equals(bom);`
	`205`	`+ getBOM();`
	`206`	`+ return byteOrderMark != null && byteOrderMark.equals(bom);`
`206`	`207`	`}`
`207`	`208`
`208`	`209`	`/**`