Author: markt
Date: Sun Jan 16 13:24:49 2011
New Revision: 1059553
URL: http://svn.apache.org/viewvc?rev=1059553&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1059553&r1=1059552&r2=1059553&view=diff
==============================================================================
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sun Jan 16 13:24:49
2011
@@ -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
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
Sun Jan 16 13:24:49 2011
@@ -84,7 +84,7 @@ public class TestOrderInterceptor extend
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 extend
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 extend
}
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 extend
}
public static class MangleOrderInterceptor extends ChannelInterceptorBase {
- int cnt = 1;
ChannelMessage hold = null;
Member[] dest = null;
@Override
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
Sun Jan 16 13:24:49 2011
@@ -111,7 +111,7 @@ public class TestSenderConnections exten
}
}
- public class TestMsgListener implements ChannelListener {
+ public static class TestMsgListener implements ChannelListener {
public String name = null;
public TestMsgListener(String name) {
this.name = name;
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
Sun Jan 16 13:24:49 2011
@@ -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) {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
Sun Jan 16 13:24:49 2011
@@ -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) {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
Sun Jan 16 13:24:49 2011
@@ -135,7 +135,7 @@ public class TestTcpFailureDetector exte
super.tearDown();
}
- public class TestMbrListener implements MembershipListener {
+ public static class TestMbrListener implements MembershipListener {
public String name = null;
public TestMbrListener(String name) {
this.name = name;
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java?rev=1059553&r1=1059552&r2=1059553&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
Sun Jan 16 13:24:49 2011
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
