From: markt Date: Tue, 18 Jan 2011 21:33:14 +0000 (+0000) Subject: Fix Findbugs and Eclipse warnings X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=99e07c7f1545ee8732f7eff5131e3e98e1a20b80;p=tomcat7.0 Fix Findbugs and Eclipse warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1060586 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java b/java/org/apache/catalina/core/ApplicationDispatcher.java index 583b8dce4..73c1f9fec 100644 --- a/java/org/apache/catalina/core/ApplicationDispatcher.java +++ b/java/org/apache/catalina/core/ApplicationDispatcher.java @@ -130,7 +130,7 @@ final class ApplicationDispatcher * variables causes threading issues and state is too complex to pass and * return single ServletRequest or ServletResponse objects. */ - private class State { + private static class State { State(ServletRequest request, ServletResponse response, boolean including) { this.outerRequest = request; diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java index 39e10b9e6..7fbc043d7 100644 --- a/java/org/apache/catalina/loader/WebappClassLoader.java +++ b/java/org/apache/catalina/loader/WebappClassLoader.java @@ -156,7 +156,7 @@ public class WebappClassLoader } - protected final class PrivilegedGetClassLoader + protected static final class PrivilegedGetClassLoader implements PrivilegedAction { public Class clazz; diff --git a/java/org/apache/catalina/realm/LockOutRealm.java b/java/org/apache/catalina/realm/LockOutRealm.java index 957c06b49..bd06929ad 100644 --- a/java/org/apache/catalina/realm/LockOutRealm.java +++ b/java/org/apache/catalina/realm/LockOutRealm.java @@ -379,7 +379,7 @@ public class LockOutRealm extends CombinedRealm { } - protected class LockRecord { + protected static class LockRecord { private AtomicInteger failures = new AtomicInteger(0); private long lastFailureTime = 0; diff --git a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java index 74a1799c4..b3580942c 100644 --- a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java +++ b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java @@ -74,6 +74,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver { } + @Override public void log(String message, Throwable throwable) { //We can't assume that Servlet.log( message, null ) //is the same as Servlet.log( message ), since API @@ -86,6 +87,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver { } + @Override public void addVariableNames(Collection variableNames) { for (int i = 0; i < VARIABLE_NAMES.length; i++) { String variableName = VARIABLE_NAMES[i]; @@ -132,6 +134,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver { } + @Override public void setVariableValue(String name, String value) { if (!isNameReserved(name)) { req.setAttribute(name, value); @@ -139,6 +142,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver { } + @Override public String getVariableValue(String name) { String retVal = null; Object object = getReqAttributeIgnoreCase(name); @@ -331,6 +335,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver { return retVal; } + @Override public Date getCurrentDate() { return new Date(); } @@ -480,6 +485,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver { } + @Override public long getFileLastModified(String path, boolean virtual) throws IOException { long lastModified = 0; @@ -493,6 +499,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver { } + @Override public long getFileSize(String path, boolean virtual) throws IOException { long fileSize = -1; try { @@ -508,6 +515,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver { //We are making lots of unnecessary copies of the included data here. If //someone ever complains that this is slow, we should connect the included // stream to the print writer that SSICommand uses. + @Override public String getFileText(String originalPath, boolean virtual) throws IOException { try { @@ -552,7 +560,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver { } } - protected class ServletContextAndPath { + protected static class ServletContextAndPath { protected ServletContext servletContext; protected String path; diff --git a/java/org/apache/jasper/runtime/JspFactoryImpl.java b/java/org/apache/jasper/runtime/JspFactoryImpl.java index 7855abc9a..74a143161 100644 --- a/java/org/apache/jasper/runtime/JspFactoryImpl.java +++ b/java/org/apache/jasper/runtime/JspFactoryImpl.java @@ -126,7 +126,7 @@ public class JspFactoryImpl extends JspFactory { } } - private class PrivilegedGetPageContext + private static class PrivilegedGetPageContext implements PrivilegedAction { private JspFactoryImpl factory; @@ -158,7 +158,7 @@ public class JspFactoryImpl extends JspFactory { } } - private class PrivilegedReleasePageContext + private static class PrivilegedReleasePageContext implements PrivilegedAction { private JspFactoryImpl factory; diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java index ad6c0ff97..d7b9e9367 100644 --- a/java/org/apache/juli/ClassLoaderLogManager.java +++ b/java/org/apache/juli/ClassLoaderLogManager.java @@ -679,7 +679,7 @@ public class ClassLoaderLogManager extends LogManager { * This class is needed to instantiate the root of each per classloader * hierarchy. */ - protected class RootLogger extends Logger { + protected static class RootLogger extends Logger { public RootLogger() { super("", null); } diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java index 20ad0126a..eff0f30f8 100644 --- a/java/org/apache/naming/resources/FileDirContext.java +++ b/java/org/apache/naming/resources/FileDirContext.java @@ -894,7 +894,7 @@ public class FileDirContext extends BaseDirContext { * This specialized resource implementation avoids opening the InputStream * to the file right away (which would put a lock on the file). */ - protected class FileResource extends Resource { + protected static class FileResource extends Resource { // -------------------------------------------------------- Constructor @@ -914,12 +914,6 @@ public class FileDirContext extends BaseDirContext { protected File file; - /** - * File length. - */ - protected long length = -1L; - - // --------------------------------------------------- Resource Methods @@ -951,7 +945,7 @@ public class FileDirContext extends BaseDirContext { * reading (to speed up simple checks, like checking the last modified * date). */ - protected class FileResourceAttributes extends ResourceAttributes { + protected static class FileResourceAttributes extends ResourceAttributes { private static final long serialVersionUID = 1L; diff --git a/java/org/apache/tomcat/util/net/NioBlockingSelector.java b/java/org/apache/tomcat/util/net/NioBlockingSelector.java index 8a97571af..192120b1b 100644 --- a/java/org/apache/tomcat/util/net/NioBlockingSelector.java +++ b/java/org/apache/tomcat/util/net/NioBlockingSelector.java @@ -194,7 +194,7 @@ public class NioBlockingSelector { } - protected class BlockPoller extends Thread { + protected static class BlockPoller extends Thread { protected volatile boolean run = true; protected Selector selector = null; protected ConcurrentLinkedQueue events = new ConcurrentLinkedQueue(); @@ -202,6 +202,7 @@ public class NioBlockingSelector { protected AtomicInteger wakeupCounter = new AtomicInteger(0); public void cancelKey(final SelectionKey key) { Runnable r = new Runnable() { + @Override public void run() { key.cancel(); } @@ -225,6 +226,7 @@ public class NioBlockingSelector { public void add(final KeyAttachment key, final int ops, final KeyReference ref) { Runnable r = new Runnable() { + @Override public void run() { if ( key == null ) return; NioChannel nch = key.getChannel(); @@ -254,6 +256,7 @@ public class NioBlockingSelector { public void remove(final KeyAttachment key, final int ops) { Runnable r = new Runnable() { + @Override public void run() { if ( key == null ) return; NioChannel nch = key.getChannel(); @@ -380,7 +383,7 @@ public class NioBlockingSelector { } } - public class KeyReference { + public static class KeyReference { SelectionKey key = null; @Override diff --git a/java/org/apache/tomcat/util/threads/DedicatedThreadExecutor.java b/java/org/apache/tomcat/util/threads/DedicatedThreadExecutor.java index 574140ea3..43e441158 100644 --- a/java/org/apache/tomcat/util/threads/DedicatedThreadExecutor.java +++ b/java/org/apache/tomcat/util/threads/DedicatedThreadExecutor.java @@ -119,7 +119,7 @@ public class DedicatedThreadExecutor { // This can lead to false alarms about potential memory leaks because the // thread may have a web application class loader for its context class // loader. - private class SingleThreadFactory implements ThreadFactory { + private static class SingleThreadFactory implements ThreadFactory { private volatile Thread singleThread; @Override diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java b/test/org/apache/catalina/connector/TestMaxConnections.java index 135b16519..15963ce7c 100644 --- a/test/org/apache/catalina/connector/TestMaxConnections.java +++ b/test/org/apache/catalina/connector/TestMaxConnections.java @@ -59,7 +59,7 @@ public class TestMaxConnections extends TomcatBaseTest{ } - private class ConnectThread extends Thread { + private static class ConnectThread extends Thread { public boolean passed = true; public boolean connectfailed = false; @Override @@ -91,7 +91,7 @@ public class TestMaxConnections extends TomcatBaseTest{ tomcat.start(); } - private class TestClient extends SimpleHttpClient { + private static class TestClient extends SimpleHttpClient { private void doHttp10Request() throws Exception {