# HG changeset patch # User dfuchs # Date 1511800801 0 # Node ID 9f345a97624981e9c4ee37fc2fa29a54155fb815 # Parent 050803da27e530e1c40509ea495105397994b12f http-client-branch: improve coverage for ExceptionallyCloseable diff -r 050803da27e5 -r 9f345a976249 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java --- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java Mon Nov 27 14:29:38 2017 +0000 +++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java Mon Nov 27 16:40:01 2017 +0000 @@ -40,7 +40,6 @@ import jdk.incubator.http.internal.common.SSLTube; import jdk.incubator.http.internal.common.Log; -import jdk.incubator.http.internal.common.ExceptionallyCloseable; import jdk.incubator.http.internal.common.Utils; @@ -63,7 +62,6 @@ * */ abstract class AbstractAsyncSSLConnection extends HttpConnection - implements ExceptionallyCloseable { protected final SSLEngine engine; protected final String serverName; diff -r 050803da27e5 -r 9f345a976249 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java --- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java Mon Nov 27 14:29:38 2017 +0000 +++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java Mon Nov 27 16:40:01 2017 +0000 @@ -90,13 +90,7 @@ ConnectionPool.CacheKey cacheKey() { return ConnectionPool.cacheKey(address, null); } - - @Override - public void closeExceptionally(Throwable cause) { - debug.log(Level.DEBUG, () -> "closing: " + cause); - plainConnection.close(); - } - + @Override public void close() { plainConnection.close(); diff -r 050803da27e5 -r 9f345a976249 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java --- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java Mon Nov 27 14:29:38 2017 +0000 +++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java Mon Nov 27 16:40:01 2017 +0000 @@ -118,12 +118,6 @@ } @Override - public void closeExceptionally(Throwable cause) { - debug.log(Level.DEBUG, "Closing connection: ", cause); - plainConnection.close(); - } - - @Override SSLTube getConnectionFlow() { return flow; } diff -r 050803da27e5 -r 9f345a976249 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ExceptionallyCloseable.java --- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ExceptionallyCloseable.java Mon Nov 27 14:29:38 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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. - */ - -package jdk.incubator.http.internal.common; - -import java.io.Closeable; -import java.io.IOException; - -/** - * Implemented by closeable objects which might be able to report - * an error when closed due to exceptional conditions. - */ -public interface ExceptionallyCloseable extends Closeable { - - /** - * Called when an instance of {@code ExceptionallyCloseable} is closed - * due to some exceptional condition revealed by {@code cause}. - * - * @implSpec The default implementation of this method simply calls - * {@link #close()}. Implementation of this interface are - * suppose to override this method in order to ensure that - * the cause is properly reported. - * - * @param cause The reason for which the object is closed. - * @throws IOException if {@link #close()} fails. - */ - public default void closeExceptionally(Throwable cause) throws IOException { - close(); - } - - public static void close(Throwable t, Closeable c) throws IOException { - if (c instanceof ExceptionallyCloseable) { - ((ExceptionallyCloseable)c).closeExceptionally(t); - } else { - c.close(); - } - } -} diff -r 050803da27e5 -r 9f345a976249 test/jdk/java/net/httpclient/http2/server/ExceptionallyCloseable.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/net/httpclient/http2/server/ExceptionallyCloseable.java Mon Nov 27 16:40:01 2017 +0000 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2016, 2017, 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. + */ + +import java.io.Closeable; +import java.io.IOException; + +/** + * Implemented by closeable objects which might be able to report + * an error when closed due to exceptional conditions. + */ +public interface ExceptionallyCloseable extends Closeable { + + /** + * Called when an instance of {@code ExceptionallyCloseable} is closed + * due to some exceptional condition revealed by {@code cause}. + * + * @implSpec The default implementation of this method simply calls + * {@link #close()}. Implementation of this interface are + * suppose to override this method in order to ensure that + * the cause is properly reported. + * + * @param cause The reason for which the object is closed. + * @throws IOException if {@link #close()} fails. + */ + public default void closeExceptionally(Throwable cause) throws IOException { + close(); + } + + public static void close(Throwable t, Closeable c) throws IOException { + if (c instanceof ExceptionallyCloseable) { + ((ExceptionallyCloseable)c).closeExceptionally(t); + } else { + c.close(); + } + } +} diff -r 050803da27e5 -r 9f345a976249 test/jdk/java/net/httpclient/http2/server/Queue.java --- a/test/jdk/java/net/httpclient/http2/server/Queue.java Mon Nov 27 14:29:38 2017 +0000 +++ b/test/jdk/java/net/httpclient/http2/server/Queue.java Mon Nov 27 16:40:01 2017 +0000 @@ -23,8 +23,6 @@ * questions. */ -import jdk.incubator.http.internal.common.ExceptionallyCloseable; - import java.io.IOException; import java.util.LinkedList; import java.util.stream.Stream;