aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-03-07 12:58:12 (EST)
committerThomas Becker2012-03-07 12:58:12 (EST)
commit3c0c01069046f0f8ca71643b37becd56fde9de70 (patch)
tree0eda00bcbf00585d790ae2eb398fc8d8c5f2a077
parent5416b93c7ed59ce0125497d149ccd322e3ffa90a (diff)
downloadorg.eclipse.jetty.project-3c0c01069046f0f8ca71643b37becd56fde9de70.zip
org.eclipse.jetty.project-3c0c01069046f0f8ca71643b37becd56fde9de70.tar.gz
org.eclipse.jetty.project-3c0c01069046f0f8ca71643b37becd56fde9de70.tar.bz2
373569: fix jdk7/macos ssl issue leading to SSLClostTest failuresrefs/changes/91/5291/1
-rw-r--r--jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java
index db9d0d7..c55f8d0 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java
@@ -51,16 +51,19 @@ public class SSLCloseTest extends TestCase
private static AsyncEndPoint __endp;
private static class CredulousTM implements TrustManager, X509TrustManager
{
+ @Override
public X509Certificate[] getAcceptedIssuers()
{
- return null;
+ return new X509Certificate[]{};
}
+ @Override
public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException
{
return;
}
+ @Override
public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException
{
return;
@@ -129,6 +132,7 @@ public class SSLCloseTest extends TestCase
private static class WriteHandler extends AbstractHandler
{
+ @Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
try