Author: markt
Date: Mon Feb 9 19:53:28 2009
New Revision: 742708
URL: http://svn.apache.org/viewvc?rev=742708&view=rev
Log:
Fix various Eclipse warnings.
Convert tabs to spaces.
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java
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/SocketReceive.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java
Mon Feb 9 19:53:28 2009
@@ -46,6 +46,7 @@
* Construct and show the application.
*/
public CoordinationDemo() {
+ // Default constructor
}
public void init() {
@@ -312,7 +313,9 @@
status = "Start failed:"+x.getMessage();
error = x;
startstatus = "failed";
- try { channel.stop(GroupChannel.DEFAULT);}catch(Exception
ignore){}
+ try { channel.stop(Channel.DEFAULT);}catch(Exception ignore){
+ // Ignore
+ }
channel = null;
interceptor = null;
}
@@ -351,7 +354,9 @@
int type = event.getEventType();
boolean display = VIEW_EVENTS[type];
if ( display ) parent.printScreen();
- try { Thread.sleep(SLEEP_TIME); }catch ( Exception x){}
+ try { Thread.sleep(SLEEP_TIME); }catch ( Exception x){
+ // Ignore
+ }
}
};
channel.addInterceptor(interceptor);
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java Mon Feb
9 19:53:28 2009
@@ -96,8 +96,10 @@
for ( int i=0; i<resp.length; i++ ) {
System.out.println("Received a response message from
["+resp[i].getSource().getName()+"] with data ["+resp[i].getMessage()+"]");
}
- Thread.sleep(pause);
- }catch(Exception x){}
+ Thread.sleep(pause);
+ }catch(Exception x){
+ // Ignore
+ }
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
Mon Feb 9 19:53:28 2009
@@ -957,6 +957,7 @@
try {
result = new Integer(object);
} catch (NumberFormatException ex) {
+ // Ignore
}
// Try a setFoo ( boolean )
} else if ("java.lang.Boolean".equals(paramType.getName())
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java Mon Feb 9
19:53:28 2009
@@ -248,8 +248,7 @@
- //public static class LoadMessage implements Serializable {
- public static class LoadMessage extends ByteMessage implements
Serializable {
+ public static class LoadMessage extends ByteMessage {
public static byte[] outdata = new byte[size];
public static Random r = new Random(System.currentTimeMillis());
@@ -263,6 +262,7 @@
protected byte[] message = getMessage();
public LoadMessage() {
+ // Default constructor
}
public byte[] getMessage() {
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Mon Feb 9
19:53:28 2009
@@ -94,17 +94,19 @@
/**
* Invoked if accept returns true.
- * No of for now
+ * No op for now
* @param msg - the message received
* @param source - the sending member
*/
public void messageReceived(Serializable msg, Member source) {
+ // NOOP
}
/**
* Invoked when a member is added to the group
*/
public void memberAdded(Member member) {
+ // NOOP
}
/**
Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java Mon
Feb 9 19:53:28 2009
@@ -42,7 +42,7 @@
MemberImpl mbr;
private static int testOptions = Channel.SEND_OPTIONS_DEFAULT;
public TestNioSender() {
-
+ // Default constructor
}
public synchronized int inc() {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
Mon Feb 9 19:53:28 2009
@@ -34,7 +34,7 @@
protected void tearDown() throws Exception {
super.tearDown();
- try {channel.stop(Channel.DEFAULT);}catch (Exception ignore){}
+ try {channel.stop(Channel.DEFAULT);}catch (Exception ignore){ /*
Ignore */ }
}
public void testDoubleFullStart() throws Exception {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
Mon Feb 9 19:53:28 2009
@@ -41,7 +41,7 @@
protected void tearDown() throws Exception {
super.tearDown();
- if ( channel != null ) try {channel.stop(Channel.DEFAULT);}catch (
Exception ignore) {}
+ if ( channel != null ) try {channel.stop(Channel.DEFAULT);}catch (
Exception ignore) { /* Ignore */ }
channel = null;
}
@@ -84,7 +84,7 @@
}
public static class TestInterceptor extends ChannelInterceptorBase {
-
+ // Just use base class
}
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
Mon Feb 9 19:53:28 2009
@@ -20,6 +20,8 @@
import java.io.Serializable;
import java.util.Random;
import java.util.Arrays;
+
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.GroupChannel;
@@ -50,14 +52,14 @@
channel2.addInterceptor(new MessageDispatch15Interceptor());
listener1 = new Listener();
channel2.addChannelListener(listener1);
- channel1.start(GroupChannel.DEFAULT);
- channel2.start(GroupChannel.DEFAULT);
+ channel1.start(Channel.DEFAULT);
+ channel2.start(Channel.DEFAULT);
}
protected void tearDown() throws Exception {
super.tearDown();
- channel1.stop(GroupChannel.DEFAULT);
- channel2.stop(GroupChannel.DEFAULT);
+ channel1.stop(Channel.DEFAULT);
+ channel2.stop(Channel.DEFAULT);
}
public void testDataSendNO_ACK() throws Exception {
@@ -96,7 +98,7 @@
public void run() {
try {
long start = System.currentTimeMillis();
- for (int i = 0; i < msgCount; i++)
channel1.send(new Member[] {channel2.getLocalMember(false)},
Data.createRandomData(),GroupChannel.SEND_OPTIONS_ASYNCHRONOUS);
+ for (int i = 0; i < msgCount; i++)
channel1.send(new Member[] {channel2.getLocalMember(false)},
Data.createRandomData(),Channel.SEND_OPTIONS_ASYNCHRONOUS);
System.out.println("Thread["+this.getName()+"]
sent "+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms.");
}catch ( Exception x ) {
x.printStackTrace();
@@ -117,7 +119,7 @@
}
public void testDataSendASYNC() throws Exception {
System.err.println("Starting ASYNC");
- for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(),GroupChannel.SEND_OPTIONS_ASYNCHRONOUS);
+ for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(),Channel.SEND_OPTIONS_ASYNCHRONOUS);
//sleep for 50 sec, let the other messages in
long start = System.currentTimeMillis();
while ( (System.currentTimeMillis()-start)<5000 &&
msgCount!=listener1.count) Thread.sleep(500);
@@ -127,7 +129,7 @@
public void testDataSendACK() throws Exception {
System.err.println("Starting ACK");
- for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(),GroupChannel.SEND_OPTIONS_USE_ACK);
+ for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(),Channel.SEND_OPTIONS_USE_ACK);
Thread.sleep(250);
System.err.println("Finished ACK");
assertEquals("Checking success messages.",msgCount,listener1.count);
@@ -135,7 +137,7 @@
public void testDataSendSYNCACK() throws Exception {
System.err.println("Starting SYNC_ACK");
- for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(),GroupChannel.SEND_OPTIONS_SYNCHRONIZED_ACK|GroupChannel.SEND_OPTIONS_USE_ACK);
+ for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(),Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK);
Thread.sleep(250);
System.err.println("Finished SYNC_ACK");
assertEquals("Checking success messages.",msgCount,listener1.count);
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
Mon Feb 9 19:53:28 2009
@@ -62,14 +62,14 @@
rb1.setUdpPort(50000);
rb2.setUdpPort(50000);
channel2.addChannelListener(listener1);
- channel1.start(GroupChannel.DEFAULT);
- channel2.start(GroupChannel.DEFAULT);
+ channel1.start(Channel.DEFAULT);
+ channel2.start(Channel.DEFAULT);
}
protected void tearDown() throws Exception {
super.tearDown();
- channel1.stop(GroupChannel.DEFAULT);
- channel2.stop(GroupChannel.DEFAULT);
+ channel1.stop(Channel.DEFAULT);
+ channel2.stop(Channel.DEFAULT);
}
public void testSingleDataSendNO_ACK() throws Exception {
@@ -136,7 +136,7 @@
}
public void testDataSendASYNC() throws Exception {
System.err.println("Starting ASYNC");
- for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),GroupChannel.SEND_OPTIONS_ASYNCHRONOUS|Channel.SEND_OPTIONS_MULTICAST);
+ for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_ASYNCHRONOUS|Channel.SEND_OPTIONS_MULTICAST);
//sleep for 50 sec, let the other messages in
long start = System.currentTimeMillis();
while ( (System.currentTimeMillis()-start)<5000 &&
msgCount!=listener1.count.get()) Thread.sleep(500);
@@ -146,7 +146,7 @@
public void testDataSendACK() throws Exception {
System.err.println("Starting ACK");
- for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),GroupChannel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_MULTICAST);
+ for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_MULTICAST);
Thread.sleep(250);
System.err.println("Finished ACK");
assertEquals("Checking success
messages.",msgCount,listener1.count.get());
@@ -154,7 +154,7 @@
public void testDataSendSYNCACK() throws Exception {
System.err.println("Starting SYNC_ACK");
- for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),GroupChannel.SEND_OPTIONS_SYNCHRONIZED_ACK|GroupChannel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_MULTICAST);
+ for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_MULTICAST);
Thread.sleep(250);
System.err.println("Finished SYNC_ACK");
assertEquals("Checking success
messages.",msgCount,listener1.count.get());
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
Mon Feb 9 19:53:28 2009
@@ -20,6 +20,8 @@
import java.io.Serializable;
import java.util.Random;
import java.util.Arrays;
+
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.GroupChannel;
@@ -46,14 +48,14 @@
channel2 = new GroupChannel();
listener1 = new Listener();
channel2.addChannelListener(listener1);
- channel1.start(GroupChannel.DEFAULT);
- channel2.start(GroupChannel.DEFAULT);
+ channel1.start(Channel.DEFAULT);
+ channel2.start(Channel.DEFAULT);
}
protected void tearDown() throws Exception {
super.tearDown();
- channel1.stop(GroupChannel.DEFAULT);
- channel2.stop(GroupChannel.DEFAULT);
+ channel1.stop(Channel.DEFAULT);
+ channel2.stop(Channel.DEFAULT);
}
public void testDataSendSYNCACK() throws Exception {
@@ -61,7 +63,7 @@
int errC=0, nerrC=0;
for (int i=0; i<msgCount; i++) {
boolean error = Data.r.nextBoolean();
-
channel1.send(channel1.getMembers(),Data.createRandomData(error),GroupChannel.SEND_OPTIONS_SYNCHRONIZED_ACK|GroupChannel.SEND_OPTIONS_USE_ACK);
+
channel1.send(channel1.getMembers(),Data.createRandomData(error),Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK);
if ( error ) errC++; else nerrC++;
}
System.err.println("Finished SYNC_ACK");
@@ -90,11 +92,10 @@
printStats(System.err);
}
throw new IllegalArgumentException();
- } else {
- noErrCnt++;
- if ( (noErrCnt % 100) == 0) {
- printStats(System.err);
- }
+ }
+ noErrCnt++;
+ if ( (noErrCnt % 100) == 0) {
+ printStats(System.err);
}
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
Mon Feb 9 19:53:28 2009
@@ -62,14 +62,14 @@
rb1.setUdpPort(50000);
rb2.setUdpPort(50000);
channel2.addChannelListener(listener1);
- channel1.start(GroupChannel.DEFAULT);
- channel2.start(GroupChannel.DEFAULT);
+ channel1.start(Channel.DEFAULT);
+ channel2.start(Channel.DEFAULT);
}
protected void tearDown() throws Exception {
super.tearDown();
- channel1.stop(GroupChannel.DEFAULT);
- channel2.stop(GroupChannel.DEFAULT);
+ channel1.stop(Channel.DEFAULT);
+ channel2.stop(Channel.DEFAULT);
}
public void testSingleDataSendNO_ACK() throws Exception {
@@ -178,7 +178,7 @@
}
public void testDataSendASYNC() throws Exception {
System.err.println("Starting ASYNC");
- for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),GroupChannel.SEND_OPTIONS_ASYNCHRONOUS|Channel.SEND_OPTIONS_UDP);
+ for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_ASYNCHRONOUS|Channel.SEND_OPTIONS_UDP);
//sleep for 50 sec, let the other messages in
long start = System.currentTimeMillis();
while ( (System.currentTimeMillis()-start)<5000 &&
msgCount!=listener1.count.get()) Thread.sleep(500);
@@ -188,7 +188,7 @@
public void testDataSendACK() throws Exception {
System.err.println("Starting ACK");
- for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),GroupChannel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_UDP);
+ for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_UDP);
Thread.sleep(250);
System.err.println("Finished ACK");
assertEquals("Checking success
messages.",msgCount,listener1.count.get());
@@ -196,7 +196,7 @@
public void testDataSendSYNCACK() throws Exception {
System.err.println("Starting SYNC_ACK");
- for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),GroupChannel.SEND_OPTIONS_SYNCHRONIZED_ACK|GroupChannel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_UDP);
+ for (int i=0; i<msgCount; i++) channel1.send(new Member[]
{channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_UDP);
Thread.sleep(250);
System.err.println("Finished SYNC_ACK");
assertEquals("Checking success
messages.",msgCount,listener1.count.get());
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java
Mon Feb 9 19:53:28 2009
@@ -64,8 +64,8 @@
assertEquals("Message count expected to be
equal.",channels[i-1].getMembers().length,channels[i].getMembers().length);
Member member = coordinators[0].getCoordinator();
int cnt = 0;
- while ( member == null && (cnt++ < 100 ) ) try {Thread.sleep(100);
member = coordinators[0].getCoordinator();}catch ( Exception x){}
- for (int i=0; i<channelCount; i++ )
super.assertEquals(member,coordinators[i].getCoordinator());
+ while ( member == null && (cnt++ < 100 ) ) try {Thread.sleep(100);
member = coordinators[0].getCoordinator();}catch ( Exception x){ /* Ignore */ }
+ for (int i=0; i<channelCount; i++ )
assertEquals(member,coordinators[i].getCoordinator());
System.out.println("Coordinator[1] is:"+member);
}
@@ -86,7 +86,7 @@
if ( index == 0 ) index = 1; else index = 0;
System.out.println("Member
count:"+channels[index].getMembers().length);
member = coordinators[index].getCoordinator();
- for (int i = 1; i < channelCount; i++) if ( i != dead )
super.assertEquals(member, coordinators[i].getCoordinator());
+ for (int i = 1; i < channelCount; i++) if ( i != dead )
assertEquals(member, coordinators[i].getCoordinator());
System.out.println("Coordinator[2b] is:" + member);
}
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=742708&r1=742707&r2=742708&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
Mon Feb 9 19:53:28 2009
@@ -82,7 +82,7 @@
}
Thread.sleep(5000);
for ( int i=0; i<test.length; i++ ) {
- super.assertEquals(false,test[i].fail);
+ assertEquals(false,test[i].fail);
}
}
@@ -115,7 +115,7 @@
}
Thread.sleep(5000);
for ( int i=0; i<test.length; i++ ) {
- super.assertEquals(false,test[i].fail);
+ assertEquals(false,test[i].fail);
}
}
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=742708&r1=742707&r2=742708&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
Mon Feb 9 19:53:28 2009
@@ -47,6 +47,7 @@
}
public void clear() {
+ // NOOP
}
public void sendMessages(long delay, long sleep) throws Exception {
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=742708&r1=742707&r2=742708&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
Mon Feb 9 19:53:28 2009
@@ -80,7 +80,9 @@
for (int i = 0; i < channels.length; i++) {
try {
channels[i].stop(Channel.DEFAULT);
- } catch (Exception ignore) {}
+ } catch (Exception ignore) {
+ // Ignore
+ }
}
super.tearDown();
}
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=742708&r1=742707&r2=742708&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
Mon Feb 9 19:53:28 2009
@@ -77,7 +77,9 @@
for (int i = 0; i < channels.length; i++) {
try {
channels[i].stop(Channel.DEFAULT);
- } catch (Exception ignore) {}
+ } catch (Exception ignore) {
+ // Ignore
+ }
}
super.tearDown();
}
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=742708&r1=742707&r2=742708&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
Mon Feb 9 19:53:28 2009
@@ -79,7 +79,7 @@
channel1.send(channel1.getMembers(), msg, 0);
assertEquals("Message send should have failed.",true,false);
} catch ( ChannelException x ) {
-
+ // Ignore
}
assertEquals("Expecting member count to not be
equal",mbrlist1.members.size()+1,mbrlist2.members.size());
channel1.stop(Channel.DEFAULT);
@@ -125,9 +125,9 @@
protected void tearDown() throws Exception {
tcpFailureDetector1 = null;
tcpFailureDetector2 = null;
- try { channel1.stop(Channel.DEFAULT);}catch (Exception ignore){}
+ try { channel1.stop(Channel.DEFAULT);}catch (Exception ignore){ /*
Ignore */ }
channel1 = null;
- try { channel2.stop(Channel.DEFAULT);}catch (Exception ignore){}
+ try { channel2.stop(Channel.DEFAULT);}catch (Exception ignore){ /*
Ignore */ }
channel2 = null;
super.tearDown();
}
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketReceive.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
Mon Feb 9 19:53:28 2009
@@ -46,7 +46,9 @@
try {
Thread.sleep(1000);
printStats(start, mb, count, df, total);
- }catch ( Exception x ) {}
+ }catch ( Exception x ) {
+ // Ignore
+ }
}
}
};
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java?rev=742708&r1=742707&r2=742708&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
Mon Feb 9 19:53:28 2009
@@ -37,7 +37,7 @@
public static void main(String[] args) throws Exception {
int size = 43800;
- if (args.length > 0 ) try
{size=Integer.parseInt(args[0]);}catch(Exception x){}
+ if (args.length > 0 ) try
{size=Integer.parseInt(args[0]);}catch(Exception x){ /* Ignore */ }
XByteBuffer xbuf = new XByteBuffer(43800,true);
ServerSocket srvSocket = new ServerSocket(9999);
System.out.println("Listening on 9999");
@@ -50,7 +50,7 @@
try {
Thread.sleep(1000);
printStats(start, mb, count, df, total);
- }catch ( Exception x ) {}
+ }catch ( Exception x ) { /* Ignore */ }
}
}
};
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=742708&r1=742707&r2=742708&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
Mon Feb 9 19:53:28 2009
@@ -35,7 +35,7 @@
public static void main(String[] args) throws Exception {
int size = 43800;
- if (args.length > 0 ) try
{size=Integer.parseInt(args[0]);}catch(Exception x){}
+ if (args.length > 0 ) try
{size=Integer.parseInt(args[0]);}catch(Exception x){ /* Ignore */ }
ServerSocket srvSocket = new ServerSocket(9999);
System.out.println("Listening on 9999");
@@ -49,7 +49,7 @@
try {
Thread.sleep(1000);
printStats(start, mb, count, df, total);
- }catch ( Exception x ) {}
+ }catch ( Exception x ) { /* Ignore */ }
}
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
