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 2017/02/17 20:20:02 UTC
svn commit: r1783460 - in /tomcat/trunk/java/org/apache/jasper/compiler:
EncodingDetector.java ParserController.java
Author: markt
Date: Fri Feb 17 20:20:02 2017
New Revision: 1783460
URL: http://svn.apache.org/viewvc?rev=1783460&view=rev
Log:
Refactoring with an eye on BZ 59901.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.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=1783460&r1=1783459&r2=1783460&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java Fri Feb 17 20:20:02 2017
@@ -36,7 +36,7 @@ class EncodingDetector {
}
private final BomResult bomResult;
- private final String prologEncoding;
+ private final boolean encodingSpecifiedInProlog;
/*
@@ -59,7 +59,7 @@ class EncodingDetector {
is.read();
}
- prologEncoding = getPrologEncoding(bis);
+ encodingSpecifiedInProlog = (getPrologEncoding(bis) != null);
}
@@ -73,8 +73,8 @@ class EncodingDetector {
}
- String getPrologEncoding() {
- return prologEncoding;
+ boolean isEncodingSpecifiedInProlog() {
+ return encodingSpecifiedInProlog;
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1783460&r1=1783459&r2=1783460&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Fri Feb 17 20:20:02 2017
@@ -322,7 +322,7 @@ class ParserController implements TagCon
EncodingDetector encodingDetector = new EncodingDetector(inStream);
sourceEnc = encodingDetector.getBomEncoding();
- isEncodingSpecifiedInProlog = (encodingDetector.getPrologEncoding() != null);
+ isEncodingSpecifiedInProlog = encodingDetector.isEncodingSpecifiedInProlog();
isBomPresent = (encodingDetector.getSkip() > 0);
skip = encodingDetector.getSkip();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org