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 2015/11/09 10:39:49 UTC
svn commit: r1713362 - in /tomcat/trunk/java/org/apache:
catalina/startup/HostConfig.java coyote/http11/Http11InputBuffer.java
coyote/http11/filters/ChunkedInputFilter.java
tomcat/util/digester/CallMethodRule.java
tomcat/util/net/SecureNioChannel.java
Author: markt
Date: Mon Nov 9 09:39:49 2015
New Revision: 1713362
URL: http://svn.apache.org/viewvc?rev=1713362&view=rev
Log:
Fix Findbugs warnings. Remove code that will never execute because the condition it depends on can never be met.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Mon Nov 9 09:39:49 2015
@@ -1311,9 +1311,6 @@ public class HostConfig implements Lifec
if (resource.exists()) {
continue;
}
- if (lastModified == 0L) {
- continue;
- }
// Undeploy application
undeploy(app);
deleteRedeployResources(app, resources, i, true);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Mon Nov 9 09:39:49 2015
@@ -90,8 +90,6 @@ public class Http11InputBuffer implement
HTTP_TOKEN_CHAR[i] = false;
} else if (i == ' ') {
HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '\t') {
- HTTP_TOKEN_CHAR[i] = false;
} else {
HTTP_TOKEN_CHAR[i] = true;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Mon Nov 9 09:39:49 2015
@@ -387,10 +387,6 @@ public class ChunkedInputFilter implemen
}
remaining = result;
- if (remaining < 0) {
- return false;
- }
-
return true;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Mon Nov 9 09:39:49 2015
@@ -349,11 +349,6 @@ public class CallMethodRule extends Rule
parameters = new Object[1];
parameters[0] = bodyText;
- if (paramTypes.length == 0) {
- paramTypes = new Class[1];
- paramTypes[0] = String.class;
- }
-
}
// Construct the parameter values array we will need
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Nov 9 09:39:49 2015
@@ -242,11 +242,10 @@ public class SecureNioChannel extends Ni
break;
}
default: throw new IllegalStateException(sm.getString("channel.nio.ssl.invalidStatus", handshakeStatus));
- }//switch
- }//while
- //return 0 if we are complete, otherwise reregister for any activity that
- //would cause this method to be called again.
- return handshakeComplete?0:(SelectionKey.OP_WRITE|SelectionKey.OP_READ);
+ }
+ }
+ // Handshake is complete if this point is reached
+ return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org