From db2e68a31dceb5ab4b4fc68ebd7f2d04e410e23c Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 5 Nov 2009 01:21:11 +0000 Subject: [PATCH] Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 Patch provided by sebb git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@832956 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tomcat/jdbc/test/CheckOutThreadTest.java | 1 + .../org/apache/tomcat/jdbc/test/ConnectCountTest.java | 1 + .../org/apache/tomcat/jdbc/test/DefaultTestCase.java | 1 + .../test/org/apache/tomcat/jdbc/test/FairnessTest.java | 1 + .../org/apache/tomcat/jdbc/test/TestAsyncQueue.java | 3 +++ test/org/apache/catalina/connector/TestRequest.java | 1 + test/org/apache/catalina/core/TestStandardContext.java | 1 + test/org/apache/catalina/startup/TestTomcat.java | 3 +++ test/org/apache/catalina/startup/TomcatBaseTest.java | 2 ++ .../apache/catalina/tribes/demos/CoordinationDemo.java | 3 +++ test/org/apache/catalina/tribes/demos/EchoRpcTest.java | 2 ++ test/org/apache/catalina/tribes/demos/LoadTest.java | 4 ++++ test/org/apache/catalina/tribes/demos/MapDemo.java | 5 +++++ .../catalina/tribes/demos/MembersWithProperties.java | 1 + .../tribes/test/channel/TestChannelOptionFlag.java | 2 ++ .../tribes/test/channel/TestChannelStartStop.java | 2 ++ .../tribes/test/channel/TestDataIntegrity.java | 4 ++++ .../tribes/test/channel/TestMulticastPackages.java | 3 +++ .../test/channel/TestRemoteProcessException.java | 2 ++ .../catalina/tribes/test/channel/TestUdpPackages.java | 4 ++++ .../test/interceptors/TestNonBlockingCoordinator.java | 3 +++ .../tribes/test/interceptors/TestOrderInterceptor.java | 4 ++++ .../catalina/tribes/test/io/TestSenderConnections.java | 2 ++ .../catalina/tribes/test/io/TestSerialization.java | 2 ++ .../tribes/test/membership/TestDomainFilter.java | 3 +++ .../tribes/test/membership/TestMemberArrival.java | 3 +++ .../test/membership/TestMemberSerialization.java | 2 ++ .../tribes/test/membership/TestTcpFailureDetector.java | 2 ++ .../catalina/tribes/test/transport/SocketReceive.java | 1 + .../tribes/test/transport/SocketTribesReceive.java | 1 + .../tribes/test/transport/SocketValidateReceive.java | 1 + test/org/apache/catalina/valves/Benchmarks.java | 18 ++++++++++++++++++ test/org/apache/tomcat/util/http/CookiesBaseTest.java | 1 + .../util/http/TestCookiesNoFwdStrictSysProps.java | 1 + 34 files changed, 90 insertions(+) diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java index 9b859c61c..0c718b4b8 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java @@ -374,6 +374,7 @@ public class CheckOutThreadTest extends DefaultTestCase { 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 { diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java index f0e8c103b..98273954e 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java @@ -239,6 +239,7 @@ public class ConnectCountTest extends DefaultTestCase { 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(); diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java index 47526925f..f19ff638c 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java @@ -171,6 +171,7 @@ public class DefaultTestCase extends TestCase { } + @Override protected void tearDown() throws Exception { try {datasource.close();}catch(Exception ignore){} try {tDatasource.close();}catch(Exception ignore){} diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java index 9f7164e70..b296eeefa 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java @@ -218,6 +218,7 @@ public class FairnessTest extends DefaultTestCase { 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(); diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java index d8ee55eeb..7f21c5208 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java @@ -27,11 +27,13 @@ import junit.framework.TestCase; public class TestAsyncQueue extends TestCase { protected FairBlockingQueue queue = null; + @Override protected void setUp() throws Exception { super.setUp(); this.queue = new FairBlockingQueue(); } + @Override protected void tearDown() throws Exception { this.queue = null; super.tearDown(); @@ -72,6 +74,7 @@ public class TestAsyncQueue extends TestCase { this.setDaemon(false); this.setName(TestAsyncQueue.class.getName()+"-OfferThread"); } + @Override public void run() { try { sleep(delay); diff --git a/test/org/apache/catalina/connector/TestRequest.java b/test/org/apache/catalina/connector/TestRequest.java index 9bc19dcff..45bb7cd46 100644 --- a/test/org/apache/catalina/connector/TestRequest.java +++ b/test/org/apache/catalina/connector/TestRequest.java @@ -177,6 +177,7 @@ public class TestRequest extends TomcatBaseTest { return null; } + @Override public boolean isResponseBodyOK() { if (getResponseBody() == null) { return false; diff --git a/test/org/apache/catalina/core/TestStandardContext.java b/test/org/apache/catalina/core/TestStandardContext.java index b9d2b7d48..6607e2d73 100644 --- a/test/org/apache/catalina/core/TestStandardContext.java +++ b/test/org/apache/catalina/core/TestStandardContext.java @@ -79,6 +79,7 @@ public class TestStandardContext extends TomcatBaseTest { } private static final class Bug46243Client extends SimpleHttpClient { + @Override public boolean isResponseBodyOK() { // Don't care about the body in this test return true; diff --git a/test/org/apache/catalina/startup/TestTomcat.java b/test/org/apache/catalina/startup/TestTomcat.java index c7c0cf253..bb0380093 100644 --- a/test/org/apache/catalina/startup/TestTomcat.java +++ b/test/org/apache/catalina/startup/TestTomcat.java @@ -40,6 +40,7 @@ public class TestTomcat extends TomcatBaseTest { 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 @@ public class TestTomcat extends TomcatBaseTest { private static final String JNDI_ENV_NAME = "test"; + @Override public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { @@ -79,6 +81,7 @@ public class TestTomcat extends TomcatBaseTest { 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"); diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java index 4df959c36..715930d53 100644 --- a/test/org/apache/catalina/startup/TomcatBaseTest.java +++ b/test/org/apache/catalina/startup/TomcatBaseTest.java @@ -66,6 +66,7 @@ public abstract class TomcatBaseTest extends TestCase { return getPort(); } + @Override public void setUp() throws Exception { tempDir = new File("output/tmp"); tempDir.mkdir(); @@ -80,6 +81,7 @@ public abstract class TomcatBaseTest extends TestCase { tomcat.setPort(port); } + @Override public void tearDown() throws Exception { tomcat.stop(); ExpandWar.delete(tempDir); diff --git a/test/org/apache/catalina/tribes/demos/CoordinationDemo.java b/test/org/apache/catalina/tribes/demos/CoordinationDemo.java index 43453ef5a..770b203f2 100644 --- a/test/org/apache/catalina/tribes/demos/CoordinationDemo.java +++ b/test/org/apache/catalina/tribes/demos/CoordinationDemo.java @@ -136,6 +136,7 @@ public class CoordinationDemo { 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 @@ public class CoordinationDemo { 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 @@ public class CoordinationDemo { channel = new GroupChannel(); ((ReceiverBase)channel.getChannelReceiver()).setAutoBind(100); interceptor = new NonBlockingCoordinator() { + @Override public void fireInterceptorEvent(InterceptorEvent event) { status = event.getEventTypeDesc(); int type = event.getEventType(); diff --git a/test/org/apache/catalina/tribes/demos/EchoRpcTest.java b/test/org/apache/catalina/tribes/demos/EchoRpcTest.java index 22ce16142..fec7c5dd9 100644 --- a/test/org/apache/catalina/tribes/demos/EchoRpcTest.java +++ b/test/org/apache/catalina/tribes/demos/EchoRpcTest.java @@ -185,6 +185,7 @@ public class EchoRpcTest implements RpcCallback, Runnable { this.channel = channel; } + @Override public void run() { System.out.println("Shutting down..."); SystemExit exit = new SystemExit(5000); @@ -204,6 +205,7 @@ public class EchoRpcTest implements RpcCallback, Runnable { public SystemExit(long delay) { this.delay = delay; } + @Override public void run () { try { Thread.sleep(delay); diff --git a/test/org/apache/catalina/tribes/demos/LoadTest.java b/test/org/apache/catalina/tribes/demos/LoadTest.java index 38e303c8f..462dd1c9a 100644 --- a/test/org/apache/catalina/tribes/demos/LoadTest.java +++ b/test/org/apache/catalina/tribes/demos/LoadTest.java @@ -265,6 +265,7 @@ public class LoadTest implements MembershipListener,ChannelListener, Runnable { // Default constructor } + @Override public byte[] getMessage() { if ( message == null ) { message = outdata; @@ -272,6 +273,7 @@ public class LoadTest implements MembershipListener,ChannelListener, Runnable { return message; } + @Override public void setMessage(byte[] data) { this.message = data; } @@ -382,6 +384,7 @@ public class LoadTest implements MembershipListener,ChannelListener, Runnable { this.channel = channel; } + @Override public void run() { System.out.println("Shutting down..."); SystemExit exit = new SystemExit(5000); @@ -401,6 +404,7 @@ public class LoadTest implements MembershipListener,ChannelListener, Runnable { public SystemExit(long delay) { this.delay = delay; } + @Override public void run () { try { Thread.sleep(delay); diff --git a/test/org/apache/catalina/tribes/demos/MapDemo.java b/test/org/apache/catalina/tribes/demos/MapDemo.java index ab6e7e194..6984be380 100644 --- a/test/org/apache/catalina/tribes/demos/MapDemo.java +++ b/test/org/apache/catalina/tribes/demos/MapDemo.java @@ -166,6 +166,7 @@ public class MapDemo implements ChannelListener, MembershipListener{ } + @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 @@ public class MapDemo implements ChannelListener, MembershipListener{ this.delay = delay; } + @Override public void run() { try { Thread.sleep(delay); @@ -285,6 +287,7 @@ public class MapDemo implements ChannelListener, MembershipListener{ if (DEBUG) { table.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { printDebugData(table); } @@ -375,6 +378,7 @@ public class MapDemo implements ChannelListener, MembershipListener{ } 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 @@ public class MapDemo implements ChannelListener, MembershipListener{ super(); } + @Override public Component getTableCellRendererComponent (JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { diff --git a/test/org/apache/catalina/tribes/demos/MembersWithProperties.java b/test/org/apache/catalina/tribes/demos/MembersWithProperties.java index e817d95ef..f02399db5 100644 --- a/test/org/apache/catalina/tribes/demos/MembersWithProperties.java +++ b/test/org/apache/catalina/tribes/demos/MembersWithProperties.java @@ -106,6 +106,7 @@ public class MembersWithProperties implements MembershipListener{ this.channel = channel; } + @Override public void run() { System.out.println("Shutting down..."); try { diff --git a/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java b/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java index 6595f3356..2beb8c7b9 100644 --- a/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java +++ b/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java @@ -34,11 +34,13 @@ import org.apache.catalina.tribes.ChannelException; */ 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 */ } diff --git a/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java b/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java index 517c51685..0bfbf011a 100644 --- a/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java +++ b/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java @@ -27,11 +27,13 @@ import org.apache.catalina.tribes.transport.ReceiverBase; 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 */ } diff --git a/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java b/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java index c5bf7b359..642ed59f4 100644 --- a/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java +++ b/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java @@ -44,6 +44,7 @@ public class TestDataIntegrity extends TestCase { GroupChannel channel2; Listener listener1; int threadCounter = 0; + @Override protected void setUp() throws Exception { super.setUp(); channel1 = new GroupChannel(); @@ -56,6 +57,7 @@ public class TestDataIntegrity extends TestCase { channel2.start(Channel.DEFAULT); } + @Override protected void tearDown() throws Exception { super.tearDown(); channel1.stop(Channel.DEFAULT); @@ -67,6 +69,7 @@ public class TestDataIntegrity extends TestCase { Thread[] threads = new Thread[threadCount]; for (int x=0; x=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++) { diff --git a/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java b/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java index e74af4cfd..b57fe054c 100644 --- a/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java +++ b/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java @@ -31,6 +31,7 @@ public class TestMemberArrival 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 @@ public class TestMemberArrival for (int i=0; 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++) { diff --git a/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java b/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java index 623f67446..2eef4416a 100644 --- a/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java +++ b/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java @@ -33,6 +33,7 @@ public class TestMemberSerialization extends TestCase { 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 @@ public class TestMemberSerialization extends TestCase { return result; } + @Override protected void tearDown() throws Exception { super.tearDown(); } diff --git a/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java b/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java index e0600dbde..ded0be283 100644 --- a/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java +++ b/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java @@ -45,6 +45,7 @@ public class TestTcpFailureDetector extends TestCase { 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 @@ public class TestTcpFailureDetector extends TestCase { } + @Override protected void tearDown() throws Exception { tcpFailureDetector1 = null; tcpFailureDetector2 = null; diff --git a/test/org/apache/catalina/tribes/test/transport/SocketReceive.java b/test/org/apache/catalina/tribes/test/transport/SocketReceive.java index 1619b25b9..bb90f4c06 100644 --- a/test/org/apache/catalina/tribes/test/transport/SocketReceive.java +++ b/test/org/apache/catalina/tribes/test/transport/SocketReceive.java @@ -41,6 +41,7 @@ public class SocketReceive { socket.setReceiveBufferSize(43800); InputStream in = socket.getInputStream(); Thread t = new Thread() { + @Override public void run() { while ( true ) { try { diff --git a/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java b/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java index e4b055567..97f0099c1 100644 --- a/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java +++ b/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java @@ -45,6 +45,7 @@ public class SocketTribesReceive { socket.setReceiveBufferSize(size); InputStream in = socket.getInputStream(); Thread t = new Thread() { + @Override public void run() { while ( true ) { try { diff --git a/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java b/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java index e6193be5d..aa7113301 100644 --- a/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java +++ b/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java @@ -44,6 +44,7 @@ public class SocketValidateReceive { InputStream in = socket.getInputStream(); MyDataReader reader = new MyDataReader(50000); Thread t = new Thread() { + @Override public void run() { while ( true ) { try { diff --git a/test/org/apache/catalina/valves/Benchmarks.java b/test/org/apache/catalina/valves/Benchmarks.java index 6fee6e10d..a986fa8b4 100644 --- a/test/org/apache/catalina/valves/Benchmarks.java +++ b/test/org/apache/catalina/valves/Benchmarks.java @@ -41,6 +41,7 @@ public class Benchmarks extends TestCase { private static class GetDateBenchmarkTest_Sync implements Runnable { + @Override public String toString() { return "Syncs"; } @@ -68,11 +69,13 @@ public class Benchmarks extends TestCase { private static class GetDateBenchmarkTest_Local implements Runnable { + @Override public String toString() { return "ThreadLocals"; } private ThreadLocal currentMillisLocal = new ThreadLocal() { + @Override protected Long initialValue() { return Long.valueOf(0); } @@ -97,6 +100,7 @@ public class Benchmarks extends TestCase { private static class GetDateBenchmarkTest_LocalMutableLong implements Runnable { + @Override public String toString() { return "ThreadLocals with a mutable Long"; } @@ -106,6 +110,7 @@ public class Benchmarks extends TestCase { } private ThreadLocal currentMillisLocal = new ThreadLocal() { + @Override protected MutableLong initialValue() { return new MutableLong(); } @@ -129,6 +134,7 @@ public class Benchmarks extends TestCase { private static class GetDateBenchmarkTest_LocalStruct implements Runnable { + @Override public String toString() { return "single ThreadLocal"; } @@ -140,6 +146,7 @@ public class Benchmarks extends TestCase { } private ThreadLocal currentStruct = new ThreadLocal() { + @Override protected Struct initialValue() { return new Struct(); } @@ -189,6 +196,7 @@ public class Benchmarks extends TestCase { private static class TimeDateElementBenchmarkTest_Sync extends TimeDateElementBenchmarkTestBase implements Runnable { + @Override public String toString() { return "Syncs"; } @@ -246,6 +254,7 @@ public class Benchmarks extends TestCase { private static class TimeDateElementBenchmarkTest_Local extends TimeDateElementBenchmarkTestBase implements Runnable { + @Override public String toString() { return "ThreadLocals"; } @@ -253,26 +262,31 @@ public class Benchmarks extends TestCase { private ThreadLocal currentDateStringLocal = new ThreadLocal(); private ThreadLocal currentDateLocal = new ThreadLocal() { + @Override protected Date initialValue() { return new Date(); } }; private ThreadLocal dayFormatterLocal = new ThreadLocal() { + @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat("dd"); } }; private ThreadLocal monthFormatterLocal = new ThreadLocal() { + @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat("MM"); } }; private ThreadLocal yearFormatterLocal = new ThreadLocal() { + @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat("yyyy"); } }; private ThreadLocal timeFormatterLocal = new ThreadLocal() { + @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat("hh:mm:ss"); } @@ -317,6 +331,7 @@ public class Benchmarks extends TestCase { private static class TimeDateElementBenchmarkTest_LocalStruct extends TimeDateElementBenchmarkTestBase implements Runnable { + @Override public String toString() { return "single ThreadLocal"; } @@ -332,6 +347,7 @@ public class Benchmarks extends TestCase { } private ThreadLocal structLocal = new ThreadLocal() { + @Override protected Struct initialValue() { return new Struct(); } @@ -375,6 +391,7 @@ public class Benchmarks extends TestCase { private static class TimeDateElementBenchmarkTest_LocalStruct_SBuilder extends TimeDateElementBenchmarkTestBase implements Runnable { + @Override public String toString() { return "single ThreadLocal, with StringBuilder"; } @@ -390,6 +407,7 @@ public class Benchmarks extends TestCase { } private ThreadLocal structLocal = new ThreadLocal() { + @Override protected Struct initialValue() { return new Struct(); } diff --git a/test/org/apache/tomcat/util/http/CookiesBaseTest.java b/test/org/apache/tomcat/util/http/CookiesBaseTest.java index d19eb73cc..712f9e5eb 100644 --- a/test/org/apache/tomcat/util/http/CookiesBaseTest.java +++ b/test/org/apache/tomcat/util/http/CookiesBaseTest.java @@ -51,6 +51,7 @@ public abstract class CookiesBaseTest extends TomcatBaseTest { this.cookieValue = cookieValue; } + @Override public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { try { diff --git a/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java b/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java index d717a0080..f7f18bd2d 100644 --- a/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java +++ b/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java @@ -28,6 +28,7 @@ import org.apache.tomcat.util.buf.ByteChunk; */ public class TestCookiesNoFwdStrictSysProps extends CookiesBaseTest { + @Override public void testCookiesInstance() throws Exception { System.setProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE", -- 2.11.0