From 4d5cb666ad87ee19399f113ad4f51db411c23b30 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 21 Dec 2010 01:57:50 +0000 Subject: [PATCH] Fix Checkstyle / Eclipse nags git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1051358 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tomcat/util/threads/DedicatedThreadExecutorTest.java | 4 ++-- test/org/apache/tomcat/util/threads/TestCounterLatch.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java b/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java index 22f84311c..ae1627aba 100644 --- a/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java +++ b/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java @@ -32,7 +32,7 @@ public class DedicatedThreadExecutorTest extends TestCase { dedicatedThread = Thread.currentThread(); DedicatedThreadExecutorTest.assertNotSame(testingThread, dedicatedThread); - return 123L; + return Long.valueOf(123); } }); assertEquals(123, result.longValue()); @@ -60,7 +60,7 @@ public class DedicatedThreadExecutorTest extends TestCase { dedicatedThread = Thread.currentThread(); DedicatedThreadExecutorTest.assertNotSame(testingThread, dedicatedThread); - return 456L; + return Long.valueOf(456); } }); assertEquals(456, result.longValue()); diff --git a/test/org/apache/tomcat/util/threads/TestCounterLatch.java b/test/org/apache/tomcat/util/threads/TestCounterLatch.java index e5110c791..34ac94cc4 100644 --- a/test/org/apache/tomcat/util/threads/TestCounterLatch.java +++ b/test/org/apache/tomcat/util/threads/TestCounterLatch.java @@ -22,10 +22,7 @@ public class TestCounterLatch extends TestCase { private volatile CounterLatch latch = null; - public void setUp() { - - } - + @Override public void tearDown() { CounterLatch temp = latch; if (temp!=null) temp.releaseAll(); @@ -41,6 +38,7 @@ public class TestCounterLatch extends TestCase { latch = new CounterLatch(0,1); assertEquals("No threads should be waiting", false, latch.hasQueuedThreads()); Thread testThread = new Thread() { + @Override public void run() { try { latch.await(); @@ -61,6 +59,7 @@ public class TestCounterLatch extends TestCase { latch = new CounterLatch(0,1); assertEquals("No threads should be waiting", false, latch.hasQueuedThreads()); Thread testThread = new Thread() { + @Override public void run() { try { latch.await(); @@ -82,6 +81,7 @@ public class TestCounterLatch extends TestCase { latch = new CounterLatch(1,0); assertEquals("No threads should be waiting", false, latch.hasQueuedThreads()); Thread testThread = new Thread() { + @Override public void run() { try { //System.out.println("Entering ["+Thread.currentThread().getName()+"]"); @@ -105,6 +105,7 @@ public class TestCounterLatch extends TestCase { latch = new CounterLatch(1,0); assertEquals("No threads should be waiting", false, latch.hasQueuedThreads()); Thread testThread = new Thread() { + @Override public void run() { try { latch.await(); -- 2.11.0