Author: markt Date: Sat Dec 17 11:30:48 2016 New Revision: 1774741 URL: http://svn.apache.org/viewvc?rev=1774741&view=rev Log: Simplify
Modified: tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java?rev=1774741&r1=1774740&r2=1774741&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java Sat Dec 17 11:30:48 2016 @@ -55,10 +55,8 @@ class EncodingDetector { // Reset the stream back to the start to allow the XML prolog detection // to work. Skip any BoM we discovered. bis.reset(); - if (bomResult != null) { - for (int i = 0; i < bomResult.skip; i++) { - is.read(); - } + for (int i = 0; i < bomResult.skip; i++) { + is.read(); } prologEncoding = getPrologEncoding(bis); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org