changeset 26221:47fd8b933a5c

8055299: HttpsURLConnection.equals() broken Reviewed-by: chegar, xuelei
author michaelm
date Thu, 28 Aug 2014 10:17:55 +0100
parents 3634fa432b00
children 314e94fc6805
files jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java jdk/test/javax/net/ssl/HttpsURLConnection/Equals.java
diffstat 2 files changed, 104 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java	Wed Aug 27 10:14:16 2014 +0200
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java	Thu Aug 28 10:17:55 2014 +0100
@@ -501,7 +501,8 @@
     }
 
     public boolean equals(Object obj) {
-        return delegate.equals(obj);
+        return this == obj || ((obj instanceof HttpsURLConnectionImpl) &&
+            delegate.equals(((HttpsURLConnectionImpl)obj).delegate));
     }
 
     public int hashCode() {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/net/ssl/HttpsURLConnection/Equals.java	Thu Aug 28 10:17:55 2014 +0100
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run main Equals
+ * @bug 8055299
+ */
+
+import com.sun.net.httpserver.*;
+
+import java.net.*;
+import java.util.*;
+import java.io.*;
+import javax.net.ssl.*;
+import java.util.concurrent.*;
+import jdk.testlibrary.SimpleSSLContext;
+
+public class Equals {
+
+    static SSLContext ctx;
+
+    public static void main (String[] args) throws Exception {
+        HttpsServer s2 = null;
+        ExecutorService executor=null;
+        try {
+            InetSocketAddress addr = new InetSocketAddress (0);
+            s2 = HttpsServer.create (addr, 0);
+            HttpHandler h = new Handler ();
+            HttpContext c2 = s2.createContext ("/test1", h);
+            executor = Executors.newCachedThreadPool();
+            s2.setExecutor (executor);
+            ctx = new SimpleSSLContext().get();
+            s2.setHttpsConfigurator(new HttpsConfigurator (ctx));
+            s2.start();
+
+            int httpsport = s2.getAddress().getPort();
+            test(httpsport);
+            System.out.println ("OK");
+        } finally {
+            if (s2 != null)
+                s2.stop(2);
+            if (executor != null)
+                executor.shutdown ();
+        }
+    }
+
+    static class Handler implements HttpHandler {
+        int invocation = 1;
+        public void handle (HttpExchange t)
+            throws IOException
+        {
+            InputStream is = t.getRequestBody();
+            while (is.read () != -1) {
+            }
+            is.close();
+            t.sendResponseHeaders (200, 0);
+            t.close();
+        }
+    }
+
+    static void test (int port) throws Exception {
+        URL url = new URL ("https://localhost:"+port+"/test1/");
+        HttpsURLConnection urlcs = (HttpsURLConnection) url.openConnection();
+        urlcs.setHostnameVerifier (new HostnameVerifier () {
+            public boolean verify (String s, SSLSession s1) {
+                return true;
+            }
+        });
+        urlcs.setSSLSocketFactory (ctx.getSocketFactory());
+
+        InputStream is = urlcs.getInputStream();
+        while (is.read() != -1) {
+        }
+        is.close();
+        if (!urlcs.equals(urlcs)) {
+            throw new RuntimeException("Test failed");
+        }
+    }
+}