Author: violetagg
Date: Fri Dec 18 13:00:53 2015
New Revision: 1720776
URL: http://svn.apache.org/viewvc?rev=1720776&view=rev
Log:
More useless conditions
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1720776&r1=1720775&r2=1720776&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Fri Dec 18
13:00:53 2015
@@ -515,7 +515,7 @@ public class XByteBuffer {
//assume it does exist
found = true;
for (int i = 1; ( (i < findlen) && found); i++)
- found = found && (find[i] == src[pos + i]);
+ found = (find[i] == src[pos + i]);
if (found)
result = pos;
else if ( (srclen - pos) < findlen)
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1720776&r1=1720775&r2=1720776&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java Fri Dec 18
13:00:53 2015
@@ -462,7 +462,7 @@ class JspReader {
// Move beyond the '{'
nextChar();
skipELExpression();
- } else if (ch == firstChar && prev != '\\') {
+ } else if (ch == firstChar) {
for (int i = 1 ; i < limlen ; i++) {
if (peekChar() == limit.charAt(i))
nextChar();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
