svn commit: r1378734 - in /tomcat/trunk/test/org/apache/catalina/tribes/group: TestGroupChannelOptionFlag.java TestGroupChannelStartStop.java

[markt]

Author: markt
Date: Wed Aug 29 21:13:41 2012
New Revision: 1378734

URL: http://svn.apache.org/viewvc?rev=1378734&view=rev
Log:
Re-organise to silence some FindBugs warnings

Modified:
    
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
    
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java

Modified: 
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?rev=1378734&r1=1378733&r2=1378734&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
 Wed Aug 29 21:13:41 2012
@@ -47,7 +47,13 @@ public class TestGroupChannelOptionFlag 
 
     @After
     public void tearDown() throws Exception {
-        if ( channel != null ) try {channel.stop(Channel.DEFAULT);}catch ( 
Exception ignore) { /* Ignore */ }
+        if (channel != null) {
+            try {
+                channel.stop(Channel.DEFAULT);
+            } catch (Exception ignore) {
+                // Ignore
+            }
+        }
         channel = null;
     }
 

Modified: 
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java?rev=1378734&r1=1378733&r2=1378734&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
 Wed Aug 29 21:13:41 2012
@@ -40,7 +40,11 @@ public class TestGroupChannelStartStop {
 
     @After
     public void tearDown() throws Exception {
-        try {channel.stop(Channel.DEFAULT);}catch (Exception ignore){ /* 
Ignore */ }
+        try {
+            channel.stop(Channel.DEFAULT);
+        } catch (Exception ignore) {
+            // Ignore
+        }
     }
 
     @Test
@@ -76,7 +80,9 @@ public class TestGroupChannelStartStop {
         try {
             channel.start(Channel.MBR_RX_SEQ);
             count++;
-        } catch ( Exception x){/*expected*/}
+        } catch ( Exception x){
+            // expected
+        }
         assertEquals(count,1);
         channel.stop(Channel.DEFAULT);
         //double the membership sender
@@ -89,7 +95,9 @@ public class TestGroupChannelStartStop {
         try {
             channel.start(Channel.MBR_TX_SEQ);
             count++;
-        } catch ( Exception x){/*expected*/}
+        } catch ( Exception x){
+            // expected
+        }
         assertEquals(count,1);
         channel.stop(Channel.DEFAULT);
 
@@ -101,7 +109,9 @@ public class TestGroupChannelStartStop {
         try {
             channel.start(Channel.SND_RX_SEQ);
             count++;
-        } catch ( Exception x){/*expected*/}
+        } catch ( Exception x){
+            // expected
+        }
         assertEquals(count,1);
         channel.stop(Channel.DEFAULT);
 
@@ -113,7 +123,9 @@ public class TestGroupChannelStartStop {
         try {
             channel.start(Channel.SND_TX_SEQ);
             count++;
-        } catch ( Exception x){/*expected*/}
+        } catch ( Exception x){
+            // expected
+        }
         assertEquals(count,1);
         channel.stop(Channel.DEFAULT);
     }
@@ -129,7 +141,9 @@ public class TestGroupChannelStartStop {
         try {
             channel.start(flag);
             count++;
-        } catch ( Exception x){/*expected*/}
+        } catch ( Exception x){
+            // expected
+        }
         assertEquals(count,2);
         channel.stop(Channel.DEFAULT);
     }
@@ -142,5 +156,4 @@ public class TestGroupChannelStartStop {
         Thread.sleep(1000);
         channel.stop(Channel.DEFAULT);
     }
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org