tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r832956 - in /tomcat/trunk: modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ test/org/apache/catalina/connector/ test/org/apache/catalina/core/ test/org/apache/catalina/startup/ test/org/apache/catalina/tribes/demos/ test/org/apache/cata...
Date Thu, 05 Nov 2009 01:21:13 GMT
Author: markt
Date: Thu Nov  5 01:21:11 2009
New Revision: 832956

URL: http://svn.apache.org/viewvc?rev=832956&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb

Modified:
    tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
    tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java
    tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
    tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java
    tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
    tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
    tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
    tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
    tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
    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/LoadTest.java
    tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
    tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java
    tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
    tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.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/io/TestSerialization.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/TestMemberSerialization.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
    tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
    tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
    tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java

Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
(original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
Thu Nov  5 01:21:11 2009
@@ -374,6 +374,7 @@
     public class TestThread extends Thread {
         protected DataSource d;
         protected String query = null;
+        @Override
         public void run() {
             long max = -1, totalmax=0, totalcmax=0, cmax = -1, nroffetch = 0, totalruntime
= 0;
             try {

Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java
(original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java
Thu Nov  5 01:21:11 2009
@@ -239,6 +239,7 @@
         protected long sleep = 10;
         protected boolean async = false;
         long minwait = Long.MAX_VALUE, maxwait = -1, totalwait=0, totalcmax=0, cmax = -1,
nroffetch = 0, totalruntime = 0;
+        @Override
         public void run() {
             try {
                 long now = System.currentTimeMillis();

Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java (original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java Thu
Nov  5 01:21:11 2009
@@ -171,6 +171,7 @@
     }
 
 
+    @Override
     protected void tearDown() throws Exception {
         try {datasource.close();}catch(Exception ignore){}
         try {tDatasource.close();}catch(Exception ignore){}

Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java (original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java Thu
Nov  5 01:21:11 2009
@@ -218,6 +218,7 @@
         protected long sleep = 10;
         protected boolean async = false;
         long minwait = Long.MAX_VALUE, maxwait = -1, totalwait=0, totalcmax=0, cmax = -1,
nroffetch = 0, totalruntime = 0;
+        @Override
         public void run() {
             try {
                 long now = System.currentTimeMillis();

Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java (original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java Thu
Nov  5 01:21:11 2009
@@ -27,11 +27,13 @@
 
 public class TestAsyncQueue extends TestCase {
     protected FairBlockingQueue<Object> queue = null;
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         this.queue = new FairBlockingQueue<Object>();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         this.queue = null;
         super.tearDown();
@@ -72,6 +74,7 @@
             this.setDaemon(false);
             this.setName(TestAsyncQueue.class.getName()+"-OfferThread");
         }
+        @Override
         public void run() {
             try {
                 sleep(delay);

Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Thu Nov  5 01:21:11 2009
@@ -177,6 +177,7 @@
             return null;
         }
 
+        @Override
         public boolean isResponseBodyOK() {
             if (getResponseBody() == null) {
                 return false;

Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Thu Nov  5 01:21:11
2009
@@ -79,6 +79,7 @@
     }
     
     private static final class Bug46243Client extends SimpleHttpClient {
+        @Override
         public boolean isResponseBodyOK() {
             // Don't care about the body in this test
             return true;

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Thu Nov  5 01:21:11 2009
@@ -40,6 +40,7 @@
 
         private static final long serialVersionUID = 1L;
 
+        @Override
         public void doGet(HttpServletRequest req, HttpServletResponse res) 
                 throws IOException {
             res.getWriter().write("Hello world");
@@ -55,6 +56,7 @@
 
         private static final String JNDI_ENV_NAME = "test";
         
+        @Override
         public void doGet(HttpServletRequest req, HttpServletResponse res) 
                 throws IOException {
             
@@ -79,6 +81,7 @@
         
         private static final long serialVersionUID = 1L;
         
+        @Override
         public void doGet(HttpServletRequest req, HttpServletResponse res) 
         throws IOException {
             URL url = req.getServletContext().getResource("/WEB-INF/web.xml");

Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Thu Nov  5 01:21:11
2009
@@ -66,6 +66,7 @@
         return getPort();
     }
     
+    @Override
     public void setUp() throws Exception {
         tempDir = new File("output/tmp");
         tempDir.mkdir();
@@ -80,6 +81,7 @@
         tomcat.setPort(port);
     }
     
+    @Override
     public void tearDown() throws Exception {
         tomcat.stop();
         ExpandWar.delete(tempDir);

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=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java Thu Nov  5 01:21:11
2009
@@ -136,6 +136,7 @@
             for (int i = 0; i < status.length; i++) {
                 final int j = i;
                 t[j] = new Thread() {
+                    @Override
                     public void run() {
                         status[j].stop();
                     }
@@ -161,6 +162,7 @@
             for (int i = 0; i < status.length; i++) {
                 final int j = i;
                 t[j] = new Thread() {
+                    @Override
                     public void run() {
                         status[j].start();
                     }
@@ -349,6 +351,7 @@
             channel = new GroupChannel();
             ((ReceiverBase)channel.getChannelReceiver()).setAutoBind(100);
             interceptor = new NonBlockingCoordinator() {
+                @Override
                 public void fireInterceptorEvent(InterceptorEvent event) {
                     status = event.getEventTypeDesc();
                     int type = event.getEventType();

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=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java Thu Nov  5 01:21:11
2009
@@ -185,6 +185,7 @@
                 this.channel = channel;
             }
     
+            @Override
             public void run() {
                 System.out.println("Shutting down...");
                 SystemExit exit = new SystemExit(5000);
@@ -204,6 +205,7 @@
             public SystemExit(long delay) {
                 this.delay = delay;
             }
+            @Override
             public void run () {
                 try {
                     Thread.sleep(delay);

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=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java Thu Nov  5 01:21:11 2009
@@ -265,6 +265,7 @@
             // Default constructor
         }
         
+        @Override
         public byte[] getMessage() {
             if ( message == null ) {
                 message = outdata;
@@ -272,6 +273,7 @@
             return message;
         }
         
+        @Override
         public void setMessage(byte[] data) {
             this.message = data;
         }
@@ -382,6 +384,7 @@
             this.channel = channel;
         }
         
+        @Override
         public void run() {
             System.out.println("Shutting down...");
             SystemExit exit = new SystemExit(5000);
@@ -401,6 +404,7 @@
         public SystemExit(long delay) {
             this.delay = delay;
         }
+        @Override
         public void run () {
             try {
                 Thread.sleep(delay);

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=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Thu Nov  5 01:21:11 2009
@@ -166,6 +166,7 @@
         }
 
         
+        @Override
         public void run() {
             System.out.println("Shutting down...");
             //create an exit thread that forces a shutdown if the JVM wont exit cleanly
@@ -188,6 +189,7 @@
             this.delay = delay;
         }
 
+        @Override
         public void run() {
             try {
                 Thread.sleep(delay);
@@ -285,6 +287,7 @@
 
             if (DEBUG) {
                 table.addMouseListener(new MouseAdapter() {
+                    @Override
                     public void mouseClicked(MouseEvent e) {
                         printDebugData(table);
                     }
@@ -375,6 +378,7 @@
             }
             if ( "random".equals(e.getActionCommand()) ) {
                 Thread t = new Thread() {
+                    @Override
                     public void run() {
                         for (int i = 0; i < 5; i++) {
                             String key = random(5,0,0,true,true,null);
@@ -510,6 +514,7 @@
             super();
         }
 
+        @Override
         public Component getTableCellRendererComponent
             (JTable table, Object value, boolean isSelected,
              boolean hasFocus, int row, int column) {

Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java Thu Nov
 5 01:21:11 2009
@@ -106,6 +106,7 @@
             this.channel = channel;
         }
 
+        @Override
         public void run() {
             System.out.println("Shutting down...");
             try {

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=832956&r1=832955&r2=832956&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 Thu
Nov  5 01:21:11 2009
@@ -34,11 +34,13 @@
  */
 public class TestChannelOptionFlag extends TestCase {
     GroupChannel channel = null;
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         channel = new GroupChannel();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         if ( channel != null ) try {channel.stop(Channel.DEFAULT);}catch ( Exception ignore)
{ /* Ignore */ }

Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java Thu
Nov  5 01:21:11 2009
@@ -27,11 +27,13 @@
 public class TestChannelStartStop extends TestCase {
     GroupChannel channel = null;
     int udpPort = 45543;
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         channel = new GroupChannel();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         try {channel.stop(Channel.DEFAULT);}catch (Exception ignore){ /* Ignore */ }

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=832956&r1=832955&r2=832956&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 Thu Nov
 5 01:21:11 2009
@@ -44,6 +44,7 @@
     GroupChannel channel2;
     Listener listener1;
     int threadCounter = 0;
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         channel1 = new GroupChannel();
@@ -56,6 +57,7 @@
         channel2.start(Channel.DEFAULT);
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         channel1.stop(Channel.DEFAULT);
@@ -67,6 +69,7 @@
         Thread[] threads = new Thread[threadCount];
         for (int x=0; x<threads.length; x++ ) {
             threads[x] = new Thread() {
+                @Override
                 public void run() {
                     try {
                         long start = System.currentTimeMillis();
@@ -95,6 +98,7 @@
             Thread[] threads = new Thread[threadCount];
             for (int x=0; x<threads.length; x++ ) {
                 threads[x] = new Thread() {
+                    @Override
                     public void run() {
                         try {
                             long start = System.currentTimeMillis();

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=832956&r1=832955&r2=832956&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 Thu
Nov  5 01:21:11 2009
@@ -44,6 +44,7 @@
     GroupChannel channel2;
     Listener listener1;
     int threadCounter = 0;
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         channel1 = new GroupChannel();
@@ -66,6 +67,7 @@
         channel2.start(Channel.DEFAULT);
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         channel1.stop(Channel.DEFAULT);
@@ -105,6 +107,7 @@
         Thread[] threads = new Thread[threadCount];
         for (int x=0; x<threads.length; x++ ) {
             threads[x] = new Thread() {
+                @Override
                 public void run() {
                     try {
                         long start = System.currentTimeMillis();

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=832956&r1=832955&r2=832956&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
Thu Nov  5 01:21:11 2009
@@ -42,6 +42,7 @@
     GroupChannel channel1;
     GroupChannel channel2;
     Listener listener1;
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         channel1 = new GroupChannel();
@@ -52,6 +53,7 @@
         channel2.start(Channel.DEFAULT);
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         channel1.stop(Channel.DEFAULT);

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=832956&r1=832955&r2=832956&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 Thu Nov
 5 01:21:11 2009
@@ -44,6 +44,7 @@
     GroupChannel channel2;
     Listener listener1;
     int threadCounter = 0;
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         channel1 = new GroupChannel();
@@ -66,6 +67,7 @@
         channel2.start(Channel.DEFAULT);
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         channel1.stop(Channel.DEFAULT);
@@ -98,6 +100,7 @@
         Thread[] threads = new Thread[threadCount];
         for (int x=0; x<threads.length; x++ ) {
             threads[x] = new Thread() {
+                @Override
                 public void run() {
                     try {
                         long start = System.currentTimeMillis();
@@ -147,6 +150,7 @@
         Thread[] threads = new Thread[threadCount];
         for (int x=0; x<threads.length; x++ ) {
             threads[x] = new Thread() {
+                @Override
                 public void run() {
                     try {
                         long start = System.currentTimeMillis();

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=832956&r1=832955&r2=832956&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
Thu Nov  5 01:21:11 2009
@@ -31,6 +31,7 @@
     NonBlockingCoordinator[] coordinators = null;
     int channelCount = 10;
     Thread[] threads = null;
+    @Override
     protected void setUp() throws Exception {
         System.out.println("Setup");
         super.setUp();
@@ -44,6 +45,7 @@
             channels[i].addInterceptor(new TcpFailureDetector());
             final int j = i;
             threads[i] = new Thread() {
+                @Override
                 public void run() {
                     try {
                         channels[j].start(Channel.DEFAULT);
@@ -90,6 +92,7 @@
         System.out.println("Coordinator[2b] is:" + member);
     }
 
+    @Override
     protected void tearDown() throws Exception {
         System.out.println("tearDown");
         super.tearDown();

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=832956&r1=832955&r2=832956&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
Thu Nov  5 01:21:11 2009
@@ -39,6 +39,7 @@
     TestListener[] test = null;
     int channelCount = 2;
     Thread[] threads = null;
+    @Override
     protected void setUp() throws Exception {
         System.out.println("Setup");
         super.setUp();
@@ -59,6 +60,7 @@
             channels[i].addChannelListener(test[i]);
             final int j = i;
             threads[i] = new Thread() {
+                @Override
                 public void run() {
                     try {
                         channels[j].start(Channel.DEFAULT);
@@ -120,6 +122,7 @@
     }
 
 
+    @Override
     protected void tearDown() throws Exception {
         System.out.println("tearDown");
         super.tearDown();
@@ -160,6 +163,7 @@
         int cnt = 1;
         ChannelMessage hold = null;
         Member[] dest = null;
+        @Override
         public synchronized void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload
payload) throws ChannelException {
             if ( hold == null ) {
                 //System.out.println("Skipping message:"+msg);

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=832956&r1=832955&r2=832956&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 Thu Nov
 5 01:21:11 2009
@@ -34,6 +34,7 @@
     private ManagedChannel[] channels = new ManagedChannel[count];
     private TestMsgListener[] listeners = new TestMsgListener[count];
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         for (int i = 0; i < channels.length; i++) {
@@ -86,6 +87,7 @@
         sendMessages(2000,15000);
     }
 
+    @Override
     protected void tearDown() throws Exception {
         for (int i = 0; i < channels.length; i++) {
             channels[i].stop(Channel.DEFAULT);

Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java Thu Nov  5
01:21:11 2009
@@ -20,6 +20,7 @@
 import junit.framework.TestCase;
 
 public class TestSerialization extends TestCase {
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
     }
@@ -28,6 +29,7 @@
         
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

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=832956&r1=832955&r2=832956&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 Thu
Nov  5 01:21:11 2009
@@ -33,6 +33,7 @@
     private ManagedChannel[] channels = new ManagedChannel[count];
     private TestMbrListener[] listeners = new TestMbrListener[count];
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         for (int i = 0; i < channels.length; i++) {
@@ -59,6 +60,7 @@
         for (int i=0; i<channels.length; i++ ) {
             final Channel channel = channels[i];
             Thread t = new Thread() {
+                @Override
                 public void run() {
                     try {
                         channel.start(Channel.DEFAULT);
@@ -75,6 +77,7 @@
         for (int i=listeners.length-1; i>=0; i-- ) assertEquals("Checking member arrival
length",0,listeners[i].members.size());
     }
 
+    @Override
     protected void tearDown() throws Exception {
 
         for (int i = 0; i < channels.length; i++) {

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=832956&r1=832955&r2=832956&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 Thu
Nov  5 01:21:11 2009
@@ -31,6 +31,7 @@
     private ManagedChannel[] channels = new ManagedChannel[count];
     private TestMbrListener[] listeners = new TestMbrListener[count];
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         for (int i = 0; i < channels.length; i++) {
@@ -55,6 +56,7 @@
         for (int i=0; i<channels.length; i++ ) {
             final Channel channel = channels[i];
             Thread t = new Thread() {
+                @Override
                 public void run() {
                     try {
                         channel.start(Channel.DEFAULT);
@@ -72,6 +74,7 @@
         for (int i=listeners.length-1; i>=0; i-- ) assertEquals("Checking member arrival
length",channels.length-1,listeners[i].members.size());
     }
 
+    @Override
     protected void tearDown() throws Exception {
 
         for (int i = 0; i < channels.length; i++) {

Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
Thu Nov  5 01:21:11 2009
@@ -33,6 +33,7 @@
     MemberImpl m1, m2, p1,p2;
     byte[] payload = null;
     int udpPort = 3445;
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         payload = new byte[333];
@@ -108,6 +109,7 @@
         return result;
     }
 
+    @Override
     protected void tearDown() throws Exception {
         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=832956&r1=832955&r2=832956&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
Thu Nov  5 01:21:11 2009
@@ -45,6 +45,7 @@
     private ManagedChannel channel2 = null;
     private TestMbrListener mbrlist1 = null;
     private TestMbrListener mbrlist2 = null;
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         channel1 = new GroupChannel();
@@ -122,6 +123,7 @@
     }
 
 
+    @Override
     protected void tearDown() throws Exception {
         tcpFailureDetector1 = null;
         tcpFailureDetector2 = null;

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=832956&r1=832955&r2=832956&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 Thu Nov
 5 01:21:11 2009
@@ -41,6 +41,7 @@
         socket.setReceiveBufferSize(43800);
         InputStream in = socket.getInputStream();
         Thread t = new Thread() {
+            @Override
             public void run() {
                 while ( true ) {
                     try {

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=832956&r1=832955&r2=832956&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 Thu
Nov  5 01:21:11 2009
@@ -45,6 +45,7 @@
         socket.setReceiveBufferSize(size);
         InputStream in = socket.getInputStream();
         Thread t = new Thread() {
+            @Override
             public void run() {
                 while ( true ) {
                     try {

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=832956&r1=832955&r2=832956&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
Thu Nov  5 01:21:11 2009
@@ -44,6 +44,7 @@
         InputStream in = socket.getInputStream();
         MyDataReader reader = new MyDataReader(50000);
         Thread t = new Thread() {
+            @Override
             public void run() {
                 while ( true ) {
                     try {

Modified: tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java (original)
+++ tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Thu Nov  5 01:21:11 2009
@@ -41,6 +41,7 @@
 
     private static class GetDateBenchmarkTest_Sync implements Runnable {
 
+        @Override
         public String toString() {
             return "Syncs";
         }
@@ -68,11 +69,13 @@
 
     private static class GetDateBenchmarkTest_Local implements Runnable {
 
+        @Override
         public String toString() {
             return "ThreadLocals";
         }
 
         private ThreadLocal<Long> currentMillisLocal = new ThreadLocal<Long>()
{
+            @Override
             protected Long initialValue() {
                 return Long.valueOf(0);
             }
@@ -97,6 +100,7 @@
     private static class GetDateBenchmarkTest_LocalMutableLong implements
             Runnable {
 
+        @Override
         public String toString() {
             return "ThreadLocals with a mutable Long";
         }
@@ -106,6 +110,7 @@
         }
 
         private ThreadLocal<MutableLong> currentMillisLocal = new ThreadLocal<MutableLong>()
{
+            @Override
             protected MutableLong initialValue() {
                 return new MutableLong();
             }
@@ -129,6 +134,7 @@
 
     private static class GetDateBenchmarkTest_LocalStruct implements Runnable {
 
+        @Override
         public String toString() {
             return "single ThreadLocal";
         }
@@ -140,6 +146,7 @@
         }
 
         private ThreadLocal<Struct> currentStruct = new ThreadLocal<Struct>()
{
+            @Override
             protected Struct initialValue() {
                 return new Struct();
             }
@@ -189,6 +196,7 @@
     private static class TimeDateElementBenchmarkTest_Sync extends
             TimeDateElementBenchmarkTestBase implements Runnable {
 
+        @Override
         public String toString() {
             return "Syncs";
         }
@@ -246,6 +254,7 @@
     private static class TimeDateElementBenchmarkTest_Local extends
             TimeDateElementBenchmarkTestBase implements Runnable {
 
+        @Override
         public String toString() {
             return "ThreadLocals";
         }
@@ -253,26 +262,31 @@
         private ThreadLocal<String> currentDateStringLocal = new ThreadLocal<String>();
 
         private ThreadLocal<Date> currentDateLocal = new ThreadLocal<Date>()
{
+            @Override
             protected Date initialValue() {
                 return new Date();
             }
         };
         private ThreadLocal<SimpleDateFormat> dayFormatterLocal = new ThreadLocal<SimpleDateFormat>()
{
+            @Override
             protected SimpleDateFormat initialValue() {
                 return new SimpleDateFormat("dd");
             }
         };
         private ThreadLocal<SimpleDateFormat> monthFormatterLocal = new ThreadLocal<SimpleDateFormat>()
{
+            @Override
             protected SimpleDateFormat initialValue() {
                 return new SimpleDateFormat("MM");
             }
         };
         private ThreadLocal<SimpleDateFormat> yearFormatterLocal = new ThreadLocal<SimpleDateFormat>()
{
+            @Override
             protected SimpleDateFormat initialValue() {
                 return new SimpleDateFormat("yyyy");
             }
         };
         private ThreadLocal<SimpleDateFormat> timeFormatterLocal = new ThreadLocal<SimpleDateFormat>()
{
+            @Override
             protected SimpleDateFormat initialValue() {
                 return new SimpleDateFormat("hh:mm:ss");
             }
@@ -317,6 +331,7 @@
     private static class TimeDateElementBenchmarkTest_LocalStruct extends
             TimeDateElementBenchmarkTestBase implements Runnable {
 
+        @Override
         public String toString() {
             return "single ThreadLocal";
         }
@@ -332,6 +347,7 @@
         }
 
         private ThreadLocal<Struct> structLocal = new ThreadLocal<Struct>() {
+            @Override
             protected Struct initialValue() {
                 return new Struct();
             }
@@ -375,6 +391,7 @@
     private static class TimeDateElementBenchmarkTest_LocalStruct_SBuilder extends
             TimeDateElementBenchmarkTestBase implements Runnable {
 
+        @Override
         public String toString() {
             return "single ThreadLocal, with StringBuilder";
         }
@@ -390,6 +407,7 @@
         }
 
         private ThreadLocal<Struct> structLocal = new ThreadLocal<Struct>() {
+            @Override
             protected Struct initialValue() {
                 return new Struct();
             }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java Thu Nov  5 01:21:11
2009
@@ -51,6 +51,7 @@
             this.cookieValue = cookieValue;
         }
         
+        @Override
         public void doGet(HttpServletRequest req, HttpServletResponse res) 
                 throws IOException {
             try {

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java?rev=832956&r1=832955&r2=832956&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java Thu
Nov  5 01:21:11 2009
@@ -28,6 +28,7 @@
  */
 public class TestCookiesNoFwdStrictSysProps extends CookiesBaseTest {
     
+    @Override
     public void testCookiesInstance() throws Exception {
 
         System.setProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE",



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


Mime
View raw message