summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorThomas Becker2012-03-07 13:09:29 (EST)
committer Thomas Becker2012-03-07 13:09:29 (EST)
commit511f4ea957da878e624f47be91274d57f4037e5e (patch)
tree56e979d0309c6cfa84833d826e59e31deb7106ef
parent5416b93c7ed59ce0125497d149ccd322e3ffa90a (diff)
downloadorg.eclipse.jetty.project-511f4ea957da878e624f47be91274d57f4037e5e.zip
org.eclipse.jetty.project-511f4ea957da878e624f47be91274d57f4037e5e.tar.gz
org.eclipse.jetty.project-511f4ea957da878e624f47be91274d57f4037e5e.tar.bz2
373572: fix jdk7/macos ssl issue leading to ConnectHandlerSSLTest failuresrefs/changes/92/5292/1
-rw-r--r--jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java
index 07977ee..18e4cd2 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java
@@ -178,22 +178,26 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest
private class AlwaysTrustManager implements X509TrustManager
{
+ @Override
public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException
{
}
+ @Override
public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException
{
}
+ @Override
public X509Certificate[] getAcceptedIssuers()
{
- return null;
+ return new X509Certificate[]{};
}
}
private static class ServerHandler extends AbstractHandler
{
+ @Override
public void handle(String target, Request request, HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws IOException, ServletException
{
request.setHandled(true);