From 535b2ac0abfa040ed67aa262b4b064232fea1eb1 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 15 Jan 2011 14:36:01 +0000
Subject: [PATCH] Fix FindBugs and Eclipse warnings Remove out-dated comments

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059342 13f79535-47bb-0310-9956-ffa450edef68
---
 .../group/interceptors/TcpFailureDetector.java       |  4 ++--
 .../catalina/tribes/membership/McastServiceImpl.java |  4 ++++
 .../catalina/tribes/transport/bio/BioReceiver.java   |  9 ---------
 res/findbugs/filter-false-positives.xml              | 20 ++++++++++++++++++++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index 3fd3694e8..b4951d746 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -130,7 +130,7 @@ public class TcpFailureDetector extends ChannelInterceptorBase {
                     membership.memberAlive( (MemberImpl) member);
                     notify = true;
                 } else {
-                    addSuspects.put(member, new Long(System.currentTimeMillis()));
+                    addSuspects.put(member, Long.valueOf(System.currentTimeMillis()));
                 }
             }
         }
@@ -160,7 +160,7 @@ public class TcpFailureDetector extends ChannelInterceptorBase {
                 notify = true;
             } else {
                 //add the member as suspect
-                removeSuspects.put(member, new Long(System.currentTimeMillis()));
+                removeSuspects.put(member, Long.valueOf(System.currentTimeMillis()));
             }
         }
         if ( notify ) {
diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index 18cf6886e..c8aeca687 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -366,6 +366,7 @@ public class McastServiceImpl
             if (log.isDebugEnabled()) log.debug("Member has shutdown:" + m);
             membership.removeMember(m);
             t = new Runnable() {
+                @Override
                 public void run() {
                     String name = Thread.currentThread().getName();
                     try {
@@ -379,6 +380,7 @@ public class McastServiceImpl
         } else if (membership.memberAlive(m)) {
             if (log.isDebugEnabled()) log.debug("Mcast add member " + m);
             t = new Runnable() {
+                @Override
                 public void run() {
                     String name = Thread.currentThread().getName();
                     try {
@@ -411,6 +413,7 @@ public class McastServiceImpl
                 }
             }
             Runnable t = new Runnable() {
+                @Override
                 public void run() {
                     String name = Thread.currentThread().getName();
                     try {
@@ -449,6 +452,7 @@ public class McastServiceImpl
                     log.debug("Mcast exipre  member " + expired[i]);
                 try {
                     Runnable t = new Runnable() {
+                        @Override
                         public void run() {
                             String name = Thread.currentThread().getName();
                             try {
diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
index 45aeb9607..3e7050469 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
@@ -42,11 +42,6 @@ public class BioReceiver extends ReceiverBase implements Runnable {
         // NO-OP
     }
 
-    /**
-     *
-     * @throws IOException
-     * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method
-     */
     @Override
     public void start() throws IOException {
         super.start();
@@ -82,10 +77,6 @@ public class BioReceiver extends ReceiverBase implements Runnable {
         return result;
     }
 
-    /**
-     *
-     * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method
-     */
     @Override
     public void stop() {
         setListen(false);
diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml
index 3e5800146..9cb76151a 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -29,6 +29,26 @@
     <Bug code="SWL" />
   </Match>
   <Match>
+    <Class name="org.apache.catalina.tribes.group.interceptors.TcpFailureDetector"/>
+    <Method name="memberAlive"/>
+    <Bug code="DE"/>
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.membership.McastServiceImpl"/>
+    <Method name="stop"/>
+    <Bug code="DE"/>
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.membership.McastServiceImpl$ReceiverThread"/>
+    <Method name="run"/>
+    <Bug code="DE"/>
+  </Match>
+  <Match>
+    <Class name="org.apache.catalina.tribes.membership.McastServiceImpl$RecoveryThread"/>
+    <Method name="run"/>
+    <Bug code="NS"/>
+  </Match>
+  <Match>
     <!-- Class name needs to start with a lower case letter in this case -->
     <Class name="org.apache.naming.java.javaURLContextFactory" />
     <Bug code="Nm" />
-- 
2.11.0