Author: markt
Date: Sat Jan 15 14:36:01 2011
New Revision: 1059342
URL: http://svn.apache.org/viewvc?rev=1059342&view=rev
Log:
Fix FindBugs and Eclipse warnings
Remove out-dated comments
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1059342&r1=1059341&r2=1059342&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Sat Jan 15 14:36:01 2011
@@ -130,7 +130,7 @@ public class TcpFailureDetector extends
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
notify = true;
} else {
//add the member as suspect
- removeSuspects.put(member, new
Long(System.currentTimeMillis()));
+ removeSuspects.put(member,
Long.valueOf(System.currentTimeMillis()));
}
}
if ( notify ) {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1059342&r1=1059341&r2=1059342&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Sat Jan 15 14:36:01 2011
@@ -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 {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1059342&r1=1059341&r2=1059342&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Sat Jan 15 14:36:01 2011
@@ -42,11 +42,6 @@ public class BioReceiver extends Receive
// 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 Receive
return result;
}
- /**
- *
- * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method
- */
@Override
public void stop() {
setListen(false);
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1059342&r1=1059341&r2=1059342&view=diff
==============================================================================
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sat Jan 15 14:36:01
2011
@@ -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" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
