diff -r 1019c97e1bde -r 43c2ab1bdfd3 src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java --- a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java Fri Mar 01 08:14:29 2019 -0500 +++ b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java Fri Mar 01 08:35:14 2019 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2019, 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 @@ -23,17 +23,7 @@ * questions. */ -/* - * NOTE: This class lives in the package sun.net.www.protocol.https. - * There is a copy in com.sun.net.ssl.internal.www.protocol.https for JSSE - * 1.0.2 compatibility. It is 100% identical except the package and extends - * lines. Any changes should be made to be class in sun.net.* and then copied - * to com.sun.net.*. - */ - -// For both copies of the file, uncomment one line and comment the other package sun.net.www.protocol.https; -// package com.sun.net.ssl.internal.www.protocol.https; import java.net.URL; import java.net.Proxy; @@ -64,21 +54,13 @@ * the way to Object. * */ - -// For both copies of the file, uncomment one line and comment the -// other. The differences between the two copies are introduced for -// plugin, and it is marked as such. public class HttpsURLConnectionImpl extends javax.net.ssl.HttpsURLConnection { -// public class HttpsURLConnectionOldImpl -// extends com.sun.net.ssl.HttpsURLConnection { // NOTE: made protected for plugin so that subclass can set it. protected DelegateHttpsURLConnection delegate; -// For both copies of the file, uncomment one line and comment the other HttpsURLConnectionImpl(URL u, Handler handler) throws IOException { -// HttpsURLConnectionOldImpl(URL u, Handler handler) throws IOException { this(u, null, handler); } @@ -90,9 +72,8 @@ } return u; } -// For both copies of the file, uncomment one line and comment the other + HttpsURLConnectionImpl(URL u, Proxy p, Handler handler) throws IOException { -// HttpsURLConnectionOldImpl(URL u, Proxy p, Handler handler) throws IOException { super(checkURL(u)); delegate = new DelegateHttpsURLConnection(url, p, handler, this); }