changeset 39730:196f4e25d9f5

8160993: Fix headers in the java/net/http package Reviewed-by: alanb
author chegar
date Mon, 18 Jul 2016 15:34:22 +0100
parents ef2b0635618f
children 7a4bc90065bd f5d65fcf55e4 0d41bfc821b3
files jdk/src/java.httpclient/share/classes/java/net/http/AsyncConnection.java jdk/src/java.httpclient/share/classes/java/net/http/AsyncEvent.java jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLConnection.java jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java jdk/src/java.httpclient/share/classes/java/net/http/BufferHandler.java jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferConsumer.java jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferGenerator.java jdk/src/java.httpclient/share/classes/java/net/http/CharsetToolkit.java jdk/src/java.httpclient/share/classes/java/net/http/ConnectionPool.java jdk/src/java.httpclient/share/classes/java/net/http/ContinuationFrame.java jdk/src/java.httpclient/share/classes/java/net/http/CookieFilter.java jdk/src/java.httpclient/share/classes/java/net/http/DataFrame.java jdk/src/java.httpclient/share/classes/java/net/http/ErrorFrame.java jdk/src/java.httpclient/share/classes/java/net/http/Exchange.java jdk/src/java.httpclient/share/classes/java/net/http/ExchangeImpl.java jdk/src/java.httpclient/share/classes/java/net/http/ExecutorWrapper.java jdk/src/java.httpclient/share/classes/java/net/http/FilterFactory.java jdk/src/java.httpclient/share/classes/java/net/http/FrameReader.java jdk/src/java.httpclient/share/classes/java/net/http/GoAwayFrame.java jdk/src/java.httpclient/share/classes/java/net/http/HeaderFilter.java jdk/src/java.httpclient/share/classes/java/net/http/HeaderFrame.java jdk/src/java.httpclient/share/classes/java/net/http/HeaderParser.java jdk/src/java.httpclient/share/classes/java/net/http/HeadersFrame.java jdk/src/java.httpclient/share/classes/java/net/http/Http1Exchange.java jdk/src/java.httpclient/share/classes/java/net/http/Http1Request.java jdk/src/java.httpclient/share/classes/java/net/http/Http1Response.java jdk/src/java.httpclient/share/classes/java/net/http/Http2ClientImpl.java jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java jdk/src/java.httpclient/share/classes/java/net/http/Http2Frame.java jdk/src/java.httpclient/share/classes/java/net/http/HttpClientBuilderImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpConnection.java jdk/src/java.httpclient/share/classes/java/net/http/HttpHeadersImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestBuilderImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestImpl.java jdk/src/java.httpclient/share/classes/java/net/http/HttpResponse.java jdk/src/java.httpclient/share/classes/java/net/http/ImmutableHeaders.java jdk/src/java.httpclient/share/classes/java/net/http/Log.java jdk/src/java.httpclient/share/classes/java/net/http/MultiExchange.java jdk/src/java.httpclient/share/classes/java/net/http/OutgoingHeaders.java jdk/src/java.httpclient/share/classes/java/net/http/Pair.java jdk/src/java.httpclient/share/classes/java/net/http/PingFrame.java jdk/src/java.httpclient/share/classes/java/net/http/PlainHttpConnection.java jdk/src/java.httpclient/share/classes/java/net/http/PlainProxyConnection.java jdk/src/java.httpclient/share/classes/java/net/http/PlainTunnelingConnection.java jdk/src/java.httpclient/share/classes/java/net/http/PriorityFrame.java jdk/src/java.httpclient/share/classes/java/net/http/PushPromiseFrame.java jdk/src/java.httpclient/share/classes/java/net/http/Queue.java jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java jdk/src/java.httpclient/share/classes/java/net/http/RawChannelImpl.java jdk/src/java.httpclient/share/classes/java/net/http/RedirectFilter.java jdk/src/java.httpclient/share/classes/java/net/http/ResetFrame.java jdk/src/java.httpclient/share/classes/java/net/http/ResponseContent.java jdk/src/java.httpclient/share/classes/java/net/http/ResponseHeaders.java jdk/src/java.httpclient/share/classes/java/net/http/SSLConnection.java jdk/src/java.httpclient/share/classes/java/net/http/SSLDelegate.java jdk/src/java.httpclient/share/classes/java/net/http/SSLTunnelConnection.java jdk/src/java.httpclient/share/classes/java/net/http/SettingsFrame.java jdk/src/java.httpclient/share/classes/java/net/http/Stream.java jdk/src/java.httpclient/share/classes/java/net/http/TimeoutEvent.java jdk/src/java.httpclient/share/classes/java/net/http/Utils.java jdk/src/java.httpclient/share/classes/java/net/http/WS.java jdk/src/java.httpclient/share/classes/java/net/http/WSBuilder.java jdk/src/java.httpclient/share/classes/java/net/http/WSCharsetToolkit.java jdk/src/java.httpclient/share/classes/java/net/http/WSDisposable.java jdk/src/java.httpclient/share/classes/java/net/http/WSFrame.java jdk/src/java.httpclient/share/classes/java/net/http/WSFrameConsumer.java jdk/src/java.httpclient/share/classes/java/net/http/WSMessageConsumer.java jdk/src/java.httpclient/share/classes/java/net/http/WSMessageSender.java jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java jdk/src/java.httpclient/share/classes/java/net/http/WSOutgoingMessage.java jdk/src/java.httpclient/share/classes/java/net/http/WSProtocolException.java jdk/src/java.httpclient/share/classes/java/net/http/WSReceiver.java jdk/src/java.httpclient/share/classes/java/net/http/WSShared.java jdk/src/java.httpclient/share/classes/java/net/http/WSSharedPool.java jdk/src/java.httpclient/share/classes/java/net/http/WSSignalHandler.java jdk/src/java.httpclient/share/classes/java/net/http/WSTransmitter.java jdk/src/java.httpclient/share/classes/java/net/http/WSUtils.java jdk/src/java.httpclient/share/classes/java/net/http/WSWriter.java jdk/src/java.httpclient/share/classes/java/net/http/WebSocket.java jdk/src/java.httpclient/share/classes/java/net/http/WebSocketHandshakeException.java jdk/src/java.httpclient/share/classes/java/net/http/WindowUpdateFrame.java jdk/src/java.httpclient/share/classes/module-info.java
diffstat 84 files changed, 208 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncConnection.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncConnection.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncEvent.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncEvent.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLConnection.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLConnection.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.Closeable;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/BufferHandler.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/BufferHandler.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferConsumer.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferConsumer.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferGenerator.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ByteBufferGenerator.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/CharsetToolkit.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/CharsetToolkit.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ConnectionPool.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ConnectionPool.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.net.InetSocketAddress;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ContinuationFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ContinuationFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/CookieFilter.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/CookieFilter.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/DataFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/DataFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ErrorFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ErrorFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Exchange.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Exchange.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ExchangeImpl.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ExchangeImpl.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ExecutorWrapper.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ExecutorWrapper.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.security.AccessControlContext;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/FilterFactory.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/FilterFactory.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/FrameReader.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/FrameReader.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,8 +1,28 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2015, 2016, 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 java.net.http;
 
 import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/GoAwayFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/GoAwayFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HeaderFilter.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HeaderFilter.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HeaderFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HeaderFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HeaderParser.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HeaderParser.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.util.Iterator;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HeadersFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HeadersFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http1Exchange.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http1Exchange.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http1Request.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http1Request.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http1Response.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http1Response.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http2ClientImpl.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http2ClientImpl.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http2Connection.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Http2Frame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Http2Frame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientBuilderImpl.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientBuilderImpl.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpClientImpl.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import javax.net.ssl.SSLContext;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpConnection.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpConnection.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.Closeable;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpHeadersImpl.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpHeadersImpl.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.util.Collections;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestBuilderImpl.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestBuilderImpl.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.net.URI;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestImpl.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpRequestImpl.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponse.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/HttpResponse.java	Mon Jul 18 15:34:22 2016 +0100
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ImmutableHeaders.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ImmutableHeaders.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Log.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Log.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.util.Locale;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/MultiExchange.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/MultiExchange.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/OutgoingHeaders.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/OutgoingHeaders.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Pair.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Pair.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 /**
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PingFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PingFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PlainHttpConnection.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PlainHttpConnection.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PlainProxyConnection.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PlainProxyConnection.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PlainTunnelingConnection.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PlainTunnelingConnection.java	Mon Jul 18 15:34:22 2016 +0100
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PriorityFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PriorityFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/PushPromiseFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/PushPromiseFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Queue.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Queue.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/RawChannel.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/RawChannelImpl.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/RawChannelImpl.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/RedirectFilter.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/RedirectFilter.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ResetFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ResetFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ResponseContent.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ResponseContent.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/ResponseHeaders.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/ResponseHeaders.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/SSLConnection.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/SSLConnection.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/SSLDelegate.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/SSLDelegate.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/SSLTunnelConnection.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/SSLTunnelConnection.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/SettingsFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/SettingsFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Stream.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/TimeoutEvent.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/TimeoutEvent.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/Utils.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/Utils.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import sun.net.NetProperties;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WS.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WS.java	Mon Jul 18 15:34:22 2016 +0100
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSBuilder.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSBuilder.java	Mon Jul 18 15:34:22 2016 +0100
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.net.URI;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSCharsetToolkit.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSCharsetToolkit.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -20,7 +20,9 @@
  *
  * 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 java.net.http;
 
 import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSDisposable.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSDisposable.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 interface WSDisposable {
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSFrameConsumer.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSFrameConsumer.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.net.http.WSFrame.Opcode;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSMessageConsumer.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSMessageConsumer.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.net.http.WebSocket.CloseCode;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSMessageSender.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSMessageSender.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.net.http.WSFrame.HeaderBuilder;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSOpeningHandshake.java	Mon Jul 18 15:34:22 2016 +0100
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.io.UncheckedIOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSOutgoingMessage.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSOutgoingMessage.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.nio.ByteBuffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSProtocolException.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSProtocolException.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,3 +1,28 @@
+/*
+ * Copyright (c) 2015, 2016, 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 java.net.http;
 
 import java.net.http.WebSocket.CloseCode;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSReceiver.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSReceiver.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSShared.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSShared.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.nio.Buffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSSharedPool.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSSharedPool.java	Mon Jul 18 15:34:22 2016 +0100
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.nio.Buffer;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSSignalHandler.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSSignalHandler.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.util.concurrent.Executor;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSTransmitter.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSTransmitter.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.net.http.WSOutgoingMessage.Binary;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSUtils.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSUtils.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.net.URI;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSWriter.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSWriter.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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  License version 2 only, as
+ * 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  License
+ * 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  License version
+ * 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.
  *
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WebSocket.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WebSocket.java	Mon Jul 18 15:34:22 2016 +0100
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 import java.io.IOException;
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WebSocketHandshakeException.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WebSocketHandshakeException.java	Mon Jul 18 15:34:22 2016 +0100
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net.http;
 
 /**
--- a/jdk/src/java.httpclient/share/classes/java/net/http/WindowUpdateFrame.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WindowUpdateFrame.java	Mon Jul 18 15:34:22 2016 +0100
@@ -20,6 +20,7 @@
  *
  * 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 java.net.http;
--- a/jdk/src/java.httpclient/share/classes/module-info.java	Mon Jul 18 13:43:49 2016 +0100
+++ b/jdk/src/java.httpclient/share/classes/module-info.java	Mon Jul 18 15:34:22 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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