Fix FindBugs warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059553 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml
index 9cb7615..ed13569 100644 (file)
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -59,6 +59,11 @@
     <Bug code="CN" />
   </Match>
   <Match>
+    <!-- Class name is appropriate -->
+    <Class name="org.apache.tomcat.util.bcel.classfile.CodeException"/>
+    <Bug code="Nm" />
+  </Match>
+  <Match>
     <!-- Returning null here is fine -->
     <Class name="org.apache.tomcat.util.buf.MessageBytes"/>
     <Method name="toString"/>
@@ -85,4 +90,59 @@
   <Match>
     <Class name="org.apache.el.parser.ParseException" />
   </Match>
+  <!-- Test code -->
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.channel.TestChannelOptionFlag" />
+    <Method name="tearDown" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.channel.TestChannelStartStop" />
+    <Method name="tearDown" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.channel.TestChannelStartStop" />
+    <Method name="testDoublePartialStart" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.channel.TestChannelStartStop" />
+    <Method name="testFalseOption" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.channel.TestRemoteProcessException" />
+   <Bug code="Nm" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.interceptors.TestNonBlockingCoordinator" />
+    <Method name="testCoord1" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.membership.TestTcpFailureDetector" />
+    <Method name="tearDown" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.transport.SocketReceive$1" />
+    <Method name="run" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.transport.SocketTribesReceive$1" />
+    <Method name="run" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.transport.SocketTribesReceive" />
+    <Method name="main" />
+    <Bug code="DE" />
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.test.transport.SocketValidateReceive$1" />
+    <Method name="run" />
+    <Bug code="DE" />
+  </Match>
 </FindBugsFilter>
\ No newline at end of file

diff --git a/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java b/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
index 42a53e2..95a4a59 100644 (file)
--- a/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
+++ b/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
@@ -84,7 +84,7 @@ public class TestOrderInterceptor extends TestCase {
         Member[] dest = channels[0].getMembers();
         final AtomicInteger value = new AtomicInteger(0);
         for ( int i=0; i<100; i++ ) {
-            channels[0].send(dest,new Integer(value.getAndAdd(1)),0);
+            channels[0].send(dest,Integer.valueOf(value.getAndAdd(1)),0);
         }
         Thread.sleep(5000);
         for ( int i=0; i<test.length; i++ ) {
@@ -102,7 +102,7 @@ public class TestOrderInterceptor extends TestCase {
                 for (int i = 0; i < 100; i++) {
                     try {
                         synchronized (channels[0]) {
-                            channels[0].send(dest, new Integer(value.getAndAdd(1)), 0);
+                            channels[0].send(dest, Integer.valueOf(value.getAndAdd(1)), 0);
                         }
                     }catch ( Exception x ) {
                         exceptionQueue.add(x);
@@ -153,7 +153,7 @@ public class TestOrderInterceptor extends TestCase {
         }
         int cnt = 0;
         int total = 0;
-        boolean fail = false;
+        volatile boolean fail = false;
         @Override
         public synchronized void messageReceived(Serializable msg, Member sender) {
             total++;
@@ -171,7 +171,6 @@ public class TestOrderInterceptor extends TestCase {
     }
     
     public static class MangleOrderInterceptor extends ChannelInterceptorBase {
-        int cnt = 1;
         ChannelMessage hold = null;
         Member[] dest = null;
         @Override

diff --git a/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java b/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
index adb336c..ea296a5 100644 (file)
--- a/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
+++ b/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
@@ -111,7 +111,7 @@ public class TestSenderConnections extends TestCase {
         }
     }
 
-    public class TestMsgListener implements ChannelListener {
+    public static class TestMsgListener implements ChannelListener {
         public String name = null;
         public TestMsgListener(String name) {
             this.name = name;

diff --git a/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java b/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
index ecc28f6..19c5cef 100644 (file)
--- a/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
+++ b/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
@@ -91,7 +91,7 @@ public class TestDomainFilter
         super.tearDown();
     }
 
-    public class TestMbrListener
+    public static class TestMbrListener
         implements MembershipListener {
         public String name = null;
         public TestMbrListener(String name) {

diff --git a/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java b/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
index 5476db2..3fb99f0 100644 (file)
--- a/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
+++ b/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
@@ -88,7 +88,7 @@ public class TestMemberArrival
         super.tearDown();
     }
 
-    public class TestMbrListener
+    public static class TestMbrListener
         implements MembershipListener {
         public String name = null;
         public TestMbrListener(String name) {

diff --git a/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java b/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
index 514c359..83f4fe7 100644 (file)
--- a/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
+++ b/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
@@ -135,7 +135,7 @@ public class TestTcpFailureDetector extends TestCase {
         super.tearDown();
     }
     
-    public class TestMbrListener implements MembershipListener {
+    public static class TestMbrListener implements MembershipListener {
         public String name = null;
         public TestMbrListener(String name) {
             this.name = name;

diff --git a/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java b/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
index 440e28d..9346be1 100644 (file)
--- a/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
@@ -83,7 +83,6 @@ public class SocketValidateReceive {
     }
     
     public static class MyDataReader {
-        byte[] data = new byte[43800];
         int length = 10;
         int cur = 0;
         byte seq = 0;