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/09/15 16:44:20 UTC
svn commit: r1808466 - in /tomcat/trunk: java/javax/el/
java/org/apache/catalina/realm/ java/org/apache/catalina/security/
java/org/apache/tomcat/util/descriptor/ java/org/apache/tomcat/util/net/
java/org/apache/tomcat/util/net/jsse/ java/org/apache/to...
Author: markt
Date: Fri Sep 15 16:44:20 2017
New Revision: 1808466
URL: http://svn.apache.org/viewvc?rev=1808466&view=rev
Log:
Fix some low hanging FindBugs fruit
Modified:
tomcat/trunk/java/javax/el/Util.java
tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java
Modified: tomcat/trunk/java/javax/el/Util.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Util.java?rev=1808466&r1=1808465&r2=1808466&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/Util.java (original)
+++ tomcat/trunk/java/javax/el/Util.java Fri Sep 15 16:44:20 2017
@@ -557,7 +557,7 @@ class Util {
if (clazz == null) {
throw new MethodNotFoundException(
- message(null, "util.method.notfound", clazz, methodName,
+ message(null, "util.method.notfound", null, methodName,
paramString(paramTypes)));
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java?rev=1808466&r1=1808465&r2=1808466&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java Fri Sep 15 16:44:20 2017
@@ -165,7 +165,7 @@ public abstract class DigestCredentialHa
if (storedCredentials == null) {
// Stored credentials are invalid
// This may be expected if nested credential handlers are being used
- logInvalidStoredCredentials(storedCredentials);
+ logInvalidStoredCredentials(null);
return false;
}
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1808466&r1=1808465&r2=1808466&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Fri Sep 15 16:44:20 2017
@@ -153,7 +153,7 @@ public final class SecurityUtil{
Method method = null;
Method[] methodsCache = classCache.get(Servlet.class);
if(methodsCache == null) {
- method = createMethodAndCacheIt(methodsCache,
+ method = createMethodAndCacheIt(null,
Servlet.class,
methodName,
targetParameterTypes);
@@ -236,7 +236,7 @@ public final class SecurityUtil{
Method method = null;
Method[] methodsCache = classCache.get(Filter.class);
if(methodsCache == null) {
- method = createMethodAndCacheIt(methodsCache,
+ method = createMethodAndCacheIt(null,
Filter.class,
methodName,
targetParameterTypes);
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java?rev=1808466&r1=1808465&r2=1808466&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java Fri Sep 15 16:44:20 2017
@@ -89,7 +89,7 @@ public class LocalResolver implements En
// If there is no systemId, can't try anything else
if (systemId == null) {
throw new FileNotFoundException(sm.getString("localResolver.unresolvedEntity",
- name, publicId, systemId, base));
+ name, publicId, null, base));
}
// Try resolving with the supplied systemId
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=1808466&r1=1808465&r2=1808466&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Fri Sep 15 16:44:20 2017
@@ -382,7 +382,7 @@ public class NioBlockingSelector {
} catch (CancelledKeyException cx) {
cancel(sk, key, ops);
} catch (ClosedChannelException cx) {
- cancel(sk, key, ops);
+ cancel(null, key, ops);
}
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1808466&r1=1808465&r2=1808466&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Fri Sep 15 16:44:20 2017
@@ -234,7 +234,7 @@ public class JSSEUtil extends SSLUtilBas
}
}
if (keyAlias == null) {
- throw new IOException(sm.getString("jsse.alias_no_key_entry", keyAlias));
+ throw new IOException(sm.getString("jsse.alias_no_key_entry", (Object) null));
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1808466&r1=1808465&r2=1808466&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri Sep 15 16:44:20 2017
@@ -347,7 +347,7 @@ public class WsWebSocketContainer implem
String maxRedirectsValue =
(String) userProperties.get(Constants.MAX_REDIRECTIONS_PROPERTY);
if (maxRedirectsValue != null) {
- maxRedirects = Integer.valueOf(maxRedirectsValue).intValue();
+ maxRedirects = Integer.parseInt(maxRedirectsValue);
}
if (httpResponse.status != 101) {
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java?rev=1808466&r1=1808465&r2=1808466&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java Fri Sep 15 16:44:20 2017
@@ -107,7 +107,7 @@ public class TestCloseBug58624 extends W
public static class Bug58624ServerConfig extends WsContextListener {
- public static String PATH = "/bug58624";
+ public static final String PATH = "/bug58624";
@Override
Modified: tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java?rev=1808466&r1=1808465&r2=1808466&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java Fri Sep 15 16:44:20 2017
@@ -138,12 +138,12 @@ public class Clock2 extends Applet imple
// a= s* pi/2 - pi/2 (to switch 0,0 from 3:00 to 12:00)
// x = r(cos a) + xcenter, y = r(sin a) + ycenter
- xs = (int)(Math.cos(s * 3.14f/30 - 3.14f/2) * 45 + xcenter);
- ys = (int)(Math.sin(s * 3.14f/30 - 3.14f/2) * 45 + ycenter);
- xm = (int)(Math.cos(m * 3.14f/30 - 3.14f/2) * 40 + xcenter);
- ym = (int)(Math.sin(m * 3.14f/30 - 3.14f/2) * 40 + ycenter);
- xh = (int)(Math.cos((h*30 + m/2) * 3.14f/180 - 3.14f/2) * 30 + xcenter);
- yh = (int)(Math.sin((h*30 + m/2) * 3.14f/180 - 3.14f/2) * 30 + ycenter);
+ xs = (int)(Math.cos(s * Math.PI/30 - Math.PI/2) * 45 + xcenter);
+ ys = (int)(Math.sin(s * Math.PI/30 - Math.PI/2) * 45 + ycenter);
+ xm = (int)(Math.cos(m * Math.PI/30 - Math.PI/2) * 40 + xcenter);
+ ym = (int)(Math.sin(m * Math.PI/30 - Math.PI/2) * 40 + ycenter);
+ xh = (int)(Math.cos((h*30 + m/2) * Math.PI/180 - Math.PI/2) * 30 + xcenter);
+ yh = (int)(Math.sin((h*30 + m/2) * Math.PI/180 - Math.PI/2) * 30 + ycenter);
// Draw the circle and numbers
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org