You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/17 11:30:48 UTC

svn commit: r1774741 - /tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java

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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org