Author: markt
Date: Tue Jun 5 19:04:01 2018
New Revision: 1832963
URL: http://svn.apache.org/viewvc?rev=1832963&view=rev
Log:
SpotBugs: Make fields static
Modified:
tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
tomcat/trunk/java/org/apache/juli/FileHandler.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=1832963&r1=1832962&r2=1832963&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Tue Jun 5 19:04:01
2018
@@ -147,7 +147,6 @@ public class AsyncFileHandler extends Fi
}
protected static class LoggerThread extends Thread {
- protected final boolean run = true;
public LoggerThread() {
this.setDaemon(true);
this.setName("AsyncFileHandlerWriter-" +
System.identityHashCode(this));
@@ -155,7 +154,7 @@ public class AsyncFileHandler extends Fi
@Override
public void run() {
- while (run) {
+ while (true) {
try {
LogEntry entry = queue.poll(LOGGER_SLEEP_TIME,
TimeUnit.MILLISECONDS);
if (entry != null) {
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1832963&r1=1832962&r2=1832963&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Tue Jun 5 19:04:01 2018
@@ -99,10 +99,10 @@ public class FileHandler extends Handler
private static final ExecutorService DELETE_FILES_SERVICE =
Executors.newSingleThreadExecutor(new ThreadFactory() {
+ private static final String NAME_PREFIX =
"FileHandlerLogFilesCleaner-";
private final boolean isSecurityEnabled;
private final ThreadGroup group;
private final AtomicInteger threadNumber = new
AtomicInteger(1);
- private final String namePrefix =
"FileHandlerLogFilesCleaner-";
{
SecurityManager s = System.getSecurityManager();
@@ -131,7 +131,7 @@ public class FileHandler extends Handler
.setContextClassLoader(getClass().getClassLoader());
}
Thread t = new Thread(group, r,
- namePrefix + threadNumber.getAndIncrement());
+ NAME_PREFIX + threadNumber.getAndIncrement());
t.setDaemon(true);
return t;
} finally {
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java?rev=1832963&r1=1832962&r2=1832963&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
Tue Jun 5 19:04:01 2018
@@ -465,9 +465,8 @@ public class TestBasicAuthParser {
*/
private static final class BasicAuthHeader {
- private final String HTTP_AUTH = "authorization: ";
- private final byte[] HEADER =
- HTTP_AUTH.getBytes(StandardCharsets.ISO_8859_1);
+ private static final byte[] HEADER =
+ "authorization: ".getBytes(StandardCharsets.ISO_8859_1);
private ByteChunk authHeader;
private int initialOffset = 0;
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java?rev=1832963&r1=1832962&r2=1832963&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
Tue Jun 5 19:04:01 2018
@@ -26,7 +26,7 @@ import org.apache.tomcat.unittest.Tester
public class TestResponsePerformance extends LoggingBaseTest {
- private final int ITERATIONS = 100000;
+ private static final int ITERATIONS = 100000;
@Test
public void testToAbsolutePerformance() throws Exception {
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1832963&r1=1832962&r2=1832963&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Tue Jun
5 19:04:01 2018
@@ -265,7 +265,7 @@ public class TestStandardContext extends
}
private static class FailingLifecycleListener implements LifecycleListener
{
- private final String failEvent = Lifecycle.CONFIGURE_START_EVENT;
+ private static final String failEvent =
Lifecycle.CONFIGURE_START_EVENT;
private boolean fail = true;
protected void setFail(boolean fail) {
this.fail = fail;
Modified:
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1832963&r1=1832962&r2=1832963&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Tue Jun 5 19:04:01 2018
@@ -408,7 +408,7 @@ public class TestNonBlockingAPI extends
public static class DataWriter implements BytesStreamer {
- final int max = 5;
+ private static final int MAX = 5;
int count = 0;
long delay = 0;
byte[] b = "WANTMORE".getBytes(StandardCharsets.ISO_8859_1);
@@ -420,12 +420,12 @@ public class TestNonBlockingAPI extends
@Override
public int getLength() {
- return b.length * max;
+ return b.length * MAX;
}
@Override
public int available() {
- if (count < max) {
+ if (count < MAX) {
return b.length;
} else {
return 0;
@@ -434,7 +434,7 @@ public class TestNonBlockingAPI extends
@Override
public byte[] next() {
- if (count < max) {
+ if (count < MAX) {
if (count > 0)
try {
if (delay > 0)
@@ -442,7 +442,7 @@ public class TestNonBlockingAPI extends
} catch (Exception x) {
}
count++;
- if (count < max)
+ if (count < MAX)
return b;
else
return f;
Modified:
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java?rev=1832963&r1=1832962&r2=1832963&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
Tue Jun 5 19:04:01 2018
@@ -41,7 +41,7 @@ import org.apache.catalina.valves.Persis
public class TestPersistentManagerIntegration extends TomcatBaseTest {
- private final String ACTIVITY_CHECK =
"org.apache.catalina.session.StandardSession.ACTIVITY_CHECK";
+ private static final String ACTIVITY_CHECK =
"org.apache.catalina.session.StandardSession.ACTIVITY_CHECK";
private String oldActivityCheck;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
