From a8bcd57ebe290978809572144b261a78ca12633b Mon Sep 17 00:00:00 2001
From: serb <unknown>
Date: Wed, 15 Nov 2017 07:07:16 -0800
Subject: [PATCH 001/196] 8189989: Improve container portability Reviewed-by:
 prr, azvegint, rhalade, skoivu

---
 src/java.desktop/share/classes/java/awt/Container.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/share/classes/java/awt/Container.java b/src/java.desktop/share/classes/java/awt/Container.java
index 5b3d404ff4f..88b07fe9b6e 100644
--- a/src/java.desktop/share/classes/java/awt/Container.java
+++ b/src/java.desktop/share/classes/java/awt/Container.java
@@ -35,6 +35,7 @@
 import java.beans.PropertyChangeListener;
 
 import java.io.IOException;
+import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
@@ -3720,8 +3721,15 @@ private void readObject(ObjectInputStream s)
         throws ClassNotFoundException, IOException
     {
         ObjectInputStream.GetField f = s.readFields();
-        Component [] tmpComponent = (Component[])f.get("component", EMPTY_ARRAY);
+        // array of components may not be present in the stream or may be null
+        Component [] tmpComponent = (Component[])f.get("component", null);
+        if (tmpComponent == null) {
+            tmpComponent = EMPTY_ARRAY;
+        }
         int ncomponents = (Integer) f.get("ncomponents", 0);
+        if (ncomponents < 0 || ncomponents > tmpComponent.length) {
+            throw new InvalidObjectException("Incorrect number of components");
+        }
         component = new java.util.ArrayList<Component>(ncomponents);
         for (int i = 0; i < ncomponents; ++i) {
             component.add(tmpComponent[i]);

From a2b7e2919333e3239c619f30e464f02026cdfcb5 Mon Sep 17 00:00:00 2001
From: weijun <unknown>
Date: Wed, 6 Dec 2017 21:17:19 +0800
Subject: [PATCH 002/196] 8189977: Improve permission portability Reviewed-by:
 rriggs

---
 .../share/classes/java/util/Hashtable.java    |  4 +++
 .../share/classes/java/util/Vector.java       | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/java.base/share/classes/java/util/Hashtable.java b/src/java.base/share/classes/java/util/Hashtable.java
index 172343c02bf..4123718baf7 100644
--- a/src/java.base/share/classes/java/util/Hashtable.java
+++ b/src/java.base/share/classes/java/util/Hashtable.java
@@ -1293,6 +1293,10 @@ void readHashtable(java.io.ObjectInputStream s)
             length--;
         length = Math.min(length, origlength);
 
+        if (length < 0) { // overflow
+            length = origlength;
+        }
+
         // Check Map.Entry[].class since it's the nearest public type to
         // what we're actually creating.
         SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Map.Entry[].class, length);
diff --git a/src/java.base/share/classes/java/util/Vector.java b/src/java.base/share/classes/java/util/Vector.java
index 39a40bded72..8648f3ab5f7 100644
--- a/src/java.base/share/classes/java/util/Vector.java
+++ b/src/java.base/share/classes/java/util/Vector.java
@@ -25,6 +25,9 @@
 
 package java.util;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.StreamCorruptedException;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
@@ -1168,6 +1171,29 @@ private void shiftTailOverGap(Object[] es, int lo, int hi) {
             es[i] = null;
     }
 
+    /**
+     * Loads a {@code Vector} instance from a stream
+     * (that is, deserializes it).
+     * This method performs checks to ensure the consistency
+     * of the fields.
+     *
+     * @param in the stream
+     * @throws java.io.IOException if an I/O error occurs
+     * @throws ClassNotFoundException if the stream contains data
+     *         of a non-existing class
+     */
+    private void readObject(ObjectInputStream in)
+            throws IOException, ClassNotFoundException {
+        ObjectInputStream.GetField gfields = in.readFields();
+        int count = gfields.get("elementCount", 0);
+        Object[] data = (Object[])gfields.get("elementData", null);
+        if (count < 0 || data == null || count > data.length) {
+            throw new StreamCorruptedException("Inconsistent vector internals");
+        }
+        elementCount = count;
+        elementData = data.clone();
+    }
+
     /**
      * Saves the state of the {@code Vector} instance to a stream
      * (that is, serializes it).

From 0b45a14b8e59a27f952139d30f7e510484b0f024 Mon Sep 17 00:00:00 2001
From: prr <unknown>
Date: Wed, 6 Dec 2017 14:35:58 -0800
Subject: [PATCH 003/196] 8183032: Upgrade to LittleCMS 2.9 Reviewed-by: serb,
 psadhukhan, mschoene, rhalade

---
 src/java.desktop/share/native/liblcms/LCMS.c  |   6 +-
 .../share/native/liblcms/cmsalpha.c           | 107 ++--
 .../share/native/liblcms/cmscam02.c           |   2 +-
 .../share/native/liblcms/cmscgats.c           | 295 +++++-----
 .../share/native/liblcms/cmscnvrt.c           |  15 +-
 .../share/native/liblcms/cmserr.c             |  10 +-
 .../share/native/liblcms/cmsgamma.c           | 458 ++++++++++-----
 .../share/native/liblcms/cmsgmt.c             |   4 +-
 .../share/native/liblcms/cmshalf.c            |   6 +-
 .../share/native/liblcms/cmsintrp.c           |  62 +-
 .../share/native/liblcms/cmsio0.c             |  71 ++-
 .../share/native/liblcms/cmsio1.c             |  38 +-
 .../share/native/liblcms/cmslut.c             | 129 +++--
 .../share/native/liblcms/cmsmd5.c             |   2 +-
 .../share/native/liblcms/cmsmtrx.c            |   2 +-
 .../share/native/liblcms/cmsnamed.c           |  49 +-
 .../share/native/liblcms/cmsopt.c             | 176 +++---
 .../share/native/liblcms/cmspack.c            | 539 ++++++++++--------
 .../share/native/liblcms/cmspcs.c             |  10 +-
 .../share/native/liblcms/cmsplugin.c          |  72 ++-
 .../share/native/liblcms/cmsps2.c             |  63 +-
 .../share/native/liblcms/cmssamp.c            |   2 +-
 src/java.desktop/share/native/liblcms/cmssm.c |   2 +-
 .../share/native/liblcms/cmstypes.c           | 231 +++++---
 .../share/native/liblcms/cmsvirt.c            |  56 +-
 .../share/native/liblcms/cmswtpnt.c           |   7 +-
 .../share/native/liblcms/cmsxform.c           |  33 +-
 src/java.desktop/share/native/liblcms/lcms2.h |  68 ++-
 .../share/native/liblcms/lcms2_internal.h     | 128 +++--
 .../share/native/liblcms/lcms2_plugin.h       |   6 +-
 30 files changed, 1595 insertions(+), 1054 deletions(-)

diff --git a/src/java.desktop/share/native/liblcms/LCMS.c b/src/java.desktop/share/native/liblcms/LCMS.c
index 17c49ad826c..329801b07f4 100644
--- a/src/java.desktop/share/native/liblcms/LCMS.c
+++ b/src/java.desktop/share/native/liblcms/LCMS.c
@@ -391,12 +391,12 @@ JNIEXPORT jbyteArray JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagNative
 {
     lcmsProfile_p sProf = (lcmsProfile_p)jlong_to_ptr(id);
     TagSignature_t sig;
-    cmsInt32Number tagSize;
+    cmsUInt32Number tagSize;
 
     jbyte* dataArray = NULL;
     jbyteArray data = NULL;
 
-    jint bufSize;
+    cmsUInt32Number bufSize;
 
     sig.j = tagSig;
 
@@ -839,7 +839,7 @@ static cmsHPROFILE _writeCookedTag(const cmsHPROFILE pfTarget,
     for (i = 0; i < tagCount; i++) {
         cmsBool isTagReady = FALSE;
         const cmsTagSignature s = cmsGetTagSignature(pfTarget, i);
-        const cmsInt32Number tagSize = cmsReadRawTag(pfTarget, s, NULL, 0);
+        const cmsUInt32Number tagSize = cmsReadRawTag(pfTarget, s, NULL, 0);
 
         if (s == sig) {
             // skip the user supplied tag
diff --git a/src/java.desktop/share/native/liblcms/cmsalpha.c b/src/java.desktop/share/native/liblcms/cmsalpha.c
index 277ed5598c3..d1ad61ab48d 100644
--- a/src/java.desktop/share/native/liblcms/cmsalpha.c
+++ b/src/java.desktop/share/native/liblcms/cmsalpha.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -55,7 +55,6 @@
 
 #include "lcms2_internal.h"
 
-
 // Alpha copy ------------------------------------------------------------------------------------------------------------------
 
 // Floor to byte, taking care of saturation
@@ -71,16 +70,16 @@ cmsINLINE cmsUInt8Number _cmsQuickSaturateByte(cmsFloat64Number d)
 
 // Return the size in bytes of a given formatter
 static
-int trueBytesSize(cmsUInt32Number Format)
+cmsUInt32Number trueBytesSize(cmsUInt32Number Format)
 {
-       int fmt_bytes = T_BYTES(Format);
+    cmsUInt32Number fmt_bytes = T_BYTES(Format);
 
-       // For double, the T_BYTES field returns zero
-       if (fmt_bytes == 0)
-              return sizeof(double);
+    // For double, the T_BYTES field returns zero
+    if (fmt_bytes == 0)
+        return sizeof(double);
 
-       // Otherwise, it is already correct for all formats
-       return fmt_bytes;
+    // Otherwise, it is already correct for all formats
+    return fmt_bytes;
 }
 
 
@@ -119,8 +118,13 @@ void from8toDBL(void* dst, const void* src)
 static
 void from8toHLF(void* dst, const void* src)
 {
+#ifndef CMS_NO_HALF_SUPPORT
        cmsFloat32Number n = (*(cmsUInt8Number*)src) / 255.0f;
        *(cmsUInt16Number*)dst = _cmsFloat2Half(n);
+#else
+    cmsUNUSED_PARAMETER(dst);
+    cmsUNUSED_PARAMETER(src);
+#endif
 }
 
 // From 16
@@ -151,8 +155,13 @@ void from16toDBL(void* dst, const void* src)
 static
 void from16toHLF(void* dst, const void* src)
 {
+#ifndef CMS_NO_HALF_SUPPORT
        cmsFloat32Number n = (*(cmsUInt16Number*)src) / 65535.0f;
        *(cmsUInt16Number*)dst = _cmsFloat2Half(n);
+#else
+    cmsUNUSED_PARAMETER(dst);
+    cmsUNUSED_PARAMETER(src);
+#endif
 }
 
 // From Float
@@ -187,8 +196,13 @@ void fromFLTtoDBL(void* dst, const void* src)
 static
 void fromFLTtoHLF(void* dst, const void* src)
 {
+#ifndef CMS_NO_HALF_SUPPORT
        cmsFloat32Number n = *(cmsFloat32Number*)src;
        *(cmsUInt16Number*)dst = _cmsFloat2Half(n);
+#else
+    cmsUNUSED_PARAMETER(dst);
+    cmsUNUSED_PARAMETER(src);
+#endif
 }
 
 
@@ -197,27 +211,48 @@ void fromFLTtoHLF(void* dst, const void* src)
 static
 void fromHLFto8(void* dst, const void* src)
 {
+#ifndef CMS_NO_HALF_SUPPORT
        cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src);
        *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0f);
+#else
+    cmsUNUSED_PARAMETER(dst);
+    cmsUNUSED_PARAMETER(src);
+#endif
+
 }
 
 static
 void fromHLFto16(void* dst, const void* src)
 {
+#ifndef CMS_NO_HALF_SUPPORT
        cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src);
        *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0f);
+#else
+    cmsUNUSED_PARAMETER(dst);
+    cmsUNUSED_PARAMETER(src);
+#endif
 }
 
 static
 void fromHLFtoFLT(void* dst, const void* src)
 {
+#ifndef CMS_NO_HALF_SUPPORT
        *(cmsFloat32Number*)dst = _cmsHalf2Float(*(cmsUInt16Number*)src);
+#else
+    cmsUNUSED_PARAMETER(dst);
+    cmsUNUSED_PARAMETER(src);
+#endif
 }
 
 static
 void fromHLFtoDBL(void* dst, const void* src)
 {
+#ifndef CMS_NO_HALF_SUPPORT
        *(cmsFloat64Number*)dst = (cmsFloat64Number)_cmsHalf2Float(*(cmsUInt16Number*)src);
+#else
+    cmsUNUSED_PARAMETER(dst);
+    cmsUNUSED_PARAMETER(src);
+#endif
 }
 
 // From double
@@ -245,8 +280,13 @@ void fromDBLtoFLT(void* dst, const void* src)
 static
 void fromDBLtoHLF(void* dst, const void* src)
 {
+#ifndef CMS_NO_HALF_SUPPORT
        cmsFloat32Number n = (cmsFloat32Number) *(cmsFloat64Number*)src;
        *(cmsUInt16Number*)dst = _cmsFloat2Half(n);
+#else
+    cmsUNUSED_PARAMETER(dst);
+    cmsUNUSED_PARAMETER(src);
+#endif
 }
 
 static
@@ -260,21 +300,22 @@ void copy64(void* dst, const void* src)
 static
 int FormatterPos(cmsUInt32Number frm)
 {
-       int  b = T_BYTES(frm);
-
-       if (b == 0 && T_FLOAT(frm))
-              return 4; // DBL
-       if (b == 2 && T_FLOAT(frm))
-              return 2; // HLF
-       if (b == 4 && T_FLOAT(frm))
-              return 3; // FLT
-       if (b == 2 && !T_FLOAT(frm))
-              return 1; // 16
-       if (b == 1 && !T_FLOAT(frm))
-              return 0; // 8
+    cmsUInt32Number  b = T_BYTES(frm);
 
-       return -1; // not recognized
+    if (b == 0 && T_FLOAT(frm))
+        return 4; // DBL
+#ifndef CMS_NO_HALF_SUPPORT
+    if (b == 2 && T_FLOAT(frm))
+        return 2; // HLF
+#endif
+    if (b == 4 && T_FLOAT(frm))
+        return 3; // FLT
+    if (b == 2 && !T_FLOAT(frm))
+        return 1; // 16
+    if (b == 1 && !T_FLOAT(frm))
+        return 0; // 8
 
+    return -1; // not recognized
 }
 
 // Obtains a alpha-to-alpha funmction formatter
@@ -310,12 +351,12 @@ void ComputeIncrementsForChunky(cmsUInt32Number Format,
                                 cmsUInt32Number ComponentPointerIncrements[])
 {
        cmsUInt32Number channels[cmsMAXCHANNELS];
-       int extra = T_EXTRA(Format);
-       int nchannels = T_CHANNELS(Format);
-       int total_chans = nchannels + extra;
-       int i;
-       int channelSize = trueBytesSize(Format);
-       int pixelSize = channelSize * total_chans;
+       cmsUInt32Number extra = T_EXTRA(Format);
+       cmsUInt32Number nchannels = T_CHANNELS(Format);
+       cmsUInt32Number total_chans = nchannels + extra;
+       cmsUInt32Number i;
+       cmsUInt32Number channelSize = trueBytesSize(Format);
+       cmsUInt32Number pixelSize = channelSize * total_chans;
 
            // Sanity check
            if (total_chans <= 0 || total_chans >= cmsMAXCHANNELS)
@@ -368,11 +409,11 @@ void ComputeIncrementsForPlanar(cmsUInt32Number Format,
                                 cmsUInt32Number ComponentPointerIncrements[])
 {
        cmsUInt32Number channels[cmsMAXCHANNELS];
-       int extra = T_EXTRA(Format);
-       int nchannels = T_CHANNELS(Format);
-       int total_chans = nchannels + extra;
-       int i;
-       int channelSize = trueBytesSize(Format);
+       cmsUInt32Number extra = T_EXTRA(Format);
+       cmsUInt32Number nchannels = T_CHANNELS(Format);
+       cmsUInt32Number total_chans = nchannels + extra;
+       cmsUInt32Number i;
+       cmsUInt32Number channelSize = trueBytesSize(Format);
 
        // Sanity check
        if (total_chans <= 0 || total_chans >= cmsMAXCHANNELS)
diff --git a/src/java.desktop/share/native/liblcms/cmscam02.c b/src/java.desktop/share/native/liblcms/cmscam02.c
index ae7038c5ea9..268677fd6f4 100644
--- a/src/java.desktop/share/native/liblcms/cmscam02.c
+++ b/src/java.desktop/share/native/liblcms/cmscam02.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmscgats.c b/src/java.desktop/share/native/liblcms/cmscgats.c
index c4f4fb5d31a..ff88ffb1367 100644
--- a/src/java.desktop/share/native/liblcms/cmscgats.c
+++ b/src/java.desktop/share/native/liblcms/cmscgats.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -176,23 +176,24 @@ typedef struct {
         SUBALLOCATOR   Allocator;             // String suballocator -- just to keep it fast
 
         // Parser state machine
-        SYMBOL         sy;                    // Current symbol
-        int            ch;                    // Current character
+        SYMBOL             sy;                // Current symbol
+        int                ch;                // Current character
+
+        cmsInt32Number     inum;              // integer value
+        cmsFloat64Number   dnum;              // real value
 
-        int            inum;                  // integer value
-        cmsFloat64Number         dnum;                  // real value
         char           id[MAXID];             // identifier
         char           str[MAXSTR];           // string
 
         // Allowed keywords & datasets. They have visibility on whole stream
-        KEYVALUE*     ValidKeywords;
-        KEYVALUE*     ValidSampleID;
+        KEYVALUE*      ValidKeywords;
+        KEYVALUE*      ValidSampleID;
 
         char*          Source;                // Points to loc. being parsed
-        int            lineno;                // line counter for error reporting
+        cmsInt32Number lineno;                // line counter for error reporting
 
         FILECTX*       FileStack[MAXINCLUDE]; // Stack of files being parsed
-        int            IncludeSP;             // Include Stack Pointer
+        cmsInt32Number IncludeSP;             // Include Stack Pointer
 
         char*          MemoryBlock;           // The stream if holded in memory
 
@@ -265,65 +266,64 @@ static PROPERTY PredefinedProperties[] = {
         {"PROD_DATE",        WRITE_STRINGIFY},   // Identifies year and month of production of the target in the form yyyy:mm.
         {"SERIAL",           WRITE_STRINGIFY},   // Uniquely identifies individual physical target.
 
-        {"MATERIAL",         WRITE_STRINGIFY},   // Identifies the material on which the target was produced using a code
-                               // uniquely identifying th e material. This is intend ed to be used for IT8.7
-                               // physical targets only (i.e . IT8.7/1 a nd IT8.7/2).
-
-        {"INSTRUMENTATION",  WRITE_STRINGIFY},   // Used to report the specific instrumentation used (manufacturer and
-                               // model number) to generate the data reported. This data will often
-                               // provide more information about the particular data collected than an
-                               // extensive list of specific details. This is particularly important for
-                               // spectral data or data derived from spectrophotometry.
+        {"MATERIAL",         WRITE_STRINGIFY},    // Identifies the material on which the target was produced using a code
+                                                  // uniquely identifying th e material. This is intend ed to be used for IT8.7
+                                                  // physical targets only (i.e . IT8.7/1 a nd IT8.7/2).
 
-        {"MEASUREMENT_SOURCE", WRITE_STRINGIFY}, // Illumination used for spectral measurements. This data helps provide
-                               // a guide to the potential for issues of paper fluorescence, etc.
+        {"INSTRUMENTATION",  WRITE_STRINGIFY},    // Used to report the specific instrumentation used (manufacturer and
+                                                  // model number) to generate the data reported. This data will often
+                                                  // provide more information about the particular data collected than an
+                                                  // extensive list of specific details. This is particularly important for
+                                                  // spectral data or data derived from spectrophotometry.
 
-        {"PRINT_CONDITIONS", WRITE_STRINGIFY},   // Used to define the characteristics of the printed sheet being reported.
-                               // Where standard conditions have been defined (e.g., SWOP at nominal)
-                               // named conditions may suffice. Otherwise, detailed information is
-                               // needed.
+        {"MEASUREMENT_SOURCE", WRITE_STRINGIFY},  // Illumination used for spectral measurements. This data helps provide
+                                                  // a guide to the potential for issues of paper fluorescence, etc.
 
-        {"SAMPLE_BACKING",   WRITE_STRINGIFY},   // Identifies the backing material used behind the sample during
-                               // measurement. Allowed values are “black”, “white”, or {"na".
+        {"PRINT_CONDITIONS", WRITE_STRINGIFY},     // Used to define the characteristics of the printed sheet being reported.
+                                                   // Where standard conditions have been defined (e.g., SWOP at nominal)
+                                                   // named conditions may suffice. Otherwise, detailed information is
+                                                   // needed.
 
-        {"CHISQ_DOF",        WRITE_STRINGIFY},   // Degrees of freedom associated with the Chi squared statistic
+        {"SAMPLE_BACKING",   WRITE_STRINGIFY},     // Identifies the backing material used behind the sample during
+                                                   // measurement. Allowed values are “black”, “white”, or {"na".
 
-       // below properties are new in recent specs:
+        {"CHISQ_DOF",        WRITE_STRINGIFY},     // Degrees of freedom associated with the Chi squared statistic
+                                                   // below properties are new in recent specs:
 
         {"MEASUREMENT_GEOMETRY", WRITE_STRINGIFY}, // The type of measurement, either reflection or transmission, should be indicated
-                               // along with details of the geometry and the aperture size and shape. For example,
-                               // for transmission measurements it is important to identify 0/diffuse, diffuse/0,
-                               // opal or integrating sphere, etc. For reflection it is important to identify 0/45,
-                               // 45/0, sphere (specular included or excluded), etc.
+                                                   // along with details of the geometry and the aperture size and shape. For example,
+                                                   // for transmission measurements it is important to identify 0/diffuse, diffuse/0,
+                                                   // opal or integrating sphere, etc. For reflection it is important to identify 0/45,
+                                                   // 45/0, sphere (specular included or excluded), etc.
 
-       {"FILTER",            WRITE_STRINGIFY},   // Identifies the use of physical filter(s) during measurement. Typically used to
-                               // denote the use of filters such as none, D65, Red, Green or Blue.
+       {"FILTER",            WRITE_STRINGIFY},     // Identifies the use of physical filter(s) during measurement. Typically used to
+                                                   // denote the use of filters such as none, D65, Red, Green or Blue.
 
-       {"POLARIZATION",      WRITE_STRINGIFY},   // Identifies the use of a physical polarization filter during measurement. Allowed
-                               // values are {"yes”, “white”, “none” or “na”.
+       {"POLARIZATION",      WRITE_STRINGIFY},     // Identifies the use of a physical polarization filter during measurement. Allowed
+                                                   // values are {"yes”, “white”, “none” or “na”.
 
-       {"WEIGHTING_FUNCTION", WRITE_PAIR},   // Indicates such functions as: the CIE standard observer functions used in the
-                               // calculation of various data parameters (2 degree and 10 degree), CIE standard
-                               // illuminant functions used in the calculation of various data parameters (e.g., D50,
-                               // D65, etc.), density status response, etc. If used there shall be at least one
-                               // name-value pair following the WEIGHTING_FUNCTION tag/keyword. The first attribute
-                               // in the set shall be {"name" and shall identify the particular parameter used.
-                               // The second shall be {"value" and shall provide the value associated with that name.
-                               // For ASCII data, a string containing the Name and Value attribute pairs shall follow
-                               // the weighting function keyword. A semi-colon separates attribute pairs from each
-                               // other and within the attribute the name and value are separated by a comma.
+       {"WEIGHTING_FUNCTION", WRITE_PAIR},         // Indicates such functions as: the CIE standard observer functions used in the
+                                                   // calculation of various data parameters (2 degree and 10 degree), CIE standard
+                                                   // illuminant functions used in the calculation of various data parameters (e.g., D50,
+                                                   // D65, etc.), density status response, etc. If used there shall be at least one
+                                                   // name-value pair following the WEIGHTING_FUNCTION tag/keyword. The first attribute
+                                                   // in the set shall be {"name" and shall identify the particular parameter used.
+                                                   // The second shall be {"value" and shall provide the value associated with that name.
+                                                   // For ASCII data, a string containing the Name and Value attribute pairs shall follow
+                                                   // the weighting function keyword. A semi-colon separates attribute pairs from each
+                                                   // other and within the attribute the name and value are separated by a comma.
 
-       {"COMPUTATIONAL_PARAMETER", WRITE_PAIR}, // Parameter that is used in computing a value from measured data. Name is the name
-                               // of the calculation, parameter is the name of the parameter used in the calculation
-                               // and value is the value of the parameter.
+       {"COMPUTATIONAL_PARAMETER", WRITE_PAIR},    // Parameter that is used in computing a value from measured data. Name is the name
+                                                   // of the calculation, parameter is the name of the parameter used in the calculation
+                                                   // and value is the value of the parameter.
 
-       {"TARGET_TYPE",        WRITE_STRINGIFY},  // The type of target being measured, e.g. IT8.7/1, IT8.7/3, user defined, etc.
+       {"TARGET_TYPE",        WRITE_STRINGIFY},    // The type of target being measured, e.g. IT8.7/1, IT8.7/3, user defined, etc.
 
-       {"COLORANT",           WRITE_STRINGIFY},  // Identifies the colorant(s) used in creating the target.
+       {"COLORANT",           WRITE_STRINGIFY},    // Identifies the colorant(s) used in creating the target.
 
-       {"TABLE_DESCRIPTOR",   WRITE_STRINGIFY},  // Describes the purpose or contents of a data table.
+       {"TABLE_DESCRIPTOR",   WRITE_STRINGIFY},    // Describes the purpose or contents of a data table.
 
-       {"TABLE_NAME",         WRITE_STRINGIFY}   // Provides a short name for a data table.
+       {"TABLE_NAME",         WRITE_STRINGIFY}     // Provides a short name for a data table.
 };
 
 #define NUMPREDEFINEDPROPS (sizeof(PredefinedProperties)/sizeof(PROPERTY))
@@ -564,13 +564,13 @@ cmsFloat64Number xpow10(int n)
 
 //  Reads a Real number, tries to follow from integer number
 static
-void ReadReal(cmsIT8* it8, int inum)
+void ReadReal(cmsIT8* it8, cmsInt32Number inum)
 {
-    it8->dnum = (cmsFloat64Number) inum;
+    it8->dnum = (cmsFloat64Number)inum;
 
     while (isdigit(it8->ch)) {
 
-        it8->dnum = it8->dnum * 10.0 + (it8->ch - '0');
+        it8->dnum = (cmsFloat64Number)it8->dnum * 10.0 + (cmsFloat64Number)(it8->ch - '0');
         NextCh(it8);
     }
 
@@ -583,7 +583,7 @@ void ReadReal(cmsIT8* it8, int inum)
 
         while (isdigit(it8->ch)) {
 
-            frac = frac * 10.0 + (it8->ch - '0');
+            frac = frac * 10.0 + (cmsFloat64Number)(it8->ch - '0');
             prec++;
             NextCh(it8);
         }
@@ -594,8 +594,8 @@ void ReadReal(cmsIT8* it8, int inum)
     // Exponent, example 34.00E+20
     if (toupper(it8->ch) == 'E') {
 
-        int e;
-        int sgn;
+        cmsInt32Number e;
+        cmsInt32Number sgn;
 
         NextCh(it8); sgn = 1;
 
@@ -610,17 +610,19 @@ void ReadReal(cmsIT8* it8, int inum)
                 NextCh(it8);
             }
 
-            e = 0;
-            while (isdigit(it8->ch)) {
+        e = 0;
+        while (isdigit(it8->ch)) {
 
-                if ((cmsFloat64Number) e * 10L < INT_MAX)
-                    e = e * 10 + (it8->ch - '0');
+            cmsInt32Number digit = (it8->ch - '0');
 
-                NextCh(it8);
-            }
+            if ((cmsFloat64Number)e * 10.0 + (cmsFloat64Number)digit < (cmsFloat64Number)+2147483647.0)
+                e = e * 10 + digit;
+
+            NextCh(it8);
+        }
 
-            e = sgn*e;
-            it8 -> dnum = it8 -> dnum * xpow10(e);
+        e = sgn*e;
+        it8->dnum = it8->dnum * xpow10(e);
     }
 }
 
@@ -638,12 +640,12 @@ cmsFloat64Number ParseFloatNumber(const char *Buffer)
 
     if (*Buffer == '-' || *Buffer == '+') {
 
-         sign = (*Buffer == '-') ? -1 : 1;
-         Buffer++;
+        sign = (*Buffer == '-') ? -1 : 1;
+        Buffer++;
     }
 
 
-    while (*Buffer && isdigit((int) *Buffer)) {
+    while (*Buffer && isdigit((int)*Buffer)) {
 
         dnum = dnum * 10.0 + (*Buffer - '0');
         if (*Buffer) Buffer++;
@@ -652,11 +654,11 @@ cmsFloat64Number ParseFloatNumber(const char *Buffer)
     if (*Buffer == '.') {
 
         cmsFloat64Number frac = 0.0;      // fraction
-        int prec = 0;                     // precission
+        int prec = 0;                     // precision
 
         if (*Buffer) Buffer++;
 
-        while (*Buffer && isdigit((int) *Buffer)) {
+        while (*Buffer && isdigit((int)*Buffer)) {
 
             frac = frac * 10.0 + (*Buffer - '0');
             prec++;
@@ -687,17 +689,19 @@ cmsFloat64Number ParseFloatNumber(const char *Buffer)
                 if (*Buffer) Buffer++;
             }
 
-            e = 0;
-            while (*Buffer && isdigit((int) *Buffer)) {
+        e = 0;
+        while (*Buffer && isdigit((int)*Buffer)) {
 
-                if ((cmsFloat64Number) e * 10L < INT_MAX)
-                    e = e * 10 + (*Buffer - '0');
+            cmsInt32Number digit = (*Buffer - '0');
 
-                if (*Buffer) Buffer++;
-            }
+            if ((cmsFloat64Number)e * 10.0 + digit < (cmsFloat64Number)+2147483647.0)
+                e = e * 10 + digit;
+
+            if (*Buffer) Buffer++;
+        }
 
-            e = sgn*e;
-            dnum = dnum * xpow10(e);
+        e = sgn*e;
+        dnum = dnum * xpow10(e);
     }
 
     return sign * dnum;
@@ -766,7 +770,7 @@ void InSymbol(cmsIT8* it8)
                             if (it8->ch >= 'A' && it8->ch <= 'F')  j = it8->ch -'A'+10;
                             else j = it8->ch - '0';
 
-                            if ((long) it8->inum * 16L > (long) INT_MAX)
+                            if ((cmsFloat64Number) it8->inum * 16.0 + (cmsFloat64Number) j > (cmsFloat64Number)+2147483647.0)
                             {
                                 SynError(it8, "Invalid hexadecimal number");
                                 return;
@@ -787,7 +791,7 @@ void InSymbol(cmsIT8* it8)
                         {
                             j = it8->ch - '0';
 
-                            if ((long) it8->inum * 2L > (long) INT_MAX)
+                            if ((cmsFloat64Number) it8->inum * 2.0 + j > (cmsFloat64Number)+2147483647.0)
                             {
                                 SynError(it8, "Invalid binary number");
                                 return;
@@ -803,14 +807,16 @@ void InSymbol(cmsIT8* it8)
 
                 while (isdigit(it8->ch)) {
 
-                    if ((long) it8->inum * 10L > (long) INT_MAX) {
+                    cmsInt32Number digit = (it8->ch - '0');
+
+                    if ((cmsFloat64Number) it8->inum * 10.0 + (cmsFloat64Number) digit > (cmsFloat64Number) +2147483647.0) {
                         ReadReal(it8, it8->inum);
                         it8->sy = SDNUM;
                         it8->dnum *= sign;
                         return;
                     }
 
-                    it8->inum = it8->inum * 10 + (it8->ch - '0');
+                    it8->inum = it8->inum * 10 + digit;
                     NextCh(it8);
                 }
 
@@ -1515,8 +1521,8 @@ cmsBool SetDataFormat(cmsIT8* it8, int n, const char *label)
 
 cmsBool CMSEXPORT cmsIT8SetDataFormat(cmsHANDLE  h, int n, const char *Sample)
 {
-        cmsIT8* it8 = (cmsIT8*) h;
-        return SetDataFormat(it8, n, Sample);
+    cmsIT8* it8 = (cmsIT8*)h;
+    return SetDataFormat(it8, n, Sample);
 }
 
 static
@@ -1541,8 +1547,8 @@ static
 char* GetData(cmsIT8* it8, int nSet, int nField)
 {
     TABLE* t = GetTable(it8);
-    int  nSamples   = t -> nSamples;
-    int  nPatches   = t -> nPatches;
+    int nSamples    = t -> nSamples;
+    int nPatches    = t -> nPatches;
 
     if (nSet >= nPatches || nField >= nSamples)
         return NULL;
@@ -1973,67 +1979,67 @@ cmsBool HeaderSection(cmsIT8* it8)
 
 
         case SIDENT:
-                strncpy(VarName, it8->id, MAXID-1);
-                VarName[MAXID-1] = 0;
+            strncpy(VarName, it8->id, MAXID - 1);
+            VarName[MAXID - 1] = 0;
 
-                if (!IsAvailableOnList(it8-> ValidKeywords, VarName, NULL, &Key)) {
+            if (!IsAvailableOnList(it8->ValidKeywords, VarName, NULL, &Key)) {
 
 #ifdef CMS_STRICT_CGATS
-                 return SynError(it8, "Undefined keyword '%s'", VarName);
+                return SynError(it8, "Undefined keyword '%s'", VarName);
 #else
-                    Key = AddAvailableProperty(it8, VarName, WRITE_UNCOOKED);
-                    if (Key == NULL) return FALSE;
+                Key = AddAvailableProperty(it8, VarName, WRITE_UNCOOKED);
+                if (Key == NULL) return FALSE;
 #endif
-                }
+            }
 
-                InSymbol(it8);
-                if (!GetVal(it8, Buffer, MAXSTR-1, "Property data expected")) return FALSE;
+            InSymbol(it8);
+            if (!GetVal(it8, Buffer, MAXSTR - 1, "Property data expected")) return FALSE;
 
-                if(Key->WriteAs != WRITE_PAIR) {
-                    AddToList(it8, &GetTable(it8)->HeaderList, VarName, NULL, Buffer,
-                                (it8->sy == SSTRING) ? WRITE_STRINGIFY : WRITE_UNCOOKED);
-                }
-                else {
-                    const char *Subkey;
-                    char *Nextkey;
-                    if (it8->sy != SSTRING)
-                        return SynError(it8, "Invalid value '%s' for property '%s'.", Buffer, VarName);
-
-                    // chop the string as a list of "subkey, value" pairs, using ';' as a separator
-                    for (Subkey = Buffer; Subkey != NULL; Subkey = Nextkey)
-                    {
-                        char *Value, *temp;
-
-                        //  identify token pair boundary
-                        Nextkey = (char*) strchr(Subkey, ';');
-                        if(Nextkey)
-                            *Nextkey++ = '\0';
-
-                        // for each pair, split the subkey and the value
-                        Value = (char*) strrchr(Subkey, ',');
-                        if(Value == NULL)
-                            return SynError(it8, "Invalid value for property '%s'.", VarName);
-
-                        // gobble the spaces before the coma, and the coma itself
-                        temp = Value++;
-                        do *temp-- = '\0'; while(temp >= Subkey && *temp == ' ');
-
-                        // gobble any space at the right
-                        temp = Value + strlen(Value) - 1;
-                        while(*temp == ' ') *temp-- = '\0';
-
-                        // trim the strings from the left
-                        Subkey += strspn(Subkey, " ");
-                        Value += strspn(Value, " ");
-
-                        if(Subkey[0] == 0 || Value[0] == 0)
-                            return SynError(it8, "Invalid value for property '%s'.", VarName);
-                        AddToList(it8, &GetTable(it8)->HeaderList, VarName, Subkey, Value, WRITE_PAIR);
-                    }
+            if (Key->WriteAs != WRITE_PAIR) {
+                AddToList(it8, &GetTable(it8)->HeaderList, VarName, NULL, Buffer,
+                    (it8->sy == SSTRING) ? WRITE_STRINGIFY : WRITE_UNCOOKED);
+            }
+            else {
+                const char *Subkey;
+                char *Nextkey;
+                if (it8->sy != SSTRING)
+                    return SynError(it8, "Invalid value '%s' for property '%s'.", Buffer, VarName);
+
+                // chop the string as a list of "subkey, value" pairs, using ';' as a separator
+                for (Subkey = Buffer; Subkey != NULL; Subkey = Nextkey)
+                {
+                    char *Value, *temp;
+
+                    //  identify token pair boundary
+                    Nextkey = (char*)strchr(Subkey, ';');
+                    if (Nextkey)
+                        *Nextkey++ = '\0';
+
+                    // for each pair, split the subkey and the value
+                    Value = (char*)strrchr(Subkey, ',');
+                    if (Value == NULL)
+                        return SynError(it8, "Invalid value for property '%s'.", VarName);
+
+                    // gobble the spaces before the coma, and the coma itself
+                    temp = Value++;
+                    do *temp-- = '\0'; while (temp >= Subkey && *temp == ' ');
+
+                    // gobble any space at the right
+                    temp = Value + strlen(Value) - 1;
+                    while (*temp == ' ') *temp-- = '\0';
+
+                    // trim the strings from the left
+                    Subkey += strspn(Subkey, " ");
+                    Value += strspn(Value, " ");
+
+                    if (Subkey[0] == 0 || Value[0] == 0)
+                        return SynError(it8, "Invalid value for property '%s'.", VarName);
+                    AddToList(it8, &GetTable(it8)->HeaderList, VarName, Subkey, Value, WRITE_PAIR);
                 }
+            }
 
-                InSymbol(it8);
-                break;
+            InSymbol(it8);
+            break;
 
 
         case SEOLN: break;
@@ -2062,7 +2068,6 @@ void ReadType(cmsIT8* it8, char* SheetTypePtr)
 
     while (it8->ch != '\r' && it8 ->ch != '\n' && it8->ch != '\t' && it8 -> ch != 0) {
 
-        *SheetTypePtr++= (char) it8 ->ch;
         if (cnt++ < MAXSTR)
             *SheetTypePtr++= (char) it8 ->ch;
         NextCh(it8);
@@ -2257,10 +2262,10 @@ void CookPointers(cmsIT8* it8)
 // that should be something like some printable characters plus a \n
 // returns 0 if this is not like a CGATS, or an integer otherwise. This integer is the number of words in first line?
 static
-int IsMyBlock(const cmsUInt8Number* Buffer, int n)
+int IsMyBlock(const cmsUInt8Number* Buffer, cmsUInt32Number n)
 {
     int words = 1, space = 0, quot = 0;
-    int i;
+    cmsUInt32Number i;
 
     if (n < 10) return 0;   // Too small
 
@@ -2748,7 +2753,7 @@ int CMSEXPORT cmsIT8SetTableByLabel(cmsHANDLE hIT8, const char* cSet, const char
 {
     const char* cLabelFld;
     char Type[256], Label[256];
-    int nTable;
+    cmsUInt32Number nTable;
 
     _cmsAssert(hIT8 != NULL);
 
@@ -2761,7 +2766,7 @@ int CMSEXPORT cmsIT8SetTableByLabel(cmsHANDLE hIT8, const char* cSet, const char
     cLabelFld = cmsIT8GetData(hIT8, cSet, cField);
     if (!cLabelFld) return -1;
 
-    if (sscanf(cLabelFld, "%255s %d %255s", Label, &nTable, Type) != 3)
+    if (sscanf(cLabelFld, "%255s %u %255s", Label, &nTable, Type) != 3)
             return -1;
 
     if (ExpectedType != NULL && *ExpectedType == 0)
diff --git a/src/java.desktop/share/native/liblcms/cmscnvrt.c b/src/java.desktop/share/native/liblcms/cmscnvrt.c
index 2ac99be19e4..04c6419fc15 100644
--- a/src/java.desktop/share/native/liblcms/cmscnvrt.c
+++ b/src/java.desktop/share/native/liblcms/cmscnvrt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -392,11 +392,12 @@ cmsBool IsEmptyLayer(cmsMAT3* m, cmsVEC3* off)
 
 // Compute the conversion layer
 static
-cmsBool ComputeConversion(int i, cmsHPROFILE hProfiles[],
-                                 cmsUInt32Number Intent,
-                                 cmsBool BPC,
-                                 cmsFloat64Number AdaptationState,
-                                 cmsMAT3* m, cmsVEC3* off)
+cmsBool ComputeConversion(cmsUInt32Number i,
+                          cmsHPROFILE hProfiles[],
+                          cmsUInt32Number Intent,
+                          cmsBool BPC,
+                          cmsFloat64Number AdaptationState,
+                          cmsMAT3* m, cmsVEC3* off)
 {
 
     int k;
@@ -708,7 +709,7 @@ cmsPipeline*  CMSEXPORT _cmsDefaultICCintents(cmsContext     ContextID,
 
 // Translate black-preserving intents to ICC ones
 static
-int TranslateNonICCIntents(int Intent)
+cmsUInt32Number TranslateNonICCIntents(cmsUInt32Number Intent)
 {
     switch (Intent) {
         case INTENT_PRESERVE_K_ONLY_PERCEPTUAL:
diff --git a/src/java.desktop/share/native/liblcms/cmserr.c b/src/java.desktop/share/native/liblcms/cmserr.c
index fc74aa7fa01..8e1e7566e0a 100644
--- a/src/java.desktop/share/native/liblcms/cmserr.c
+++ b/src/java.desktop/share/native/liblcms/cmserr.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -83,9 +83,11 @@ long int CMSEXPORT cmsfilelength(FILE* f)
     long int p , n;
 
     p = ftell(f); // register current file position
+    if (p == -1L)
+        return -1L;
 
     if (fseek(f, 0, SEEK_END) != 0) {
-        return -1;
+        return -1L;
     }
 
     n = ftell(f);
@@ -115,7 +117,7 @@ cmsBool   _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plug
 // *********************************************************************************
 
 // This is the default memory allocation function. It does a very coarse
-// check of amout of memory, just to prevent exploits
+// check of amount of memory, just to prevent exploits
 static
 void* _cmsMallocDefaultFn(cmsContext ContextID, cmsUInt32Number size)
 {
@@ -222,7 +224,7 @@ void _cmsAllocMemPluginChunk(struct _cmsContext_struct* ctx, const struct _cmsCo
     }
     else {
 
-        // To reset it, we use the default allocators, which cannot be overriden
+        // To reset it, we use the default allocators, which cannot be overridden
         ctx ->chunks[MemPlugin] = &ctx ->DefaultMemoryManager;
     }
 }
diff --git a/src/java.desktop/share/native/liblcms/cmsgamma.c b/src/java.desktop/share/native/liblcms/cmsgamma.c
index e940fe28feb..9f0645fb8bc 100644
--- a/src/java.desktop/share/native/liblcms/cmsgamma.c
+++ b/src/java.desktop/share/native/liblcms/cmsgamma.c
@@ -73,10 +73,11 @@
 // The list of supported parametric curves
 typedef struct _cmsParametricCurvesCollection_st {
 
-    int nFunctions;                                     // Number of supported functions in this chunk
-    int FunctionTypes[MAX_TYPES_IN_LCMS_PLUGIN];        // The identification types
-    int ParameterCount[MAX_TYPES_IN_LCMS_PLUGIN];       // Number of parameters for each function
-    cmsParametricCurveEvaluator    Evaluator;           // The evaluator
+    cmsUInt32Number nFunctions;                                     // Number of supported functions in this chunk
+    cmsInt32Number  FunctionTypes[MAX_TYPES_IN_LCMS_PLUGIN];        // The identification types
+    cmsUInt32Number ParameterCount[MAX_TYPES_IN_LCMS_PLUGIN];       // Number of parameters for each function
+
+    cmsParametricCurveEvaluator Evaluator;                          // The evaluator
 
     struct _cmsParametricCurvesCollection_st* Next; // Next in list
 
@@ -194,7 +195,7 @@ int IsInSet(int Type, _cmsParametricCurvesCollection* c)
 {
     int i;
 
-    for (i=0; i < c ->nFunctions; i++)
+    for (i=0; i < (int) c ->nFunctions; i++)
         if (abs(Type) == c ->FunctionTypes[i]) return i;
 
     return -1;
@@ -238,20 +239,20 @@ _cmsParametricCurvesCollection *GetParametricCurveByType(cmsContext ContextID, i
 // no optimation curve is computed. nSegments may also be zero in the inverse case, where only the
 // optimization curve is given. Both features simultaneously is an error
 static
-cmsToneCurve* AllocateToneCurveStruct(cmsContext ContextID, cmsInt32Number nEntries,
-                                      cmsInt32Number nSegments, const cmsCurveSegment* Segments,
+cmsToneCurve* AllocateToneCurveStruct(cmsContext ContextID, cmsUInt32Number nEntries,
+                                      cmsUInt32Number nSegments, const cmsCurveSegment* Segments,
                                       const cmsUInt16Number* Values)
 {
     cmsToneCurve* p;
-    int i;
+    cmsUInt32Number i;
 
     // We allow huge tables, which are then restricted for smoothing operations
-    if (nEntries > 65530 || nEntries < 0) {
+    if (nEntries > 65530) {
         cmsSignalError(ContextID, cmsERROR_RANGE, "Couldn't create tone curve of more than 65530 entries");
         return NULL;
     }
 
-    if (nEntries <= 0 && nSegments <= 0) {
+    if (nEntries == 0 && nSegments == 0) {
         cmsSignalError(ContextID, cmsERROR_RANGE, "Couldn't create tone curve with zero segments and no table");
         return NULL;
     }
@@ -261,7 +262,7 @@ cmsToneCurve* AllocateToneCurveStruct(cmsContext ContextID, cmsInt32Number nEntr
     if (!p) return NULL;
 
     // In this case, there are no segments
-    if (nSegments <= 0) {
+    if (nSegments == 0) {
         p ->Segments = NULL;
         p ->Evals = NULL;
     }
@@ -277,7 +278,7 @@ cmsToneCurve* AllocateToneCurveStruct(cmsContext ContextID, cmsInt32Number nEntr
 
     // This 16-bit table contains a limited precision representation of the whole curve and is kept for
     // increasing xput on certain operations.
-    if (nEntries <= 0) {
+    if (nEntries == 0) {
         p ->Table16 = NULL;
     }
     else {
@@ -303,7 +304,7 @@ cmsToneCurve* AllocateToneCurveStruct(cmsContext ContextID, cmsInt32Number nEntr
         p ->SegInterp = (cmsInterpParams**) _cmsCalloc(ContextID, nSegments, sizeof(cmsInterpParams*));
         if (p ->SegInterp == NULL) goto Error;
 
-        for (i=0; i< nSegments; i++) {
+        for (i=0; i < nSegments; i++) {
 
             // Type 0 is a special marker for table-based curves
             if (Segments[i].Type == 0)
@@ -359,7 +360,7 @@ cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Nu
 
     // Type 1 Reversed: X = Y ^1/gamma
     case -1:
-         if (R < 0) {
+        if (R < 0) {
 
             if (fabs(Params[0] - 1.0) < MATRIX_DET_TOLERANCE)
                 Val = R;
@@ -367,80 +368,123 @@ cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Nu
                 Val = 0;
         }
         else
-            Val = pow(R, 1/Params[0]);
+        {
+            if (fabs(Params[0]) < MATRIX_DET_TOLERANCE)
+                Val = PLUS_INF;
+            else
+                Val = pow(R, 1 / Params[0]);
+        }
         break;
 
     // CIE 122-1966
     // Y = (aX + b)^Gamma  | X >= -b/a
     // Y = 0               | else
     case 2:
-        disc = -Params[2] / Params[1];
+    {
 
-        if (R >= disc ) {
+        if (fabs(Params[1]) < MATRIX_DET_TOLERANCE)
+        {
+            Val = 0;
+        }
+        else
+        {
+            disc = -Params[2] / Params[1];
 
-            e = Params[1]*R + Params[2];
+            if (R >= disc) {
 
-            if (e > 0)
-                Val = pow(e, Params[0]);
+                e = Params[1] * R + Params[2];
+
+                if (e > 0)
+                    Val = pow(e, Params[0]);
+                else
+                    Val = 0;
+            }
             else
                 Val = 0;
         }
-        else
-            Val = 0;
-        break;
+    }
+    break;
 
      // Type 2 Reversed
      // X = (Y ^1/g  - b) / a
      case -2:
-         if (R < 0)
+     {
+         if (fabs(Params[0]) < MATRIX_DET_TOLERANCE ||
+             fabs(Params[1]) < MATRIX_DET_TOLERANCE)
+         {
              Val = 0;
+         }
          else
-             Val = (pow(R, 1.0/Params[0]) - Params[2]) / Params[1];
+         {
+             if (R < 0)
+                 Val = 0;
+             else
+                 Val = (pow(R, 1.0 / Params[0]) - Params[2]) / Params[1];
 
-         if (Val < 0)
-              Val = 0;
-         break;
+             if (Val < 0)
+                 Val = 0;
+         }
+     }
+     break;
 
 
     // IEC 61966-3
     // Y = (aX + b)^Gamma | X <= -b/a
     // Y = c              | else
     case 3:
-        disc = -Params[2] / Params[1];
-        if (disc < 0)
-            disc = 0;
+    {
+        if (fabs(Params[1]) < MATRIX_DET_TOLERANCE)
+        {
+            Val = 0;
+        }
+        else
+        {
+            disc = -Params[2] / Params[1];
+            if (disc < 0)
+                disc = 0;
 
-        if (R >= disc) {
+            if (R >= disc) {
 
-            e = Params[1]*R + Params[2];
+                e = Params[1] * R + Params[2];
 
-            if (e > 0)
-                Val = pow(e, Params[0]) + Params[3];
+                if (e > 0)
+                    Val = pow(e, Params[0]) + Params[3];
+                else
+                    Val = 0;
+            }
             else
-                Val = 0;
+                Val = Params[3];
         }
-        else
-            Val = Params[3];
-        break;
+    }
+    break;
 
 
     // Type 3 reversed
     // X=((Y-c)^1/g - b)/a      | (Y>=c)
     // X=-b/a                   | (Y<c)
     case -3:
-        if (R >= Params[3])  {
+    {
+        if (fabs(Params[1]) < MATRIX_DET_TOLERANCE)
+        {
+            Val = 0;
+        }
+        else
+        {
+            if (R >= Params[3]) {
 
-            e = R - Params[3];
+                e = R - Params[3];
 
-            if (e > 0)
-                Val = (pow(e, 1/Params[0]) - Params[2]) / Params[1];
-            else
-                Val = 0;
-        }
-        else {
-            Val = -Params[2] / Params[1];
+                if (e > 0)
+                    Val = (pow(e, 1 / Params[0]) - Params[2]) / Params[1];
+                else
+                    Val = 0;
+            }
+            else {
+                Val = -Params[2] / Params[1];
+            }
         }
-        break;
+    }
+    break;
 
 
     // IEC 61966-2.1 (sRGB)
@@ -464,20 +508,31 @@ cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Nu
     // X=((Y^1/g-b)/a)    | Y >= (ad+b)^g
     // X=Y/c              | Y< (ad+b)^g
     case -4:
-        e = Params[1] * Params[4] + Params[2];
-        if (e < 0)
-            disc = 0;
+    {
+        if (fabs(Params[0]) < MATRIX_DET_TOLERANCE ||
+            fabs(Params[1]) < MATRIX_DET_TOLERANCE ||
+            fabs(Params[3]) < MATRIX_DET_TOLERANCE)
+        {
+            Val = 0;
+        }
         else
-            disc = pow(e, Params[0]);
+        {
+            e = Params[1] * Params[4] + Params[2];
+            if (e < 0)
+                disc = 0;
+            else
+                disc = pow(e, Params[0]);
 
-        if (R >= disc) {
+            if (R >= disc) {
 
-            Val = (pow(R, 1.0/Params[0]) - Params[2]) / Params[1];
-        }
-        else {
-            Val = R / Params[3];
+                Val = (pow(R, 1.0 / Params[0]) - Params[2]) / Params[1];
+            }
+            else {
+                Val = R / Params[3];
+            }
         }
-        break;
+    }
+    break;
 
 
     // Y = (aX + b)^Gamma + e | X >= d
@@ -501,20 +556,29 @@ cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Nu
     // X=((Y-e)1/g-b)/a   | Y >=(ad+b)^g+e), cd+f
     // X=(Y-f)/c          | else
     case -5:
-
-        disc = Params[3] * Params[4] + Params[6];
-        if (R >= disc) {
-
-            e = R - Params[5];
-            if (e < 0)
-                Val = 0;
-            else
-                Val = (pow(e, 1.0/Params[0]) - Params[2]) / Params[1];
+    {
+        if (fabs(Params[1]) < MATRIX_DET_TOLERANCE ||
+            fabs(Params[3]) < MATRIX_DET_TOLERANCE)
+        {
+            Val = 0;
         }
-        else {
-            Val = (R - Params[6]) / Params[3];
+        else
+        {
+            disc = Params[3] * Params[4] + Params[6];
+            if (R >= disc) {
+
+                e = R - Params[5];
+                if (e < 0)
+                    Val = 0;
+                else
+                    Val = (pow(e, 1.0 / Params[0]) - Params[2]) / Params[1];
+            }
+            else {
+                Val = (R - Params[6]) / Params[3];
+            }
         }
-        break;
+    }
+    break;
 
 
     // Types 6,7,8 comes from segmented curves as described in ICCSpecRevision_02_11_06_Float.pdf
@@ -532,12 +596,21 @@ cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Nu
 
     // ((Y - c) ^1/Gamma - b) / a
     case -6:
-        e = R - Params[3];
-        if (e < 0)
+    {
+        if (fabs(Params[1]) < MATRIX_DET_TOLERANCE)
+        {
             Val = 0;
+        }
         else
-        Val = (pow(e, 1.0/Params[0]) - Params[2]) / Params[1];
-        break;
+        {
+            e = R - Params[3];
+            if (e < 0)
+                Val = 0;
+            else
+                Val = (pow(e, 1.0 / Params[0]) - Params[2]) / Params[1];
+        }
+    }
+    break;
 
 
     // Y = a * log (b * X^Gamma + c) + d
@@ -554,8 +627,19 @@ cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Nu
     // pow(10, (Y-d) / a) = b * X ^Gamma + c
     // pow((pow(10, (Y-d) / a) - c) / b, 1/g) = X
     case -7:
-       Val = pow((pow(10.0, (R-Params[4]) / Params[1]) - Params[3]) / Params[2], 1.0 / Params[0]);
-       break;
+    {
+        if (fabs(Params[0]) < MATRIX_DET_TOLERANCE ||
+            fabs(Params[1]) < MATRIX_DET_TOLERANCE ||
+            fabs(Params[2]) < MATRIX_DET_TOLERANCE)
+        {
+            Val = 0;
+        }
+        else
+        {
+            Val = pow((pow(10.0, (R - Params[4]) / Params[1]) - Params[3]) / Params[2], 1.0 / Params[0]);
+        }
+    }
+    break;
 
 
    //Y = a * b^(c*X+d) + e
@@ -571,12 +655,25 @@ cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Nu
        disc = R - Params[4];
        if (disc < 0) Val = 0;
        else
-           Val = (log(disc / Params[0]) / log(Params[1]) - Params[3]) / Params[2];
+       {
+           if (fabs(Params[0]) < MATRIX_DET_TOLERANCE ||
+               fabs(Params[2]) < MATRIX_DET_TOLERANCE)
+           {
+               Val = 0;
+           }
+           else
+           {
+               Val = (log(disc / Params[0]) / log(Params[1]) - Params[3]) / Params[2];
+           }
+       }
        break;
 
    // S-Shaped: (1 - (1-x)^1/g)^1/g
    case 108:
-      Val = pow(1.0 - pow(1 - R, 1/Params[0]), 1/Params[0]);
+       if (fabs(Params[0]) < MATRIX_DET_TOLERANCE)
+           Val = 0;
+       else
+           Val = pow(1.0 - pow(1 - R, 1/Params[0]), 1/Params[0]);
       break;
 
     // y = (1 - (1-x)^1/g)^1/g
@@ -596,33 +693,45 @@ cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Nu
     return Val;
 }
 
-// Evaluate a segmented function for a single value. Return -1 if no valid segment found .
+// Evaluate a segmented function for a single value. Return -Inf if no valid segment found .
 // If fn type is 0, perform an interpolation on the table
 static
 cmsFloat64Number EvalSegmentedFn(const cmsToneCurve *g, cmsFloat64Number R)
 {
     int i;
+    cmsFloat32Number Out32;
+    cmsFloat64Number Out;
 
-    for (i = g ->nSegments-1; i >= 0 ; --i) {
+    for (i = (int) g->nSegments - 1; i >= 0; --i) {
 
         // Check for domain
-        if ((R > g ->Segments[i].x0) && (R <= g ->Segments[i].x1)) {
+        if ((R > g->Segments[i].x0) && (R <= g->Segments[i].x1)) {
 
             // Type == 0 means segment is sampled
-            if (g ->Segments[i].Type == 0) {
+            if (g->Segments[i].Type == 0) {
 
-                cmsFloat32Number R1 = (cmsFloat32Number) (R - g ->Segments[i].x0) / (g ->Segments[i].x1 - g ->Segments[i].x0);
-                cmsFloat32Number Out;
+                cmsFloat32Number R1 = (cmsFloat32Number)(R - g->Segments[i].x0) / (g->Segments[i].x1 - g->Segments[i].x0);
 
                 // Setup the table (TODO: clean that)
-                g ->SegInterp[i]-> Table = g ->Segments[i].SampledPoints;
+                g->SegInterp[i]->Table = g->Segments[i].SampledPoints;
 
-                g ->SegInterp[i] -> Interpolation.LerpFloat(&R1, &Out, g ->SegInterp[i]);
+                g->SegInterp[i]->Interpolation.LerpFloat(&R1, &Out32, g->SegInterp[i]);
+                Out = (cmsFloat64Number) Out32;
 
-                return Out;
             }
+            else {
+                Out = g->Evals[i](g->Segments[i].Type, g->Segments[i].Params, R);
+            }
+
+            if (isinf(Out))
+                return PLUS_INF;
             else
-                return g ->Evals[i](g->Segments[i].Type, g ->Segments[i].Params, R);
+            {
+                if (isinf(-Out))
+                    return MINUS_INF;
+            }
+
+            return Out;
         }
     }
 
@@ -645,13 +754,13 @@ const cmsUInt16Number* CMSEXPORT cmsGetToneCurveEstimatedTable(const cmsToneCurv
 
 // Create an empty gamma curve, by using tables. This specifies only the limited-precision part, and leaves the
 // floating point description empty.
-cmsToneCurve* CMSEXPORT cmsBuildTabulatedToneCurve16(cmsContext ContextID, cmsInt32Number nEntries, const cmsUInt16Number Values[])
+cmsToneCurve* CMSEXPORT cmsBuildTabulatedToneCurve16(cmsContext ContextID, cmsUInt32Number nEntries, const cmsUInt16Number Values[])
 {
     return AllocateToneCurveStruct(ContextID, nEntries, 0, NULL, Values);
 }
 
 static
-int EntriesByGamma(cmsFloat64Number Gamma)
+cmsUInt32Number EntriesByGamma(cmsFloat64Number Gamma)
 {
     if (fabs(Gamma - 1.0) < 0.001) return 2;
     return 4096;
@@ -660,12 +769,12 @@ int EntriesByGamma(cmsFloat64Number Gamma)
 
 // Create a segmented gamma, fill the table
 cmsToneCurve* CMSEXPORT cmsBuildSegmentedToneCurve(cmsContext ContextID,
-                                                   cmsInt32Number nSegments, const cmsCurveSegment Segments[])
+                                                   cmsUInt32Number nSegments, const cmsCurveSegment Segments[])
 {
-    int i;
+    cmsUInt32Number i;
     cmsFloat64Number R, Val;
     cmsToneCurve* g;
-    int nGridPoints = 4096;
+    cmsUInt32Number nGridPoints = 4096;
 
     _cmsAssert(Segments != NULL);
 
@@ -680,7 +789,7 @@ cmsToneCurve* CMSEXPORT cmsBuildSegmentedToneCurve(cmsContext ContextID,
 
     // Once we have the floating point version, we can approximate a 16 bit table of 4096 entries
     // for performance reasons. This table would normally not be used except on 8/16 bits transforms.
-    for (i=0; i < nGridPoints; i++) {
+    for (i = 0; i < nGridPoints; i++) {
 
         R   = (cmsFloat64Number) i / (nGridPoints-1);
 
@@ -893,7 +1002,7 @@ int GetInterval(cmsFloat64Number In, const cmsUInt16Number LutTable[], const str
     if (LutTable[0] < LutTable[p ->Domain[0]]) {
 
         // Table is overall ascending
-        for (i=p->Domain[0]-1; i >=0; --i) {
+        for (i = (int) p->Domain[0] - 1; i >= 0; --i) {
 
             y0 = LutTable[i];
             y1 = LutTable[i+1];
@@ -928,7 +1037,7 @@ int GetInterval(cmsFloat64Number In, const cmsUInt16Number LutTable[], const str
 }
 
 // Reverse a gamma table
-cmsToneCurve* CMSEXPORT cmsReverseToneCurveEx(cmsInt32Number nResultSamples, const cmsToneCurve* InCurve)
+cmsToneCurve* CMSEXPORT cmsReverseToneCurveEx(cmsUInt32Number nResultSamples, const cmsToneCurve* InCurve)
 {
     cmsToneCurve *out;
     cmsFloat64Number a = 0, b = 0, y, x1, y1, x2, y2;
@@ -957,7 +1066,7 @@ cmsToneCurve* CMSEXPORT cmsReverseToneCurveEx(cmsInt32Number nResultSamples, con
     Ascending = !cmsIsToneCurveDescending(InCurve);
 
     // Iterate across Y axis
-    for (i=0; i <  nResultSamples; i++) {
+    for (i=0; i < (int) nResultSamples; i++) {
 
         y = (cmsFloat64Number) i * 65535.0 / (nResultSamples - 1);
 
@@ -1012,7 +1121,8 @@ cmsToneCurve* CMSEXPORT cmsReverseToneCurve(const cmsToneCurve* InGamma)
 //   Output: smoothed vector (z): vector from 1 to m.
 
 static
-cmsBool smooth2(cmsContext ContextID, cmsFloat32Number w[], cmsFloat32Number y[], cmsFloat32Number z[], cmsFloat32Number lambda, int m)
+cmsBool smooth2(cmsContext ContextID, cmsFloat32Number w[], cmsFloat32Number y[],
+                cmsFloat32Number z[], cmsFloat32Number lambda, int m)
 {
     int i, i1, i2;
     cmsFloat32Number *c, *d, *e;
@@ -1071,73 +1181,121 @@ cmsBool smooth2(cmsContext ContextID, cmsFloat32Number w[], cmsFloat32Number y[]
 // Smooths a curve sampled at regular intervals.
 cmsBool  CMSEXPORT cmsSmoothToneCurve(cmsToneCurve* Tab, cmsFloat64Number lambda)
 {
-    cmsFloat32Number w[MAX_NODES_IN_CURVE], y[MAX_NODES_IN_CURVE], z[MAX_NODES_IN_CURVE];
-    int i, nItems, Zeros, Poles;
+    cmsBool SuccessStatus = TRUE;
+    cmsFloat32Number *w, *y, *z;
+    cmsUInt32Number i, nItems, Zeros, Poles;
 
-    if (Tab == NULL) return FALSE;
-
-    if (cmsIsToneCurveLinear(Tab)) return TRUE; // Nothing to do
-
-    nItems = Tab -> nEntries;
-
-    if (nItems >= MAX_NODES_IN_CURVE) {
-        cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: too many points.");
-        return FALSE;
-    }
-
-    memset(w, 0, nItems * sizeof(cmsFloat32Number));
-    memset(y, 0, nItems * sizeof(cmsFloat32Number));
-    memset(z, 0, nItems * sizeof(cmsFloat32Number));
-
-    for (i=0; i < nItems; i++)
+    if (Tab != NULL && Tab->InterpParams != NULL)
     {
-        y[i+1] = (cmsFloat32Number) Tab -> Table16[i];
-        w[i+1] = 1.0;
-    }
+        cmsContext ContextID = Tab->InterpParams->ContextID;
+
+        if (!cmsIsToneCurveLinear(Tab)) // Only non-linear curves need smoothing
+        {
+            nItems = Tab->nEntries;
+            if (nItems < MAX_NODES_IN_CURVE)
+            {
+                // Allocate one more item than needed
+                w = (cmsFloat32Number *)_cmsCalloc(ContextID, nItems + 1, sizeof(cmsFloat32Number));
+                y = (cmsFloat32Number *)_cmsCalloc(ContextID, nItems + 1, sizeof(cmsFloat32Number));
+                z = (cmsFloat32Number *)_cmsCalloc(ContextID, nItems + 1, sizeof(cmsFloat32Number));
+
+                if (w != NULL && y != NULL && z != NULL) // Ensure no memory allocation failure
+                {
+                    memset(w, 0, (nItems + 1) * sizeof(cmsFloat32Number));
+                    memset(y, 0, (nItems + 1) * sizeof(cmsFloat32Number));
+                    memset(z, 0, (nItems + 1) * sizeof(cmsFloat32Number));
+
+                    for (i = 0; i < nItems; i++)
+                    {
+                        y[i + 1] = (cmsFloat32Number)Tab->Table16[i];
+                        w[i + 1] = 1.0;
+                    }
+
+                    if (smooth2(ContextID, w, y, z, (cmsFloat32Number)lambda, (int)nItems))
+                    {
+                        // Do some reality - checking...
+
+                        Zeros = Poles = 0;
+                        for (i = nItems; i > 1; --i)
+                        {
+                            if (z[i] == 0.) Zeros++;
+                            if (z[i] >= 65535.) Poles++;
+                            if (z[i] < z[i - 1])
+                            {
+                                cmsSignalError(ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Non-Monotonic.");
+                                SuccessStatus = FALSE;
+                                break;
+                            }
+                        }
+
+                        if (SuccessStatus && Zeros > (nItems / 3))
+                        {
+                            cmsSignalError(ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Degenerated, mostly zeros.");
+                            SuccessStatus = FALSE;
+                        }
+
+                        if (SuccessStatus && Poles > (nItems / 3))
+                        {
+                            cmsSignalError(ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Degenerated, mostly poles.");
+                            SuccessStatus = FALSE;
+                        }
+
+                        if (SuccessStatus) // Seems ok
+                        {
+                            for (i = 0; i < nItems; i++)
+                            {
+                                // Clamp to cmsUInt16Number
+                                Tab->Table16[i] = _cmsQuickSaturateWord(z[i + 1]);
+                            }
+                        }
+                    }
+                    else // Could not smooth
+                    {
+                        cmsSignalError(ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Function smooth2 failed.");
+                        SuccessStatus = FALSE;
+                    }
+                }
+                else // One or more buffers could not be allocated
+                {
+                    cmsSignalError(ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Could not allocate memory.");
+                    SuccessStatus = FALSE;
+                }
 
-    if (!smooth2(Tab ->InterpParams->ContextID, w, y, z, (cmsFloat32Number) lambda, nItems)) return FALSE;
+                if (z != NULL)
+                    _cmsFree(ContextID, z);
 
-    // Do some reality - checking...
-    Zeros = Poles = 0;
-    for (i=nItems; i > 1; --i) {
+                if (y != NULL)
+                    _cmsFree(ContextID, y);
 
-        if (z[i] == 0.) Zeros++;
-        if (z[i] >= 65535.) Poles++;
-        if (z[i] < z[i-1]) {
-            cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Non-Monotonic.");
-            return FALSE;
+                if (w != NULL)
+                    _cmsFree(ContextID, w);
+            }
+            else // too many items in the table
+            {
+                cmsSignalError(ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Too many points.");
+                SuccessStatus = FALSE;
+            }
         }
     }
-
-    if (Zeros > (nItems / 3)) {
-        cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Degenerated, mostly zeros.");
-        return FALSE;
-    }
-    if (Poles > (nItems / 3)) {
-        cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Degenerated, mostly poles.");
-        return FALSE;
-    }
-
-    // Seems ok
-    for (i=0; i < nItems; i++) {
-
-        // Clamp to cmsUInt16Number
-        Tab -> Table16[i] = _cmsQuickSaturateWord(z[i+1]);
+    else // Tab parameter or Tab->InterpParams is NULL
+    {
+        // Can't signal an error here since the ContextID is not known at this point
+        SuccessStatus = FALSE;
     }
 
-    return TRUE;
+    return SuccessStatus;
 }
 
 // Is a table linear? Do not use parametric since we cannot guarantee some weird parameters resulting
 // in a linear table. This way assures it is linear in 12 bits, which should be enought in most cases.
 cmsBool CMSEXPORT cmsIsToneCurveLinear(const cmsToneCurve* Curve)
 {
-    cmsUInt32Number i;
+    int i;
     int diff;
 
     _cmsAssert(Curve != NULL);
 
-    for (i=0; i < Curve ->nEntries; i++) {
+    for (i=0; i < (int) Curve ->nEntries; i++) {
 
         diff = abs((int) Curve->Table16[i] - (int) _cmsQuantizeVal(i, Curve ->nEntries));
         if (diff > 0x0f)
@@ -1150,7 +1308,7 @@ cmsBool CMSEXPORT cmsIsToneCurveLinear(const cmsToneCurve* Curve)
 // Same, but for monotonicity
 cmsBool  CMSEXPORT cmsIsToneCurveMonotonic(const cmsToneCurve* t)
 {
-    int n;
+    cmsUInt32Number n;
     int i, last;
     cmsBool lDescending;
 
@@ -1167,7 +1325,7 @@ cmsBool  CMSEXPORT cmsIsToneCurveMonotonic(const cmsToneCurve* t)
 
         last = t ->Table16[0];
 
-        for (i = 1; i < n; i++) {
+        for (i = 1; i < (int) n; i++) {
 
             if (t ->Table16[i] - last > 2) // We allow some ripple
                 return FALSE;
@@ -1180,7 +1338,7 @@ cmsBool  CMSEXPORT cmsIsToneCurveMonotonic(const cmsToneCurve* t)
 
         last = t ->Table16[n-1];
 
-        for (i = n-2; i >= 0; --i) {
+        for (i = (int) n - 2; i >= 0; --i) {
 
             if (t ->Table16[i] - last > 2)
                 return FALSE;
diff --git a/src/java.desktop/share/native/liblcms/cmsgmt.c b/src/java.desktop/share/native/liblcms/cmsgmt.c
index 81254c2ad9b..1b464af0fa8 100644
--- a/src/java.desktop/share/native/liblcms/cmsgmt.c
+++ b/src/java.desktop/share/native/liblcms/cmsgmt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -326,7 +326,7 @@ cmsPipeline* _cmsCreateGamutCheckPipeline(cmsContext ContextID,
     cmsStage* CLUT;
     cmsUInt32Number dwFormat;
     GAMUTCHAIN Chain;
-    int nChannels, nGridpoints;
+    cmsUInt32Number nChannels, nGridpoints;
     cmsColorSpaceSignature ColorSpace;
     cmsUInt32Number i;
     cmsHPROFILE ProfileList[256];
diff --git a/src/java.desktop/share/native/liblcms/cmshalf.c b/src/java.desktop/share/native/liblcms/cmshalf.c
index ddcaf48b8b4..287fcb5e5f1 100644
--- a/src/java.desktop/share/native/liblcms/cmshalf.c
+++ b/src/java.desktop/share/native/liblcms/cmshalf.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -532,7 +532,7 @@ static cmsUInt8Number  Shift[512] = {
 0x18, 0x18, 0x18, 0x18, 0x0d
 };
 
-cmsFloat32Number _cmsHalf2Float(cmsUInt16Number h)
+cmsFloat32Number CMSEXPORT _cmsHalf2Float(cmsUInt16Number h)
 {
     union {
         cmsFloat32Number flt;
@@ -545,7 +545,7 @@ cmsFloat32Number _cmsHalf2Float(cmsUInt16Number h)
     return out.flt;
 }
 
-cmsUInt16Number _cmsFloat2Half(cmsFloat32Number flt)
+cmsUInt16Number CMSEXPORT _cmsFloat2Half(cmsFloat32Number flt)
 {
     union {
         cmsFloat32Number flt;
diff --git a/src/java.desktop/share/native/liblcms/cmsintrp.c b/src/java.desktop/share/native/liblcms/cmsintrp.c
index aa96cbb440b..6a3c7f85a7c 100644
--- a/src/java.desktop/share/native/liblcms/cmsintrp.c
+++ b/src/java.desktop/share/native/liblcms/cmsintrp.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -58,6 +58,13 @@
 // This module incorporates several interpolation routines, for 1 to 8 channels on input and
 // up to 65535 channels on output. The user may change those by using the interpolation plug-in
 
+// Some people may want to compile as C++ with all warnings on, in this case make compiler silent
+#ifdef _MSC_VER
+#    if (_MSC_VER >= 1400)
+#       pragma warning( disable : 4365 )
+#    endif
+#endif
+
 // Interpolation routines by default
 static cmsInterpFunction DefaultInterpolatorsFactory(cmsUInt32Number nInputChannels, cmsUInt32Number nOutputChannels, cmsUInt32Number dwFlags);
 
@@ -131,12 +138,12 @@ cmsBool _cmsSetInterpolationRoutine(cmsContext ContextID, cmsInterpParams* p)
 // This function precalculates as many parameters as possible to speed up the interpolation.
 cmsInterpParams* _cmsComputeInterpParamsEx(cmsContext ContextID,
                                            const cmsUInt32Number nSamples[],
-                                           int InputChan, int OutputChan,
+                                           cmsUInt32Number InputChan, cmsUInt32Number OutputChan,
                                            const void *Table,
                                            cmsUInt32Number dwFlags)
 {
     cmsInterpParams* p;
-    int i;
+    cmsUInt32Number i;
 
     // Check for maximum inputs
     if (InputChan > MAX_INPUT_DIMENSIONS) {
@@ -180,7 +187,8 @@ cmsInterpParams* _cmsComputeInterpParamsEx(cmsContext ContextID,
 
 
 // This one is a wrapper on the anterior, but assuming all directions have same number of nodes
-cmsInterpParams* _cmsComputeInterpParams(cmsContext ContextID, int nSamples, int InputChan, int OutputChan, const void* Table, cmsUInt32Number dwFlags)
+cmsInterpParams* CMSEXPORT _cmsComputeInterpParams(cmsContext ContextID, cmsUInt32Number nSamples,
+                                                   cmsUInt32Number InputChan, cmsUInt32Number OutputChan, const void* Table, cmsUInt32Number dwFlags)
 {
     int i;
     cmsUInt32Number Samples[MAX_INPUT_DIMENSIONS];
@@ -195,7 +203,7 @@ cmsInterpParams* _cmsComputeInterpParams(cmsContext ContextID, int nSamples, int
 
 
 // Free all associated memory
-void _cmsFreeInterpParams(cmsInterpParams* p)
+void CMSEXPORT _cmsFreeInterpParams(cmsInterpParams* p)
 {
     if (p != NULL) _cmsFree(p ->ContextID, p);
 }
@@ -244,7 +252,7 @@ void LinLerp1D(register const cmsUInt16Number Value[],
 // To prevent out of bounds indexing
 cmsINLINE cmsFloat32Number fclamp(cmsFloat32Number v)
 {
-    return v < 0.0f || v != v ? 0.0f : (v > 1.0f ? 1.0f : v);
+    return ((v < 1.0e-9f) || isnan(v)) ? 0.0f : (v > 1.0f ? 1.0f : v);
 }
 
 // Floating-point version of 1D interpolation
@@ -381,10 +389,10 @@ void BilinearInterpFloat(const cmsFloat32Number Input[],
     y0 = (int) _cmsQuickFloor(py); fy = py - (cmsFloat32Number) y0;
 
     X0 = p -> opta[1] * x0;
-    X1 = X0 + (Input[0] >= 1.0 ? 0 : p->opta[1]);
+    X1 = X0 + (fclamp(Input[0]) >= 1.0 ? 0 : p->opta[1]);
 
     Y0 = p -> opta[0] * y0;
-    Y1 = Y0 + (Input[1] >= 1.0 ? 0 : p->opta[0]);
+    Y1 = Y0 + (fclamp(Input[1]) >= 1.0 ? 0 : p->opta[0]);
 
     for (OutChan = 0; OutChan < TotalOut; OutChan++) {
 
@@ -493,18 +501,18 @@ void TrilinearInterpFloat(const cmsFloat32Number Input[],
     py = fclamp(Input[1]) * p->Domain[1];
     pz = fclamp(Input[2]) * p->Domain[2];
 
-    x0 = (int) _cmsQuickFloor(px); fx = px - (cmsFloat32Number) x0;
-    y0 = (int) _cmsQuickFloor(py); fy = py - (cmsFloat32Number) y0;
-    z0 = (int) _cmsQuickFloor(pz); fz = pz - (cmsFloat32Number) z0;
+    x0 = (int) floor(px); fx = px - (cmsFloat32Number) x0;  // We need full floor funcionality here
+    y0 = (int) floor(py); fy = py - (cmsFloat32Number) y0;
+    z0 = (int) floor(pz); fz = pz - (cmsFloat32Number) z0;
 
     X0 = p -> opta[2] * x0;
-    X1 = X0 + (Input[0] >= 1.0 ? 0 : p->opta[2]);
+    X1 = X0 + (fclamp(Input[0]) >= 1.0 ? 0 : p->opta[2]);
 
     Y0 = p -> opta[1] * y0;
-    Y1 = Y0 + (Input[1] >= 1.0 ? 0 : p->opta[1]);
+    Y1 = Y0 + (fclamp(Input[1]) >= 1.0 ? 0 : p->opta[1]);
 
     Z0 = p -> opta[0] * z0;
-    Z1 = Z0 + (Input[2] >= 1.0 ? 0 : p->opta[0]);
+    Z1 = Z0 + (fclamp(Input[2]) >= 1.0 ? 0 : p->opta[0]);
 
     for (OutChan = 0; OutChan < TotalOut; OutChan++) {
 
@@ -637,19 +645,19 @@ void TetrahedralInterpFloat(const cmsFloat32Number Input[],
     py = fclamp(Input[1]) * p->Domain[1];
     pz = fclamp(Input[2]) * p->Domain[2];
 
-    x0 = (int) _cmsQuickFloor(px); rx = (px - (cmsFloat32Number) x0);
-    y0 = (int) _cmsQuickFloor(py); ry = (py - (cmsFloat32Number) y0);
-    z0 = (int) _cmsQuickFloor(pz); rz = (pz - (cmsFloat32Number) z0);
+    x0 = (int) floor(px); rx = (px - (cmsFloat32Number) x0);  // We need full floor functionality here
+    y0 = (int) floor(py); ry = (py - (cmsFloat32Number) y0);
+    z0 = (int) floor(pz); rz = (pz - (cmsFloat32Number) z0);
 
 
     X0 = p -> opta[2] * x0;
-    X1 = X0 + (Input[0] >= 1.0 ? 0 : p->opta[2]);
+    X1 = X0 + (fclamp(Input[0]) >= 1.0 ? 0 : p->opta[2]);
 
     Y0 = p -> opta[1] * y0;
-    Y1 = Y0 + (Input[1] >= 1.0 ? 0 : p->opta[1]);
+    Y1 = Y0 + (fclamp(Input[1]) >= 1.0 ? 0 : p->opta[1]);
 
     Z0 = p -> opta[0] * z0;
-    Z1 = Z0 + (Input[2] >= 1.0 ? 0 : p->opta[0]);
+    Z1 = Z0 + (fclamp(Input[2]) >= 1.0 ? 0 : p->opta[0]);
 
     for (OutChan=0; OutChan < TotalOut; OutChan++) {
 
@@ -952,13 +960,13 @@ void Eval4Inputs(register const cmsUInt16Number Input[],
                                 c3 = DENS(X0, Y0, Z1) - c0;
 
                             }
-                            else  {
+                            else {
                                 c1 = c2 = c3 = 0;
                             }
 
                             Rest = c1 * rx + c2 * ry + c3 * rz;
 
-                            Tmp1[OutChan] = (cmsUInt16Number) ( c0 + ROUND_FIXED_TO_INT(_cmsToFixedDomain(Rest)));
+                            Tmp1[OutChan] = (cmsUInt16Number)(c0 + ROUND_FIXED_TO_INT(_cmsToFixedDomain(Rest)));
     }
 
 
@@ -1057,7 +1065,7 @@ void Eval4InputsFloat(const cmsFloat32Number Input[],
        rest = pk - (cmsFloat32Number) k0;
 
        K0 = p -> opta[3] * k0;
-       K1 = K0 + (Input[0] >= 1.0 ? 0 : p->opta[3]);
+       K1 = K0 + (fclamp(Input[0]) >= 1.0 ? 0 : p->opta[3]);
 
        p1 = *p;
        memmove(&p1.Domain[0], &p ->Domain[1], 3*sizeof(cmsUInt32Number));
@@ -1144,7 +1152,7 @@ void Eval5InputsFloat(const cmsFloat32Number Input[],
        rest = pk - (cmsFloat32Number) k0;
 
        K0 = p -> opta[4] * k0;
-       K1 = K0 + (Input[0] >= 1.0 ? 0 : p->opta[4]);
+       K1 = K0 + (fclamp(Input[0]) >= 1.0 ? 0 : p->opta[4]);
 
        p1 = *p;
        memmove(&p1.Domain[0], &p ->Domain[1], 4*sizeof(cmsUInt32Number));
@@ -1231,7 +1239,7 @@ void Eval6InputsFloat(const cmsFloat32Number Input[],
        rest = pk - (cmsFloat32Number) k0;
 
        K0 = p -> opta[5] * k0;
-       K1 = K0 + (Input[0] >= 1.0 ? 0 : p->opta[5]);
+       K1 = K0 + (fclamp(Input[0]) >= 1.0 ? 0 : p->opta[5]);
 
        p1 = *p;
        memmove(&p1.Domain[0], &p ->Domain[1], 5*sizeof(cmsUInt32Number));
@@ -1316,7 +1324,7 @@ void Eval7InputsFloat(const cmsFloat32Number Input[],
        rest = pk - (cmsFloat32Number) k0;
 
        K0 = p -> opta[6] * k0;
-       K1 = K0 + (Input[0] >= 1.0 ? 0 : p->opta[6]);
+       K1 = K0 + (fclamp(Input[0]) >= 1.0 ? 0 : p->opta[6]);
 
        p1 = *p;
        memmove(&p1.Domain[0], &p ->Domain[1], 6*sizeof(cmsUInt32Number));
@@ -1401,7 +1409,7 @@ void Eval8InputsFloat(const cmsFloat32Number Input[],
        rest = pk - (cmsFloat32Number) k0;
 
        K0 = p -> opta[7] * k0;
-       K1 = K0 + (Input[0] >= 1.0 ? 0 : p->opta[7]);
+       K1 = K0 + (fclamp(Input[0]) >= 1.0 ? 0 : p->opta[7]);
 
        p1 = *p;
        memmove(&p1.Domain[0], &p ->Domain[1], 7*sizeof(cmsUInt32Number));
diff --git a/src/java.desktop/share/native/liblcms/cmsio0.c b/src/java.desktop/share/native/liblcms/cmsio0.c
index f86f2e738d8..3dbfcb37ebf 100644
--- a/src/java.desktop/share/native/liblcms/cmsio0.c
+++ b/src/java.desktop/share/native/liblcms/cmsio0.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -366,21 +366,27 @@ cmsBool  FileSeek(cmsIOHANDLER* iohandler, cmsUInt32Number offset)
     return TRUE;
 }
 
-// Returns file pointer position
+// Returns file pointer position or 0 on error, which is also a valid position.
 static
 cmsUInt32Number FileTell(cmsIOHANDLER* iohandler)
 {
-    return (cmsUInt32Number) ftell((FILE*)iohandler ->stream);
+    long t = ftell((FILE*)iohandler ->stream);
+    if (t == -1L) {
+        cmsSignalError(iohandler->ContextID, cmsERROR_FILE, "Tell error; probably corrupted file");
+        return 0;
+    }
+
+    return (cmsUInt32Number)t;
 }
 
 // Writes data to stream, also keeps used space for further reference. Returns TRUE on success, FALSE on error
 static
 cmsBool  FileWrite(cmsIOHANDLER* iohandler, cmsUInt32Number size, const void* Buffer)
 {
-       if (size == 0) return TRUE;  // We allow to write 0 bytes, but nothing is written
+    if (size == 0) return TRUE;  // We allow to write 0 bytes, but nothing is written
 
-       iohandler->UsedSpace += size;
-       return (fwrite(Buffer, size, 1, (FILE*) iohandler->stream) == 1);
+    iohandler->UsedSpace += size;
+    return (fwrite(Buffer, size, 1, (FILE*)iohandler->stream) == 1);
 }
 
 // Closes the file
@@ -548,7 +554,7 @@ cmsInt32Number CMSEXPORT cmsGetTagCount(cmsHPROFILE hProfile)
     _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
     if (Icc == NULL) return -1;
 
-    return  Icc->TagCount;
+    return  (cmsInt32Number) Icc->TagCount;
 }
 
 // Return the tag signature of a given tag number
@@ -566,9 +572,9 @@ cmsTagSignature CMSEXPORT cmsGetTagSignature(cmsHPROFILE hProfile, cmsUInt32Numb
 static
 int SearchOneTag(_cmsICCPROFILE* Profile, cmsTagSignature sig)
 {
-    cmsUInt32Number i;
+    int i;
 
-    for (i=0; i < Profile -> TagCount; i++) {
+    for (i=0; i < (int) Profile -> TagCount; i++) {
 
         if (sig == Profile -> TagNames[i])
             return i;
@@ -662,7 +668,7 @@ cmsBool _cmsNewTag(_cmsICCPROFILE* Icc, cmsTagSignature sig, int* NewPos)
             return FALSE;
         }
 
-        *NewPos = Icc ->TagCount;
+        *NewPos = (int) Icc ->TagCount;
         Icc -> TagCount++;
     }
 
@@ -693,10 +699,10 @@ cmsUInt32Number _validatedVersion(cmsUInt32Number DWord)
     cmsUInt8Number temp2;
 
     if (*pByte > 0x09) *pByte = (cmsUInt8Number) 0x09;
-    temp1 = *(pByte+1) & 0xf0;
-    temp2 = *(pByte+1) & 0x0f;
-    if (temp1 > 0x90) temp1 = 0x90;
-    if (temp2 > 0x09) temp2 = 0x09;
+    temp1 = (cmsUInt8Number) (*(pByte+1) & 0xf0);
+    temp2 = (cmsUInt8Number) (*(pByte+1) & 0x0f);
+    if (temp1 > 0x90U) temp1 = 0x90U;
+    if (temp2 > 0x09U) temp2 = 0x09U;
     *(pByte+1) = (cmsUInt8Number)(temp1 | temp2);
     *(pByte+2) = (cmsUInt8Number)0;
     *(pByte+3) = (cmsUInt8Number)0;
@@ -804,7 +810,7 @@ cmsBool _cmsWriteHeader(_cmsICCPROFILE* Icc, cmsUInt32Number UsedSpace)
     cmsICCHeader Header;
     cmsUInt32Number i;
     cmsTagEntry Tag;
-    cmsInt32Number Count = 0;
+    cmsUInt32Number Count;
 
     Header.size        = _cmsAdjustEndianess32(UsedSpace);
     Header.cmmId       = _cmsAdjustEndianess32(lcmsSignature);
@@ -835,9 +841,9 @@ cmsBool _cmsWriteHeader(_cmsICCPROFILE* Icc, cmsUInt32Number UsedSpace)
     Header.renderingIntent = _cmsAdjustEndianess32(Icc -> RenderingIntent);
 
     // Illuminant is always D50
-    Header.illuminant.X = _cmsAdjustEndianess32(_cmsDoubleTo15Fixed16(cmsD50_XYZ()->X));
-    Header.illuminant.Y = _cmsAdjustEndianess32(_cmsDoubleTo15Fixed16(cmsD50_XYZ()->Y));
-    Header.illuminant.Z = _cmsAdjustEndianess32(_cmsDoubleTo15Fixed16(cmsD50_XYZ()->Z));
+    Header.illuminant.X = (cmsS15Fixed16Number) _cmsAdjustEndianess32((cmsUInt32Number) _cmsDoubleTo15Fixed16(cmsD50_XYZ()->X));
+    Header.illuminant.Y = (cmsS15Fixed16Number) _cmsAdjustEndianess32((cmsUInt32Number) _cmsDoubleTo15Fixed16(cmsD50_XYZ()->Y));
+    Header.illuminant.Z = (cmsS15Fixed16Number) _cmsAdjustEndianess32((cmsUInt32Number) _cmsDoubleTo15Fixed16(cmsD50_XYZ()->Z));
 
     // Created by LittleCMS (that's me!)
     Header.creator      = _cmsAdjustEndianess32(lcmsSignature);
@@ -853,6 +859,7 @@ cmsBool _cmsWriteHeader(_cmsICCPROFILE* Icc, cmsUInt32Number UsedSpace)
     // Saves Tag directory
 
     // Get true count
+    Count = 0;
     for (i=0;  i < Icc -> TagCount; i++) {
         if (Icc ->TagNames[i] != (cmsTagSignature) 0)
             Count++;
@@ -865,9 +872,9 @@ cmsBool _cmsWriteHeader(_cmsICCPROFILE* Icc, cmsUInt32Number UsedSpace)
 
         if (Icc ->TagNames[i] == (cmsTagSignature) 0) continue;   // It is just a placeholder
 
-        Tag.sig    = (cmsTagSignature) _cmsAdjustEndianess32((cmsInt32Number) Icc -> TagNames[i]);
-        Tag.offset = _cmsAdjustEndianess32((cmsInt32Number) Icc -> TagOffsets[i]);
-        Tag.size   = _cmsAdjustEndianess32((cmsInt32Number) Icc -> TagSizes[i]);
+        Tag.sig    = (cmsTagSignature) _cmsAdjustEndianess32((cmsUInt32Number) Icc -> TagNames[i]);
+        Tag.offset = _cmsAdjustEndianess32((cmsUInt32Number) Icc -> TagOffsets[i]);
+        Tag.size   = _cmsAdjustEndianess32((cmsUInt32Number) Icc -> TagSizes[i]);
 
         if (!Icc ->IOhandler -> Write(Icc-> IOhandler, sizeof(cmsTagEntry), &Tag)) return FALSE;
     }
@@ -1176,7 +1183,7 @@ cmsHPROFILE CMSEXPORT cmsOpenProfileFromMemTHR(cmsContext ContextID, const void*
     NewIcc = (_cmsICCPROFILE*) hEmpty;
 
     // Ok, in this case const void* is casted to void* just because open IO handler
-    // shares read and writting modes. Don't abuse this feature!
+    // shares read and writing modes. Don't abuse this feature!
     NewIcc ->IOhandler = cmsOpenIOhandlerFromMem(ContextID, (void*) MemPtr, dwSize, "r");
     if (NewIcc ->IOhandler == NULL) goto Error;
 
@@ -1466,7 +1473,7 @@ cmsBool  CMSEXPORT cmsCloseProfile(cmsHPROFILE hProfile)
     // Was open in write mode?
     if (Icc ->IsWrite) {
 
-        Icc ->IsWrite = FALSE;      // Assure no further writting
+        Icc ->IsWrite = FALSE;      // Assure no further writing
         rc &= cmsSaveProfileToFile(hProfile, Icc ->IOhandler->PhysicalFile);
     }
 
@@ -1543,11 +1550,15 @@ void* CMSEXPORT cmsReadTag(cmsHPROFILE hProfile, cmsTagSignature sig)
     // If the element is already in memory, return the pointer
     if (Icc -> TagPtrs[n]) {
 
-        if (Icc -> TagTypeHandlers[n] == NULL) goto Error;
-        BaseType = Icc -> TagTypeHandlers[n]->Signature;
+        if (Icc->TagTypeHandlers[n] == NULL) goto Error;
+
+        // Sanity check
+        BaseType = Icc->TagTypeHandlers[n]->Signature;
         if (BaseType == 0) goto Error;
-        TagDescriptor = _cmsGetTagDescriptor(Icc-> ContextID, sig);
+
+        TagDescriptor = _cmsGetTagDescriptor(Icc->ContextID, sig);
         if (TagDescriptor == NULL) goto Error;
+
         if (!IsTypeSupported(TagDescriptor, BaseType)) goto Error;
 
         if (Icc ->TagSaveAsRaw[n]) goto Error;  // We don't support read raw tags as cooked
@@ -1560,6 +1571,8 @@ void* CMSEXPORT cmsReadTag(cmsHPROFILE hProfile, cmsTagSignature sig)
     Offset    = Icc -> TagOffsets[n];
     TagSize   = Icc -> TagSizes[n];
 
+    if (TagSize < 8) goto Error;
+
     // Seek to its location
     if (!io -> Seek(io, Offset))
         goto Error;
@@ -1583,7 +1596,7 @@ void* CMSEXPORT cmsReadTag(cmsHPROFILE hProfile, cmsTagSignature sig)
 
     if (!IsTypeSupported(TagDescriptor, BaseType)) goto Error;
 
-    TagSize  -= 8;                      // Alredy read by the type base logic
+    TagSize  -= 8;       // Alredy read by the type base logic
 
     // Get type handler
     TypeHandler = _cmsGetTagTypeHandler(Icc ->ContextID, BaseType);
@@ -1772,7 +1785,7 @@ cmsBool CMSEXPORT cmsWriteTag(cmsHPROFILE hProfile, cmsTagSignature sig, const v
 // raw data written does not exactly correspond with the raw data proposed to cmsWriteRaw data, but this approach allows
 // to write a tag as raw data and the read it as handled.
 
-cmsInt32Number CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSignature sig, void* data, cmsUInt32Number BufferSize)
+cmsUInt32Number CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSignature sig, void* data, cmsUInt32Number BufferSize)
 {
     _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
     void *Object;
@@ -1890,7 +1903,7 @@ cmsInt32Number CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSignature sig
 }
 
 // Similar to the anterior. This function allows to write directly to the ICC profile any data, without
-// checking anything. As a rule, mixing Raw with cooked doesn't work, so writting a tag as raw and then reading
+// checking anything. As a rule, mixing Raw with cooked doesn't work, so writing a tag as raw and then reading
 // it as cooked without serializing does result into an error. If that is what you want, you will need to dump
 // the profile to memry or disk and then reopen it.
 cmsBool CMSEXPORT cmsWriteRawTag(cmsHPROFILE hProfile, cmsTagSignature sig, const void* data, cmsUInt32Number Size)
diff --git a/src/java.desktop/share/native/liblcms/cmsio1.c b/src/java.desktop/share/native/liblcms/cmsio1.c
index c478b2ec75e..efac5abbba8 100644
--- a/src/java.desktop/share/native/liblcms/cmsio1.c
+++ b/src/java.desktop/share/native/liblcms/cmsio1.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -335,8 +335,8 @@ cmsPipeline* _cmsReadFloatInputTag(cmsHPROFILE hProfile, cmsTagSignature tagFloa
 
 // Read and create a BRAND NEW MPE LUT from a given profile. All stuff dependent of version, etc
 // is adjusted here in order to create a LUT that takes care of all those details.
-// We add intent = -1 as a way to read matrix shaper always, no matter of other LUT
-cmsPipeline* _cmsReadInputLUT(cmsHPROFILE hProfile, int Intent)
+// We add intent = 0xffffffff as a way to read matrix shaper always, no matter of other LUT
+cmsPipeline* CMSEXPORT _cmsReadInputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent)
 {
     cmsTagTypeSignature OriginalType;
     cmsTagSignature tag16;
@@ -366,8 +366,8 @@ cmsPipeline* _cmsReadInputLUT(cmsHPROFILE hProfile, int Intent)
     }
 
     // This is an attempt to reuse this function to retrieve the matrix-shaper as pipeline no
-    // matter other LUT are present and have precedence. Intent = -1 means just this.
-    if (Intent >= INTENT_PERCEPTUAL && Intent <= INTENT_ABSOLUTE_COLORIMETRIC) {
+    // matter other LUT are present and have precedence. Intent = 0xffffffff can be used for that.
+    if (Intent <= INTENT_ABSOLUTE_COLORIMETRIC) {
 
         tag16 = Device2PCS16[Intent];
         tagFloat = Device2PCSFloat[Intent];
@@ -611,7 +611,7 @@ cmsPipeline* _cmsReadFloatOutputTag(cmsHPROFILE hProfile, cmsTagSignature tagFlo
 }
 
 // Create an output MPE LUT from agiven profile. Version mismatches are handled here
-cmsPipeline* _cmsReadOutputLUT(cmsHPROFILE hProfile, int Intent)
+cmsPipeline* CMSEXPORT _cmsReadOutputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent)
 {
     cmsTagTypeSignature OriginalType;
     cmsTagSignature tag16;
@@ -619,7 +619,7 @@ cmsPipeline* _cmsReadOutputLUT(cmsHPROFILE hProfile, int Intent)
     cmsContext ContextID  = cmsGetProfileContextID(hProfile);
 
 
-    if (Intent >= INTENT_PERCEPTUAL && Intent <= INTENT_ABSOLUTE_COLORIMETRIC) {
+    if (Intent <= INTENT_ABSOLUTE_COLORIMETRIC) {
 
         tag16 = PCS2Device16[Intent];
         tagFloat = PCS2DeviceFloat[Intent];
@@ -695,8 +695,8 @@ cmsPipeline* _cmsReadOutputLUT(cmsHPROFILE hProfile, int Intent)
 static
 cmsPipeline* _cmsReadFloatDevicelinkTag(cmsHPROFILE hProfile, cmsTagSignature tagFloat)
 {
-    cmsContext ContextID       = cmsGetProfileContextID(hProfile);
-    cmsPipeline* Lut           = cmsPipelineDup((cmsPipeline*) cmsReadTag(hProfile, tagFloat));
+    cmsContext ContextID = cmsGetProfileContextID(hProfile);
+    cmsPipeline* Lut = cmsPipelineDup((cmsPipeline*)cmsReadTag(hProfile, tagFloat));
     cmsColorSpaceSignature PCS = cmsGetPCS(hProfile);
     cmsColorSpaceSignature spc = cmsGetColorSpace(hProfile);
 
@@ -714,17 +714,17 @@ cmsPipeline* _cmsReadFloatDevicelinkTag(cmsHPROFILE hProfile, cmsTagSignature ta
                 goto Error;
         }
 
-        if (PCS == cmsSigLabData)
+    if (PCS == cmsSigLabData)
+    {
+        if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromLabFloat(ContextID)))
+            goto Error;
+    }
+    else
+        if (PCS == cmsSigXYZData)
         {
-            if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromLabFloat(ContextID)))
+            if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromXyzFloat(ContextID)))
                 goto Error;
         }
-        else
-            if (PCS == cmsSigXYZData)
-            {
-                if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageNormalizeFromXyzFloat(ContextID)))
-                    goto Error;
-            }
 
     return Lut;
 Error:
@@ -734,7 +734,7 @@ cmsPipeline* _cmsReadFloatDevicelinkTag(cmsHPROFILE hProfile, cmsTagSignature ta
 
 // This one includes abstract profiles as well. Matrix-shaper cannot be obtained on that device class. The
 // tag name here may default to AToB0
-cmsPipeline* _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, int Intent)
+cmsPipeline* CMSEXPORT _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent)
 {
     cmsPipeline* Lut;
     cmsTagTypeSignature OriginalType;
@@ -743,7 +743,7 @@ cmsPipeline* _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, int Intent)
     cmsContext ContextID = cmsGetProfileContextID(hProfile);
 
 
-    if (Intent < INTENT_PERCEPTUAL || Intent > INTENT_ABSOLUTE_COLORIMETRIC)
+    if (Intent > INTENT_ABSOLUTE_COLORIMETRIC)
         return NULL;
 
     tag16 = Device2PCS16[Intent];
diff --git a/src/java.desktop/share/native/liblcms/cmslut.c b/src/java.desktop/share/native/liblcms/cmslut.c
index 6c4b8ce4b40..495f3ef9283 100644
--- a/src/java.desktop/share/native/liblcms/cmslut.c
+++ b/src/java.desktop/share/native/liblcms/cmslut.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -153,8 +153,8 @@ cmsBool  CMSEXPORT cmsPipelineCheckAndRetreiveStages(const cmsPipeline* Lut, cms
     mpe = Lut ->Elements;
     for (i=0; i < n; i++) {
 
-        // Get asked type
-        Type  = (cmsStageSignature)va_arg(args, cmsStageSignature);
+        // Get asked type. cmsStageSignature is promoted to int by compiler
+        Type  = (cmsStageSignature)va_arg(args, int);
         if (mpe ->Type != Type) {
 
             va_end(args);       // Mismatch. We are done.
@@ -321,7 +321,7 @@ cmsStage* CMSEXPORT cmsStageAllocToneCurves(cmsContext ContextID, cmsUInt32Numbe
 
 
 // Create a bunch of identity curves
-cmsStage* _cmsStageAllocIdentityCurves(cmsContext ContextID, int nChannels)
+cmsStage* CMSEXPORT _cmsStageAllocIdentityCurves(cmsContext ContextID, cmsUInt32Number nChannels)
 {
     cmsStage* mpe = cmsStageAllocToneCurves(ContextID, nChannels, NULL);
 
@@ -443,13 +443,13 @@ cmsStage*  CMSEXPORT cmsStageAllocMatrix(cmsContext ContextID, cmsUInt32Number R
 
     if (Offset != NULL) {
 
-        NewElem ->Offset = (cmsFloat64Number*) _cmsCalloc(ContextID, Cols, sizeof(cmsFloat64Number));
+        NewElem ->Offset = (cmsFloat64Number*) _cmsCalloc(ContextID, Rows, sizeof(cmsFloat64Number));
         if (NewElem->Offset == NULL) {
            MatrixElemTypeFree(NewMPE);
            return NULL;
         }
 
-        for (i=0; i < Cols; i++) {
+        for (i=0; i < Rows; i++) {
                 NewElem ->Offset[i] = Offset[i];
         }
 
@@ -741,7 +741,7 @@ int IdentitySampler(register const cmsUInt16Number In[], register cmsUInt16Numbe
 }
 
 // Creates an MPE that just copies input to output
-cmsStage* _cmsStageAllocIdentityCLut(cmsContext ContextID, int nChan)
+cmsStage* CMSEXPORT _cmsStageAllocIdentityCLut(cmsContext ContextID, cmsUInt32Number nChan)
 {
     cmsUInt32Number Dimensions[MAX_INPUT_DIMENSIONS];
     cmsStage* mpe ;
@@ -765,7 +765,7 @@ cmsStage* _cmsStageAllocIdentityCLut(cmsContext ContextID, int nChan)
 
 
 // Quantize a value 0 <= i < MaxSamples to 0..0xffff
-cmsUInt16Number _cmsQuantizeVal(cmsFloat64Number i, int MaxSamples)
+cmsUInt16Number CMSEXPORT _cmsQuantizeVal(cmsFloat64Number i, cmsUInt32Number MaxSamples)
 {
     cmsFloat64Number x;
 
@@ -778,8 +778,9 @@ cmsUInt16Number _cmsQuantizeVal(cmsFloat64Number i, int MaxSamples)
 // function on knots. returns TRUE if all ok, FALSE otherwise.
 cmsBool CMSEXPORT cmsStageSampleCLut16bit(cmsStage* mpe, cmsSAMPLER16 Sampler, void * Cargo, cmsUInt32Number dwFlags)
 {
-    int i, t, nTotalPoints, index, rest;
-    int nInputs, nOutputs;
+    int i, t, index, rest;
+    cmsUInt32Number nTotalPoints;
+    cmsUInt32Number nInputs, nOutputs;
     cmsUInt32Number* nSamples;
     cmsUInt16Number In[MAX_INPUT_DIMENSIONS+1], Out[MAX_STAGE_CHANNELS];
     _cmsStageCLutData* clut;
@@ -799,14 +800,17 @@ cmsBool CMSEXPORT cmsStageSampleCLut16bit(cmsStage* mpe, cmsSAMPLER16 Sampler, v
     if (nInputs > MAX_INPUT_DIMENSIONS) return FALSE;
     if (nOutputs >= MAX_STAGE_CHANNELS) return FALSE;
 
+    memset(In, 0, sizeof(In));
+    memset(Out, 0, sizeof(Out));
+
     nTotalPoints = CubeSize(nSamples, nInputs);
     if (nTotalPoints == 0) return FALSE;
 
     index = 0;
-    for (i = 0; i < nTotalPoints; i++) {
+    for (i = 0; i < (int) nTotalPoints; i++) {
 
         rest = i;
-        for (t = nInputs-1; t >=0; --t) {
+        for (t = (int)nInputs - 1; t >= 0; --t) {
 
             cmsUInt32Number  Colorant = rest % nSamples[t];
 
@@ -816,7 +820,7 @@ cmsBool CMSEXPORT cmsStageSampleCLut16bit(cmsStage* mpe, cmsSAMPLER16 Sampler, v
         }
 
         if (clut ->Tab.T != NULL) {
-            for (t=0; t < nOutputs; t++)
+            for (t = 0; t < (int)nOutputs; t++)
                 Out[t] = clut->Tab.T[index + t];
         }
 
@@ -826,7 +830,7 @@ cmsBool CMSEXPORT cmsStageSampleCLut16bit(cmsStage* mpe, cmsSAMPLER16 Sampler, v
         if (!(dwFlags & SAMPLER_INSPECT)) {
 
             if (clut ->Tab.T != NULL) {
-                for (t=0; t < nOutputs; t++)
+                for (t=0; t < (int) nOutputs; t++)
                     clut->Tab.T[index + t] = Out[t];
             }
         }
@@ -837,11 +841,12 @@ cmsBool CMSEXPORT cmsStageSampleCLut16bit(cmsStage* mpe, cmsSAMPLER16 Sampler, v
     return TRUE;
 }
 
-// Same as anterior, but for floting point
+// Same as anterior, but for floating point
 cmsBool CMSEXPORT cmsStageSampleCLutFloat(cmsStage* mpe, cmsSAMPLERFLOAT Sampler, void * Cargo, cmsUInt32Number dwFlags)
 {
-    int i, t, nTotalPoints, index, rest;
-    int nInputs, nOutputs;
+    int i, t, index, rest;
+    cmsUInt32Number nTotalPoints;
+    cmsUInt32Number nInputs, nOutputs;
     cmsUInt32Number* nSamples;
     cmsFloat32Number In[MAX_INPUT_DIMENSIONS+1], Out[MAX_STAGE_CHANNELS];
     _cmsStageCLutData* clut = (_cmsStageCLutData*) mpe->Data;
@@ -859,10 +864,10 @@ cmsBool CMSEXPORT cmsStageSampleCLutFloat(cmsStage* mpe, cmsSAMPLERFLOAT Sampler
     if (nTotalPoints == 0) return FALSE;
 
     index = 0;
-    for (i = 0; i < nTotalPoints; i++) {
+    for (i = 0; i < (int)nTotalPoints; i++) {
 
         rest = i;
-        for (t = nInputs-1; t >=0; --t) {
+        for (t = (int) nInputs-1; t >=0; --t) {
 
             cmsUInt32Number  Colorant = rest % nSamples[t];
 
@@ -872,7 +877,7 @@ cmsBool CMSEXPORT cmsStageSampleCLutFloat(cmsStage* mpe, cmsSAMPLERFLOAT Sampler
         }
 
         if (clut ->Tab.TFloat != NULL) {
-            for (t=0; t < nOutputs; t++)
+            for (t=0; t < (int) nOutputs; t++)
                 Out[t] = clut->Tab.TFloat[index + t];
         }
 
@@ -882,7 +887,7 @@ cmsBool CMSEXPORT cmsStageSampleCLutFloat(cmsStage* mpe, cmsSAMPLERFLOAT Sampler
         if (!(dwFlags & SAMPLER_INSPECT)) {
 
             if (clut ->Tab.TFloat != NULL) {
-                for (t=0; t < nOutputs; t++)
+                for (t=0; t < (int) nOutputs; t++)
                     clut->Tab.TFloat[index + t] = Out[t];
             }
         }
@@ -900,7 +905,8 @@ cmsBool CMSEXPORT cmsStageSampleCLutFloat(cmsStage* mpe, cmsSAMPLERFLOAT Sampler
 cmsBool CMSEXPORT cmsSliceSpace16(cmsUInt32Number nInputs, const cmsUInt32Number clutPoints[],
                                          cmsSAMPLER16 Sampler, void * Cargo)
 {
-    int i, t, nTotalPoints, rest;
+    int i, t, rest;
+    cmsUInt32Number nTotalPoints;
     cmsUInt16Number In[cmsMAXCHANNELS];
 
     if (nInputs >= cmsMAXCHANNELS) return FALSE;
@@ -908,10 +914,10 @@ cmsBool CMSEXPORT cmsSliceSpace16(cmsUInt32Number nInputs, const cmsUInt32Number
     nTotalPoints = CubeSize(clutPoints, nInputs);
     if (nTotalPoints == 0) return FALSE;
 
-    for (i = 0; i < nTotalPoints; i++) {
+    for (i = 0; i < (int) nTotalPoints; i++) {
 
         rest = i;
-        for (t = nInputs-1; t >=0; --t) {
+        for (t = (int) nInputs-1; t >=0; --t) {
 
             cmsUInt32Number  Colorant = rest % clutPoints[t];
 
@@ -930,7 +936,8 @@ cmsBool CMSEXPORT cmsSliceSpace16(cmsUInt32Number nInputs, const cmsUInt32Number
 cmsInt32Number CMSEXPORT cmsSliceSpaceFloat(cmsUInt32Number nInputs, const cmsUInt32Number clutPoints[],
                                             cmsSAMPLERFLOAT Sampler, void * Cargo)
 {
-    int i, t, nTotalPoints, rest;
+    int i, t, rest;
+    cmsUInt32Number nTotalPoints;
     cmsFloat32Number In[cmsMAXCHANNELS];
 
     if (nInputs >= cmsMAXCHANNELS) return FALSE;
@@ -938,10 +945,10 @@ cmsInt32Number CMSEXPORT cmsSliceSpaceFloat(cmsUInt32Number nInputs, const cmsUI
     nTotalPoints = CubeSize(clutPoints, nInputs);
     if (nTotalPoints == 0) return FALSE;
 
-    for (i = 0; i < nTotalPoints; i++) {
+    for (i = 0; i < (int) nTotalPoints; i++) {
 
         rest = i;
-        for (t = nInputs-1; t >=0; --t) {
+        for (t = (int) nInputs-1; t >=0; --t) {
 
             cmsUInt32Number  Colorant = rest % clutPoints[t];
 
@@ -991,7 +998,7 @@ void EvaluateLab2XYZ(const cmsFloat32Number In[],
 
 
 // No dup or free routines needed, as the structure has no pointers in it.
-cmsStage* _cmsStageAllocLab2XYZ(cmsContext ContextID)
+cmsStage* CMSEXPORT _cmsStageAllocLab2XYZ(cmsContext ContextID)
 {
     return _cmsStageAllocPlaceholder(ContextID, cmsSigLab2XYZElemType, 3, 3, EvaluateLab2XYZ, NULL, NULL, NULL);
 }
@@ -1021,7 +1028,7 @@ cmsStage* _cmsStageAllocLabV2ToV4curves(cmsContext ContextID)
             return NULL;
         }
 
-        // We need to map * (0xffff / 0xff00), thats same as (257 / 256)
+        // We need to map * (0xffff / 0xff00), that's same as (257 / 256)
         // So we can use 258-entry tables to do the trick (i / 257) * (255 * 257) * (257 / 256);
         for (i=0; i < 257; i++)  {
 
@@ -1042,7 +1049,7 @@ cmsStage* _cmsStageAllocLabV2ToV4curves(cmsContext ContextID)
 // ********************************************************************************
 
 // Matrix-based conversion, which is more accurate, but slower and cannot properly be saved in devicelink profiles
-cmsStage* _cmsStageAllocLabV2ToV4(cmsContext ContextID)
+cmsStage* CMSEXPORT _cmsStageAllocLabV2ToV4(cmsContext ContextID)
 {
     static const cmsFloat64Number V2ToV4[] = { 65535.0/65280.0, 0, 0,
                                      0, 65535.0/65280.0, 0,
@@ -1058,7 +1065,7 @@ cmsStage* _cmsStageAllocLabV2ToV4(cmsContext ContextID)
 
 
 // Reverse direction
-cmsStage* _cmsStageAllocLabV4ToV2(cmsContext ContextID)
+cmsStage* CMSEXPORT _cmsStageAllocLabV4ToV2(cmsContext ContextID)
 {
     static const cmsFloat64Number V4ToV2[] = { 65280.0/65535.0, 0, 0,
                                      0, 65280.0/65535.0, 0,
@@ -1166,7 +1173,7 @@ void Clipper(const cmsFloat32Number In[], cmsFloat32Number Out[], const cmsStage
        }
 }
 
-cmsStage*  _cmsStageClipNegatives(cmsContext ContextID, int nChannels)
+cmsStage*  _cmsStageClipNegatives(cmsContext ContextID, cmsUInt32Number nChannels)
 {
        return _cmsStageAllocPlaceholder(ContextID, cmsSigClipNegativesElemType,
               nChannels, nChannels, Clipper, NULL, NULL, NULL);
@@ -1201,7 +1208,7 @@ void EvaluateXYZ2Lab(const cmsFloat32Number In[], cmsFloat32Number Out[], const
     cmsUNUSED_PARAMETER(mpe);
 }
 
-cmsStage* _cmsStageAllocXYZ2Lab(cmsContext ContextID)
+cmsStage* CMSEXPORT _cmsStageAllocXYZ2Lab(cmsContext ContextID)
 {
     return _cmsStageAllocPlaceholder(ContextID, cmsSigXYZ2LabElemType, 3, 3, EvaluateXYZ2Lab, NULL, NULL, NULL);
 
@@ -1300,23 +1307,42 @@ cmsStage* CMSEXPORT cmsStageDup(cmsStage* mpe)
 // ***********************************************************************************************************
 
 // This function sets up the channel count
-
 static
-void BlessLUT(cmsPipeline* lut)
+cmsBool BlessLUT(cmsPipeline* lut)
 {
-    // We can set the input/ouput channels only if we have elements.
+    // We can set the input/output channels only if we have elements.
     if (lut ->Elements != NULL) {
 
-        cmsStage *First, *Last;
+        cmsStage* prev;
+        cmsStage* next;
+        cmsStage* First;
+        cmsStage* Last;
 
         First  = cmsPipelineGetPtrToFirstStage(lut);
         Last   = cmsPipelineGetPtrToLastStage(lut);
 
-        if (First != NULL)lut ->InputChannels = First ->InputChannels;
-        if (Last != NULL) lut ->OutputChannels = Last ->OutputChannels;
+        if (First == NULL || Last == NULL) return FALSE;
+
+        lut->InputChannels = First->InputChannels;
+        lut->OutputChannels = Last->OutputChannels;
+
+        // Check chain consistency
+        prev = First;
+        next = prev->Next;
+
+        while (next != NULL)
+        {
+            if (next->InputChannels != prev->OutputChannels)
+                return FALSE;
+
+            next = next->Next;
+            prev = prev->Next;
     }
 }
 
+    return TRUE;
+}
+
 
 // Default to evaluate the LUT on 16 bit-basis. Precision is retained.
 static
@@ -1368,21 +1394,18 @@ void _LUTevalFloat(register const cmsFloat32Number In[], register cmsFloat32Numb
 }
 
 
-
-
 // LUT Creation & Destruction
-
 cmsPipeline* CMSEXPORT cmsPipelineAlloc(cmsContext ContextID, cmsUInt32Number InputChannels, cmsUInt32Number OutputChannels)
 {
        cmsPipeline* NewLUT;
 
+       // A value of zero in channels is allowed as placeholder
        if (InputChannels >= cmsMAXCHANNELS ||
            OutputChannels >= cmsMAXCHANNELS) return NULL;
 
        NewLUT = (cmsPipeline*) _cmsMallocZero(ContextID, sizeof(cmsPipeline));
        if (NewLUT == NULL) return NULL;
 
-
        NewLUT -> InputChannels  = InputChannels;
        NewLUT -> OutputChannels = OutputChannels;
 
@@ -1393,7 +1416,11 @@ cmsPipeline* CMSEXPORT cmsPipelineAlloc(cmsContext ContextID, cmsUInt32Number In
        NewLUT ->Data        = NewLUT;
        NewLUT ->ContextID   = ContextID;
 
-       BlessLUT(NewLUT);
+       if (!BlessLUT(NewLUT))
+       {
+           _cmsFree(ContextID, NewLUT);
+           return NULL;
+       }
 
        return NewLUT;
 }
@@ -1500,7 +1527,12 @@ cmsPipeline* CMSEXPORT cmsPipelineDup(const cmsPipeline* lut)
 
     NewLUT ->SaveAs8Bits    = lut ->SaveAs8Bits;
 
-    BlessLUT(NewLUT);
+    if (!BlessLUT(NewLUT))
+    {
+        _cmsFree(lut->ContextID, NewLUT);
+        return NULL;
+    }
+
     return NewLUT;
 }
 
@@ -1537,8 +1569,7 @@ int CMSEXPORT cmsPipelineInsertStage(cmsPipeline* lut, cmsStageLoc loc, cmsStage
             return FALSE;
     }
 
-    BlessLUT(lut);
-    return TRUE;
+    return BlessLUT(lut);
 }
 
 // Unlink an element and return the pointer to it
@@ -1593,6 +1624,7 @@ void CMSEXPORT cmsPipelineUnlinkStage(cmsPipeline* lut, cmsStageLoc loc, cmsStag
     else
         cmsStageFree(Unlinked);
 
+    // May fail, but we ignore it
     BlessLUT(lut);
 }
 
@@ -1619,8 +1651,7 @@ cmsBool  CMSEXPORT cmsPipelineCat(cmsPipeline* l1, const cmsPipeline* l2)
                 return FALSE;
     }
 
-    BlessLUT(l1);
-    return TRUE;
+    return BlessLUT(l1);
 }
 
 
diff --git a/src/java.desktop/share/native/liblcms/cmsmd5.c b/src/java.desktop/share/native/liblcms/cmsmd5.c
index 619c94edf4c..d86c9822ec8 100644
--- a/src/java.desktop/share/native/liblcms/cmsmd5.c
+++ b/src/java.desktop/share/native/liblcms/cmsmd5.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsmtrx.c b/src/java.desktop/share/native/liblcms/cmsmtrx.c
index 2bc6a497775..916a2926810 100644
--- a/src/java.desktop/share/native/liblcms/cmsmtrx.c
+++ b/src/java.desktop/share/native/liblcms/cmsmtrx.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsnamed.c b/src/java.desktop/share/native/liblcms/cmsnamed.c
index d1edeb4ce12..177ed799465 100644
--- a/src/java.desktop/share/native/liblcms/cmsnamed.c
+++ b/src/java.desktop/share/native/liblcms/cmsnamed.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -156,7 +156,7 @@ int SearchMLUEntry(cmsMLU* mlu, cmsUInt16Number LanguageCode, cmsUInt16Number Co
     for (i=0; i < mlu ->UsedEntries; i++) {
 
         if (mlu ->Entries[i].Country  == CountryCode &&
-            mlu ->Entries[i].Language == LanguageCode) return i;
+            mlu ->Entries[i].Language == LanguageCode) return (int) i;
     }
 
     // Not found
@@ -207,31 +207,24 @@ cmsBool AddMLUBlock(cmsMLU* mlu, cmsUInt32Number size, const wchar_t *Block,
     return TRUE;
 }
 
-// Convert from a 3-char code to a cmsUInt16Number. It is done inthis way because some
+// Convert from a 3-char code to a cmsUInt16Number. It is done in this way because some
 // compilers don't properly align beginning of strings
 
 static
 cmsUInt16Number strTo16(const char str[3])
 {
-    cmsUInt16Number n = ((cmsUInt16Number) str[0] << 8) | str[1];
+    const cmsUInt8Number* ptr8 = (const cmsUInt8Number*)str;
+    cmsUInt16Number n = (cmsUInt16Number)(((cmsUInt16Number)ptr8[0] << 8) | ptr8[1]);
 
-    return n;  // Always big endian in this case
+    return n;
 }
 
 static
 void strFrom16(char str[3], cmsUInt16Number n)
 {
-    // Assiming this would be aligned
-    union {
-
-       cmsUInt16Number n;
-       char str[2];
-
-    } c;
-
-    c.n = n;  // Always big endian in this case
-
-    str[0] = c.str[0]; str[1] = c.str[1]; str[2] = 0;
+    str[0] = (char)(n >> 8);
+    str[1] = (char)n;
+    str[2] = (char)0;
 
 }
 
@@ -354,7 +347,7 @@ const wchar_t* _cmsMLUgetWide(const cmsMLU* mlu,
                               cmsUInt16Number* UsedLanguageCode, cmsUInt16Number* UsedCountryCode)
 {
     cmsUInt32Number i;
-    cmsInt32Number Best = -1;
+    int Best = -1;
     _cmsMLUentry* v;
 
     if (mlu == NULL) return NULL;
@@ -367,7 +360,7 @@ const wchar_t* _cmsMLUgetWide(const cmsMLU* mlu,
 
         if (v -> Language == LanguageCode) {
 
-            if (Best == -1) Best = i;
+            if (Best == -1) Best = (int) i;
 
             if (v -> Country == CountryCode) {
 
@@ -633,10 +626,10 @@ cmsBool  CMSEXPORT cmsAppendNamedColor(cmsNAMEDCOLORLIST* NamedColorList,
     }
 
     for (i=0; i < NamedColorList ->ColorantCount; i++)
-        NamedColorList ->List[NamedColorList ->nColors].DeviceColorant[i] = Colorant == NULL? 0 : Colorant[i];
+        NamedColorList ->List[NamedColorList ->nColors].DeviceColorant[i] = Colorant == NULL ? (cmsUInt16Number)0 : Colorant[i];
 
     for (i=0; i < 3; i++)
-        NamedColorList ->List[NamedColorList ->nColors].PCS[i] = PCS == NULL ? 0 : PCS[i];
+        NamedColorList ->List[NamedColorList ->nColors].PCS[i] = PCS == NULL ? (cmsUInt16Number) 0 : PCS[i];
 
     if (Name != NULL) {
 
@@ -671,6 +664,7 @@ cmsBool  CMSEXPORT cmsNamedColorInfo(const cmsNAMEDCOLORLIST* NamedColorList, cm
 
     if (nColor >= cmsNamedColorCount(NamedColorList)) return FALSE;
 
+    // strcpy instead of strncpy because many apps are using small buffers
     if (Name) strcpy(Name, NamedColorList->List[nColor].Name);
     if (Prefix) strcpy(Prefix, NamedColorList->Prefix);
     if (Suffix) strcpy(Suffix, NamedColorList->Suffix);
@@ -688,13 +682,14 @@ cmsBool  CMSEXPORT cmsNamedColorInfo(const cmsNAMEDCOLORLIST* NamedColorList, cm
 // Search for a given color name (no prefix or suffix)
 cmsInt32Number CMSEXPORT cmsNamedColorIndex(const cmsNAMEDCOLORLIST* NamedColorList, const char* Name)
 {
-    int i, n;
+    cmsUInt32Number i;
+    cmsUInt32Number n;
 
     if (NamedColorList == NULL) return -1;
     n = cmsNamedColorCount(NamedColorList);
     for (i=0; i < n; i++) {
         if (cmsstrcasecmp(Name,  NamedColorList->List[i].Name) == 0)
-            return i;
+            return (cmsInt32Number) i;
     }
 
     return -1;
@@ -723,7 +718,8 @@ void EvalNamedColorPCS(const cmsFloat32Number In[], cmsFloat32Number Out[], cons
     cmsUInt16Number index = (cmsUInt16Number) _cmsQuickSaturateWord(In[0] * 65535.0);
 
     if (index >= NamedColorList-> nColors) {
-        cmsSignalError(NamedColorList ->ContextID, cmsERROR_RANGE, "Color %d out of range; ignored", index);
+        cmsSignalError(NamedColorList ->ContextID, cmsERROR_RANGE, "Color %d out of range", index);
+        Out[0] = Out[1] = Out[2] = 0.0f;
     }
     else {
 
@@ -742,7 +738,10 @@ void EvalNamedColor(const cmsFloat32Number In[], cmsFloat32Number Out[], const c
     cmsUInt32Number j;
 
     if (index >= NamedColorList-> nColors) {
-        cmsSignalError(NamedColorList ->ContextID, cmsERROR_RANGE, "Color %d out of range; ignored", index);
+        cmsSignalError(NamedColorList ->ContextID, cmsERROR_RANGE, "Color %d out of range", index);
+        for (j = 0; j < NamedColorList->ColorantCount; j++)
+            Out[j] = 0.0f;
+
     }
     else {
         for (j=0; j < NamedColorList ->ColorantCount; j++)
@@ -752,7 +751,7 @@ void EvalNamedColor(const cmsFloat32Number In[], cmsFloat32Number Out[], const c
 
 
 // Named color lookup element
-cmsStage* _cmsStageAllocNamedColor(cmsNAMEDCOLORLIST* NamedColorList, cmsBool UsePCS)
+cmsStage* CMSEXPORT _cmsStageAllocNamedColor(cmsNAMEDCOLORLIST* NamedColorList, cmsBool UsePCS)
 {
     return _cmsStageAllocPlaceholder(NamedColorList ->ContextID,
                                    cmsSigNamedColorElemType,
diff --git a/src/java.desktop/share/native/liblcms/cmsopt.c b/src/java.desktop/share/native/liblcms/cmsopt.c
index a3ff2fc10e3..395ececad79 100644
--- a/src/java.desktop/share/native/liblcms/cmsopt.c
+++ b/src/java.desktop/share/native/liblcms/cmsopt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -78,8 +78,8 @@ typedef struct {
     cmsContext ContextID;
 
     // Number of channels
-    int nInputs;
-    int nOutputs;
+    cmsUInt32Number nInputs;
+    cmsUInt32Number nOutputs;
 
     _cmsInterpFn16 EvalCurveIn16[MAX_INPUT_DIMENSIONS];       // The maximum number of input channels is known in advance
     cmsInterpParams*  ParamsCurveIn16[MAX_INPUT_DIMENSIONS];
@@ -123,8 +123,8 @@ typedef struct {
 
     cmsContext ContextID;
 
-    int nCurves;                  // Number of curves
-    int nElements;                // Elements in curves
+    cmsUInt32Number nCurves;      // Number of curves
+    cmsUInt32Number nElements;    // Elements in curves
     cmsUInt16Number** Curves;     // Points to a dynamically  allocated array
 
 } Curves16Data;
@@ -245,7 +245,7 @@ cmsBool _MultiplyMatrix(cmsPipeline* Lut)
                      // Multiply both matrices to get the result
                      _cmsMAT3per(&res, (cmsMAT3*)m2->Double, (cmsMAT3*)m1->Double);
 
-                     // Get the next in chain afer the matrices
+                     // Get the next in chain after the matrices
                      chain = (*pt2)->Next;
 
                      // Remove both matrices
@@ -334,7 +334,7 @@ void PrelinEval16(register const cmsUInt16Number Input[],
     Prelin16Data* p16 = (Prelin16Data*) D;
     cmsUInt16Number  StageABC[MAX_INPUT_DIMENSIONS];
     cmsUInt16Number  StageDEF[cmsMAXCHANNELS];
-    int i;
+    cmsUInt32Number i;
 
     for (i=0; i < p16 ->nInputs; i++) {
 
@@ -379,15 +379,15 @@ void* Prelin16dup(cmsContext ContextID, const void* ptr)
 static
 Prelin16Data* PrelinOpt16alloc(cmsContext ContextID,
                                const cmsInterpParams* ColorMap,
-                               int nInputs, cmsToneCurve** In,
-                               int nOutputs, cmsToneCurve** Out )
+                               cmsUInt32Number nInputs, cmsToneCurve** In,
+                               cmsUInt32Number nOutputs, cmsToneCurve** Out )
 {
-    int i;
+    cmsUInt32Number i;
     Prelin16Data* p16 = (Prelin16Data*)_cmsMallocZero(ContextID, sizeof(Prelin16Data));
     if (p16 == NULL) return NULL;
 
     p16 ->nInputs = nInputs;
-    p16 -> nOutputs = nOutputs;
+    p16 ->nOutputs = nOutputs;
 
 
     for (i=0; i < nInputs; i++) {
@@ -435,7 +435,7 @@ Prelin16Data* PrelinOpt16alloc(cmsContext ContextID,
 // Sampler implemented by another LUT. This is a clean way to precalculate the devicelink 3D CLUT for
 // almost any transform. We use floating point precision and then convert from floating point to 16 bits.
 static
-int XFormSampler16(register const cmsUInt16Number In[], register cmsUInt16Number Out[], register void* Cargo)
+cmsInt32Number XFormSampler16(register const cmsUInt16Number In[], register cmsUInt16Number Out[], register void* Cargo)
 {
     cmsPipeline* Lut = (cmsPipeline*) Cargo;
     cmsFloat32Number InFloat[cmsMAXCHANNELS], OutFloat[cmsMAXCHANNELS];
@@ -482,7 +482,7 @@ cmsBool AllCurvesAreLinear(cmsStage* mpe)
 // is to fix scum dot on broken profiles/transforms. Works on 1, 3 and 4 channels
 static
 cmsBool  PatchLUT(cmsStage* CLUT, cmsUInt16Number At[], cmsUInt16Number Value[],
-                  int nChannelsOut, int nChannelsIn)
+                  cmsUInt32Number nChannelsOut, cmsUInt32Number nChannelsIn)
 {
     _cmsStageCLutData* Grid = (_cmsStageCLutData*) CLUT ->Data;
     cmsInterpParams* p16  = Grid ->Params;
@@ -512,10 +512,10 @@ cmsBool  PatchLUT(cmsStage* CLUT, cmsUInt16Number At[], cmsUInt16Number Value[],
             ((pz - z0) != 0) ||
             ((pw - w0) != 0)) return FALSE; // Not on exact node
 
-        index = p16 -> opta[3] * x0 +
-                p16 -> opta[2] * y0 +
-                p16 -> opta[1] * z0 +
-                p16 -> opta[0] * w0;
+        index = (int) p16 -> opta[3] * x0 +
+                (int) p16 -> opta[2] * y0 +
+                (int) p16 -> opta[1] * z0 +
+                (int) p16 -> opta[0] * w0;
     }
     else
         if (nChannelsIn == 3) {
@@ -532,9 +532,9 @@ cmsBool  PatchLUT(cmsStage* CLUT, cmsUInt16Number At[], cmsUInt16Number Value[],
                 ((py - y0) != 0) ||
                 ((pz - z0) != 0)) return FALSE;  // Not on exact node
 
-            index = p16 -> opta[2] * x0 +
-                    p16 -> opta[1] * y0 +
-                    p16 -> opta[0] * z0;
+            index = (int) p16 -> opta[2] * x0 +
+                    (int) p16 -> opta[1] * y0 +
+                    (int) p16 -> opta[0] * z0;
         }
         else
             if (nChannelsIn == 1) {
@@ -545,24 +545,24 @@ cmsBool  PatchLUT(cmsStage* CLUT, cmsUInt16Number At[], cmsUInt16Number Value[],
 
                 if (((px - x0) != 0)) return FALSE; // Not on exact node
 
-                index = p16 -> opta[0] * x0;
+                index = (int) p16 -> opta[0] * x0;
             }
             else {
                 cmsSignalError(CLUT->ContextID, cmsERROR_INTERNAL, "(internal) %d Channels are not supported on PatchLUT", nChannelsIn);
                 return FALSE;
             }
 
-            for (i=0; i < nChannelsOut; i++)
-                Grid -> Tab.T[index + i] = Value[i];
+            for (i = 0; i < (int) nChannelsOut; i++)
+                Grid->Tab.T[index + i] = Value[i];
 
             return TRUE;
 }
 
 // Auxiliary, to see if two values are equal or very different
 static
-cmsBool WhitesAreEqual(int n, cmsUInt16Number White1[], cmsUInt16Number White2[] )
+cmsBool WhitesAreEqual(cmsUInt32Number n, cmsUInt16Number White1[], cmsUInt16Number White2[] )
 {
-    int i;
+    cmsUInt32Number i;
 
     for (i=0; i < n; i++) {
 
@@ -664,7 +664,7 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3
     cmsStage* mpe;
     cmsStage* CLUT;
     cmsStage *KeepPreLin = NULL, *KeepPostLin = NULL;
-    int nGridPoints;
+    cmsUInt32Number nGridPoints;
     cmsColorSpaceSignature ColorSpace, OutputColorSpace;
     cmsStage *NewPreLin = NULL;
     cmsStage *NewPostLin = NULL;
@@ -676,8 +676,13 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3
     // This is a loosy optimization! does not apply in floating-point cases
     if (_cmsFormatterIsFloat(*InputFormat) || _cmsFormatterIsFloat(*OutputFormat)) return FALSE;
 
-    ColorSpace       = _cmsICCcolorSpace(T_COLORSPACE(*InputFormat));
-    OutputColorSpace = _cmsICCcolorSpace(T_COLORSPACE(*OutputFormat));
+    ColorSpace       = _cmsICCcolorSpace((int) T_COLORSPACE(*InputFormat));
+    OutputColorSpace = _cmsICCcolorSpace((int) T_COLORSPACE(*OutputFormat));
+
+    // Color space must be specified
+    if (ColorSpace == (cmsColorSpaceSignature)0 ||
+        OutputColorSpace == (cmsColorSpaceSignature)0) return FALSE;
+
     nGridPoints      = _cmsReasonableGridpointsByColorspace(ColorSpace, *dwFlags);
 
     // For empty LUTs, 2 points are enough
@@ -715,7 +720,7 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3
                     goto Error;
 
                 // Remove prelinearization. Since we have duplicated the curve
-                // in destination LUT, the sampling shoud be applied after this stage.
+                // in destination LUT, the sampling should be applied after this stage.
                 cmsPipelineUnlinkStage(Src, cmsAT_BEGIN, &KeepPreLin);
             }
         }
@@ -723,7 +728,7 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3
 
     // Allocate the CLUT
     CLUT = cmsStageAllocCLut16bit(Src ->ContextID, nGridPoints, Src ->InputChannels, Src->OutputChannels, NULL);
-    if (CLUT == NULL) return FALSE;
+    if (CLUT == NULL) goto Error;
 
     // Add the CLUT to the destination LUT
     if (!cmsPipelineInsertStage(Dest, cmsAT_END, CLUT)) {
@@ -747,14 +752,14 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3
                 if (!cmsPipelineInsertStage(Dest, cmsAT_END, NewPostLin))
                     goto Error;
 
-                // In destination LUT, the sampling shoud be applied after this stage.
+                // In destination LUT, the sampling should be applied after this stage.
                 cmsPipelineUnlinkStage(Src, cmsAT_END, &KeepPostLin);
             }
         }
     }
 
     // Now its time to do the sampling. We have to ignore pre/post linearization
-    // The source LUT whithout pre/post curves is passed as parameter.
+    // The source LUT without pre/post curves is passed as parameter.
     if (!cmsStageSampleCLut16bit(CLUT, XFormSampler16, (void*) Src, 0)) {
 Error:
         // Ops, something went wrong, Restore stages
@@ -834,7 +839,7 @@ void SlopeLimiting(cmsToneCurve* g)
 {
     int BeginVal, EndVal;
     int AtBegin = (int) floor((cmsFloat64Number) g ->nEntries * 0.02 + 0.5);   // Cutoff at 2%
-    int AtEnd   = g ->nEntries - AtBegin - 1;                                  // And 98%
+    int AtEnd   = (int) g ->nEntries - AtBegin - 1;                                  // And 98%
     cmsFloat64Number Val, Slope, beta;
     int i;
 
@@ -895,9 +900,9 @@ Prelin8Data* PrelinOpt8alloc(cmsContext ContextID, const cmsInterpParams* p, cms
 
 
         // Move to 0..1.0 in fixed domain
-        v1 = _cmsToFixedDomain(Input[0] * p -> Domain[0]);
-        v2 = _cmsToFixedDomain(Input[1] * p -> Domain[1]);
-        v3 = _cmsToFixedDomain(Input[2] * p -> Domain[2]);
+        v1 = _cmsToFixedDomain((int) (Input[0] * p -> Domain[0]));
+        v2 = _cmsToFixedDomain((int) (Input[1] * p -> Domain[1]));
+        v3 = _cmsToFixedDomain((int) (Input[2] * p -> Domain[2]));
 
         // Store the precalculated table of nodes
         p8 ->X0[i] = (p->opta[2] * FIXED_TO_INT(v1));
@@ -942,27 +947,27 @@ void PrelinEval8(register const cmsUInt16Number Input[],
     cmsS15Fixed16Number    rx, ry, rz;
     cmsS15Fixed16Number    c0, c1, c2, c3, Rest;
     int                    OutChan;
-    register cmsS15Fixed16Number    X0, X1, Y0, Y1, Z0, Z1;
+    register cmsS15Fixed16Number X0, X1, Y0, Y1, Z0, Z1;
     Prelin8Data* p8 = (Prelin8Data*) D;
     register const cmsInterpParams* p = p8 ->p;
-    int                    TotalOut = p -> nOutputs;
+    int                    TotalOut = (int) p -> nOutputs;
     const cmsUInt16Number* LutTable = (const cmsUInt16Number*) p->Table;
 
-    r = Input[0] >> 8;
-    g = Input[1] >> 8;
-    b = Input[2] >> 8;
+    r = (cmsUInt8Number) (Input[0] >> 8);
+    g = (cmsUInt8Number) (Input[1] >> 8);
+    b = (cmsUInt8Number) (Input[2] >> 8);
 
-    X0 = X1 = p8->X0[r];
-    Y0 = Y1 = p8->Y0[g];
-    Z0 = Z1 = p8->Z0[b];
+    X0 = X1 = (cmsS15Fixed16Number) p8->X0[r];
+    Y0 = Y1 = (cmsS15Fixed16Number) p8->Y0[g];
+    Z0 = Z1 = (cmsS15Fixed16Number) p8->Z0[b];
 
     rx = p8 ->rx[r];
     ry = p8 ->ry[g];
     rz = p8 ->rz[b];
 
-    X1 = X0 + ((rx == 0) ? 0 : p ->opta[2]);
-    Y1 = Y0 + ((ry == 0) ? 0 : p ->opta[1]);
-    Z1 = Z0 + ((rz == 0) ? 0 : p ->opta[0]);
+    X1 = X0 + (cmsS15Fixed16Number)((rx == 0) ? 0 :  p ->opta[2]);
+    Y1 = Y0 + (cmsS15Fixed16Number)((ry == 0) ? 0 :  p ->opta[1]);
+    Z1 = Z0 + (cmsS15Fixed16Number)((rz == 0) ? 0 :  p ->opta[0]);
 
 
     // These are the 6 Tetrahedral
@@ -1015,9 +1020,8 @@ void PrelinEval8(register const cmsUInt16Number Input[],
                                 c1 = c2 = c3 = 0;
                             }
 
-
                             Rest = c1 * rx + c2 * ry + c3 * rz + 0x8001;
-                            Output[OutChan] = (cmsUInt16Number)c0 + ((Rest + (Rest>>16))>>16);
+                            Output[OutChan] = (cmsUInt16Number) (c0 + ((Rest + (Rest >> 16)) >> 16));
 
     }
 }
@@ -1029,8 +1033,8 @@ void PrelinEval8(register const cmsUInt16Number Input[],
 static
 cmsBool IsDegenerated(const cmsToneCurve* g)
 {
-    int i, Zeros = 0, Poles = 0;
-    int nEntries = g ->nEntries;
+    cmsUInt32Number i, Zeros = 0, Poles = 0;
+    cmsUInt32Number nEntries = g ->nEntries;
 
     for (i=0; i < nEntries; i++) {
 
@@ -1052,7 +1056,7 @@ static
 cmsBool OptimizeByComputingLinearization(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt32Number* InputFormat, cmsUInt32Number* OutputFormat, cmsUInt32Number* dwFlags)
 {
     cmsPipeline* OriginalLut;
-    int nGridPoints;
+    cmsUInt32Number nGridPoints;
     cmsToneCurve *Trans[cmsMAXCHANNELS], *TransReverse[cmsMAXCHANNELS];
     cmsUInt32Number t, i;
     cmsFloat32Number v, In[cmsMAXCHANNELS], Out[cmsMAXCHANNELS];
@@ -1090,8 +1094,13 @@ cmsBool OptimizeByComputingLinearization(cmsPipeline** Lut, cmsUInt32Number Inte
             if (cmsStageType(mpe) == cmsSigNamedColorElemType) return FALSE;
     }
 
-    ColorSpace       = _cmsICCcolorSpace(T_COLORSPACE(*InputFormat));
-    OutputColorSpace = _cmsICCcolorSpace(T_COLORSPACE(*OutputFormat));
+    ColorSpace       = _cmsICCcolorSpace((int) T_COLORSPACE(*InputFormat));
+    OutputColorSpace = _cmsICCcolorSpace((int) T_COLORSPACE(*OutputFormat));
+
+    // Color space must be specified
+    if (ColorSpace == (cmsColorSpaceSignature)0 ||
+        OutputColorSpace == (cmsColorSpaceSignature)0) return FALSE;
+
     nGridPoints      = _cmsReasonableGridpointsByColorspace(ColorSpace, *dwFlags);
 
     // Empty gamma containers
@@ -1212,7 +1221,10 @@ cmsBool OptimizeByComputingLinearization(cmsPipeline** Lut, cmsUInt32Number Inte
         Prelin8Data* p8 = PrelinOpt8alloc(OptimizedLUT ->ContextID,
                                                 OptimizedPrelinCLUT ->Params,
                                                 OptimizedPrelinCurves);
-        if (p8 == NULL) return FALSE;
+        if (p8 == NULL) {
+            cmsPipelineFree(OptimizedLUT);
+            return FALSE;
+        }
 
         _cmsPipelineSetOptimizationParameters(OptimizedLUT, PrelinEval8, (void*) p8, Prelin8free, Prelin8dup);
 
@@ -1222,7 +1234,10 @@ cmsBool OptimizeByComputingLinearization(cmsPipeline** Lut, cmsUInt32Number Inte
         Prelin16Data* p16 = PrelinOpt16alloc(OptimizedLUT ->ContextID,
             OptimizedPrelinCLUT ->Params,
             3, OptimizedPrelinCurves, 3, NULL);
-        if (p16 == NULL) return FALSE;
+        if (p16 == NULL) {
+            cmsPipelineFree(OptimizedLUT);
+            return FALSE;
+        }
 
         _cmsPipelineSetOptimizationParameters(OptimizedLUT, PrelinEval16, (void*) p16, PrelinOpt16free, Prelin16dup);
 
@@ -1260,6 +1275,7 @@ cmsBool OptimizeByComputingLinearization(cmsPipeline** Lut, cmsUInt32Number Inte
     return FALSE;
 
     cmsUNUSED_PARAMETER(Intent);
+    cmsUNUSED_PARAMETER(lIsLinear);
 }
 
 
@@ -1269,7 +1285,7 @@ static
 void CurvesFree(cmsContext ContextID, void* ptr)
 {
      Curves16Data* Data = (Curves16Data*) ptr;
-     int i;
+     cmsUInt32Number i;
 
      for (i=0; i < Data -> nCurves; i++) {
 
@@ -1284,7 +1300,7 @@ static
 void* CurvesDup(cmsContext ContextID, const void* ptr)
 {
     Curves16Data* Data = (Curves16Data*)_cmsDupMem(ContextID, ptr, sizeof(Curves16Data));
-    int i;
+    cmsUInt32Number i;
 
     if (Data == NULL) return NULL;
 
@@ -1299,9 +1315,9 @@ void* CurvesDup(cmsContext ContextID, const void* ptr)
 
 // Precomputes tables for 8-bit on input devicelink.
 static
-Curves16Data* CurvesAlloc(cmsContext ContextID, int nCurves, int nElements, cmsToneCurve** G)
+Curves16Data* CurvesAlloc(cmsContext ContextID, cmsUInt32Number nCurves, cmsUInt32Number nElements, cmsToneCurve** G)
 {
-    int i, j;
+    cmsUInt32Number i, j;
     Curves16Data* c16;
 
     c16 = (Curves16Data*)_cmsMallocZero(ContextID, sizeof(Curves16Data));
@@ -1311,7 +1327,10 @@ Curves16Data* CurvesAlloc(cmsContext ContextID, int nCurves, int nElements, cmsT
     c16 ->nElements = nElements;
 
     c16->Curves = (cmsUInt16Number**) _cmsCalloc(ContextID, nCurves, sizeof(cmsUInt16Number*));
-    if (c16 ->Curves == NULL) return NULL;
+    if (c16->Curves == NULL) {
+        _cmsFree(ContextID, c16);
+        return NULL;
+    }
 
     for (i=0; i < nCurves; i++) {
 
@@ -1327,7 +1346,7 @@ Curves16Data* CurvesAlloc(cmsContext ContextID, int nCurves, int nElements, cmsT
             return NULL;
         }
 
-        if (nElements == 256) {
+        if (nElements == 256U) {
 
             for (j=0; j < nElements; j++) {
 
@@ -1351,8 +1370,8 @@ void FastEvaluateCurves8(register const cmsUInt16Number In[],
                           register const void* D)
 {
     Curves16Data* Data = (Curves16Data*) D;
-    cmsUInt8Number x;
-    int i;
+    int x;
+    cmsUInt32Number i;
 
     for (i=0; i < Data ->nCurves; i++) {
 
@@ -1368,7 +1387,7 @@ void FastEvaluateCurves16(register const cmsUInt16Number In[],
                           register const void* D)
 {
     Curves16Data* Data = (Curves16Data*) D;
-    int i;
+    cmsUInt32Number i;
 
     for (i=0; i < Data ->nCurves; i++) {
          Out[i] = Data -> Curves[i][In[i]];
@@ -1548,9 +1567,9 @@ void MatShaperEval16(register const cmsUInt16Number In[],
 
     // In this case (and only in this case!) we can use this simplification since
     // In[] is assured to come from a 8 bit number. (a << 8 | a)
-    ri = In[0] & 0xFF;
-    gi = In[1] & 0xFF;
-    bi = In[2] & 0xFF;
+    ri = In[0] & 0xFFU;
+    gi = In[1] & 0xFFU;
+    bi = In[2] & 0xFFU;
 
     // Across first shaper, which also converts to 1.14 fixed point
     r = p->Shaper1R[ri];
@@ -1563,9 +1582,9 @@ void MatShaperEval16(register const cmsUInt16Number In[],
     l3 =  (p->Mat[2][0] * r + p->Mat[2][1] * g + p->Mat[2][2] * b + p->Off[2] + 0x2000) >> 14;
 
     // Now we have to clip to 0..1.0 range
-    ri = (l1 < 0) ? 0 : ((l1 > 16384) ? 16384 : l1);
-    gi = (l2 < 0) ? 0 : ((l2 > 16384) ? 16384 : l2);
-    bi = (l3 < 0) ? 0 : ((l3 > 16384) ? 16384 : l3);
+    ri = (l1 < 0) ? 0 : ((l1 > 16384) ? 16384U : (cmsUInt32Number) l1);
+    gi = (l2 < 0) ? 0 : ((l2 > 16384) ? 16384U : (cmsUInt32Number) l2);
+    bi = (l3 < 0) ? 0 : ((l3 > 16384) ? 16384U : (cmsUInt32Number) l3);
 
     // And across second shaper,
     Out[0] = p->Shaper2R[ri];
@@ -1586,7 +1605,10 @@ void FillFirstShaper(cmsS1Fixed14Number* Table, cmsToneCurve* Curve)
         R   = (cmsFloat32Number) (i / 255.0);
         y   = cmsEvalToneCurveFloat(Curve, R);
 
-        Table[i] = DOUBLE_TO_1FIXED14(y);
+        if (y < 131072.0)
+            Table[i] = DOUBLE_TO_1FIXED14(y);
+        else
+            Table[i] = 0x7fffffff;
     }
 }
 
@@ -1602,6 +1624,12 @@ void FillSecondShaper(cmsUInt16Number* Table, cmsToneCurve* Curve, cmsBool Is8Bi
         R   = (cmsFloat32Number) (i / 16384.0);
         Val = cmsEvalToneCurveFloat(Curve, R);    // Val comes 0..1.0
 
+        if (Val < 0)
+            Val = 0;
+
+        if (Val > 1.0)
+            Val = 1.0;
+
         if (Is8BitsOutput) {
 
             // If 8 bits output, we can optimize further by computing the / 257 part.
@@ -1640,7 +1668,7 @@ cmsBool SetMatShaper(cmsPipeline* Dest, cmsToneCurve* Curve1[3], cmsMAT3* Mat, c
     FillSecondShaper(p ->Shaper2G, Curve2[1], Is8Bits);
     FillSecondShaper(p ->Shaper2B, Curve2[2], Is8Bits);
 
-    // Convert matrix to nFixed14. Note that those values may take more than 16 bits as
+    // Convert matrix to nFixed14. Note that those values may take more than 16 bits
     for (i=0; i < 3; i++) {
         for (j=0; j < 3; j++) {
             p ->Mat[i][j] = DOUBLE_TO_1FIXED14(Mat->v[i].n[j]);
@@ -1902,7 +1930,7 @@ cmsBool  _cmsRegisterOptimizationPlugin(cmsContext ContextID, cmsPluginBase* Dat
 // The entry point for LUT optimization
 cmsBool _cmsOptimizePipeline(cmsContext ContextID,
                              cmsPipeline**    PtrLut,
-                             int              Intent,
+                             cmsUInt32Number  Intent,
                              cmsUInt32Number* InputFormat,
                              cmsUInt32Number* OutputFormat,
                              cmsUInt32Number* dwFlags)
diff --git a/src/java.desktop/share/native/liblcms/cmspack.c b/src/java.desktop/share/native/liblcms/cmspack.c
index a9087f6fc8a..7aabcc244ed 100644
--- a/src/java.desktop/share/native/liblcms/cmspack.c
+++ b/src/java.desktop/share/native/liblcms/cmspack.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -126,21 +126,21 @@ cmsUInt8Number* UnrollChunkyBytes(register _cmsTRANSFORM* info,
                                   register cmsUInt8Number* accum,
                                   register cmsUInt32Number Stride)
 {
-    int nChan      = T_CHANNELS(info -> InputFormat);
-    int DoSwap     = T_DOSWAP(info ->InputFormat);
-    int Reverse    = T_FLAVOR(info ->InputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> InputFormat);
-    int Extra      = T_EXTRA(info -> InputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number nChan      = T_CHANNELS(info -> InputFormat);
+    cmsUInt32Number DoSwap     = T_DOSWAP(info ->InputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->InputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> InputFormat);
+    cmsUInt32Number Extra      = T_EXTRA(info -> InputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
     cmsUInt16Number v;
-    int i;
+    cmsUInt32Number i;
 
     if (ExtraFirst) {
         accum += Extra;
     }
 
     for (i=0; i < nChan; i++) {
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         v = FROM_8_TO_16(*accum);
         v = Reverse ? REVERSE_FLAVOR_16(v) : v;
@@ -173,11 +173,11 @@ cmsUInt8Number* UnrollPlanarBytes(register _cmsTRANSFORM* info,
                                   register cmsUInt8Number* accum,
                                   register cmsUInt32Number Stride)
 {
-    int nChan     = T_CHANNELS(info -> InputFormat);
-    int DoSwap    = T_DOSWAP(info ->InputFormat);
-    int SwapFirst = T_SWAPFIRST(info ->InputFormat);
-    int Reverse   = T_FLAVOR(info ->InputFormat);
-    int i;
+    cmsUInt32Number nChan     = T_CHANNELS(info -> InputFormat);
+    cmsUInt32Number DoSwap    = T_DOSWAP(info ->InputFormat);
+    cmsUInt32Number SwapFirst = T_SWAPFIRST(info ->InputFormat);
+    cmsUInt32Number Reverse   = T_FLAVOR(info ->InputFormat);
+    cmsUInt32Number i;
     cmsUInt8Number* Init = accum;
 
     if (DoSwap ^ SwapFirst) {
@@ -186,7 +186,7 @@ cmsUInt8Number* UnrollPlanarBytes(register _cmsTRANSFORM* info,
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
         cmsUInt16Number v = FROM_8_TO_16(*accum);
 
         wIn[index] = Reverse ? REVERSE_FLAVOR_16(v) : v;
@@ -503,14 +503,14 @@ cmsUInt8Number* UnrollAnyWords(register _cmsTRANSFORM* info,
                                register cmsUInt8Number* accum,
                                register cmsUInt32Number Stride)
 {
-    int nChan       = T_CHANNELS(info -> InputFormat);
-    int SwapEndian  = T_ENDIAN16(info -> InputFormat);
-    int DoSwap      = T_DOSWAP(info ->InputFormat);
-    int Reverse     = T_FLAVOR(info ->InputFormat);
-    int SwapFirst   = T_SWAPFIRST(info -> InputFormat);
-    int Extra       = T_EXTRA(info -> InputFormat);
-    int ExtraFirst  = DoSwap ^ SwapFirst;
-    int i;
+   cmsUInt32Number nChan       = T_CHANNELS(info -> InputFormat);
+   cmsUInt32Number SwapEndian  = T_ENDIAN16(info -> InputFormat);
+   cmsUInt32Number DoSwap      = T_DOSWAP(info ->InputFormat);
+   cmsUInt32Number Reverse     = T_FLAVOR(info ->InputFormat);
+   cmsUInt32Number SwapFirst   = T_SWAPFIRST(info -> InputFormat);
+   cmsUInt32Number Extra       = T_EXTRA(info -> InputFormat);
+   cmsUInt32Number ExtraFirst  = DoSwap ^ SwapFirst;
+   cmsUInt32Number i;
 
     if (ExtraFirst) {
         accum += Extra * sizeof(cmsUInt16Number);
@@ -518,7 +518,7 @@ cmsUInt8Number* UnrollAnyWords(register _cmsTRANSFORM* info,
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
         cmsUInt16Number v = *(cmsUInt16Number*) accum;
 
         if (SwapEndian)
@@ -552,20 +552,20 @@ cmsUInt8Number* UnrollPlanarWords(register _cmsTRANSFORM* info,
                                   register cmsUInt8Number* accum,
                                   register cmsUInt32Number Stride)
 {
-    int nChan = T_CHANNELS(info -> InputFormat);
-    int DoSwap= T_DOSWAP(info ->InputFormat);
-    int Reverse= T_FLAVOR(info ->InputFormat);
-    int SwapEndian = T_ENDIAN16(info -> InputFormat);
-    int i;
+    cmsUInt32Number nChan = T_CHANNELS(info -> InputFormat);
+    cmsUInt32Number DoSwap= T_DOSWAP(info ->InputFormat);
+    cmsUInt32Number Reverse= T_FLAVOR(info ->InputFormat);
+    cmsUInt32Number SwapEndian = T_ENDIAN16(info -> InputFormat);
+    cmsUInt32Number i;
     cmsUInt8Number* Init = accum;
 
     if (DoSwap) {
-        accum += T_EXTRA(info -> InputFormat) * Stride * sizeof(cmsUInt16Number);
+        accum += T_EXTRA(info -> InputFormat) * Stride;
     }
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
         cmsUInt16Number v = *(cmsUInt16Number*) accum;
 
         if (SwapEndian)
@@ -573,7 +573,7 @@ cmsUInt8Number* UnrollPlanarWords(register _cmsTRANSFORM* info,
 
         wIn[index] = Reverse ? REVERSE_FLAVOR_16(v) : v;
 
-        accum +=  Stride * sizeof(cmsUInt16Number);
+        accum +=  Stride;
     }
 
     return (Init + sizeof(cmsUInt16Number));
@@ -801,13 +801,18 @@ cmsUInt8Number* UnrollLabDoubleTo16(register _cmsTRANSFORM* info,
 {
     if (T_PLANAR(info -> InputFormat)) {
 
-        cmsFloat64Number* Pt = (cmsFloat64Number*) accum;
-
         cmsCIELab Lab;
+        cmsUInt8Number* pos_L;
+        cmsUInt8Number* pos_a;
+        cmsUInt8Number* pos_b;
+
+        pos_L = accum;
+        pos_a = accum + Stride;
+        pos_b = accum + Stride * 2;
 
-        Lab.L = Pt[0];
-        Lab.a = Pt[Stride];
-        Lab.b = Pt[Stride*2];
+        Lab.L = *(cmsFloat64Number*) pos_L;
+        Lab.a = *(cmsFloat64Number*) pos_a;
+        Lab.b = *(cmsFloat64Number*) pos_b;
 
         cmsFloat2LabEncoded(wIn, &Lab);
         return accum + sizeof(cmsFloat64Number);
@@ -832,12 +837,17 @@ cmsUInt8Number* UnrollLabFloatTo16(register _cmsTRANSFORM* info,
 
     if (T_PLANAR(info -> InputFormat)) {
 
-        cmsFloat32Number* Pt = (cmsFloat32Number*) accum;
+        cmsUInt8Number* pos_L;
+        cmsUInt8Number* pos_a;
+        cmsUInt8Number* pos_b;
 
+        pos_L = accum;
+        pos_a = accum + Stride;
+        pos_b = accum + Stride * 2;
 
-        Lab.L = Pt[0];
-        Lab.a = Pt[Stride];
-        Lab.b = Pt[Stride*2];
+        Lab.L = *(cmsFloat32Number*)pos_L;
+        Lab.a = *(cmsFloat32Number*)pos_a;
+        Lab.b = *(cmsFloat32Number*)pos_b;
 
         cmsFloat2LabEncoded(wIn, &Lab);
         return accum + sizeof(cmsFloat32Number);
@@ -863,12 +873,19 @@ cmsUInt8Number* UnrollXYZDoubleTo16(register _cmsTRANSFORM* info,
 {
     if (T_PLANAR(info -> InputFormat)) {
 
-        cmsFloat64Number* Pt = (cmsFloat64Number*) accum;
         cmsCIEXYZ XYZ;
+        cmsUInt8Number* pos_X;
+        cmsUInt8Number* pos_Y;
+        cmsUInt8Number* pos_Z;
+
+        pos_X = accum;
+        pos_Y = accum + Stride;
+        pos_Z = accum + Stride * 2;
+
+        XYZ.X = *(cmsFloat64Number*)pos_X;
+        XYZ.Y = *(cmsFloat64Number*)pos_Y;
+        XYZ.Z = *(cmsFloat64Number*)pos_Z;
 
-        XYZ.X = Pt[0];
-        XYZ.Y = Pt[Stride];
-        XYZ.Z = Pt[Stride*2];
         cmsFloat2XYZEncoded(wIn, &XYZ);
 
         return accum + sizeof(cmsFloat64Number);
@@ -892,12 +909,19 @@ cmsUInt8Number* UnrollXYZFloatTo16(register _cmsTRANSFORM* info,
 {
     if (T_PLANAR(info -> InputFormat)) {
 
-        cmsFloat32Number* Pt = (cmsFloat32Number*) accum;
         cmsCIEXYZ XYZ;
+        cmsUInt8Number* pos_X;
+        cmsUInt8Number* pos_Y;
+        cmsUInt8Number* pos_Z;
+
+        pos_X = accum;
+        pos_Y = accum + Stride;
+        pos_Z = accum + Stride * 2;
+
+        XYZ.X = *(cmsFloat32Number*)pos_X;
+        XYZ.Y = *(cmsFloat32Number*)pos_Y;
+        XYZ.Z = *(cmsFloat32Number*)pos_Z;
 
-        XYZ.X = Pt[0];
-        XYZ.Y = Pt[Stride];
-        XYZ.Z = Pt[Stride*2];
         cmsFloat2XYZEncoded(wIn, &XYZ);
 
         return accum + sizeof(cmsFloat32Number);
@@ -942,6 +966,20 @@ cmsINLINE cmsBool IsInkSpace(cmsUInt32Number Type)
     }
 }
 
+// Return the size in bytes of a given formatter
+static
+cmsUInt32Number PixelSize(cmsUInt32Number Format)
+{
+    cmsUInt32Number fmt_bytes = T_BYTES(Format);
+
+    // For double, the T_BYTES field is zero
+    if (fmt_bytes == 0)
+        return sizeof(cmsUInt64Number);
+
+    // Otherwise, it is already correct for all formats
+    return fmt_bytes;
+}
+
 // Inks does come in percentage, remaining cases are between 0..1.0, again to 16 bits
 static
 cmsUInt8Number* UnrollDoubleTo16(register _cmsTRANSFORM* info,
@@ -950,25 +988,27 @@ cmsUInt8Number* UnrollDoubleTo16(register _cmsTRANSFORM* info,
                                 register cmsUInt32Number Stride)
 {
 
-    int nChan      = T_CHANNELS(info -> InputFormat);
-    int DoSwap     = T_DOSWAP(info ->InputFormat);
-    int Reverse    = T_FLAVOR(info ->InputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> InputFormat);
-    int Extra      = T_EXTRA(info -> InputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
-    int Planar     = T_PLANAR(info -> InputFormat);
+    cmsUInt32Number nChan      = T_CHANNELS(info -> InputFormat);
+    cmsUInt32Number DoSwap     = T_DOSWAP(info ->InputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->InputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> InputFormat);
+    cmsUInt32Number Extra      = T_EXTRA(info -> InputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number Planar     = T_PLANAR(info -> InputFormat);
     cmsFloat64Number v;
     cmsUInt16Number  vi;
-    int i, start = 0;
-   cmsFloat64Number maximum = IsInkSpace(info ->InputFormat) ? 655.35 : 65535.0;
+    cmsUInt32Number i, start = 0;
+    cmsFloat64Number maximum = IsInkSpace(info ->InputFormat) ? 655.35 : 65535.0;
+
 
+    Stride /= PixelSize(info->InputFormat);
 
     if (ExtraFirst)
             start = Extra;
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         if (Planar)
             v = (cmsFloat32Number) ((cmsFloat64Number*) accum)[(i + start) * Stride];
@@ -1006,25 +1046,26 @@ cmsUInt8Number* UnrollFloatTo16(register _cmsTRANSFORM* info,
                                 register cmsUInt32Number Stride)
 {
 
-    int nChan      = T_CHANNELS(info -> InputFormat);
-    int DoSwap     = T_DOSWAP(info ->InputFormat);
-    int Reverse    = T_FLAVOR(info ->InputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> InputFormat);
-    int Extra      = T_EXTRA(info -> InputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
-    int Planar     = T_PLANAR(info -> InputFormat);
+    cmsUInt32Number nChan  = T_CHANNELS(info -> InputFormat);
+    cmsUInt32Number DoSwap   = T_DOSWAP(info ->InputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->InputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> InputFormat);
+    cmsUInt32Number Extra   = T_EXTRA(info -> InputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number Planar     = T_PLANAR(info -> InputFormat);
     cmsFloat32Number v;
     cmsUInt16Number  vi;
-    int i, start = 0;
-   cmsFloat64Number maximum = IsInkSpace(info ->InputFormat) ? 655.35 : 65535.0;
+    cmsUInt32Number i, start = 0;
+    cmsFloat64Number maximum = IsInkSpace(info ->InputFormat) ? 655.35 : 65535.0;
 
+    Stride /= PixelSize(info->InputFormat);
 
     if (ExtraFirst)
             start = Extra;
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         if (Planar)
             v = (cmsFloat32Number) ((cmsFloat32Number*) accum)[(i + start) * Stride];
@@ -1083,24 +1124,25 @@ cmsUInt8Number* UnrollFloatsToFloat(_cmsTRANSFORM* info,
                                     cmsUInt32Number Stride)
 {
 
-    int nChan      = T_CHANNELS(info -> InputFormat);
-    int DoSwap     = T_DOSWAP(info ->InputFormat);
-    int Reverse    = T_FLAVOR(info ->InputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> InputFormat);
-    int Extra      = T_EXTRA(info -> InputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
-    int Planar     = T_PLANAR(info -> InputFormat);
+    cmsUInt32Number nChan  = T_CHANNELS(info -> InputFormat);
+    cmsUInt32Number DoSwap   = T_DOSWAP(info ->InputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->InputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> InputFormat);
+    cmsUInt32Number Extra   = T_EXTRA(info -> InputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number Planar     = T_PLANAR(info -> InputFormat);
     cmsFloat32Number v;
-    int i, start = 0;
+    cmsUInt32Number i, start = 0;
     cmsFloat32Number maximum = IsInkSpace(info ->InputFormat) ? 100.0F : 1.0F;
 
+    Stride /= PixelSize(info->InputFormat);
 
     if (ExtraFirst)
             start = Extra;
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         if (Planar)
             v = (cmsFloat32Number) ((cmsFloat32Number*) accum)[(i + start) * Stride];
@@ -1135,24 +1177,25 @@ cmsUInt8Number* UnrollDoublesToFloat(_cmsTRANSFORM* info,
                                     cmsUInt32Number Stride)
 {
 
-    int nChan      = T_CHANNELS(info -> InputFormat);
-    int DoSwap     = T_DOSWAP(info ->InputFormat);
-    int Reverse    = T_FLAVOR(info ->InputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> InputFormat);
-    int Extra      = T_EXTRA(info -> InputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
-    int Planar     = T_PLANAR(info -> InputFormat);
+    cmsUInt32Number nChan  = T_CHANNELS(info -> InputFormat);
+    cmsUInt32Number DoSwap   = T_DOSWAP(info ->InputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->InputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> InputFormat);
+    cmsUInt32Number Extra   = T_EXTRA(info -> InputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number Planar     = T_PLANAR(info -> InputFormat);
     cmsFloat64Number v;
-    int i, start = 0;
+    cmsUInt32Number i, start = 0;
     cmsFloat64Number maximum = IsInkSpace(info ->InputFormat) ? 100.0 : 1.0;
 
+    Stride /= PixelSize(info->InputFormat);
 
     if (ExtraFirst)
             start = Extra;
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         if (Planar)
             v = (cmsFloat64Number) ((cmsFloat64Number*) accum)[(i + start)  * Stride];
@@ -1191,7 +1234,9 @@ cmsUInt8Number* UnrollLabDoubleToFloat(_cmsTRANSFORM* info,
 
     if (T_PLANAR(info -> InputFormat)) {
 
-        wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0);                            // from 0..100 to 0..1
+        Stride /= PixelSize(info->InputFormat);
+
+        wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0);                 // from 0..100 to 0..1
         wIn[1] = (cmsFloat32Number) ((Pt[Stride] + 128) / 255.0);    // form -128..+127 to 0..1
         wIn[2] = (cmsFloat32Number) ((Pt[Stride*2] + 128) / 255.0);
 
@@ -1219,6 +1264,8 @@ cmsUInt8Number* UnrollLabFloatToFloat(_cmsTRANSFORM* info,
 
     if (T_PLANAR(info -> InputFormat)) {
 
+        Stride /= PixelSize(info->InputFormat);
+
         wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0);                 // from 0..100 to 0..1
         wIn[1] = (cmsFloat32Number) ((Pt[Stride] + 128) / 255.0);    // form -128..+127 to 0..1
         wIn[2] = (cmsFloat32Number) ((Pt[Stride*2] + 128) / 255.0);
@@ -1249,6 +1296,8 @@ cmsUInt8Number* UnrollXYZDoubleToFloat(_cmsTRANSFORM* info,
 
     if (T_PLANAR(info -> InputFormat)) {
 
+        Stride /= PixelSize(info->InputFormat);
+
         wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ);
         wIn[1] = (cmsFloat32Number) (Pt[Stride] / MAX_ENCODEABLE_XYZ);
         wIn[2] = (cmsFloat32Number) (Pt[Stride*2] / MAX_ENCODEABLE_XYZ);
@@ -1276,6 +1325,8 @@ cmsUInt8Number* UnrollXYZFloatToFloat(_cmsTRANSFORM* info,
 
     if (T_PLANAR(info -> InputFormat)) {
 
+        Stride /= PixelSize(info->InputFormat);
+
         wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ);
         wIn[1] = (cmsFloat32Number) (Pt[Stride] / MAX_ENCODEABLE_XYZ);
         wIn[2] = (cmsFloat32Number) (Pt[Stride*2] / MAX_ENCODEABLE_XYZ);
@@ -1306,15 +1357,15 @@ cmsUInt8Number* PackAnyBytes(register _cmsTRANSFORM* info,
                              register cmsUInt8Number* output,
                              register cmsUInt32Number Stride)
 {
-    int nChan      = T_CHANNELS(info -> OutputFormat);
-    int DoSwap     = T_DOSWAP(info ->OutputFormat);
-    int Reverse    = T_FLAVOR(info ->OutputFormat);
-    int Extra      = T_EXTRA(info -> OutputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> OutputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number nChan  = T_CHANNELS(info -> OutputFormat);
+    cmsUInt32Number DoSwap   = T_DOSWAP(info ->OutputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->OutputFormat);
+    cmsUInt32Number Extra   = T_EXTRA(info -> OutputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> OutputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
     cmsUInt8Number* swap1;
     cmsUInt8Number v = 0;
-    int i;
+    cmsUInt32Number i;
 
     swap1 = output;
 
@@ -1324,7 +1375,7 @@ cmsUInt8Number* PackAnyBytes(register _cmsTRANSFORM* info,
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         v = FROM_16_TO_8(wOut[index]);
 
@@ -1358,16 +1409,16 @@ cmsUInt8Number* PackAnyWords(register _cmsTRANSFORM* info,
                              register cmsUInt8Number* output,
                              register cmsUInt32Number Stride)
 {
-    int nChan      = T_CHANNELS(info -> OutputFormat);
-    int SwapEndian = T_ENDIAN16(info -> InputFormat);
-    int DoSwap     = T_DOSWAP(info ->OutputFormat);
-    int Reverse    = T_FLAVOR(info ->OutputFormat);
-    int Extra      = T_EXTRA(info -> OutputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> OutputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number nChan  = T_CHANNELS(info -> OutputFormat);
+    cmsUInt32Number SwapEndian = T_ENDIAN16(info -> OutputFormat);
+    cmsUInt32Number DoSwap   = T_DOSWAP(info ->OutputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->OutputFormat);
+    cmsUInt32Number Extra   = T_EXTRA(info -> OutputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> OutputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
     cmsUInt16Number* swap1;
     cmsUInt16Number v = 0;
-    int i;
+    cmsUInt32Number i;
 
     swap1 = (cmsUInt16Number*) output;
 
@@ -1377,7 +1428,7 @@ cmsUInt8Number* PackAnyWords(register _cmsTRANSFORM* info,
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         v = wOut[index];
 
@@ -1415,11 +1466,11 @@ cmsUInt8Number* PackPlanarBytes(register _cmsTRANSFORM* info,
                                 register cmsUInt8Number* output,
                                 register cmsUInt32Number Stride)
 {
-    int nChan     = T_CHANNELS(info -> OutputFormat);
-    int DoSwap    = T_DOSWAP(info ->OutputFormat);
-    int SwapFirst = T_SWAPFIRST(info ->OutputFormat);
-    int Reverse   = T_FLAVOR(info ->OutputFormat);
-    int i;
+    cmsUInt32Number nChan     = T_CHANNELS(info -> OutputFormat);
+    cmsUInt32Number DoSwap    = T_DOSWAP(info ->OutputFormat);
+    cmsUInt32Number SwapFirst = T_SWAPFIRST(info ->OutputFormat);
+    cmsUInt32Number Reverse   = T_FLAVOR(info ->OutputFormat);
+    cmsUInt32Number i;
     cmsUInt8Number* Init = output;
 
 
@@ -1430,7 +1481,7 @@ cmsUInt8Number* PackPlanarBytes(register _cmsTRANSFORM* info,
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
         cmsUInt8Number v = FROM_16_TO_8(wOut[index]);
 
         *(cmsUInt8Number*)  output = (cmsUInt8Number) (Reverse ? REVERSE_FLAVOR_8(v) : v);
@@ -1449,21 +1500,21 @@ cmsUInt8Number* PackPlanarWords(register _cmsTRANSFORM* info,
                                 register cmsUInt8Number* output,
                                 register cmsUInt32Number Stride)
 {
-    int nChan = T_CHANNELS(info -> OutputFormat);
-    int DoSwap = T_DOSWAP(info ->OutputFormat);
-    int Reverse= T_FLAVOR(info ->OutputFormat);
-    int SwapEndian = T_ENDIAN16(info -> OutputFormat);
-    int i;
+    cmsUInt32Number nChan      = T_CHANNELS(info -> OutputFormat);
+    cmsUInt32Number DoSwap     = T_DOSWAP(info ->OutputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->OutputFormat);
+    cmsUInt32Number SwapEndian = T_ENDIAN16(info -> OutputFormat);
+    cmsUInt32Number i;
     cmsUInt8Number* Init = output;
     cmsUInt16Number v;
 
     if (DoSwap) {
-        output += T_EXTRA(info -> OutputFormat) * Stride * sizeof(cmsUInt16Number);
+        output += T_EXTRA(info -> OutputFormat) * Stride;
     }
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         v = wOut[index];
 
@@ -1474,7 +1525,7 @@ cmsUInt8Number* PackPlanarWords(register _cmsTRANSFORM* info,
             v =  REVERSE_FLAVOR_16(v);
 
         *(cmsUInt16Number*) output = v;
-        output += (Stride * sizeof(cmsUInt16Number));
+        output += Stride;
     }
 
     return (Init + sizeof(cmsUInt16Number));
@@ -1823,9 +1874,9 @@ cmsUInt8Number* Pack3BytesOptimized(register _cmsTRANSFORM* info,
                                     register cmsUInt8Number* output,
                                     register cmsUInt32Number Stride)
 {
-    *output++ = (wOut[0] & 0xFF);
-    *output++ = (wOut[1] & 0xFF);
-    *output++ = (wOut[2] & 0xFF);
+    *output++ = (wOut[0] & 0xFFU);
+    *output++ = (wOut[1] & 0xFFU);
+    *output++ = (wOut[2] & 0xFFU);
 
     return output;
 
@@ -1855,9 +1906,9 @@ cmsUInt8Number* Pack3BytesSwapOptimized(register _cmsTRANSFORM* info,
                                         register cmsUInt8Number* output,
                                         register cmsUInt32Number Stride)
 {
-    *output++ = (wOut[2] & 0xFF);
-    *output++ = (wOut[1] & 0xFF);
-    *output++ = (wOut[0] & 0xFF);
+    *output++ = (wOut[2] & 0xFFU);
+    *output++ = (wOut[1] & 0xFFU);
+    *output++ = (wOut[0] & 0xFFU);
 
     return output;
 
@@ -1946,9 +1997,9 @@ cmsUInt8Number* Pack3BytesAndSkip1Optimized(register _cmsTRANSFORM* info,
                                             register cmsUInt8Number* output,
                                             register cmsUInt32Number Stride)
 {
-    *output++ = (wOut[0] & 0xFF);
-    *output++ = (wOut[1] & 0xFF);
-    *output++ = (wOut[2] & 0xFF);
+    *output++ = (wOut[0] & 0xFFU);
+    *output++ = (wOut[1] & 0xFFU);
+    *output++ = (wOut[2] & 0xFFU);
     output++;
 
     return output;
@@ -1982,9 +2033,9 @@ cmsUInt8Number* Pack3BytesAndSkip1SwapFirstOptimized(register _cmsTRANSFORM* inf
                                                      register cmsUInt32Number Stride)
 {
     output++;
-    *output++ = (wOut[0] & 0xFF);
-    *output++ = (wOut[1] & 0xFF);
-    *output++ = (wOut[2] & 0xFF);
+    *output++ = (wOut[0] & 0xFFU);
+    *output++ = (wOut[1] & 0xFFU);
+    *output++ = (wOut[2] & 0xFFU);
 
     return output;
 
@@ -2016,9 +2067,9 @@ cmsUInt8Number* Pack3BytesAndSkip1SwapOptimized(register _cmsTRANSFORM* info,
                                                 register cmsUInt32Number Stride)
 {
     output++;
-    *output++ = (wOut[2] & 0xFF);
-    *output++ = (wOut[1] & 0xFF);
-    *output++ = (wOut[0] & 0xFF);
+    *output++ = (wOut[2] & 0xFFU);
+    *output++ = (wOut[1] & 0xFFU);
+    *output++ = (wOut[0] & 0xFFU);
 
     return output;
 
@@ -2050,9 +2101,9 @@ cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirstOptimized(register _cmsTRANSFORM*
                                                          register cmsUInt8Number* output,
                                                          register cmsUInt32Number Stride)
 {
-    *output++ = (wOut[2] & 0xFF);
-    *output++ = (wOut[1] & 0xFF);
-    *output++ = (wOut[0] & 0xFF);
+    *output++ = (wOut[2] & 0xFFU);
+    *output++ = (wOut[1] & 0xFFU);
+    *output++ = (wOut[0] & 0xFFU);
     output++;
 
     return output;
@@ -2326,6 +2377,8 @@ cmsUInt8Number* PackLabFloatFrom16(register _cmsTRANSFORM* info,
 
         cmsFloat32Number* Out = (cmsFloat32Number*) output;
 
+        Stride /= PixelSize(info->OutputFormat);
+
         Out[0]        = (cmsFloat32Number)Lab.L;
         Out[Stride]   = (cmsFloat32Number)Lab.a;
         Out[Stride*2] = (cmsFloat32Number)Lab.b;
@@ -2354,6 +2407,8 @@ cmsUInt8Number* PackXYZDoubleFrom16(register _cmsTRANSFORM* Info,
         cmsFloat64Number* Out = (cmsFloat64Number*) output;
         cmsXYZEncoded2Float(&XYZ, wOut);
 
+        Stride /= PixelSize(Info->OutputFormat);
+
         Out[0]        = XYZ.X;
         Out[Stride]   = XYZ.Y;
         Out[Stride*2] = XYZ.Z;
@@ -2381,6 +2436,8 @@ cmsUInt8Number* PackXYZFloatFrom16(register _cmsTRANSFORM* Info,
         cmsFloat32Number* Out = (cmsFloat32Number*) output;
         cmsXYZEncoded2Float(&XYZ, wOut);
 
+        Stride /= PixelSize(Info->OutputFormat);
+
         Out[0]        = (cmsFloat32Number) XYZ.X;
         Out[Stride]   = (cmsFloat32Number) XYZ.Y;
         Out[Stride*2] = (cmsFloat32Number) XYZ.Z;
@@ -2408,24 +2465,26 @@ cmsUInt8Number* PackDoubleFrom16(register _cmsTRANSFORM* info,
                                 register cmsUInt8Number* output,
                                 register cmsUInt32Number Stride)
 {
-    int nChan      = T_CHANNELS(info -> OutputFormat);
-    int DoSwap     = T_DOSWAP(info ->OutputFormat);
-    int Reverse    = T_FLAVOR(info ->OutputFormat);
-    int Extra      = T_EXTRA(info -> OutputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> OutputFormat);
-    int Planar     = T_PLANAR(info -> OutputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number nChan      = T_CHANNELS(info -> OutputFormat);
+    cmsUInt32Number DoSwap     = T_DOSWAP(info ->OutputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->OutputFormat);
+    cmsUInt32Number Extra      = T_EXTRA(info -> OutputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> OutputFormat);
+    cmsUInt32Number Planar     = T_PLANAR(info -> OutputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
     cmsFloat64Number maximum = IsInkSpace(info ->OutputFormat) ? 655.35 : 65535.0;
     cmsFloat64Number v = 0;
     cmsFloat64Number* swap1 = (cmsFloat64Number*) output;
-    int i, start = 0;
+    cmsUInt32Number i, start = 0;
+
+    Stride /= PixelSize(info->OutputFormat);
 
     if (ExtraFirst)
         start = Extra;
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         v = (cmsFloat64Number) wOut[index] / maximum;
 
@@ -2459,24 +2518,26 @@ cmsUInt8Number* PackFloatFrom16(register _cmsTRANSFORM* info,
                                 register cmsUInt8Number* output,
                                 register cmsUInt32Number Stride)
 {
-       int nChan = T_CHANNELS(info->OutputFormat);
-       int DoSwap = T_DOSWAP(info->OutputFormat);
-       int Reverse = T_FLAVOR(info->OutputFormat);
-       int Extra = T_EXTRA(info->OutputFormat);
-       int SwapFirst = T_SWAPFIRST(info->OutputFormat);
-       int Planar = T_PLANAR(info->OutputFormat);
-       int ExtraFirst = DoSwap ^ SwapFirst;
+       cmsUInt32Number nChan      = T_CHANNELS(info->OutputFormat);
+       cmsUInt32Number DoSwap     = T_DOSWAP(info->OutputFormat);
+       cmsUInt32Number Reverse    = T_FLAVOR(info->OutputFormat);
+       cmsUInt32Number Extra      = T_EXTRA(info->OutputFormat);
+       cmsUInt32Number SwapFirst  = T_SWAPFIRST(info->OutputFormat);
+       cmsUInt32Number Planar     = T_PLANAR(info->OutputFormat);
+       cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
        cmsFloat64Number maximum = IsInkSpace(info->OutputFormat) ? 655.35 : 65535.0;
        cmsFloat64Number v = 0;
        cmsFloat32Number* swap1 = (cmsFloat32Number*)output;
-       int i, start = 0;
+       cmsUInt32Number i, start = 0;
+
+       Stride /= PixelSize(info->OutputFormat);
 
        if (ExtraFirst)
               start = Extra;
 
        for (i = 0; i < nChan; i++) {
 
-              int index = DoSwap ? (nChan - i - 1) : i;
+              cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
               v = (cmsFloat64Number)wOut[index] / maximum;
 
@@ -2512,24 +2573,26 @@ cmsUInt8Number* PackFloatsFromFloat(_cmsTRANSFORM* info,
                                     cmsUInt8Number* output,
                                     cmsUInt32Number Stride)
 {
-       int nChan = T_CHANNELS(info->OutputFormat);
-       int DoSwap = T_DOSWAP(info->OutputFormat);
-       int Reverse = T_FLAVOR(info->OutputFormat);
-       int Extra = T_EXTRA(info->OutputFormat);
-       int SwapFirst = T_SWAPFIRST(info->OutputFormat);
-       int Planar = T_PLANAR(info->OutputFormat);
-       int ExtraFirst = DoSwap ^ SwapFirst;
+       cmsUInt32Number nChan = T_CHANNELS(info->OutputFormat);
+       cmsUInt32Number DoSwap = T_DOSWAP(info->OutputFormat);
+       cmsUInt32Number Reverse = T_FLAVOR(info->OutputFormat);
+       cmsUInt32Number Extra = T_EXTRA(info->OutputFormat);
+       cmsUInt32Number SwapFirst = T_SWAPFIRST(info->OutputFormat);
+       cmsUInt32Number Planar = T_PLANAR(info->OutputFormat);
+       cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
        cmsFloat64Number maximum = IsInkSpace(info->OutputFormat) ? 100.0 : 1.0;
        cmsFloat32Number* swap1 = (cmsFloat32Number*)output;
        cmsFloat64Number v = 0;
-       int i, start = 0;
+       cmsUInt32Number i, start = 0;
+
+       Stride /= PixelSize(info->OutputFormat);
 
        if (ExtraFirst)
               start = Extra;
 
        for (i = 0; i < nChan; i++) {
 
-              int index = DoSwap ? (nChan - i - 1) : i;
+              cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
               v = wOut[index] * maximum;
 
@@ -2561,24 +2624,26 @@ cmsUInt8Number* PackDoublesFromFloat(_cmsTRANSFORM* info,
                                     cmsUInt8Number* output,
                                     cmsUInt32Number Stride)
 {
-       int nChan = T_CHANNELS(info->OutputFormat);
-       int DoSwap = T_DOSWAP(info->OutputFormat);
-       int Reverse = T_FLAVOR(info->OutputFormat);
-       int Extra = T_EXTRA(info->OutputFormat);
-       int SwapFirst = T_SWAPFIRST(info->OutputFormat);
-       int Planar = T_PLANAR(info->OutputFormat);
-       int ExtraFirst = DoSwap ^ SwapFirst;
+       cmsUInt32Number nChan      = T_CHANNELS(info->OutputFormat);
+       cmsUInt32Number DoSwap     = T_DOSWAP(info->OutputFormat);
+       cmsUInt32Number Reverse    = T_FLAVOR(info->OutputFormat);
+       cmsUInt32Number Extra      = T_EXTRA(info->OutputFormat);
+       cmsUInt32Number SwapFirst  = T_SWAPFIRST(info->OutputFormat);
+       cmsUInt32Number Planar     = T_PLANAR(info->OutputFormat);
+       cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
        cmsFloat64Number maximum = IsInkSpace(info->OutputFormat) ? 100.0 : 1.0;
        cmsFloat64Number v = 0;
        cmsFloat64Number* swap1 = (cmsFloat64Number*)output;
-       int i, start = 0;
+       cmsUInt32Number i, start = 0;
+
+       Stride /= PixelSize(info->OutputFormat);
 
        if (ExtraFirst)
               start = Extra;
 
        for (i = 0; i < nChan; i++) {
 
-              int index = DoSwap ? (nChan - i - 1) : i;
+              cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
               v = wOut[index] * maximum;
 
@@ -2619,6 +2684,8 @@ cmsUInt8Number* PackLabFloatFromFloat(_cmsTRANSFORM* Info,
 
     if (T_PLANAR(Info -> OutputFormat)) {
 
+        Stride /= PixelSize(Info->OutputFormat);
+
         Out[0]        = (cmsFloat32Number) (wOut[0] * 100.0);
         Out[Stride]   = (cmsFloat32Number) (wOut[1] * 255.0 - 128.0);
         Out[Stride*2] = (cmsFloat32Number) (wOut[2] * 255.0 - 128.0);
@@ -2647,6 +2714,8 @@ cmsUInt8Number* PackLabDoubleFromFloat(_cmsTRANSFORM* Info,
 
     if (T_PLANAR(Info -> OutputFormat)) {
 
+        Stride /= PixelSize(Info->OutputFormat);
+
         Out[0]        = (cmsFloat64Number) (wOut[0] * 100.0);
         Out[Stride]   = (cmsFloat64Number) (wOut[1] * 255.0 - 128.0);
         Out[Stride*2] = (cmsFloat64Number) (wOut[2] * 255.0 - 128.0);
@@ -2676,6 +2745,8 @@ cmsUInt8Number* PackXYZFloatFromFloat(_cmsTRANSFORM* Info,
 
     if (T_PLANAR(Info -> OutputFormat)) {
 
+        Stride /= PixelSize(Info->OutputFormat);
+
         Out[0]        = (cmsFloat32Number) (wOut[0] * MAX_ENCODEABLE_XYZ);
         Out[Stride]   = (cmsFloat32Number) (wOut[1] * MAX_ENCODEABLE_XYZ);
         Out[Stride*2] = (cmsFloat32Number) (wOut[2] * MAX_ENCODEABLE_XYZ);
@@ -2704,6 +2775,8 @@ cmsUInt8Number* PackXYZDoubleFromFloat(_cmsTRANSFORM* Info,
 
     if (T_PLANAR(Info -> OutputFormat)) {
 
+        Stride /= PixelSize(Info->OutputFormat);
+
         Out[0]        = (cmsFloat64Number) (wOut[0] * MAX_ENCODEABLE_XYZ);
         Out[Stride]   = (cmsFloat64Number) (wOut[1] * MAX_ENCODEABLE_XYZ);
         Out[Stride*2] = (cmsFloat64Number) (wOut[2] * MAX_ENCODEABLE_XYZ);
@@ -2735,24 +2808,26 @@ cmsUInt8Number* UnrollHalfTo16(register _cmsTRANSFORM* info,
                                 register cmsUInt32Number Stride)
 {
 
-    int nChan      = T_CHANNELS(info -> InputFormat);
-    int DoSwap     = T_DOSWAP(info ->InputFormat);
-    int Reverse    = T_FLAVOR(info ->InputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> InputFormat);
-    int Extra      = T_EXTRA(info -> InputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
-    int Planar     = T_PLANAR(info -> InputFormat);
+    cmsUInt32Number nChan      = T_CHANNELS(info -> InputFormat);
+    cmsUInt32Number DoSwap     = T_DOSWAP(info ->InputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->InputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> InputFormat);
+    cmsUInt32Number Extra      = T_EXTRA(info -> InputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number Planar     = T_PLANAR(info -> InputFormat);
     cmsFloat32Number v;
-    int i, start = 0;
+    cmsUInt32Number i, start = 0;
     cmsFloat32Number maximum = IsInkSpace(info ->InputFormat) ? 655.35F : 65535.0F;
 
 
+    Stride /= PixelSize(info->OutputFormat);
+
     if (ExtraFirst)
             start = Extra;
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         if (Planar)
             v = _cmsHalf2Float ( ((cmsUInt16Number*) accum)[(i + start) * Stride] );
@@ -2787,24 +2862,25 @@ cmsUInt8Number* UnrollHalfToFloat(_cmsTRANSFORM* info,
                                     cmsUInt32Number Stride)
 {
 
-    int nChan      = T_CHANNELS(info -> InputFormat);
-    int DoSwap     = T_DOSWAP(info ->InputFormat);
-    int Reverse    = T_FLAVOR(info ->InputFormat);
-    int SwapFirst  = T_SWAPFIRST(info -> InputFormat);
-    int Extra      = T_EXTRA(info -> InputFormat);
-    int ExtraFirst = DoSwap ^ SwapFirst;
-    int Planar     = T_PLANAR(info -> InputFormat);
+    cmsUInt32Number nChan      = T_CHANNELS(info -> InputFormat);
+    cmsUInt32Number DoSwap     = T_DOSWAP(info ->InputFormat);
+    cmsUInt32Number Reverse    = T_FLAVOR(info ->InputFormat);
+    cmsUInt32Number SwapFirst  = T_SWAPFIRST(info -> InputFormat);
+    cmsUInt32Number Extra      = T_EXTRA(info -> InputFormat);
+    cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
+    cmsUInt32Number Planar     = T_PLANAR(info -> InputFormat);
     cmsFloat32Number v;
-    int i, start = 0;
+    cmsUInt32Number i, start = 0;
     cmsFloat32Number maximum = IsInkSpace(info ->InputFormat) ? 100.0F : 1.0F;
 
+    Stride /= PixelSize(info->OutputFormat);
 
     if (ExtraFirst)
             start = Extra;
 
     for (i=0; i < nChan; i++) {
 
-        int index = DoSwap ? (nChan - i - 1) : i;
+        cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
         if (Planar)
             v =  _cmsHalf2Float ( ((cmsUInt16Number*) accum)[(i + start) * Stride] );
@@ -2837,24 +2913,26 @@ cmsUInt8Number* PackHalfFrom16(register _cmsTRANSFORM* info,
                                 register cmsUInt8Number* output,
                                 register cmsUInt32Number Stride)
 {
-       int nChan = T_CHANNELS(info->OutputFormat);
-       int DoSwap = T_DOSWAP(info->OutputFormat);
-       int Reverse = T_FLAVOR(info->OutputFormat);
-       int Extra = T_EXTRA(info->OutputFormat);
-       int SwapFirst = T_SWAPFIRST(info->OutputFormat);
-       int Planar = T_PLANAR(info->OutputFormat);
-       int ExtraFirst = DoSwap ^ SwapFirst;
+       cmsUInt32Number nChan      = T_CHANNELS(info->OutputFormat);
+       cmsUInt32Number DoSwap     = T_DOSWAP(info->OutputFormat);
+       cmsUInt32Number Reverse    = T_FLAVOR(info->OutputFormat);
+       cmsUInt32Number Extra      = T_EXTRA(info->OutputFormat);
+       cmsUInt32Number SwapFirst  = T_SWAPFIRST(info->OutputFormat);
+       cmsUInt32Number Planar     = T_PLANAR(info->OutputFormat);
+       cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
        cmsFloat32Number maximum = IsInkSpace(info->OutputFormat) ? 655.35F : 65535.0F;
        cmsFloat32Number v = 0;
        cmsUInt16Number* swap1 = (cmsUInt16Number*)output;
-       int i, start = 0;
+       cmsUInt32Number i, start = 0;
+
+       Stride /= PixelSize(info->OutputFormat);
 
        if (ExtraFirst)
               start = Extra;
 
        for (i = 0; i < nChan; i++) {
 
-              int index = DoSwap ? (nChan - i - 1) : i;
+              cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
               v = (cmsFloat32Number)wOut[index] / maximum;
 
@@ -2888,24 +2966,26 @@ cmsUInt8Number* PackHalfFromFloat(_cmsTRANSFORM* info,
                                     cmsUInt8Number* output,
                                     cmsUInt32Number Stride)
 {
-       int nChan = T_CHANNELS(info->OutputFormat);
-       int DoSwap = T_DOSWAP(info->OutputFormat);
-       int Reverse = T_FLAVOR(info->OutputFormat);
-       int Extra = T_EXTRA(info->OutputFormat);
-       int SwapFirst = T_SWAPFIRST(info->OutputFormat);
-       int Planar = T_PLANAR(info->OutputFormat);
-       int ExtraFirst = DoSwap ^ SwapFirst;
+       cmsUInt32Number nChan      = T_CHANNELS(info->OutputFormat);
+       cmsUInt32Number DoSwap     = T_DOSWAP(info->OutputFormat);
+       cmsUInt32Number Reverse    = T_FLAVOR(info->OutputFormat);
+       cmsUInt32Number Extra      = T_EXTRA(info->OutputFormat);
+       cmsUInt32Number SwapFirst  = T_SWAPFIRST(info->OutputFormat);
+       cmsUInt32Number Planar     = T_PLANAR(info->OutputFormat);
+       cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
        cmsFloat32Number maximum = IsInkSpace(info->OutputFormat) ? 100.0F : 1.0F;
        cmsUInt16Number* swap1 = (cmsUInt16Number*)output;
        cmsFloat32Number v = 0;
-       int i, start = 0;
+       cmsUInt32Number i, start = 0;
+
+       Stride /= PixelSize(info->OutputFormat);
 
        if (ExtraFirst)
               start = Extra;
 
        for (i = 0; i < nChan; i++) {
 
-              int index = DoSwap ? (nChan - i - 1) : i;
+           cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
 
               v = wOut[index] * maximum;
 
@@ -2936,7 +3016,7 @@ cmsUInt8Number* PackHalfFromFloat(_cmsTRANSFORM* info,
 // ----------------------------------------------------------------------------------------------------------------
 
 
-static cmsFormatters16 InputFormatters16[] = {
+static const cmsFormatters16 InputFormatters16[] = {
 
     //    Type                                          Mask                  Function
     //  ----------------------------   ------------------------------------  ----------------------------
@@ -3007,7 +3087,7 @@ static cmsFormatters16 InputFormatters16[] = {
 
 
 
-static cmsFormattersFloat InputFormattersFloat[] = {
+static const cmsFormattersFloat InputFormattersFloat[] = {
 
     //    Type                                          Mask                  Function
     //  ----------------------------   ------------------------------------  ----------------------------
@@ -3040,7 +3120,7 @@ cmsFormatter _cmsGetStockInputFormatter(cmsUInt32Number dwInput, cmsUInt32Number
 
     case CMS_PACK_FLAGS_16BITS: {
         for (i=0; i < sizeof(InputFormatters16) / sizeof(cmsFormatters16); i++) {
-            cmsFormatters16* f = InputFormatters16 + i;
+            const cmsFormatters16* f = InputFormatters16 + i;
 
             if ((dwInput & ~f ->Mask) == f ->Type) {
                 fr.Fmt16 = f ->Frm;
@@ -3052,7 +3132,7 @@ cmsFormatter _cmsGetStockInputFormatter(cmsUInt32Number dwInput, cmsUInt32Number
 
     case CMS_PACK_FLAGS_FLOAT: {
         for (i=0; i < sizeof(InputFormattersFloat) / sizeof(cmsFormattersFloat); i++) {
-            cmsFormattersFloat* f = InputFormattersFloat + i;
+            const cmsFormattersFloat* f = InputFormattersFloat + i;
 
             if ((dwInput & ~f ->Mask) == f ->Type) {
                 fr.FmtFloat = f ->Frm;
@@ -3070,7 +3150,7 @@ cmsFormatter _cmsGetStockInputFormatter(cmsUInt32Number dwInput, cmsUInt32Number
     return fr;
 }
 
-static cmsFormatters16 OutputFormatters16[] = {
+static const cmsFormatters16 OutputFormatters16[] = {
     //    Type                                          Mask                  Function
     //  ----------------------------   ------------------------------------  ----------------------------
 
@@ -3158,7 +3238,7 @@ static cmsFormatters16 OutputFormatters16[] = {
 };
 
 
-static cmsFormattersFloat OutputFormattersFloat[] = {
+static const cmsFormattersFloat OutputFormattersFloat[] = {
     //    Type                                          Mask                                 Function
     //  ----------------------------   ---------------------------------------------------  ----------------------------
     {     TYPE_Lab_FLT,                                                ANYPLANAR|ANYEXTRA,   PackLabFloatFromFloat},
@@ -3176,8 +3256,6 @@ static cmsFormattersFloat OutputFormattersFloat[] = {
                              ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE,   PackHalfFromFloat },
 #endif
 
-
-
 };
 
 
@@ -3197,7 +3275,7 @@ cmsFormatter _cmsGetStockOutputFormatter(cmsUInt32Number dwInput, cmsUInt32Numbe
      case CMS_PACK_FLAGS_16BITS: {
 
         for (i=0; i < sizeof(OutputFormatters16) / sizeof(cmsFormatters16); i++) {
-            cmsFormatters16* f = OutputFormatters16 + i;
+            const cmsFormatters16* f = OutputFormatters16 + i;
 
             if ((dwInput & ~f ->Mask) == f ->Type) {
                 fr.Fmt16 = f ->Frm;
@@ -3210,7 +3288,7 @@ cmsFormatter _cmsGetStockOutputFormatter(cmsUInt32Number dwInput, cmsUInt32Numbe
     case CMS_PACK_FLAGS_FLOAT: {
 
         for (i=0; i < sizeof(OutputFormattersFloat) / sizeof(cmsFormattersFloat); i++) {
-            cmsFormattersFloat* f = OutputFormattersFloat + i;
+            const cmsFormattersFloat* f = OutputFormattersFloat + i;
 
             if ((dwInput & ~f ->Mask) == f ->Type) {
                 fr.FmtFloat = f ->Frm;
@@ -3319,10 +3397,10 @@ cmsBool  _cmsRegisterFormattersPlugin(cmsContext ContextID, cmsPluginBase* Data)
     return TRUE;
 }
 
-cmsFormatter _cmsGetFormatter(cmsContext ContextID,
-                             cmsUInt32Number Type,         // Specific type, i.e. TYPE_RGB_8
-                             cmsFormatterDirection Dir,
-                             cmsUInt32Number dwFlags)
+cmsFormatter CMSEXPORT _cmsGetFormatter(cmsContext ContextID,
+                                        cmsUInt32Number Type,         // Specific type, i.e. TYPE_RGB_8
+                                        cmsFormatterDirection Dir,
+                                        cmsUInt32Number dwFlags)
 {
     _cmsFormattersPluginChunkType* ctx = ( _cmsFormattersPluginChunkType*) _cmsContextGetClientChunk(ContextID, FormattersPlugin);
     cmsFormattersFactoryList* f;
@@ -3350,7 +3428,7 @@ cmsBool  _cmsFormatterIsFloat(cmsUInt32Number Type)
 // Return whatever given formatter refers to 8 bits
 cmsBool  _cmsFormatterIs8bit(cmsUInt32Number Type)
 {
-    int Bytes = T_BYTES(Type);
+    cmsUInt32Number Bytes = T_BYTES(Type);
 
     return (Bytes == 1);
 }
@@ -3360,9 +3438,9 @@ cmsUInt32Number CMSEXPORT cmsFormatterForColorspaceOfProfile(cmsHPROFILE hProfil
 {
 
     cmsColorSpaceSignature ColorSpace      = cmsGetColorSpace(hProfile);
-    cmsUInt32Number        ColorSpaceBits  = _cmsLCMScolorSpace(ColorSpace);
+    cmsUInt32Number        ColorSpaceBits  = (cmsUInt32Number) _cmsLCMScolorSpace(ColorSpace);
     cmsUInt32Number        nOutputChans    = cmsChannelsOf(ColorSpace);
-    cmsUInt32Number        Float           = lIsFloat ? 1 : 0;
+    cmsUInt32Number        Float           = lIsFloat ? 1U : 0;
 
     // Create a fake formatter for result
     return FLOAT_SH(Float) | COLORSPACE_SH(ColorSpaceBits) | BYTES_SH(nBytes) | CHANNELS_SH(nOutputChans);
@@ -3372,10 +3450,11 @@ cmsUInt32Number CMSEXPORT cmsFormatterForColorspaceOfProfile(cmsHPROFILE hProfil
 cmsUInt32Number CMSEXPORT cmsFormatterForPCSOfProfile(cmsHPROFILE hProfile, cmsUInt32Number nBytes, cmsBool lIsFloat)
 {
 
-    cmsColorSpaceSignature ColorSpace      = cmsGetPCS(hProfile);
-    int                    ColorSpaceBits  = _cmsLCMScolorSpace(ColorSpace);
-    cmsUInt32Number        nOutputChans    = cmsChannelsOf(ColorSpace);
-    cmsUInt32Number        Float           = lIsFloat ? 1 : 0;
+    cmsColorSpaceSignature ColorSpace = cmsGetPCS(hProfile);
+
+    cmsUInt32Number ColorSpaceBits = (cmsUInt32Number) _cmsLCMScolorSpace(ColorSpace);
+    cmsUInt32Number nOutputChans = cmsChannelsOf(ColorSpace);
+    cmsUInt32Number Float = lIsFloat ? 1U : 0;
 
     // Create a fake formatter for result
     return FLOAT_SH(Float) | COLORSPACE_SH(ColorSpaceBits) | BYTES_SH(nBytes) | CHANNELS_SH(nOutputChans);
diff --git a/src/java.desktop/share/native/liblcms/cmspcs.c b/src/java.desktop/share/native/liblcms/cmspcs.c
index f2ebf53bf96..6c6773620c5 100644
--- a/src/java.desktop/share/native/liblcms/cmspcs.c
+++ b/src/java.desktop/share/native/liblcms/cmspcs.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -685,9 +685,9 @@ cmsFloat64Number CMSEXPORT cmsCIE2000DeltaE(const cmsCIELab* Lab1, const cmsCIEL
 
 // This function returns a number of gridpoints to be used as LUT table. It assumes same number
 // of gripdpoints in all dimensions. Flags may override the choice.
-int _cmsReasonableGridpointsByColorspace(cmsColorSpaceSignature Colorspace, cmsUInt32Number dwFlags)
+cmsUInt32Number _cmsReasonableGridpointsByColorspace(cmsColorSpaceSignature Colorspace, cmsUInt32Number dwFlags)
 {
-    int nChannels;
+    cmsUInt32Number nChannels;
 
     // Already specified?
     if (dwFlags & 0x00FF0000) {
@@ -831,7 +831,7 @@ cmsColorSpaceSignature CMSEXPORT _cmsICCcolorSpace(int OurNotation)
        case PT_MCH14: return cmsSigMCHEData;
        case PT_MCH15: return cmsSigMCHFData;
 
-       default:  return (cmsColorSpaceSignature) (-1);
+       default:  return (cmsColorSpaceSignature) 0;
        }
 }
 
@@ -898,7 +898,7 @@ int CMSEXPORT _cmsLCMScolorSpace(cmsColorSpaceSignature ProfileSpace)
     case cmsSigMCHFData:
     case cmsSig15colorData:return PT_MCH15;
 
-    default:  return (cmsColorSpaceSignature) (-1);
+    default:  return (cmsColorSpaceSignature) 0;
     }
 }
 
diff --git a/src/java.desktop/share/native/liblcms/cmsplugin.c b/src/java.desktop/share/native/liblcms/cmsplugin.c
index 683c8305980..e7100c8ea60 100644
--- a/src/java.desktop/share/native/liblcms/cmsplugin.c
+++ b/src/java.desktop/share/native/liblcms/cmsplugin.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -201,14 +201,28 @@ cmsBool CMSEXPORT  _cmsReadFloat32Number(cmsIOHANDLER* io, cmsFloat32Number* n)
 
     _cmsAssert(io != NULL);
 
-    if (io -> Read(io, &tmp, sizeof(cmsUInt32Number), 1) != 1)
-            return FALSE;
+    if (io->Read(io, &tmp, sizeof(cmsUInt32Number), 1) != 1)
+        return FALSE;
 
     if (n != NULL) {
 
         tmp = _cmsAdjustEndianess32(tmp);
-        *n = *(cmsFloat32Number*) (void*) &tmp;
+        *n = *(cmsFloat32Number*)(void*)&tmp;
+
+        // Safeguard which covers against absurd values
+        if (*n > 1E+20 || *n < -1E+20) return FALSE;
+
+        #if defined(_MSC_VER) && _MSC_VER < 1800
+           return TRUE;
+        #elif defined (__BORLANDC__)
+           return TRUE;
+        #else
+
+           // fpclassify() required by C99 (only provided by MSVC >= 1800, VS2013 onwards)
+           return ((fpclassify(*n) == FP_ZERO) || (fpclassify(*n) == FP_NORMAL));
+        #endif
     }
+
     return TRUE;
 }
 
@@ -222,7 +236,11 @@ cmsBool CMSEXPORT   _cmsReadUInt64Number(cmsIOHANDLER* io, cmsUInt64Number* n)
     if (io -> Read(io, &tmp, sizeof(cmsUInt64Number), 1) != 1)
             return FALSE;
 
-    if (n != NULL) _cmsAdjustEndianess64(n, &tmp);
+    if (n != NULL) {
+
+        _cmsAdjustEndianess64(n, &tmp);
+    }
+
     return TRUE;
 }
 
@@ -237,7 +255,7 @@ cmsBool CMSEXPORT  _cmsRead15Fixed16Number(cmsIOHANDLER* io, cmsFloat64Number* n
             return FALSE;
 
     if (n != NULL) {
-        *n = _cms15Fixed16toDouble(_cmsAdjustEndianess32(tmp));
+        *n = _cms15Fixed16toDouble((cmsS15Fixed16Number) _cmsAdjustEndianess32(tmp));
     }
 
     return TRUE;
@@ -254,9 +272,9 @@ cmsBool CMSEXPORT  _cmsReadXYZNumber(cmsIOHANDLER* io, cmsCIEXYZ* XYZ)
 
     if (XYZ != NULL) {
 
-        XYZ->X = _cms15Fixed16toDouble(_cmsAdjustEndianess32(xyz.X));
-        XYZ->Y = _cms15Fixed16toDouble(_cmsAdjustEndianess32(xyz.Y));
-        XYZ->Z = _cms15Fixed16toDouble(_cmsAdjustEndianess32(xyz.Z));
+        XYZ->X = _cms15Fixed16toDouble((cmsS15Fixed16Number) _cmsAdjustEndianess32((cmsUInt32Number) xyz.X));
+        XYZ->Y = _cms15Fixed16toDouble((cmsS15Fixed16Number) _cmsAdjustEndianess32((cmsUInt32Number) xyz.Y));
+        XYZ->Z = _cms15Fixed16toDouble((cmsS15Fixed16Number) _cmsAdjustEndianess32((cmsUInt32Number) xyz.Z));
     }
     return TRUE;
 }
@@ -345,7 +363,7 @@ cmsBool CMSEXPORT  _cmsWrite15Fixed16Number(cmsIOHANDLER* io, cmsFloat64Number n
 
     _cmsAssert(io != NULL);
 
-    tmp = _cmsAdjustEndianess32(_cmsDoubleTo15Fixed16(n));
+    tmp = _cmsAdjustEndianess32((cmsUInt32Number) _cmsDoubleTo15Fixed16(n));
     if (io -> Write(io, sizeof(cmsUInt32Number), &tmp) != 1)
             return FALSE;
 
@@ -359,9 +377,9 @@ cmsBool CMSEXPORT  _cmsWriteXYZNumber(cmsIOHANDLER* io, const cmsCIEXYZ* XYZ)
     _cmsAssert(io != NULL);
     _cmsAssert(XYZ != NULL);
 
-    xyz.X = _cmsAdjustEndianess32(_cmsDoubleTo15Fixed16(XYZ->X));
-    xyz.Y = _cmsAdjustEndianess32(_cmsDoubleTo15Fixed16(XYZ->Y));
-    xyz.Z = _cmsAdjustEndianess32(_cmsDoubleTo15Fixed16(XYZ->Z));
+    xyz.X = (cmsS15Fixed16Number) _cmsAdjustEndianess32((cmsUInt32Number) _cmsDoubleTo15Fixed16(XYZ->X));
+    xyz.Y = (cmsS15Fixed16Number) _cmsAdjustEndianess32((cmsUInt32Number) _cmsDoubleTo15Fixed16(XYZ->Y));
+    xyz.Z = (cmsS15Fixed16Number) _cmsAdjustEndianess32((cmsUInt32Number) _cmsDoubleTo15Fixed16(XYZ->Z));
 
     return io -> Write(io,  sizeof(cmsEncodedXYZNumber), &xyz);
 }
@@ -519,7 +537,7 @@ cmsBool CMSEXPORT _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...)
         return FALSE;   // Truncated, which is a fatal error for us
     }
 
-    rc = io ->Write(io, len, Buffer);
+    rc = io ->Write(io, (cmsUInt32Number) len, Buffer);
 
     va_end(args);
 
@@ -779,6 +797,30 @@ cmsContext CMSEXPORT cmsCreateContext(void* Plugin, void* UserData)
     struct _cmsContext_struct* ctx;
     struct _cmsContext_struct  fakeContext;
 
+    // See the comments regarding locking in lcms2_internal.h
+    // for an explanation of why we need the following code.
+#ifdef CMS_IS_WINDOWS_
+#ifndef CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT
+    {
+        static HANDLE _cmsWindowsInitMutex = NULL;
+        static volatile HANDLE* mutex = &_cmsWindowsInitMutex;
+
+        if (*mutex == NULL)
+        {
+            HANDLE p = CreateMutex(NULL, FALSE, NULL);
+            if (p && InterlockedCompareExchangePointer((void **)mutex, (void*)p, NULL) != NULL)
+                CloseHandle(p);
+        }
+        if (*mutex == NULL || WaitForSingleObject(*mutex, INFINITE) == WAIT_FAILED)
+            return NULL;
+        if (((void **)&_cmsContextPoolHeadMutex)[0] == NULL)
+            InitializeCriticalSection(&_cmsContextPoolHeadMutex);
+        if (*mutex == NULL || !ReleaseMutex(*mutex))
+            return NULL;
+    }
+#endif
+#endif
+
     _cmsInstallAllocFunctions(_cmsFindMemoryPlugin(Plugin), &fakeContext.DefaultMemoryManager);
 
     fakeContext.chunks[UserPtr]     = UserData;
@@ -805,7 +847,7 @@ cmsContext CMSEXPORT cmsCreateContext(void* Plugin, void* UserData)
     ctx ->chunks[MemPlugin]   = &ctx->DefaultMemoryManager;
 
     // Now we can allocate the pool by using default memory manager
-    ctx ->MemPool = _cmsCreateSubAlloc(ctx, 22 * sizeof(void*));  // default size about 32 pointers
+    ctx ->MemPool = _cmsCreateSubAlloc(ctx, 22 * sizeof(void*));  // default size about 22 pointers
     if (ctx ->MemPool == NULL) {
 
          cmsDeleteContext(ctx);
diff --git a/src/java.desktop/share/native/liblcms/cmsps2.c b/src/java.desktop/share/native/liblcms/cmsps2.c
index 03d476bc367..a3c7b49dbff 100644
--- a/src/java.desktop/share/native/liblcms/cmsps2.c
+++ b/src/java.desktop/share/native/liblcms/cmsps2.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -429,7 +429,7 @@ void EmitRangeCheck(cmsIOHANDLER* m)
 // Does write the intent
 
 static
-void EmitIntent(cmsIOHANDLER* m, int RenderingIntent)
+void EmitIntent(cmsIOHANDLER* m, cmsUInt32Number RenderingIntent)
 {
     const char *intent;
 
@@ -563,7 +563,7 @@ void Emit1Gamma(cmsIOHANDLER* m, cmsToneCurve* Table)
 // Compare gamma table
 
 static
-cmsBool GammaTableEquals(cmsUInt16Number* g1, cmsUInt16Number* g2, int nEntries)
+cmsBool GammaTableEquals(cmsUInt16Number* g1, cmsUInt16Number* g2, cmsUInt32Number nEntries)
 {
     return memcmp(g1, g2, nEntries* sizeof(cmsUInt16Number)) == 0;
 }
@@ -572,9 +572,9 @@ cmsBool GammaTableEquals(cmsUInt16Number* g1, cmsUInt16Number* g2, int nEntries)
 // Does write a set of gamma curves
 
 static
-void EmitNGamma(cmsIOHANDLER* m, int n, cmsToneCurve* g[])
+void EmitNGamma(cmsIOHANDLER* m, cmsUInt32Number n, cmsToneCurve* g[])
 {
-    int i;
+    cmsUInt32Number i;
 
     for( i=0; i < n; i++ )
     {
@@ -797,7 +797,7 @@ int EmitCIEBasedABC(cmsIOHANDLER* m, cmsFloat64Number* Matrix, cmsToneCurve** Cu
 
 
 static
-int EmitCIEBasedDEF(cmsIOHANDLER* m, cmsPipeline* Pipeline, int Intent, cmsCIEXYZ* BlackPoint)
+int EmitCIEBasedDEF(cmsIOHANDLER* m, cmsPipeline* Pipeline, cmsUInt32Number Intent, cmsCIEXYZ* BlackPoint)
 {
     const char* PreMaj;
     const char* PostMaj;
@@ -857,14 +857,14 @@ int EmitCIEBasedDEF(cmsIOHANDLER* m, cmsPipeline* Pipeline, int Intent, cmsCIEXY
 // Generates a curve from a gray profile
 
 static
-    cmsToneCurve* ExtractGray2Y(cmsContext ContextID, cmsHPROFILE hProfile, int Intent)
+cmsToneCurve* ExtractGray2Y(cmsContext ContextID, cmsHPROFILE hProfile, cmsUInt32Number Intent)
 {
     cmsToneCurve* Out = cmsBuildTabulatedToneCurve16(ContextID, 256, NULL);
     cmsHPROFILE hXYZ  = cmsCreateXYZProfile();
     cmsHTRANSFORM xform = cmsCreateTransformTHR(ContextID, hProfile, TYPE_GRAY_8, hXYZ, TYPE_XYZ_DBL, Intent, cmsFLAGS_NOOPTIMIZE);
     int i;
 
-    if (Out != NULL) {
+    if (Out != NULL && xform != NULL) {
         for (i=0; i < 256; i++) {
 
             cmsUInt8Number Gray = (cmsUInt8Number) i;
@@ -876,8 +876,8 @@ static
         }
     }
 
-    cmsDeleteTransform(xform);
-    cmsCloseProfile(hXYZ);
+    if (xform) cmsDeleteTransform(xform);
+    if (hXYZ) cmsCloseProfile(hXYZ);
     return Out;
 }
 
@@ -887,7 +887,7 @@ static
 // a more perceptually uniform space... I do choose Lab.
 
 static
-int WriteInputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, int Intent, cmsUInt32Number dwFlags)
+int WriteInputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent, cmsUInt32Number dwFlags)
 {
     cmsHPROFILE hLab;
     cmsHTRANSFORM xform;
@@ -972,7 +972,6 @@ cmsFloat64Number* GetPtrToMatrix(const cmsStage* mpe)
 
 
 // Does create CSA based on matrix-shaper. Allowed types are gray and RGB based
-
 static
 int WriteInputMatrixShaper(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsStage* Matrix, cmsStage* Shaper)
 {
@@ -998,17 +997,17 @@ int WriteInputMatrixShaper(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsStage* Matr
 
             memmove(&Mat, GetPtrToMatrix(Matrix), sizeof(Mat));
 
-            for (i=0; i < 3; i++)
-                for (j=0; j < 3; j++)
+            for (i = 0; i < 3; i++)
+                for (j = 0; j < 3; j++)
                     Mat.v[i].n[j] *= MAX_ENCODEABLE_XYZ;
 
-            rc = EmitCIEBasedABC(m,  (cmsFloat64Number *) &Mat,
-                                _cmsStageGetPtrToCurveSet(Shaper),
-                                 &BlackPointAdaptedToD50);
+            rc = EmitCIEBasedABC(m, (cmsFloat64Number *)&Mat,
+                _cmsStageGetPtrToCurveSet(Shaper),
+                &BlackPointAdaptedToD50);
         }
-        else  {
+        else {
 
-            cmsSignalError(m ->ContextID, cmsERROR_COLORSPACE_CHECK, "Profile is not suitable for CSA. Unsupported colorspace.");
+            cmsSignalError(m->ContextID, cmsERROR_COLORSPACE_CHECK, "Profile is not suitable for CSA. Unsupported colorspace.");
             return 0;
         }
 
@@ -1021,12 +1020,12 @@ int WriteInputMatrixShaper(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsStage* Matr
 // This is a HP extension, and it works in Lab instead of XYZ
 
 static
-int WriteNamedColorCSA(cmsIOHANDLER* m, cmsHPROFILE hNamedColor, int Intent)
+int WriteNamedColorCSA(cmsIOHANDLER* m, cmsHPROFILE hNamedColor, cmsUInt32Number Intent)
 {
     cmsHTRANSFORM xform;
     cmsHPROFILE   hLab;
-    int i, nColors;
-    char ColorName[32];
+    cmsUInt32Number i, nColors;
+    char ColorName[cmsMAX_PATH];
     cmsNAMEDCOLORLIST* NamedColorList;
 
     hLab  = cmsCreateLab4ProfileTHR(m ->ContextID, NULL);
@@ -1304,20 +1303,20 @@ void EmitXYZ2Lab(cmsIOHANDLER* m)
 // 8 bits.
 
 static
-int WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, int Intent, cmsUInt32Number dwFlags)
+int WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent, cmsUInt32Number dwFlags)
 {
     cmsHPROFILE hLab;
     cmsHTRANSFORM xform;
-    int i, nChannels;
+    cmsUInt32Number i, nChannels;
     cmsUInt32Number OutputFormat;
     _cmsTRANSFORM* v;
     cmsPipeline* DeviceLink;
     cmsHPROFILE Profiles[3];
     cmsCIEXYZ BlackPointAdaptedToD50;
-    cmsBool lDoBPC = (dwFlags & cmsFLAGS_BLACKPOINTCOMPENSATION);
-    cmsBool lFixWhite = !(dwFlags & cmsFLAGS_NOWHITEONWHITEFIXUP);
+    cmsBool lDoBPC = (cmsBool) (dwFlags & cmsFLAGS_BLACKPOINTCOMPENSATION);
+    cmsBool lFixWhite = (cmsBool) !(dwFlags & cmsFLAGS_NOWHITEONWHITEFIXUP);
     cmsUInt32Number InFrm = TYPE_Lab_16;
-    int RelativeEncodingIntent;
+    cmsUInt32Number RelativeEncodingIntent;
     cmsColorSpaceSignature ColorSpace;
 
 
@@ -1413,10 +1412,10 @@ int WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, int Intent, cmsUInt32N
 
 // Builds a ASCII string containing colorant list in 0..1.0 range
 static
-void BuildColorantList(char *Colorant, int nColorant, cmsUInt16Number Out[])
+void BuildColorantList(char *Colorant, cmsUInt32Number nColorant, cmsUInt16Number Out[])
 {
     char Buff[32];
-    int j;
+    cmsUInt32Number j;
 
     Colorant[0] = 0;
     if (nColorant > cmsMAXCHANNELS)
@@ -1438,12 +1437,12 @@ void BuildColorantList(char *Colorant, int nColorant, cmsUInt16Number Out[])
 // This is a HP extension.
 
 static
-int WriteNamedColorCRD(cmsIOHANDLER* m, cmsHPROFILE hNamedColor, int Intent, cmsUInt32Number dwFlags)
+int WriteNamedColorCRD(cmsIOHANDLER* m, cmsHPROFILE hNamedColor, cmsUInt32Number Intent, cmsUInt32Number dwFlags)
 {
     cmsHTRANSFORM xform;
-    int i, nColors, nColorant;
+    cmsUInt32Number i, nColors, nColorant;
     cmsUInt32Number OutputFormat;
-    char ColorName[32];
+    char ColorName[cmsMAX_PATH];
     char Colorant[128];
     cmsNAMEDCOLORLIST* NamedColorList;
 
diff --git a/src/java.desktop/share/native/liblcms/cmssamp.c b/src/java.desktop/share/native/liblcms/cmssamp.c
index b22c427323e..1e38e4f3188 100644
--- a/src/java.desktop/share/native/liblcms/cmssamp.c
+++ b/src/java.desktop/share/native/liblcms/cmssamp.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmssm.c b/src/java.desktop/share/native/liblcms/cmssm.c
index 1923a02841a..38e08fc9a4f 100644
--- a/src/java.desktop/share/native/liblcms/cmssm.c
+++ b/src/java.desktop/share/native/liblcms/cmssm.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmstypes.c b/src/java.desktop/share/native/liblcms/cmstypes.c
index ebf81c83b39..d0d4d24829e 100644
--- a/src/java.desktop/share/native/liblcms/cmstypes.c
+++ b/src/java.desktop/share/native/liblcms/cmstypes.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -89,6 +89,11 @@ typedef struct _cmsTagTypeLinkedList_st {
 // Helper macro to define a MPE handler. Callbacks do have a fixed naming convention
 #define TYPE_MPE_HANDLER(t, x)  { (t), READ_FN(x), WRITE_FN(x), GenericMPEdup, GenericMPEfree, NULL, 0 }
 
+// Infinites
+#define MINUS_INF   (-1E22F)
+#define PLUS_INF    (+1E22F)
+
+
 // Register a new type handler. This routine is shared between normal types and MPE. LinkedList points to the optional list head
 static
 cmsBool RegisterTypesPlugin(cmsContext id, cmsPluginBase* Data, _cmsMemoryClient pos)
@@ -202,6 +207,13 @@ cmsBool ReadPositionTable(struct _cms_typehandler_struct* self,
 {
     cmsUInt32Number i;
     cmsUInt32Number *ElementOffsets = NULL, *ElementSizes = NULL;
+    cmsUInt32Number currentPosition;
+
+    currentPosition = io->Tell(io);
+
+    // Verify there is enough space left to read at least two cmsUInt32Number items for Count items.
+    if (((io->ReportedSize - currentPosition) / (2 * sizeof(cmsUInt32Number))) < Count)
+        return FALSE;
 
     // Let's take the offsets to each element
     ElementOffsets = (cmsUInt32Number *) _cmsCalloc(io ->ContextID, Count, sizeof(cmsUInt32Number));
@@ -424,8 +436,8 @@ void *Type_Chromaticity_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER*
 static
 cmsBool  SaveOneChromaticity(cmsFloat64Number x, cmsFloat64Number y, cmsIOHANDLER* io)
 {
-    if (!_cmsWriteUInt32Number(io, _cmsDoubleTo15Fixed16(x))) return FALSE;
-    if (!_cmsWriteUInt32Number(io, _cmsDoubleTo15Fixed16(y))) return FALSE;
+    if (!_cmsWriteUInt32Number(io, (cmsUInt32Number) _cmsDoubleTo15Fixed16(x))) return FALSE;
+    if (!_cmsWriteUInt32Number(io, (cmsUInt32Number) _cmsDoubleTo15Fixed16(y))) return FALSE;
 
     return TRUE;
 }
@@ -984,7 +996,7 @@ cmsBool  Type_Text_Description_Write(struct _cms_typehandler_struct* self, cmsIO
     cmsBool  rc = FALSE;
     char Filler[68];
 
-    // Used below for writting zeroes
+    // Used below for writing zeroes
     memset(Filler, 0, sizeof(Filler));
 
     // Get the len of string
@@ -1146,7 +1158,10 @@ void *Type_Curve_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cm
                NewGamma = cmsBuildTabulatedToneCurve16(self ->ContextID, Count, NULL);
                if (!NewGamma) return NULL;
 
-               if (!_cmsReadUInt16Array(io, Count, NewGamma -> Table16)) return NULL;
+               if (!_cmsReadUInt16Array(io, Count, NewGamma -> Table16)) {
+                   cmsFreeToneCurve(NewGamma);
+                   return NULL;
+               }
 
                *nItems = 1;
                return NewGamma;
@@ -1206,7 +1221,7 @@ void Type_Curve_Free(struct _cms_typehandler_struct* self, void* Ptr)
 // ********************************************************************************
 
 
-// Decide which curve type to use on writting
+// Decide which curve type to use on writing
 static
 cmsTagTypeSignature DecideCurveType(cmsFloat64Number ICCVersion, const void *Data)
 {
@@ -1599,7 +1614,7 @@ void Type_MLU_Free(struct _cms_typehandler_struct* self, void* Ptr)
 // Type cmsSigLut8Type
 // ********************************************************************************
 
-// Decide which LUT type to use on writting
+// Decide which LUT type to use on writing
 static
 cmsTagTypeSignature DecideLUTtypeA2B(cmsFloat64Number ICCVersion, const void *Data)
 {
@@ -1648,10 +1663,10 @@ Byte Position   Field Length (bytes)  Content Encoded as...
 
 // Read 8 bit tables as gamma functions
 static
-cmsBool  Read8bitTables(cmsContext ContextID, cmsIOHANDLER* io, cmsPipeline* lut, int nChannels)
+cmsBool  Read8bitTables(cmsContext ContextID, cmsIOHANDLER* io, cmsPipeline* lut, cmsUInt32Number nChannels)
 {
     cmsUInt8Number* Temp = NULL;
-    int i, j;
+    cmsUInt32Number i, j;
     cmsToneCurve* Tables[cmsMAXCHANNELS];
 
     if (nChannels > cmsMAXCHANNELS) return FALSE;
@@ -1784,8 +1799,8 @@ void *Type_LUT8_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cms
     if (!_cmsReadUInt8Number(io, NULL)) goto Error;
 
     // Do some checking
-    if (InputChannels > cmsMAXCHANNELS)  goto Error;
-    if (OutputChannels > cmsMAXCHANNELS) goto Error;
+    if (InputChannels == 0 || InputChannels > cmsMAXCHANNELS)  goto Error;
+    if (OutputChannels == 0 || OutputChannels > cmsMAXCHANNELS) goto Error;
 
    // Allocates an empty Pipeline
     NewLUT = cmsPipelineAlloc(self ->ContextID, InputChannels, OutputChannels);
@@ -1842,8 +1857,10 @@ void *Type_LUT8_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cms
         _cmsFree(self ->ContextID, Temp);
         Temp = NULL;
 
-        if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, cmsStageAllocCLut16bit(self ->ContextID, CLUTpoints, InputChannels, OutputChannels, T)))
+        if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, cmsStageAllocCLut16bit(self ->ContextID, CLUTpoints, InputChannels, OutputChannels, T))) {
+            _cmsFree(self ->ContextID, T);
             goto Error;
+        }
         _cmsFree(self ->ContextID, T);
     }
 
@@ -1872,7 +1889,7 @@ cmsBool  Type_LUT8_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io,
     _cmsStageToneCurvesData* PreMPE = NULL, *PostMPE = NULL;
     _cmsStageMatrixData* MatMPE = NULL;
     _cmsStageCLutData* clut = NULL;
-    int clutPoints;
+    cmsUInt32Number clutPoints;
 
     // Disassemble the LUT into components.
     mpe = NewLUT -> Elements;
@@ -1992,9 +2009,10 @@ void Type_LUT8_Free(struct _cms_typehandler_struct* self, void* Ptr)
 
 // Read 16 bit tables as gamma functions
 static
-cmsBool  Read16bitTables(cmsContext ContextID, cmsIOHANDLER* io, cmsPipeline* lut, int nChannels, int nEntries)
+cmsBool  Read16bitTables(cmsContext ContextID, cmsIOHANDLER* io, cmsPipeline* lut,
+                                    cmsUInt32Number nChannels, cmsUInt32Number nEntries)
 {
-    int i;
+    cmsUInt32Number i;
     cmsToneCurve* Tables[cmsMAXCHANNELS];
 
     // Maybe an empty table? (this is a lcms extension)
@@ -2036,10 +2054,10 @@ cmsBool  Read16bitTables(cmsContext ContextID, cmsIOHANDLER* io, cmsPipeline* lu
 static
 cmsBool Write16bitTables(cmsContext ContextID, cmsIOHANDLER* io, _cmsStageToneCurvesData* Tables)
 {
-    int j;
+    cmsUInt32Number j;
     cmsUInt32Number i;
     cmsUInt16Number val;
-    int nEntries;
+    cmsUInt32Number nEntries;
 
     _cmsAssert(Tables != NULL);
 
@@ -2077,8 +2095,8 @@ void *Type_LUT16_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cm
     if (!_cmsReadUInt8Number(io, NULL)) return NULL;
 
     // Do some checking
-    if (InputChannels > cmsMAXCHANNELS)  goto Error;
-    if (OutputChannels > cmsMAXCHANNELS) goto Error;
+    if (InputChannels == 0 || InputChannels > cmsMAXCHANNELS)  goto Error;
+    if (OutputChannels == 0 || OutputChannels > cmsMAXCHANNELS) goto Error;
 
     // Allocates an empty LUT
     NewLUT = cmsPipelineAlloc(self ->ContextID, InputChannels, OutputChannels);
@@ -2160,7 +2178,7 @@ cmsBool  Type_LUT16_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
     _cmsStageToneCurvesData* PreMPE = NULL, *PostMPE = NULL;
     _cmsStageMatrixData* MatMPE = NULL;
     _cmsStageCLutData* clut = NULL;
-    int i, InputChannels, OutputChannels, clutPoints;
+    cmsUInt32Number i, InputChannels, OutputChannels, clutPoints;
 
     // Disassemble the LUT into components.
     mpe = NewLUT -> Elements;
@@ -2346,7 +2364,8 @@ cmsStage* ReadMatrix(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cms
 //  V4 stuff. Read CLUT part for LutAtoB and LutBtoA
 
 static
-cmsStage* ReadCLUT(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUInt32Number Offset, int InputChannels, int OutputChannels)
+cmsStage* ReadCLUT(struct _cms_typehandler_struct* self, cmsIOHANDLER* io,
+                   cmsUInt32Number Offset, cmsUInt32Number InputChannels, cmsUInt32Number OutputChannels)
 {
     cmsUInt8Number  gridPoints8[cmsMAXCHANNELS]; // Number of grid points in each dimension.
     cmsUInt32Number GridPoints[cmsMAXCHANNELS], i;
@@ -2382,7 +2401,10 @@ cmsStage* ReadCLUT(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUI
 
         for (i=0; i < Data ->nEntries; i++) {
 
-            if (io ->Read(io, &v, sizeof(cmsUInt8Number), 1) != 1) return NULL;
+            if (io ->Read(io, &v, sizeof(cmsUInt8Number), 1) != 1) {
+                cmsStageFree(CLUT);
+                return NULL;
+            }
             Data ->Tab.T[i] = FROM_8_TO_16(v);
         }
 
@@ -2512,7 +2534,10 @@ void* Type_LUTA2B_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, c
     if (!_cmsReadUInt32Number(io, &offsetC)) return NULL;
     if (!_cmsReadUInt32Number(io, &offsetA)) return NULL;
 
-   // Allocates an empty LUT
+    if (inputChan == 0 || inputChan >= cmsMAXCHANNELS) return NULL;
+    if (outputChan == 0 || outputChan >= cmsMAXCHANNELS) return NULL;
+
+    // Allocates an empty LUT
     NewLUT = cmsPipelineAlloc(self ->ContextID, inputChan, outputChan);
     if (NewLUT == NULL) return NULL;
 
@@ -2694,7 +2719,7 @@ static
 cmsBool Type_LUTA2B_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
 {
     cmsPipeline* Lut = (cmsPipeline*) Ptr;
-    int inputChan, outputChan;
+    cmsUInt32Number inputChan, outputChan;
     cmsStage *A = NULL, *B = NULL, *M = NULL;
     cmsStage * Matrix = NULL;
     cmsStage * CLUT = NULL;
@@ -2742,7 +2767,7 @@ cmsBool Type_LUTA2B_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
 
     if (CLUT != NULL) {
         offsetC = io ->Tell(io) - BaseOffset;
-        if (!WriteCLUT(self, io, Lut ->SaveAs8Bits ? 1 : 2, CLUT)) return FALSE;
+        if (!WriteCLUT(self, io, (Lut ->SaveAs8Bits ? 1U : 2U), CLUT)) return FALSE;
 
     }
     if (M != NULL) {
@@ -2820,6 +2845,9 @@ void* Type_LUTB2A_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, c
     if (!_cmsReadUInt8Number(io, &inputChan)) return NULL;
     if (!_cmsReadUInt8Number(io, &outputChan)) return NULL;
 
+    if (inputChan == 0 || inputChan >= cmsMAXCHANNELS) return NULL;
+    if (outputChan == 0 || outputChan >= cmsMAXCHANNELS) return NULL;
+
     // Padding
     if (!_cmsReadUInt16Number(io, NULL)) return NULL;
 
@@ -2879,7 +2907,7 @@ static
 cmsBool  Type_LUTB2A_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
 {
     cmsPipeline* Lut = (cmsPipeline*) Ptr;
-    int inputChan, outputChan;
+    cmsUInt32Number inputChan, outputChan;
     cmsStage *A = NULL, *B = NULL, *M = NULL;
     cmsStage *Matrix = NULL;
     cmsStage *CLUT = NULL;
@@ -2921,7 +2949,7 @@ cmsBool  Type_LUTB2A_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* i
 
     if (CLUT != NULL) {
         offsetC = io ->Tell(io) - BaseOffset;
-        if (!WriteCLUT(self, io, Lut ->SaveAs8Bits ? 1 : 2, CLUT)) return FALSE;
+        if (!WriteCLUT(self, io, (Lut ->SaveAs8Bits ? 1U : 2U), CLUT)) return FALSE;
 
     }
     if (M != NULL) {
@@ -3011,7 +3039,7 @@ void *Type_ColorantTable_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER
     for (i=0; i < Count; i++) {
 
         if (io ->Read(io, Name, 32, 1) != 1) goto Error;
-        Name[33] = 0;
+        Name[32] = 0;
 
         if (!_cmsReadUInt16Array(io, 3, PCS)) goto Error;
 
@@ -3037,7 +3065,7 @@ static
 cmsBool  Type_ColorantTable_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
 {
     cmsNAMEDCOLORLIST* NamedColorList = (cmsNAMEDCOLORLIST*) Ptr;
-    int i, nColors;
+    cmsUInt32Number i, nColors;
 
     nColors = cmsNamedColorCount(NamedColorList);
 
@@ -3045,9 +3073,11 @@ cmsBool  Type_ColorantTable_Write(struct _cms_typehandler_struct* self, cmsIOHAN
 
     for (i=0; i < nColors; i++) {
 
-        char root[33];
+        char root[cmsMAX_PATH];
         cmsUInt16Number PCS[3];
 
+        memset(root, 0, sizeof(root));
+
         if (!cmsNamedColorInfo(NamedColorList, i, root, NULL, NULL, PCS, NULL)) return 0;
         root[32] = 0;
 
@@ -3107,8 +3137,8 @@ void *Type_NamedColor_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* i
     cmsUInt32Number      nDeviceCoords;  // Num of device coordinates
     char                 prefix[32];     // Prefix for each color name
     char                 suffix[32];     // Suffix for each color name
-    cmsNAMEDCOLORLIST*  v;
-    cmsUInt32Number i;
+    cmsNAMEDCOLORLIST*   v;
+    cmsUInt32Number      i;
 
 
     *nItems = 0;
@@ -3129,7 +3159,7 @@ void *Type_NamedColor_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* i
 
     if (nDeviceCoords > cmsMAXCHANNELS) {
         cmsSignalError(self->ContextID, cmsERROR_RANGE, "Too many device coordinates '%d'", nDeviceCoords);
-        return 0;
+        goto Error;
     }
     for (i=0; i < count; i++) {
 
@@ -3138,7 +3168,7 @@ void *Type_NamedColor_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* i
         char Root[33];
 
         memset(Colorant, 0, sizeof(Colorant));
-        if (io -> Read(io, Root, 32, 1) != 1) return NULL;
+        if (io -> Read(io, Root, 32, 1) != 1) goto Error;
         Root[32] = 0;  // To prevent exploits
 
         if (!_cmsReadUInt16Array(io, 3, PCS)) goto Error;
@@ -3165,7 +3195,7 @@ cmsBool Type_NamedColor_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER
     cmsNAMEDCOLORLIST* NamedColorList = (cmsNAMEDCOLORLIST*) Ptr;
     char                prefix[33];     // Prefix for each color name
     char                suffix[33];     // Suffix for each color name
-    int i, nColors;
+    cmsUInt32Number     i, nColors;
 
     nColors = cmsNamedColorCount(NamedColorList);
 
@@ -3185,7 +3215,7 @@ cmsBool Type_NamedColor_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER
 
        cmsUInt16Number PCS[3];
        cmsUInt16Number Colorant[cmsMAXCHANNELS];
-       char Root[33];
+       char Root[cmsMAX_PATH];
 
         if (!cmsNamedColorInfo(NamedColorList, i, Root, NULL, NULL, PCS, Colorant)) return 0;
         Root[32] = 0;
@@ -3939,7 +3969,7 @@ cmsToneCurve* ReadSegmentedCurve(struct _cms_typehandler_struct* self, cmsIOHAND
     cmsUInt16Number nSegments;
     cmsCurveSegment*  Segments;
     cmsToneCurve* Curve;
-    cmsFloat32Number PrevBreak = -1E22F;    // - infinite
+    cmsFloat32Number PrevBreak = MINUS_INF;    // - infinite
 
     // Take signature and channels for each element.
      if (!_cmsReadUInt32Number(io, (cmsUInt32Number*) &ElementSig)) return NULL;
@@ -3964,7 +3994,7 @@ cmsToneCurve* ReadSegmentedCurve(struct _cms_typehandler_struct* self, cmsIOHAND
      }
 
      Segments[nSegments-1].x0 = PrevBreak;
-     Segments[nSegments-1].x1 = 1E22F;     // A big cmsFloat32Number number
+     Segments[nSegments-1].x1 = PLUS_INF;     // A big cmsFloat32Number number
 
      // Read segments
      for (i=0; i < nSegments; i++) {
@@ -3998,7 +4028,7 @@ cmsToneCurve* ReadSegmentedCurve(struct _cms_typehandler_struct* self, cmsIOHAND
             case cmsSigSampledCurveSeg: {
                 cmsUInt32Number Count;
 
-                if (!_cmsReadUInt32Number(io, &Count)) return NULL;
+                if (!_cmsReadUInt32Number(io, &Count)) goto Error;
 
                 Segments[i].nGridPoints = Count;
                 Segments[i].SampledPoints = (cmsFloat32Number*) _cmsCalloc(self ->ContextID, Count, sizeof(cmsFloat32Number));
@@ -4017,7 +4047,7 @@ cmsToneCurve* ReadSegmentedCurve(struct _cms_typehandler_struct* self, cmsIOHAND
                 _cmsTagSignature2String(String, (cmsTagSignature) ElementSig);
                 cmsSignalError(self->ContextID, cmsERROR_UNKNOWN_EXTENSION, "Unknown curve element type '%s' found.", String);
                 }
-                return NULL;
+                goto Error;
 
          }
      }
@@ -4031,7 +4061,12 @@ cmsToneCurve* ReadSegmentedCurve(struct _cms_typehandler_struct* self, cmsIOHAND
      return Curve;
 
 Error:
-     if (Segments) _cmsFree(self ->ContextID, Segments);
+     if (Segments) {
+         for (i=0; i < nSegments; i++) {
+             if (Segments[i].SampledPoints) _cmsFree(self ->ContextID, Segments[i].SampledPoints);
+         }
+         _cmsFree(self ->ContextID, Segments);
+     }
      return NULL;
 }
 
@@ -4085,7 +4120,7 @@ void *Type_MPEcurve_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io,
     }
 
     _cmsFree(self ->ContextID, GammaTables);
-    *nItems = (mpe != NULL) ? 1 : 0;
+    *nItems = (mpe != NULL) ? 1U : 0;
     return mpe;
 
     cmsUNUSED_PARAMETER(SizeOfTag);
@@ -4216,9 +4251,13 @@ void *Type_MPEmatrix_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
     if (!_cmsReadUInt16Number(io, &OutputChans)) return NULL;
 
 
-    nElems = InputChans * OutputChans;
+    // Input and output chans may be ANY (up to 0xffff),
+    // but we choose to limit to 16 channels for now
+    if (InputChans >= cmsMAXCHANNELS) return NULL;
+    if (OutputChans >= cmsMAXCHANNELS) return NULL;
+
+    nElems = (cmsUInt32Number) InputChans * OutputChans;
 
-    // Input and output chans may be ANY (up to 0xffff)
     Matrix = (cmsFloat64Number*) _cmsCalloc(self ->ContextID, nElems, sizeof(cmsFloat64Number));
     if (Matrix == NULL) return NULL;
 
@@ -4233,7 +4272,11 @@ void *Type_MPEmatrix_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
 
         cmsFloat32Number v;
 
-        if (!_cmsReadFloat32Number(io, &v)) return NULL;
+        if (!_cmsReadFloat32Number(io, &v)) {
+            _cmsFree(self ->ContextID, Matrix);
+            _cmsFree(self ->ContextID, Offsets);
+            return NULL;
+        }
         Matrix[i] = v;
     }
 
@@ -4242,7 +4285,11 @@ void *Type_MPEmatrix_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
 
         cmsFloat32Number v;
 
-        if (!_cmsReadFloat32Number(io, &v)) return NULL;
+        if (!_cmsReadFloat32Number(io, &v)) {
+            _cmsFree(self ->ContextID, Matrix);
+            _cmsFree(self ->ContextID, Offsets);
+            return NULL;
+        }
         Offsets[i] = v;
     }
 
@@ -4313,8 +4360,9 @@ void *Type_MPEclut_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io,
         goto Error;
 
     // Copy MAX_INPUT_DIMENSIONS at most. Expand to cmsUInt32Number
-    nMaxGrids = InputChans > MAX_INPUT_DIMENSIONS ? MAX_INPUT_DIMENSIONS : InputChans;
-    for (i=0; i < nMaxGrids; i++) {
+    nMaxGrids = InputChans > MAX_INPUT_DIMENSIONS ? (cmsUInt32Number) MAX_INPUT_DIMENSIONS : InputChans;
+
+    for (i = 0; i < nMaxGrids; i++) {
         if (Dimensions8[i] == 1) goto Error; // Impossible value, 0 for no CLUT and then 2 at least
         GridPoints[i] = (cmsUInt32Number)Dimensions8[i];
     }
@@ -4323,11 +4371,11 @@ void *Type_MPEclut_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io,
     mpe = cmsStageAllocCLutFloatGranular(self ->ContextID, GridPoints, InputChans, OutputChans, NULL);
     if (mpe == NULL) goto Error;
 
-    // Read the data
+    // Read and sanitize the data
     clut = (_cmsStageCLutData*) mpe ->Data;
     for (i=0; i < clut ->nEntries; i++) {
 
-        if (!_cmsReadFloat32Number(io, &clut ->Tab.TFloat[i])) goto Error;
+        if (!_cmsReadFloat32Number(io, &clut->Tab.TFloat[i])) goto Error;
     }
 
     *nItems = 1;
@@ -4457,6 +4505,9 @@ void *Type_MPE_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
     if (!_cmsReadUInt16Number(io, &InputChans)) return NULL;
     if (!_cmsReadUInt16Number(io, &OutputChans)) return NULL;
 
+    if (InputChans == 0 || InputChans >= cmsMAXCHANNELS) return NULL;
+    if (OutputChans == 0 || OutputChans >= cmsMAXCHANNELS) return NULL;
+
     // Allocates an empty LUT
     NewLUT = cmsPipelineAlloc(self ->ContextID, InputChans, OutputChans);
     if (NewLUT == NULL) return NULL;
@@ -4464,6 +4515,10 @@ void *Type_MPE_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
     if (!_cmsReadUInt32Number(io, &ElementCount)) goto Error;
     if (!ReadPositionTable(self, io, ElementCount, BaseOffset, NewLUT, ReadMPEElem)) goto Error;
 
+    // Check channel count
+    if (InputChans != NewLUT->InputChannels ||
+        OutputChans != NewLUT->OutputChannels) goto Error;
+
     // Success
     *nItems = 1;
     return NewLUT;
@@ -4484,7 +4539,7 @@ static
 cmsBool Type_MPE_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
 {
     cmsUInt32Number i, BaseOffset, DirectoryPos, CurrentPos;
-    int inputChan, outputChan;
+    cmsUInt32Number inputChan, outputChan;
     cmsUInt32Number ElemCount;
     cmsUInt32Number *ElementOffsets = NULL, *ElementSizes = NULL, Before;
     cmsStageSignature ElementSig;
@@ -4532,7 +4587,7 @@ cmsBool Type_MPE_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, v
 
                 _cmsTagSignature2String(String, (cmsTagSignature) ElementSig);
 
-                 // An unknow element was found.
+                 // An unknown element was found.
                  cmsSignalError(self->ContextID, cmsERROR_UNKNOWN_EXTENSION, "Found unknown MPE type '%s'", String);
                  goto Error;
         }
@@ -5267,38 +5322,38 @@ void Type_Dictionary_Free(struct _cms_typehandler_struct* self, void* Ptr)
 
 
 // This is the list of built-in types
-static _cmsTagTypeLinkedList SupportedTagTypes[] = {
-
-{TYPE_HANDLER(cmsSigChromaticityType,          Chromaticity),        &SupportedTagTypes[1] },
-{TYPE_HANDLER(cmsSigColorantOrderType,         ColorantOrderType),   &SupportedTagTypes[2] },
-{TYPE_HANDLER(cmsSigS15Fixed16ArrayType,       S15Fixed16),          &SupportedTagTypes[3] },
-{TYPE_HANDLER(cmsSigU16Fixed16ArrayType,       U16Fixed16),          &SupportedTagTypes[4] },
-{TYPE_HANDLER(cmsSigTextType,                  Text),                &SupportedTagTypes[5] },
-{TYPE_HANDLER(cmsSigTextDescriptionType,       Text_Description),    &SupportedTagTypes[6] },
-{TYPE_HANDLER(cmsSigCurveType,                 Curve),               &SupportedTagTypes[7] },
-{TYPE_HANDLER(cmsSigParametricCurveType,       ParametricCurve),     &SupportedTagTypes[8] },
-{TYPE_HANDLER(cmsSigDateTimeType,              DateTime),            &SupportedTagTypes[9] },
-{TYPE_HANDLER(cmsSigLut8Type,                  LUT8),                &SupportedTagTypes[10] },
-{TYPE_HANDLER(cmsSigLut16Type,                 LUT16),               &SupportedTagTypes[11] },
-{TYPE_HANDLER(cmsSigColorantTableType,         ColorantTable),       &SupportedTagTypes[12] },
-{TYPE_HANDLER(cmsSigNamedColor2Type,           NamedColor),          &SupportedTagTypes[13] },
-{TYPE_HANDLER(cmsSigMultiLocalizedUnicodeType, MLU),                 &SupportedTagTypes[14] },
-{TYPE_HANDLER(cmsSigProfileSequenceDescType,   ProfileSequenceDesc), &SupportedTagTypes[15] },
-{TYPE_HANDLER(cmsSigSignatureType,             Signature),           &SupportedTagTypes[16] },
-{TYPE_HANDLER(cmsSigMeasurementType,           Measurement),         &SupportedTagTypes[17] },
-{TYPE_HANDLER(cmsSigDataType,                  Data),                &SupportedTagTypes[18] },
-{TYPE_HANDLER(cmsSigLutAtoBType,               LUTA2B),              &SupportedTagTypes[19] },
-{TYPE_HANDLER(cmsSigLutBtoAType,               LUTB2A),              &SupportedTagTypes[20] },
-{TYPE_HANDLER(cmsSigUcrBgType,                 UcrBg),               &SupportedTagTypes[21] },
-{TYPE_HANDLER(cmsSigCrdInfoType,               CrdInfo),             &SupportedTagTypes[22] },
-{TYPE_HANDLER(cmsSigMultiProcessElementType,   MPE),                 &SupportedTagTypes[23] },
-{TYPE_HANDLER(cmsSigScreeningType,             Screening),           &SupportedTagTypes[24] },
-{TYPE_HANDLER(cmsSigViewingConditionsType,     ViewingConditions),   &SupportedTagTypes[25] },
-{TYPE_HANDLER(cmsSigXYZType,                   XYZ),                 &SupportedTagTypes[26] },
-{TYPE_HANDLER(cmsCorbisBrokenXYZtype,          XYZ),                 &SupportedTagTypes[27] },
-{TYPE_HANDLER(cmsMonacoBrokenCurveType,        Curve),               &SupportedTagTypes[28] },
-{TYPE_HANDLER(cmsSigProfileSequenceIdType,     ProfileSequenceId),   &SupportedTagTypes[29] },
-{TYPE_HANDLER(cmsSigDictType,                  Dictionary),          &SupportedTagTypes[30] },
+static const _cmsTagTypeLinkedList SupportedTagTypes[] = {
+
+{TYPE_HANDLER(cmsSigChromaticityType,          Chromaticity),       (_cmsTagTypeLinkedList*) &SupportedTagTypes[1] },
+{TYPE_HANDLER(cmsSigColorantOrderType,         ColorantOrderType),  (_cmsTagTypeLinkedList*) &SupportedTagTypes[2] },
+{TYPE_HANDLER(cmsSigS15Fixed16ArrayType,       S15Fixed16),         (_cmsTagTypeLinkedList*) &SupportedTagTypes[3] },
+{TYPE_HANDLER(cmsSigU16Fixed16ArrayType,       U16Fixed16),         (_cmsTagTypeLinkedList*) &SupportedTagTypes[4] },
+{TYPE_HANDLER(cmsSigTextType,                  Text),               (_cmsTagTypeLinkedList*) &SupportedTagTypes[5] },
+{TYPE_HANDLER(cmsSigTextDescriptionType,       Text_Description),   (_cmsTagTypeLinkedList*) &SupportedTagTypes[6] },
+{TYPE_HANDLER(cmsSigCurveType,                 Curve),              (_cmsTagTypeLinkedList*) &SupportedTagTypes[7] },
+{TYPE_HANDLER(cmsSigParametricCurveType,       ParametricCurve),    (_cmsTagTypeLinkedList*) &SupportedTagTypes[8] },
+{TYPE_HANDLER(cmsSigDateTimeType,              DateTime),           (_cmsTagTypeLinkedList*) &SupportedTagTypes[9] },
+{TYPE_HANDLER(cmsSigLut8Type,                  LUT8),               (_cmsTagTypeLinkedList*) &SupportedTagTypes[10] },
+{TYPE_HANDLER(cmsSigLut16Type,                 LUT16),              (_cmsTagTypeLinkedList*) &SupportedTagTypes[11] },
+{TYPE_HANDLER(cmsSigColorantTableType,         ColorantTable),      (_cmsTagTypeLinkedList*) &SupportedTagTypes[12] },
+{TYPE_HANDLER(cmsSigNamedColor2Type,           NamedColor),         (_cmsTagTypeLinkedList*) &SupportedTagTypes[13] },
+{TYPE_HANDLER(cmsSigMultiLocalizedUnicodeType, MLU),                (_cmsTagTypeLinkedList*) &SupportedTagTypes[14] },
+{TYPE_HANDLER(cmsSigProfileSequenceDescType,   ProfileSequenceDesc),(_cmsTagTypeLinkedList*) &SupportedTagTypes[15] },
+{TYPE_HANDLER(cmsSigSignatureType,             Signature),          (_cmsTagTypeLinkedList*) &SupportedTagTypes[16] },
+{TYPE_HANDLER(cmsSigMeasurementType,           Measurement),        (_cmsTagTypeLinkedList*) &SupportedTagTypes[17] },
+{TYPE_HANDLER(cmsSigDataType,                  Data),               (_cmsTagTypeLinkedList*) &SupportedTagTypes[18] },
+{TYPE_HANDLER(cmsSigLutAtoBType,               LUTA2B),             (_cmsTagTypeLinkedList*) &SupportedTagTypes[19] },
+{TYPE_HANDLER(cmsSigLutBtoAType,               LUTB2A),             (_cmsTagTypeLinkedList*) &SupportedTagTypes[20] },
+{TYPE_HANDLER(cmsSigUcrBgType,                 UcrBg),              (_cmsTagTypeLinkedList*) &SupportedTagTypes[21] },
+{TYPE_HANDLER(cmsSigCrdInfoType,               CrdInfo),            (_cmsTagTypeLinkedList*) &SupportedTagTypes[22] },
+{TYPE_HANDLER(cmsSigMultiProcessElementType,   MPE),                (_cmsTagTypeLinkedList*) &SupportedTagTypes[23] },
+{TYPE_HANDLER(cmsSigScreeningType,             Screening),          (_cmsTagTypeLinkedList*) &SupportedTagTypes[24] },
+{TYPE_HANDLER(cmsSigViewingConditionsType,     ViewingConditions),  (_cmsTagTypeLinkedList*) &SupportedTagTypes[25] },
+{TYPE_HANDLER(cmsSigXYZType,                   XYZ),                (_cmsTagTypeLinkedList*) &SupportedTagTypes[26] },
+{TYPE_HANDLER(cmsCorbisBrokenXYZtype,          XYZ),                (_cmsTagTypeLinkedList*) &SupportedTagTypes[27] },
+{TYPE_HANDLER(cmsMonacoBrokenCurveType,        Curve),              (_cmsTagTypeLinkedList*) &SupportedTagTypes[28] },
+{TYPE_HANDLER(cmsSigProfileSequenceIdType,     ProfileSequenceId),  (_cmsTagTypeLinkedList*) &SupportedTagTypes[29] },
+{TYPE_HANDLER(cmsSigDictType,                  Dictionary),         (_cmsTagTypeLinkedList*) &SupportedTagTypes[30] },
 {TYPE_HANDLER(cmsSigVcgtType,                  vcgt),                NULL }
 };
 
@@ -5390,7 +5445,7 @@ cmsTagTypeHandler* _cmsGetTagTypeHandler(cmsContext ContextID, cmsTagTypeSignatu
 {
     _cmsTagTypePluginChunkType* ctx = ( _cmsTagTypePluginChunkType*) _cmsContextGetClientChunk(ContextID, TagTypePlugin);
 
-    return GetHandler(sig, ctx->TagTypes, SupportedTagTypes);
+    return GetHandler(sig, ctx->TagTypes, (_cmsTagTypeLinkedList*) SupportedTagTypes);
 }
 
 // ********************************************************************************
@@ -5405,7 +5460,7 @@ typedef struct _cmsTagLinkedList_st {
 
 } _cmsTagLinkedList;
 
-// This is the list of built-in tags
+// This is the list of built-in tags. The data of this list can be modified by plug-ins
 static _cmsTagLinkedList SupportedTags[] = {
 
     { cmsSigAToB0Tag,               { 1, 3,  { cmsSigLut16Type,  cmsSigLutAtoBType, cmsSigLut8Type}, DecideLUTtypeA2B}, &SupportedTags[1]},
@@ -5454,7 +5509,7 @@ static _cmsTagLinkedList SupportedTags[] = {
     { cmsSigPreview2Tag,            { 1, 3,  { cmsSigLut16Type, cmsSigLutBtoAType, cmsSigLut8Type }, DecideLUTtypeB2A}, &SupportedTags[32]},
 
     { cmsSigProfileDescriptionTag,  { 1, 3, { cmsSigTextDescriptionType, cmsSigMultiLocalizedUnicodeType, cmsSigTextType}, DecideTextDescType}, &SupportedTags[33]},
-    { cmsSigProfileSequenceDescTag, { 1, 1, { cmsSigProfileSequenceDescType }, NULL}, &SupportedTags[34]},
+    { cmsSigProfileSequenceDescTag, { 1, 1, { cmsSigProfileSequenceDescType }, NULL},  &SupportedTags[34]},
     { cmsSigTechnologyTag,          { 1, 1, { cmsSigSignatureType }, NULL},  &SupportedTags[35]},
 
     { cmsSigColorimetricIntentImageStateTag,   { 1, 1, { cmsSigSignatureType }, NULL}, &SupportedTags[36]},
@@ -5491,10 +5546,10 @@ static _cmsTagLinkedList SupportedTags[] = {
     { cmsSigVcgtTag,                { 1, 1, { cmsSigVcgtType},               NULL }, &SupportedTags[60]},
     { cmsSigMetaTag,                { 1, 1, { cmsSigDictType},               NULL }, &SupportedTags[61]},
     { cmsSigProfileSequenceIdTag,   { 1, 1, { cmsSigProfileSequenceIdType},  NULL }, &SupportedTags[62]},
+
     { cmsSigProfileDescriptionMLTag,{ 1, 1, { cmsSigMultiLocalizedUnicodeType}, NULL}, &SupportedTags[63]},
     { cmsSigArgyllArtsTag,          { 9, 1, { cmsSigS15Fixed16ArrayType},    NULL}, NULL}
 
-
 };
 
 /*
diff --git a/src/java.desktop/share/native/liblcms/cmsvirt.c b/src/java.desktop/share/native/liblcms/cmsvirt.c
index 8d353b369d7..89e55e4e439 100644
--- a/src/java.desktop/share/native/liblcms/cmsvirt.c
+++ b/src/java.desktop/share/native/liblcms/cmsvirt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -320,7 +320,7 @@ cmsHPROFILE CMSEXPORT cmsCreateLinearizationDeviceLinkTHR(cmsContext ContextID,
 {
     cmsHPROFILE hICC;
     cmsPipeline* Pipeline;
-    int nChannels;
+    cmsUInt32Number nChannels;
 
     hICC = cmsCreateProfilePlaceholder(ContextID);
     if (!hICC)
@@ -426,7 +426,7 @@ cmsHPROFILE CMSEXPORT cmsCreateInkLimitingDeviceLinkTHR(cmsContext ContextID,
     cmsHPROFILE hICC;
     cmsPipeline* LUT;
     cmsStage* CLUT;
-    int nChannels;
+    cmsUInt32Number nChannels;
 
     if (ColorSpace != cmsSigCmykData) {
         cmsSignalError(ContextID, cmsERROR_COLORSPACE_CHECK, "InkLimiting: Only CMYK currently supported");
@@ -755,13 +755,13 @@ int bchswSampler(register const cmsUInt16Number In[], register cmsUInt16Number O
 // contrast, Saturation and white point displacement
 
 cmsHPROFILE CMSEXPORT cmsCreateBCHSWabstractProfileTHR(cmsContext ContextID,
-    int nLUTPoints,
-    cmsFloat64Number Bright,
-    cmsFloat64Number Contrast,
-    cmsFloat64Number Hue,
-    cmsFloat64Number Saturation,
-    int TempSrc,
-    int TempDest)
+                                                       cmsUInt32Number nLUTPoints,
+                                                       cmsFloat64Number Bright,
+                                                       cmsFloat64Number Contrast,
+                                                       cmsFloat64Number Hue,
+                                                       cmsFloat64Number Saturation,
+                                                       cmsUInt32Number TempSrc,
+                                                       cmsUInt32Number TempDest)
 {
     cmsHPROFILE hICC;
     cmsPipeline* Pipeline;
@@ -769,7 +769,7 @@ cmsHPROFILE CMSEXPORT cmsCreateBCHSWabstractProfileTHR(cmsContext ContextID,
     cmsCIExyY WhitePnt;
     cmsStage* CLUT;
     cmsUInt32Number Dimensions[MAX_INPUT_DIMENSIONS];
-    int i;
+    cmsUInt32Number i;
 
     bchsw.Brightness = Bright;
     bchsw.Contrast   = Contrast;
@@ -807,7 +807,7 @@ cmsHPROFILE CMSEXPORT cmsCreateBCHSWabstractProfileTHR(cmsContext ContextID,
 
     for (i=0; i < MAX_INPUT_DIMENSIONS; i++) Dimensions[i] = nLUTPoints;
     CLUT = cmsStageAllocCLut16bitGranular(ContextID, Dimensions, 3, 3, NULL);
-    if (CLUT == NULL) return NULL;
+    if (CLUT == NULL) goto Error;
 
 
     if (!cmsStageSampleCLut16bit(CLUT, bchswSampler, (void*) &bchsw, 0)) {
@@ -840,13 +840,13 @@ cmsHPROFILE CMSEXPORT cmsCreateBCHSWabstractProfileTHR(cmsContext ContextID,
 }
 
 
-CMSAPI cmsHPROFILE   CMSEXPORT cmsCreateBCHSWabstractProfile(int nLUTPoints,
+CMSAPI cmsHPROFILE   CMSEXPORT cmsCreateBCHSWabstractProfile(cmsUInt32Number nLUTPoints,
                                                              cmsFloat64Number Bright,
                                                              cmsFloat64Number Contrast,
                                                              cmsFloat64Number Hue,
                                                              cmsFloat64Number Saturation,
-                                                             int TempSrc,
-                                                             int TempDest)
+                                                             cmsUInt32Number TempSrc,
+                                                             cmsUInt32Number TempDest)
 {
     return cmsCreateBCHSWabstractProfileTHR(NULL, nLUTPoints, Bright, Contrast, Hue, Saturation, TempSrc, TempDest);
 }
@@ -859,8 +859,10 @@ cmsHPROFILE CMSEXPORT cmsCreateNULLProfileTHR(cmsContext ContextID)
     cmsHPROFILE hProfile;
     cmsPipeline* LUT = NULL;
     cmsStage* PostLin;
-    cmsToneCurve* EmptyTab;
+    cmsStage* OutLin;
+    cmsToneCurve* EmptyTab[3];
     cmsUInt16Number Zero[2] = { 0, 0 };
+    const cmsFloat64Number PickLstarMatrix[] = { 1, 0, 0 };
 
     hProfile = cmsCreateProfilePlaceholder(ContextID);
     if (!hProfile)                          // can't allocate
@@ -871,22 +873,28 @@ cmsHPROFILE CMSEXPORT cmsCreateNULLProfileTHR(cmsContext ContextID)
     if (!SetTextTags(hProfile, L"NULL profile built-in")) goto Error;
 
 
-
     cmsSetDeviceClass(hProfile, cmsSigOutputClass);
     cmsSetColorSpace(hProfile,  cmsSigGrayData);
     cmsSetPCS(hProfile,         cmsSigLabData);
 
-    // An empty LUTs is all we need
-    LUT = cmsPipelineAlloc(ContextID, 1, 1);
+    // Create a valid ICC 4 structure
+    LUT = cmsPipelineAlloc(ContextID, 3, 1);
     if (LUT == NULL) goto Error;
 
-    EmptyTab = cmsBuildTabulatedToneCurve16(ContextID, 2, Zero);
-    PostLin = cmsStageAllocToneCurves(ContextID, 1, &EmptyTab);
-    cmsFreeToneCurve(EmptyTab);
+    EmptyTab[0] = EmptyTab[1] = EmptyTab[2] = cmsBuildTabulatedToneCurve16(ContextID, 2, Zero);
+    PostLin = cmsStageAllocToneCurves(ContextID, 3, EmptyTab);
+    OutLin  = cmsStageAllocToneCurves(ContextID, 1, EmptyTab);
+    cmsFreeToneCurve(EmptyTab[0]);
 
     if (!cmsPipelineInsertStage(LUT, cmsAT_END, PostLin))
         goto Error;
 
+    if (!cmsPipelineInsertStage(LUT, cmsAT_END, cmsStageAllocMatrix(ContextID, 1, 3, PickLstarMatrix, NULL)))
+        goto Error;
+
+    if (!cmsPipelineInsertStage(LUT, cmsAT_END, OutLin))
+        goto Error;
+
     if (!cmsWriteTag(hProfile, cmsSigBToA0Tag, (void*) LUT)) goto Error;
     if (!cmsWriteTag(hProfile, cmsSigMediaWhitePointTag, cmsD50_XYZ())) goto Error;
 
@@ -967,7 +975,7 @@ cmsHPROFILE CreateNamedColorDevicelink(cmsHTRANSFORM xform)
 {
     _cmsTRANSFORM* v = (_cmsTRANSFORM*) xform;
     cmsHPROFILE hICC = NULL;
-    int i, nColors;
+    cmsUInt32Number i, nColors;
     cmsNAMEDCOLORLIST *nc2 = NULL, *Original = NULL;
 
     // Create an empty placeholder
@@ -1084,7 +1092,7 @@ cmsHPROFILE CMSEXPORT cmsTransform2DeviceLink(cmsHTRANSFORM hTransform, cmsFloat
 {
     cmsHPROFILE hProfile = NULL;
     cmsUInt32Number FrmIn, FrmOut, ChansIn, ChansOut;
-    cmsUInt32Number ColorSpaceBitsIn, ColorSpaceBitsOut;
+    int ColorSpaceBitsIn, ColorSpaceBitsOut;
     _cmsTRANSFORM* xform = (_cmsTRANSFORM*) hTransform;
     cmsPipeline* LUT = NULL;
     cmsStage* mpe;
diff --git a/src/java.desktop/share/native/liblcms/cmswtpnt.c b/src/java.desktop/share/native/liblcms/cmswtpnt.c
index d23b29f1b00..fddf8b5e709 100644
--- a/src/java.desktop/share/native/liblcms/cmswtpnt.c
+++ b/src/java.desktop/share/native/liblcms/cmswtpnt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -105,7 +105,6 @@ cmsBool  CMSEXPORT cmsWhitePointFromTemp(cmsCIExyY* WhitePoint, cmsFloat64Number
         }
 
         // Obtain y(x)
-
         y = -3.000*(x*x) + 2.870*x - 0.275;
 
         // wave factors (not used, but here for futures extensions)
@@ -131,7 +130,7 @@ typedef struct {
 
     } ISOTEMPERATURE;
 
-static ISOTEMPERATURE isotempdata[] = {
+static const ISOTEMPERATURE isotempdata[] = {
 //  {Mirek, Ut,       Vt,      Tt      }
     {0,     0.18006,  0.26352,  -0.24341},
     {10,    0.18066,  0.26589,  -0.25479},
@@ -295,7 +294,7 @@ cmsBool _cmsAdaptMatrixToD50(cmsMAT3* r, const cmsCIExyY* SourceWhitePt)
 // Build a White point, primary chromas transfer matrix from RGB to CIE XYZ
 // This is just an approximation, I am not handling all the non-linear
 // aspects of the RGB to XYZ process, and assumming that the gamma correction
-// has transitive property in the tranformation chain.
+// has transitive property in the transformation chain.
 //
 // the alghoritm:
 //
diff --git a/src/java.desktop/share/native/liblcms/cmsxform.c b/src/java.desktop/share/native/liblcms/cmsxform.c
index dfedd7f5cf9..77d54804a42 100644
--- a/src/java.desktop/share/native/liblcms/cmsxform.c
+++ b/src/java.desktop/share/native/liblcms/cmsxform.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -284,6 +284,8 @@ void FloatXFORM(_cmsTRANSFORM* p,
 
     strideIn = 0;
     strideOut = 0;
+    memset(fIn, 0, sizeof(fIn));
+    memset(fOut, 0, sizeof(fIn));
 
     for (i = 0; i < LineCount; i++) {
 
@@ -348,6 +350,7 @@ void NullFloatXFORM(_cmsTRANSFORM* p,
 
     strideIn = 0;
     strideOut = 0;
+    memset(fIn, 0, sizeof(fIn));
 
     for (i = 0; i < LineCount; i++) {
 
@@ -385,6 +388,7 @@ void NullXFORM(_cmsTRANSFORM* p,
 
     strideIn = 0;
     strideOut = 0;
+    memset(wIn, 0, sizeof(wIn));
 
     for (i = 0; i < LineCount; i++) {
 
@@ -422,6 +426,8 @@ void PrecalculatedXFORM(_cmsTRANSFORM* p,
 
     strideIn = 0;
     strideOut = 0;
+    memset(wIn, 0, sizeof(wIn));
+    memset(wOut, 0, sizeof(wOut));
 
     for (i = 0; i < LineCount; i++) {
 
@@ -483,6 +489,8 @@ void PrecalculatedXFORMGamutCheck(_cmsTRANSFORM* p,
 
     strideIn = 0;
     strideOut = 0;
+    memset(wIn, 0, sizeof(wIn));
+    memset(wOut, 0, sizeof(wOut));
 
     for (i = 0; i < LineCount; i++) {
 
@@ -790,7 +798,10 @@ _cmsTRANSFORM* AllocEmptyTransform(cmsContext ContextID, cmsPipeline* lut,
 
        // Allocate needed memory
        _cmsTRANSFORM* p = (_cmsTRANSFORM*)_cmsMallocZero(ContextID, sizeof(_cmsTRANSFORM));
-       if (!p) return NULL;
+       if (!p) {
+              cmsPipelineFree(lut);
+              return NULL;
+       }
 
        // Store the proposed pipeline
        p->Lut = lut;
@@ -823,7 +834,7 @@ _cmsTRANSFORM* AllocEmptyTransform(cmsContext ContextID, cmsPipeline* lut,
                             p->FromInputFloat = _cmsGetFormatter(ContextID, *InputFormat, cmsFormatterInput, CMS_PACK_FLAGS_FLOAT).FmtFloat;
                             p->ToOutputFloat = _cmsGetFormatter(ContextID, *OutputFormat, cmsFormatterOutput, CMS_PACK_FLAGS_FLOAT).FmtFloat;
 
-                            // Save the day?
+                            // Save the day? (Ignore the warning)
                             if (Plugin->OldXform) {
                                    p->OldXform = (_cmsTransformFn) p->xform;
                                    p->xform = _cmsTransform2toTransformAdaptor;
@@ -848,7 +859,7 @@ _cmsTRANSFORM* AllocEmptyTransform(cmsContext ContextID, cmsPipeline* lut,
         if (p ->FromInputFloat == NULL || p ->ToOutputFloat == NULL) {
 
             cmsSignalError(ContextID, cmsERROR_UNKNOWN_EXTENSION, "Unsupported raster format");
-            _cmsFree(ContextID, p);
+            cmsDeleteTransform(p);
             return NULL;
         }
 
@@ -870,7 +881,7 @@ _cmsTRANSFORM* AllocEmptyTransform(cmsContext ContextID, cmsPipeline* lut,
         }
         else {
 
-            int BytesPerPixelInput;
+            cmsUInt32Number BytesPerPixelInput;
 
             p ->FromInput = _cmsGetFormatter(ContextID, *InputFormat,  cmsFormatterInput, CMS_PACK_FLAGS_16BITS).Fmt16;
             p ->ToOutput  = _cmsGetFormatter(ContextID, *OutputFormat, cmsFormatterOutput, CMS_PACK_FLAGS_16BITS).Fmt16;
@@ -878,7 +889,7 @@ _cmsTRANSFORM* AllocEmptyTransform(cmsContext ContextID, cmsPipeline* lut,
             if (p ->FromInput == NULL || p ->ToOutput == NULL) {
 
                 cmsSignalError(ContextID, cmsERROR_UNKNOWN_EXTENSION, "Unsupported raster format");
-                _cmsFree(ContextID, p);
+                cmsDeleteTransform(p);
                 return NULL;
             }
 
@@ -920,13 +931,13 @@ _cmsTRANSFORM* AllocEmptyTransform(cmsContext ContextID, cmsPipeline* lut,
 }
 
 static
-cmsBool GetXFormColorSpaces(int nProfiles, cmsHPROFILE hProfiles[], cmsColorSpaceSignature* Input, cmsColorSpaceSignature* Output)
+cmsBool GetXFormColorSpaces(cmsUInt32Number nProfiles, cmsHPROFILE hProfiles[], cmsColorSpaceSignature* Input, cmsColorSpaceSignature* Output)
 {
     cmsColorSpaceSignature ColorSpaceIn, ColorSpaceOut;
     cmsColorSpaceSignature PostColorSpace;
-    int i;
+    cmsUInt32Number i;
 
-    if (nProfiles <= 0) return FALSE;
+    if (nProfiles == 0) return FALSE;
     if (hProfiles[0] == NULL) return FALSE;
 
     *Input = PostColorSpace = cmsGetColorSpace(hProfiles[0]);
@@ -975,7 +986,7 @@ cmsBool GetXFormColorSpaces(int nProfiles, cmsHPROFILE hProfiles[], cmsColorSpac
 static
 cmsBool  IsProperColorSpace(cmsColorSpaceSignature Check, cmsUInt32Number dwFormat)
 {
-    int Space1 = T_COLORSPACE(dwFormat);
+    int Space1 = (int) T_COLORSPACE(dwFormat);
     int Space2 = _cmsLCMScolorSpace(Check);
 
     if (Space1 == PT_ANY) return TRUE;
@@ -1231,7 +1242,7 @@ cmsHTRANSFORM CMSEXPORT cmsCreateTransformTHR(cmsContext ContextID,
     hArray[0] = Input;
     hArray[1] = Output;
 
-    return cmsCreateMultiprofileTransformTHR(ContextID, hArray, Output == NULL ? 1 : 2, InputFormat, OutputFormat, Intent, dwFlags);
+    return cmsCreateMultiprofileTransformTHR(ContextID, hArray, Output == NULL ? 1U : 2U, InputFormat, OutputFormat, Intent, dwFlags);
 }
 
 CMSAPI cmsHTRANSFORM CMSEXPORT cmsCreateTransform(cmsHPROFILE Input,
diff --git a/src/java.desktop/share/native/liblcms/lcms2.h b/src/java.desktop/share/native/liblcms/lcms2.h
index cbca89421a5..cc5d0cf60fb 100644
--- a/src/java.desktop/share/native/liblcms/lcms2.h
+++ b/src/java.desktop/share/native/liblcms/lcms2.h
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -52,7 +52,7 @@
 //
 //---------------------------------------------------------------------------------
 //
-// Version 2.8
+// Version 2.9rc3
 //
 
 #ifndef _lcms2_H
@@ -78,7 +78,7 @@
 // #define CMS_USE_CPP_API
 
 // Uncomment this line if you need strict CGATS syntax. Makes CGATS files to
-// require "KEYWORD" on undefined identifiers, keep it comented out unless needed
+// require "KEYWORD" on undefined identifiers, keep it commented out unless needed
 // #define CMS_STRICT_CGATS  1
 
 // Uncomment to get rid of the tables for "half" float support
@@ -87,6 +87,9 @@
 // Uncomment to get rid of pthreads/windows dependency
 // #define CMS_NO_PTHREADS  1
 
+// Uncomment this for special windows mutex initialization (see lcms2_internal.h)
+// #define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT
+
 // ********** End of configuration toggles ******************************
 
 // Needed for streams
@@ -104,7 +107,7 @@ extern "C" {
 #endif
 
 // Version/release
-#define LCMS_VERSION        2080
+#define LCMS_VERSION        2090
 
 // I will give the chance of redefining basic types for compilers that are not fully C99 compliant
 #ifndef CMS_BASIC_TYPES_ALREADY_DEFINED
@@ -254,16 +257,21 @@ typedef int                  cmsBool;
 #            define CMSAPI    __declspec(dllexport)
 #        else
 #           define CMSAPI     __declspec(dllimport)
-#       endif
+#        endif
 #     endif
 #  else
-#       define CMSEXPORT
-#       define CMSAPI
+#     define CMSEXPORT
+#     define CMSAPI
 #  endif
-#else
-# define CMSEXPORT
-# define CMSAPI
-#endif
+#else  // not Windows
+#  ifdef HAVE_FUNC_ATTRIBUTE_VISIBILITY
+#     define CMSEXPORT
+#     define CMSAPI    __attribute__((visibility("default")))
+#  else
+#     define CMSEXPORT
+#     define CMSAPI
+#  endif
+#endif  // CMS_IS_WINDOWS_
 
 #ifdef HasTHREADS
 # if HasTHREADS == 1
@@ -284,9 +292,9 @@ typedef int                  cmsBool;
 #endif
 
 // D50 XYZ normalized to Y=1.0
-#define cmsD50X             0.9642
-#define cmsD50Y             1.0
-#define cmsD50Z             0.8249
+#define cmsD50X  0.9642
+#define cmsD50Y  1.0
+#define cmsD50Z  0.8249
 
 // V4 perceptual black
 #define cmsPERCEPTUAL_BLACK_X  0.00336
@@ -294,8 +302,8 @@ typedef int                  cmsBool;
 #define cmsPERCEPTUAL_BLACK_Z  0.00287
 
 // Definitions in ICC spec
-#define cmsMagicNumber      0x61637370     // 'acsp'
-#define lcmsSignature       0x6c636d73     // 'lcms'
+#define cmsMagicNumber  0x61637370     // 'acsp'
+#define lcmsSignature   0x6c636d73     // 'lcms'
 
 
 // Base ICC type definitions
@@ -1154,7 +1162,7 @@ typedef struct {
     cmsCIEXYZ        whitePoint;
     cmsFloat64Number Yb;
     cmsFloat64Number La;
-    int              surround;
+    cmsUInt32Number  surround;
     cmsFloat64Number D_value;
 
     } cmsViewingConditions;
@@ -1182,16 +1190,16 @@ typedef struct {
 // The internal representation is none of your business.
 typedef struct _cms_curve_struct cmsToneCurve;
 
-CMSAPI cmsToneCurve*     CMSEXPORT cmsBuildSegmentedToneCurve(cmsContext ContextID, cmsInt32Number nSegments, const cmsCurveSegment Segments[]);
+CMSAPI cmsToneCurve*     CMSEXPORT cmsBuildSegmentedToneCurve(cmsContext ContextID, cmsUInt32Number nSegments, const cmsCurveSegment Segments[]);
 CMSAPI cmsToneCurve*     CMSEXPORT cmsBuildParametricToneCurve(cmsContext ContextID, cmsInt32Number Type, const cmsFloat64Number Params[]);
 CMSAPI cmsToneCurve*     CMSEXPORT cmsBuildGamma(cmsContext ContextID, cmsFloat64Number Gamma);
-CMSAPI cmsToneCurve*     CMSEXPORT cmsBuildTabulatedToneCurve16(cmsContext ContextID, cmsInt32Number nEntries, const cmsUInt16Number values[]);
+CMSAPI cmsToneCurve*     CMSEXPORT cmsBuildTabulatedToneCurve16(cmsContext ContextID, cmsUInt32Number nEntries, const cmsUInt16Number values[]);
 CMSAPI cmsToneCurve*     CMSEXPORT cmsBuildTabulatedToneCurveFloat(cmsContext ContextID, cmsUInt32Number nEntries, const cmsFloat32Number values[]);
 CMSAPI void              CMSEXPORT cmsFreeToneCurve(cmsToneCurve* Curve);
 CMSAPI void              CMSEXPORT cmsFreeToneCurveTriple(cmsToneCurve* Curve[3]);
 CMSAPI cmsToneCurve*     CMSEXPORT cmsDupToneCurve(const cmsToneCurve* Src);
 CMSAPI cmsToneCurve*     CMSEXPORT cmsReverseToneCurve(const cmsToneCurve* InGamma);
-CMSAPI cmsToneCurve*     CMSEXPORT cmsReverseToneCurveEx(cmsInt32Number nResultSamples, const cmsToneCurve* InGamma);
+CMSAPI cmsToneCurve*     CMSEXPORT cmsReverseToneCurveEx(cmsUInt32Number nResultSamples, const cmsToneCurve* InGamma);
 CMSAPI cmsToneCurve*     CMSEXPORT cmsJoinToneCurve(cmsContext ContextID, const cmsToneCurve* X,  const cmsToneCurve* Y, cmsUInt32Number nPoints);
 CMSAPI cmsBool           CMSEXPORT cmsSmoothToneCurve(cmsToneCurve* Tab, cmsFloat64Number lambda);
 CMSAPI cmsFloat32Number  CMSEXPORT cmsEvalToneCurveFloat(const cmsToneCurve* Curve, cmsFloat32Number v);
@@ -1236,7 +1244,7 @@ CMSAPI cmsBool           CMSEXPORT cmsPipelineSetSaveAs8bitsFlag(cmsPipeline* lu
 // Where to place/locate the stages in the pipeline chain
 typedef enum { cmsAT_BEGIN, cmsAT_END } cmsStageLoc;
 
-CMSAPI int               CMSEXPORT cmsPipelineInsertStage(cmsPipeline* lut, cmsStageLoc loc, cmsStage* mpe);
+CMSAPI cmsBool           CMSEXPORT cmsPipelineInsertStage(cmsPipeline* lut, cmsStageLoc loc, cmsStage* mpe);
 CMSAPI void              CMSEXPORT cmsPipelineUnlinkStage(cmsPipeline* lut, cmsStageLoc loc, cmsStage** mpe);
 
 // This function is quite useful to analyze the structure of a Pipeline and retrieve the Stage elements
@@ -1459,7 +1467,7 @@ CMSAPI cmsBool           CMSEXPORT cmsLinkTag(cmsHPROFILE hProfile, cmsTagSignat
 CMSAPI cmsTagSignature   CMSEXPORT cmsTagLinkedTo(cmsHPROFILE hProfile, cmsTagSignature sig);
 
 // Read and write raw data
-CMSAPI cmsInt32Number    CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSignature sig, void* Buffer, cmsUInt32Number BufferSize);
+CMSAPI cmsUInt32Number   CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSignature sig, void* Buffer, cmsUInt32Number BufferSize);
 CMSAPI cmsBool           CMSEXPORT cmsWriteRawTag(cmsHPROFILE hProfile, cmsTagSignature sig, const void* data, cmsUInt32Number Size);
 
 // Access header data
@@ -1550,7 +1558,7 @@ CMSAPI cmsBool           CMSEXPORT cmsCloseIOhandler(cmsIOHANDLER* io);
 
 CMSAPI cmsBool           CMSEXPORT cmsMD5computeID(cmsHPROFILE hProfile);
 
-// Profile high level funtions ------------------------------------------------------------------------------------------
+// Profile high level functions ------------------------------------------------------------------------------------------
 
 CMSAPI cmsHPROFILE      CMSEXPORT cmsOpenProfileFromFile(const char *ICCProfile, const char *sAccess);
 CMSAPI cmsHPROFILE      CMSEXPORT cmsOpenProfileFromFileTHR(cmsContext ContextID, const char *ICCProfile, const char *sAccess);
@@ -1610,21 +1618,21 @@ CMSAPI cmsHPROFILE      CMSEXPORT cmsCreate_sRGBProfileTHR(cmsContext ContextID)
 CMSAPI cmsHPROFILE      CMSEXPORT cmsCreate_sRGBProfile(void);
 
 CMSAPI cmsHPROFILE      CMSEXPORT cmsCreateBCHSWabstractProfileTHR(cmsContext ContextID,
-                                                             int nLUTPoints,
+                                                             cmsUInt32Number nLUTPoints,
                                                              cmsFloat64Number Bright,
                                                              cmsFloat64Number Contrast,
                                                              cmsFloat64Number Hue,
                                                              cmsFloat64Number Saturation,
-                                                             int TempSrc,
-                                                             int TempDest);
+                                                             cmsUInt32Number TempSrc,
+                                                             cmsUInt32Number TempDest);
 
-CMSAPI cmsHPROFILE      CMSEXPORT cmsCreateBCHSWabstractProfile(int nLUTPoints,
+CMSAPI cmsHPROFILE      CMSEXPORT cmsCreateBCHSWabstractProfile(cmsUInt32Number nLUTPoints,
                                                              cmsFloat64Number Bright,
                                                              cmsFloat64Number Contrast,
                                                              cmsFloat64Number Hue,
                                                              cmsFloat64Number Saturation,
-                                                             int TempSrc,
-                                                             int TempDest);
+                                                             cmsUInt32Number TempSrc,
+                                                             cmsUInt32Number TempDest);
 
 CMSAPI cmsHPROFILE      CMSEXPORT cmsCreateNULLProfileTHR(cmsContext ContextID);
 CMSAPI cmsHPROFILE      CMSEXPORT cmsCreateNULLProfile(void);
@@ -1666,7 +1674,7 @@ CMSAPI cmsUInt32Number  CMSEXPORT cmsGetSupportedIntentsTHR(cmsContext ContextID
 #define cmsFLAGS_BLACKPOINTCOMPENSATION   0x2000
 #define cmsFLAGS_NOWHITEONWHITEFIXUP      0x0004    // Don't fix scum dot
 #define cmsFLAGS_HIGHRESPRECALC           0x0400    // Use more memory to give better accurancy
-#define cmsFLAGS_LOWRESPRECALC            0x0800    // Use less memory to minimize resouces
+#define cmsFLAGS_LOWRESPRECALC            0x0800    // Use less memory to minimize resources
 
 // For devicelink creation
 #define cmsFLAGS_8BITS_DEVICELINK         0x0008   // Create 8 bits devicelinks
diff --git a/src/java.desktop/share/native/liblcms/lcms2_internal.h b/src/java.desktop/share/native/liblcms/lcms2_internal.h
index 90094728823..8984981e830 100644
--- a/src/java.desktop/share/native/liblcms/lcms2_internal.h
+++ b/src/java.desktop/share/native/liblcms/lcms2_internal.h
@@ -30,7 +30,7 @@
 
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -106,7 +106,7 @@
 // Maximum of channels for internal pipeline evaluation
 #define MAX_STAGE_CHANNELS  128
 
-// Unused parameter warning supression
+// Unused parameter warning suppression
 #define cmsUNUSED_PARAMETER(x) ((void)x)
 
 // The specification for "inline" is section 6.7.4 of the C99 standard (ISO/IEC 9899:1999).
@@ -125,8 +125,16 @@
 # ifndef vsnprintf
 #       define vsnprintf  _vsnprintf
 # endif
-#endif
 
+/// Properly define some macros to accommodate
+/// older MSVC versions.
+# if _MSC_VER <= 1700
+        #include <float.h>
+        #define isnan _isnan
+        #define isinf(x) (!_finite((x)))
+# endif
+
+#endif
 
 // A fast way to convert from/to 16 <-> 8 bits
 #define FROM_8_TO_16(rgb) (cmsUInt16Number) ((((cmsUInt16Number) (rgb)) << 8)|(rgb))
@@ -201,19 +209,48 @@ cmsINLINE cmsUInt16Number _cmsQuickSaturateWord(cmsFloat64Number d)
     return _cmsQuickFloorWord(d);
 }
 
+// Test bed entry points---------------------------------------------------------------
+#define CMSCHECKPOINT CMSAPI
 
 // Pthread support --------------------------------------------------------------------
 #ifndef CMS_NO_PTHREADS
 
 // This is the threading support. Unfortunately, it has to be platform-dependent because
 // windows does not support pthreads.
-
 #ifdef CMS_IS_WINDOWS_
 
 #define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
 
 
+// The locking scheme in LCMS requires a single 'top level' mutex
+// to work. This is actually implemented on Windows as a
+// CriticalSection, because they are lighter weight. With
+// pthreads, this is statically inited. Unfortunately, windows
+// can't officially statically init critical sections.
+//
+// We can work around this in 2 ways.
+//
+// 1) We can use a proper mutex purely to protect the init
+// of the CriticalSection. This in turns requires us to protect
+// the Mutex creation, which we can do using the snappily
+// named InterlockedCompareExchangePointer API (present on
+// windows XP and above).
+//
+// 2) In cases where we want to work on pre-Windows XP, we
+// can use an even more horrible hack described below.
+//
+// So why wouldn't we always use 2)? Because not calling
+// the init function for a critical section means it fails
+// testing with ApplicationVerifier (and presumably similar
+// tools).
+//
+// We therefore default to 1, and people who want to be able
+// to run on pre-Windows XP boxes can build with:
+//     CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT
+// defined. This is automatically set for builds using
+// versions of MSVC that don't have this API available.
+//
 // From: http://locklessinc.com/articles/pthreads_on_windows/
 // The pthreads API has an initialization macro that has no correspondence to anything in
 // the windows API. By investigating the internal definition of the critical section type,
@@ -235,14 +272,30 @@ cmsINLINE cmsUInt16Number _cmsQuickSaturateWord(cmsFloat64Number d)
 
 typedef CRITICAL_SECTION _cmsMutex;
 
-#define CMS_MUTEX_INITIALIZER {(PRTL_CRITICAL_SECTION_DEBUG) -1,-1,0,0,0,0}
-
 #ifdef _MSC_VER
 #    if (_MSC_VER >= 1800)
 #          pragma warning(disable : 26135)
 #    endif
 #endif
 
+#ifndef CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT
+// If we are building with a version of MSVC smaller
+// than 1400 (i.e. before VS2005) then we don't have
+// the InterlockedCompareExchangePointer API, so use
+// the old version.
+#    ifdef _MSC_VER
+#       if _MSC_VER < 1400
+#          define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT
+#       endif
+#    endif
+#endif
+
+#ifdef CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT
+#      define CMS_MUTEX_INITIALIZER {(PRTL_CRITICAL_SECTION_DEBUG) -1,-1,0,0,0,0}
+#else
+#      define CMS_MUTEX_INITIALIZER {(PRTL_CRITICAL_SECTION_DEBUG)NULL,-1,0,0,0,0}
+#endif
+
 cmsINLINE int _cmsLockPrimitive(_cmsMutex *m)
 {
         EnterCriticalSection(m);
@@ -478,7 +531,7 @@ struct _cmsContext_struct {
     void* chunks[MemoryClientMax];    // array of pointers to client chunks. Memory itself is hold in the suballocator.
                                       // If NULL, then it reverts to global Context0
 
-    _cmsMemPluginChunkType DefaultMemoryManager;  // The allocators used for creating the context itself. Cannot be overriden
+    _cmsMemPluginChunkType DefaultMemoryManager;  // The allocators used for creating the context itself. Cannot be overridden
 };
 
 // Returns a pointer to a valid context structure, including the global one if id is zero.
@@ -800,10 +853,10 @@ void                 _cmsTagSignature2String(char String[5], cmsTagSignature sig
 
 // Interpolation ---------------------------------------------------------------------------------------------------------
 
-cmsInterpParams*     _cmsComputeInterpParams(cmsContext ContextID, int nSamples, int InputChan, int OutputChan, const void* Table, cmsUInt32Number dwFlags);
-cmsInterpParams*     _cmsComputeInterpParamsEx(cmsContext ContextID, const cmsUInt32Number nSamples[], int InputChan, int OutputChan, const void* Table, cmsUInt32Number dwFlags);
-void                 _cmsFreeInterpParams(cmsInterpParams* p);
-cmsBool              _cmsSetInterpolationRoutine(cmsContext ContextID, cmsInterpParams* p);
+CMSCHECKPOINT cmsInterpParams* CMSEXPORT _cmsComputeInterpParams(cmsContext ContextID, cmsUInt32Number nSamples, cmsUInt32Number InputChan, cmsUInt32Number OutputChan, const void* Table, cmsUInt32Number dwFlags);
+cmsInterpParams*                         _cmsComputeInterpParamsEx(cmsContext ContextID, const cmsUInt32Number nSamples[], cmsUInt32Number InputChan, cmsUInt32Number OutputChan, const void* Table, cmsUInt32Number dwFlags);
+CMSCHECKPOINT void             CMSEXPORT _cmsFreeInterpParams(cmsInterpParams* p);
+cmsBool                                  _cmsSetInterpolationRoutine(cmsContext ContextID, cmsInterpParams* p);
 
 // Curves ----------------------------------------------------------------------------------------------------------------
 
@@ -853,20 +906,20 @@ struct _cmsStage_struct {
 
 
 // Special Stages (cannot be saved)
-cmsStage*        _cmsStageAllocLab2XYZ(cmsContext ContextID);
-cmsStage*        _cmsStageAllocXYZ2Lab(cmsContext ContextID);
-cmsStage*        _cmsStageAllocLabPrelin(cmsContext ContextID);
-cmsStage*        _cmsStageAllocLabV2ToV4(cmsContext ContextID);
-cmsStage*        _cmsStageAllocLabV2ToV4curves(cmsContext ContextID);
-cmsStage*        _cmsStageAllocLabV4ToV2(cmsContext ContextID);
-cmsStage*        _cmsStageAllocNamedColor(cmsNAMEDCOLORLIST* NamedColorList, cmsBool UsePCS);
-cmsStage*        _cmsStageAllocIdentityCurves(cmsContext ContextID, int nChannels);
-cmsStage*        _cmsStageAllocIdentityCLut(cmsContext ContextID, int nChan);
-cmsStage*        _cmsStageNormalizeFromLabFloat(cmsContext ContextID);
-cmsStage*        _cmsStageNormalizeFromXyzFloat(cmsContext ContextID);
-cmsStage*        _cmsStageNormalizeToLabFloat(cmsContext ContextID);
-cmsStage*        _cmsStageNormalizeToXyzFloat(cmsContext ContextID);
-cmsStage*        _cmsStageClipNegatives(cmsContext ContextID, int nChannels);
+CMSCHECKPOINT cmsStage*  CMSEXPORT _cmsStageAllocLab2XYZ(cmsContext ContextID);
+CMSCHECKPOINT cmsStage*  CMSEXPORT _cmsStageAllocXYZ2Lab(cmsContext ContextID);
+cmsStage*                          _cmsStageAllocLabPrelin(cmsContext ContextID);
+CMSCHECKPOINT cmsStage*  CMSEXPORT _cmsStageAllocLabV2ToV4(cmsContext ContextID);
+cmsStage*                          _cmsStageAllocLabV2ToV4curves(cmsContext ContextID);
+CMSCHECKPOINT cmsStage*  CMSEXPORT _cmsStageAllocLabV4ToV2(cmsContext ContextID);
+CMSCHECKPOINT cmsStage*  CMSEXPORT _cmsStageAllocNamedColor(cmsNAMEDCOLORLIST* NamedColorList, cmsBool UsePCS);
+CMSCHECKPOINT cmsStage*  CMSEXPORT _cmsStageAllocIdentityCurves(cmsContext ContextID, cmsUInt32Number nChannels);
+CMSCHECKPOINT cmsStage*  CMSEXPORT _cmsStageAllocIdentityCLut(cmsContext ContextID, cmsUInt32Number nChan);
+cmsStage*                          _cmsStageNormalizeFromLabFloat(cmsContext ContextID);
+cmsStage*                          _cmsStageNormalizeFromXyzFloat(cmsContext ContextID);
+cmsStage*                          _cmsStageNormalizeToLabFloat(cmsContext ContextID);
+cmsStage*                          _cmsStageNormalizeToXyzFloat(cmsContext ContextID);
+cmsStage*                          _cmsStageClipNegatives(cmsContext ContextID, cmsUInt32Number nChannels);
 
 
 // For curve set only
@@ -901,9 +954,9 @@ struct _cmsPipeline_struct {
 // Read tags using low-level function, provide necessary glue code to adapt versions, etc. All those return a brand new copy
 // of the LUTS, since ownership of original is up to the profile. The user should free allocated resources.
 
-cmsPipeline*      _cmsReadInputLUT(cmsHPROFILE hProfile, int Intent);
-cmsPipeline*      _cmsReadOutputLUT(cmsHPROFILE hProfile, int Intent);
-cmsPipeline*      _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, int Intent);
+CMSCHECKPOINT cmsPipeline* CMSEXPORT _cmsReadInputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent);
+CMSCHECKPOINT cmsPipeline* CMSEXPORT _cmsReadOutputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent);
+CMSCHECKPOINT cmsPipeline* CMSEXPORT _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent);
 
 // Special values
 cmsBool           _cmsReadMediaWhitePoint(cmsCIEXYZ* Dest, cmsHPROFILE hProfile);
@@ -928,8 +981,9 @@ cmsSEQ* _cmsCompileProfileSequence(cmsContext ContextID, cmsUInt32Number nProfil
 
 // LUT optimization ------------------------------------------------------------------------------------------------
 
-cmsUInt16Number  _cmsQuantizeVal(cmsFloat64Number i, int MaxSamples);
-int              _cmsReasonableGridpointsByColorspace(cmsColorSpaceSignature Colorspace, cmsUInt32Number dwFlags);
+CMSCHECKPOINT cmsUInt16Number  CMSEXPORT _cmsQuantizeVal(cmsFloat64Number i, cmsUInt32Number MaxSamples);
+
+cmsUInt32Number  _cmsReasonableGridpointsByColorspace(cmsColorSpaceSignature Colorspace, cmsUInt32Number dwFlags);
 
 cmsBool          _cmsEndPointsBySpace(cmsColorSpaceSignature Space,
                                       cmsUInt16Number **White,
@@ -938,7 +992,7 @@ cmsBool          _cmsEndPointsBySpace(cmsColorSpaceSignature Space,
 
 cmsBool          _cmsOptimizePipeline(cmsContext ContextID,
                                       cmsPipeline**    Lut,
-                                      int              Intent,
+                                      cmsUInt32Number  Intent,
                                       cmsUInt32Number* InputFormat,
                                       cmsUInt32Number* OutputFormat,
                                       cmsUInt32Number* dwFlags );
@@ -962,17 +1016,17 @@ cmsPipeline*     _cmsCreateGamutCheckPipeline(cmsContext ContextID,
 cmsBool         _cmsFormatterIsFloat(cmsUInt32Number Type);
 cmsBool         _cmsFormatterIs8bit(cmsUInt32Number Type);
 
-cmsFormatter    _cmsGetFormatter(cmsContext ContextID,
-                                 cmsUInt32Number Type,          // Specific type, i.e. TYPE_RGB_8
-                                 cmsFormatterDirection Dir,
-                                 cmsUInt32Number dwFlags);
+CMSCHECKPOINT cmsFormatter CMSEXPORT _cmsGetFormatter(cmsContext ContextID,
+                                                      cmsUInt32Number Type,          // Specific type, i.e. TYPE_RGB_8
+                                                      cmsFormatterDirection Dir,
+                                                      cmsUInt32Number dwFlags);
 
 
 #ifndef CMS_NO_HALF_SUPPORT
 
 // Half float
-cmsFloat32Number _cmsHalf2Float(cmsUInt16Number h);
-cmsUInt16Number  _cmsFloat2Half(cmsFloat32Number flt);
+CMSCHECKPOINT cmsFloat32Number CMSEXPORT _cmsHalf2Float(cmsUInt16Number h);
+CMSCHECKPOINT cmsUInt16Number  CMSEXPORT _cmsFloat2Half(cmsFloat32Number flt);
 
 #endif
 
diff --git a/src/java.desktop/share/native/liblcms/lcms2_plugin.h b/src/java.desktop/share/native/liblcms/lcms2_plugin.h
index aff3b48d7ec..6fe59c39665 100644
--- a/src/java.desktop/share/native/liblcms/lcms2_plugin.h
+++ b/src/java.desktop/share/native/liblcms/lcms2_plugin.h
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2016 Marti Maria Saguer
+//  Copyright (c) 1998-2017 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -347,7 +347,7 @@ typedef struct {
 
 // Parametric curves. A negative type means same function but analytically inverted. Max. number of params is 10
 
-// Evaluator callback for user-suplied parametric curves. May implement more than one type
+// Evaluator callback for user-supplied parametric curves. May implement more than one type
 typedef  cmsFloat64Number (* cmsParametricCurveEvaluator)(cmsInt32Number Type, const cmsFloat64Number Params[10], cmsFloat64Number R);
 
 // Plug-in may implement an arbitrary number of parametric curves
@@ -457,7 +457,7 @@ typedef struct {
     cmsUInt32Number     nSupportedTypes;    // In how many types this tag can come (MAX_TYPES_IN_LCMS_PLUGIN maximum)
     cmsTagTypeSignature SupportedTypes[MAX_TYPES_IN_LCMS_PLUGIN];
 
-    // For writting
+    // For writing
     cmsTagTypeSignature (* DecideType)(cmsFloat64Number ICCVersion, const void *Data);
 
 } cmsTagDescriptor;

From cbe7fedef2a61d34482ac12e6da111716fd1b3bd Mon Sep 17 00:00:00 2001
From: mullan <unknown>
Date: Fri, 8 Dec 2017 09:37:28 -0500
Subject: [PATCH 004/196] 8191358: Restore TSA certificate expiration check
 Reviewed-by: coffeys, rhalade

---
 .../certpath/PKIXCertPathValidator.java       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java b/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
index c65ebf03986..80497e774fd 100644
--- a/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
+++ b/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
@@ -31,6 +31,7 @@
 import java.util.*;
 
 import sun.security.provider.certpath.PKIX.ValidatorParams;
+import sun.security.validator.Validator;
 import sun.security.x509.X509CertImpl;
 import sun.security.util.Debug;
 
@@ -189,12 +190,21 @@ private static PKIXCertPathValidatorResult validate(TrustAnchor anchor,
                                              params.policyQualifiersRejected(),
                                              rootNode);
         certPathCheckers.add(pc);
-        // default value for date is current time
-        BasicChecker bc;
-        bc = new BasicChecker(anchor,
-                (params.timestamp() == null ? params.date() :
-                        params.timestamp().getTimestamp()),
-                params.sigProvider(), false);
+
+        // the time that the certificate validity period should be
+        // checked against
+        Date timeToCheck = null;
+        // use timestamp if checking signed code that is timestamped, otherwise
+        // use date parameter from PKIXParameters
+        if ((params.variant() == Validator.VAR_CODE_SIGNING ||
+             params.variant() == Validator.VAR_PLUGIN_CODE_SIGNING) &&
+             params.timestamp() != null) {
+            timeToCheck = params.timestamp().getTimestamp();
+        } else {
+            timeToCheck = params.date();
+        }
+        BasicChecker bc = new BasicChecker(anchor, timeToCheck,
+                                           params.sigProvider(), false);
         certPathCheckers.add(bc);
 
         boolean revCheckerAdded = false;

From 3b6148b10c24a8fc08d2afef663e914e52bf5208 Mon Sep 17 00:00:00 2001
From: serb <unknown>
Date: Sun, 10 Dec 2017 15:29:26 -0800
Subject: [PATCH 005/196] 8192030: Better MTSchema support Reviewed-by: skoivu,
 rhalade, prr, aghaisas

---
 .../classes/sun/awt/windows/ThemeReader.java   | 18 ++++++++++++++++--
 .../native/libawt/windows/ThemeReader.cpp      |  4 ++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java b/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java
index 26751e953ba..167d4d5b910 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -61,6 +61,7 @@ public final class ThemeReader {
     private static final Lock readLock = readWriteLock.readLock();
     private static final Lock writeLock = readWriteLock.writeLock();
     private static volatile boolean valid = false;
+    private static volatile boolean isThemed;
 
     static volatile boolean xpStyleEnabled;
 
@@ -70,7 +71,17 @@ static void flush() {
         valid = false;
     }
 
-    public static native boolean isThemed();
+    private static native boolean initThemes();
+
+    public static boolean isThemed() {
+        writeLock.lock();
+        try {
+            isThemed = initThemes();
+            return isThemed;
+        } finally {
+            writeLock.unlock();
+        }
+    }
 
     public static boolean isXPStyleEnabled() {
         return xpStyleEnabled;
@@ -98,6 +109,9 @@ private static Long getThemeImpl(String widget) {
     // returns theme value
     // this method should be invoked with readLock locked
     private static Long getTheme(String widget) {
+        if (!isThemed) {
+            throw new IllegalStateException("Themes are not loaded");
+        }
         if (!valid) {
             readLock.unlock();
             writeLock.lock();
diff --git a/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp b/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp
index c48ae8fbe31..99ca918a500 100644
--- a/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -232,7 +232,7 @@ BOOL InitThemes() {
     return FALSE;
 }
 
-JNIEXPORT jboolean JNICALL Java_sun_awt_windows_ThemeReader_isThemed
+JNIEXPORT jboolean JNICALL Java_sun_awt_windows_ThemeReader_initThemes
 (JNIEnv *env, jclass klass) {
     static BOOL TryLoadingThemeLib = FALSE;
     static BOOL Themed = FALSE;

From 36930b9f667f9fe58be2544cad3bd7f7363a09c1 Mon Sep 17 00:00:00 2001
From: weijun <unknown>
Date: Thu, 14 Dec 2017 08:21:36 +0800
Subject: [PATCH 006/196] 8189969: Manifest better manifest entries
 Reviewed-by: mullan

---
 .../sun/security/util/ManifestDigester.java   | 84 ++++++++++++-------
 1 file changed, 54 insertions(+), 30 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/util/ManifestDigester.java b/src/java.base/share/classes/sun/security/util/ManifestDigester.java
index 913667716e0..aeff45bd21c 100644
--- a/src/java.base/share/classes/sun/security/util/ManifestDigester.java
+++ b/src/java.base/share/classes/sun/security/util/ManifestDigester.java
@@ -26,12 +26,17 @@
 package sun.security.util;
 
 import java.security.*;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.io.ByteArrayOutputStream;
+import java.util.List;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
  * This class is used to compute digests on sections of the Manifest.
+ * Please note that multiple sections might have the same name, and they
+ * all belong to a single Entry.
  */
 public class ManifestDigester {
 
@@ -40,7 +45,7 @@ public class ManifestDigester {
     /** the raw bytes of the manifest */
     private byte[] rawBytes;
 
-    /** the offset/length pair for a section */
+    /** the entries grouped by names */
     private HashMap<String, Entry> entries; // key is a UTF-8 string
 
     /** state returned by findSection */
@@ -119,8 +124,8 @@ public ManifestDigester(byte[] bytes)
             return; // XXX: exception?
 
         // create an entry for main attributes
-        entries.put(MF_MAIN_ATTRS,
-                new Entry(0, pos.endOfSection + 1, pos.startOfNext, rawBytes));
+        entries.put(MF_MAIN_ATTRS, new Entry().addSection(
+                new Section(0, pos.endOfSection + 1, pos.startOfNext, rawBytes)));
 
         int start = pos.startOfNext;
         while(findSection(start, pos)) {
@@ -162,9 +167,10 @@ public ManifestDigester(byte[] bytes)
                         }
                     }
 
-                    entries.put(new String(nameBuf.toByteArray(), UTF_8),
-                        new Entry(start, sectionLen, sectionLenWithBlank,
-                                rawBytes));
+                    entries.computeIfAbsent(new String(nameBuf.toByteArray(), UTF_8),
+                                            dummy -> new Entry())
+                            .addSection(new Section(start, sectionLen,
+                                    sectionLenWithBlank, rawBytes));
                 }
             }
             start = pos.startOfNext;
@@ -182,13 +188,52 @@ private boolean isNameAttr(byte[] bytes, int start)
     }
 
     public static class Entry {
+
+        // One Entry for one name, and one name can have multiple sections.
+        // According to the JAR File Specification: "If there are multiple
+        // individual sections for the same file entry, the attributes in
+        // these sections are merged."
+        private List<Section> sections = new ArrayList<>();
+        boolean oldStyle;
+
+        private Entry addSection(Section sec)
+        {
+            sections.add(sec);
+            return this;
+        }
+
+        public byte[] digest(MessageDigest md)
+        {
+            md.reset();
+            for (Section sec : sections) {
+                if (oldStyle) {
+                    Section.doOldStyle(md, sec.rawBytes, sec.offset, sec.lengthWithBlankLine);
+                } else {
+                    md.update(sec.rawBytes, sec.offset, sec.lengthWithBlankLine);
+                }
+            }
+            return md.digest();
+        }
+
+        /** Netscape doesn't include the new line. Intel and JavaSoft do */
+
+        public byte[] digestWorkaround(MessageDigest md)
+        {
+            md.reset();
+            for (Section sec : sections) {
+                md.update(sec.rawBytes, sec.offset, sec.length);
+            }
+            return md.digest();
+        }
+    }
+
+    private static class Section {
         int offset;
         int length;
         int lengthWithBlankLine;
         byte[] rawBytes;
-        boolean oldStyle;
 
-        public Entry(int offset, int length,
+        public Section(int offset, int length,
                      int lengthWithBlankLine, byte[] rawBytes)
         {
             this.offset = offset;
@@ -197,18 +242,7 @@ public Entry(int offset, int length,
             this.rawBytes = rawBytes;
         }
 
-        public byte[] digest(MessageDigest md)
-        {
-            md.reset();
-            if (oldStyle) {
-                doOldStyle(md,rawBytes, offset, lengthWithBlankLine);
-            } else {
-                md.update(rawBytes, offset, lengthWithBlankLine);
-            }
-            return md.digest();
-        }
-
-        private void doOldStyle(MessageDigest md,
+        private static void doOldStyle(MessageDigest md,
                                 byte[] bytes,
                                 int offset,
                                 int length)
@@ -232,16 +266,6 @@ private void doOldStyle(MessageDigest md,
             }
             md.update(bytes, start, i-start);
         }
-
-
-        /** Netscape doesn't include the new line. Intel and JavaSoft do */
-
-        public byte[] digestWorkaround(MessageDigest md)
-        {
-            md.reset();
-            md.update(rawBytes, offset, length);
-            return md.digest();
-        }
     }
 
     public Entry get(String name, boolean oldStyle) {

From 29fbeff3b89eaafdb12506f9c91ff765589305dd Mon Sep 17 00:00:00 2001
From: mullan <unknown>
Date: Fri, 15 Dec 2017 10:42:25 -0500
Subject: [PATCH 007/196] 8186032: Disable XML Signatures signed with EC keys
 less than 224 bits Reviewed-by: weijun, rhalade

---
 src/java.base/share/conf/security/java.security | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index b7766158830..deb5a2e26c2 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -881,6 +881,7 @@ jdk.xml.dsig.secureValidationPolicy=\
     disallowReferenceUriSchemes file http https,\
     minKeySize RSA 1024,\
     minKeySize DSA 1024,\
+    minKeySize EC 224,\
     noDuplicateIds,\
     noRetrievalMethodLoops
 

From a81e06afa40d45a0c8c125ff2ee278e70d7b7d3a Mon Sep 17 00:00:00 2001
From: psandoz <unknown>
Date: Tue, 12 Dec 2017 16:37:39 -0800
Subject: [PATCH 008/196] 8193414: Improvements in MethodType lookups
 Reviewed-by: ahgross, jrose

---
 .../classes/java/lang/invoke/MethodType.java  | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/MethodType.java b/src/java.base/share/classes/java/lang/invoke/MethodType.java
index f3346bc21c6..620404c8782 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodType.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodType.java
@@ -1206,33 +1206,24 @@ private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOExceptio
      * @param s the stream to read the object from
      * @throws java.io.IOException if there is a problem reading the object
      * @throws ClassNotFoundException if one of the component classes cannot be resolved
-     * @see #MethodType()
      * @see #readResolve
      * @see #writeObject
      */
     private void readObject(java.io.ObjectInputStream s) throws java.io.IOException, ClassNotFoundException {
+        // Assign temporary defaults in case this object escapes
+        MethodType_init(void.class, NO_PTYPES);
+
         s.defaultReadObject();  // requires serialPersistentFields to be an empty array
 
         Class<?>   returnType     = (Class<?>)   s.readObject();
         Class<?>[] parameterArray = (Class<?>[]) s.readObject();
-
-        // Probably this object will never escape, but let's check
-        // the field values now, just to be sure.
-        checkRtype(returnType);
-        checkPtypes(parameterArray);
-
         parameterArray = parameterArray.clone();  // make sure it is unshared
+
+        // Assign deserialized values
         MethodType_init(returnType, parameterArray);
     }
 
-    /**
-     * For serialization only.
-     * Sets the final fields to null, pending {@code Unsafe.putObject}.
-     */
-    private MethodType() {
-        this.rtype = null;
-        this.ptypes = null;
-    }
+    // Initialization of state for deserialization only
     private void MethodType_init(Class<?> rtype, Class<?>[] ptypes) {
         // In order to communicate these values to readResolve, we must
         // store them into the implementation-specific final fields.
@@ -1259,9 +1250,14 @@ private static class OffsetHolder {
      */
     private Object readResolve() {
         // Do not use a trusted path for deserialization:
-        //return makeImpl(rtype, ptypes, true);
+        //    return makeImpl(rtype, ptypes, true);
         // Verify all operands, and make sure ptypes is unshared:
-        return methodType(rtype, ptypes);
+        try {
+            return methodType(rtype, ptypes);
+        } finally {
+            // Re-assign defaults in case this object escapes
+            MethodType_init(void.class, NO_PTYPES);
+        }
     }
 
     /**

From 42c7d5faab54b353102c7ba611cda626ef6afbe8 Mon Sep 17 00:00:00 2001
From: apetcher <unknown>
Date: Tue, 2 Jan 2018 09:23:01 -0500
Subject: [PATCH 009/196] 8182362: Update CipherOutputStream Usage Summary:
 Clarify spec of CipherOutputStream in Javadoc comments Reviewed-by: ascarpino

---
 .../classes/javax/crypto/CipherOutputStream.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/javax/crypto/CipherOutputStream.java b/src/java.base/share/classes/javax/crypto/CipherOutputStream.java
index 40e7dc49a6a..30c9c53553c 100644
--- a/src/java.base/share/classes/javax/crypto/CipherOutputStream.java
+++ b/src/java.base/share/classes/javax/crypto/CipherOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -42,7 +42,15 @@
  * java.io.OutputStream and java.io.FilterOutputStream.  This class
  * has exactly those methods specified in its ancestor classes, and
  * overrides them all.  Moreover, this class catches all exceptions
- * that are not thrown by its ancestor classes.
+ * that are not thrown by its ancestor classes. In particular, this
+ * class catches BadPaddingException and other exceptions thrown by
+ * failed integrity checks during decryption. These exceptions are not
+ * re-thrown, so the client will not be informed that integrity checks
+ * failed. Because of this behavior, this class may not be suitable
+ * for use with decryption in an authenticated mode of operation (e.g. GCM)
+ * if the application requires explicit notification when authentication
+ * fails. Such an application can use the Cipher API directly as an
+ * alternative to using this class.
  *
  * <p> It is crucial for a programmer using this class not to use
  * methods that are not defined or overriden in this class (such as a

From bfc2894d7768d9024fe549f7a2a91966c0abb576 Mon Sep 17 00:00:00 2001
From: serb <unknown>
Date: Wed, 3 Jan 2018 09:05:11 -0800
Subject: [PATCH 010/196] 8191696: Better mouse positioning Reviewed-by:
 skoivu, rhalade, prr, aghaisas

---
 .../classes/sun/awt/X11/XMouseInfoPeer.java   | 23 ++++++++++---------
 .../native/libawt/windows/MouseInfo.cpp       |  3 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java
index 09c9450a176..f4c46c2766d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,16 +25,16 @@
 
 package sun.awt.X11;
 
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.Window;
-import java.awt.GraphicsEnvironment;
-import java.awt.GraphicsDevice;
 import java.awt.peer.MouseInfoPeer;
-import sun.awt.X11GraphicsDevice;
 
 import sun.awt.AWTAccessor;
+import sun.awt.X11GraphicsDevice;
 
-public class XMouseInfoPeer implements MouseInfoPeer {
+public final class XMouseInfoPeer implements MouseInfoPeer {
 
     /**
      * Package-private constructor to prevent instantiation.
@@ -85,13 +85,14 @@ public int fillPointWithCoords(Point point) {
 
     @SuppressWarnings("deprecation")
     public boolean isWindowUnderMouse(Window w) {
-
-        long display = XToolkit.getDisplay();
-
-        // java.awt.Component.findUnderMouseInWindow checks that
-        // the peer is non-null by checking that the component
-        // is showing.
+        if (w == null) {
+            return false;
+        }
         XWindow peer = AWTAccessor.getComponentAccessor().getPeer(w);
+        if (peer == null) {
+            return false;
+        }
+        long display = XToolkit.getDisplay();
         long contentWindow = peer.getContentWindow();
         long parent = XlibUtil.getParentWindow(contentWindow);
 
diff --git a/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp b/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp
index 90cef5303cf..37fbc914519 100644
--- a/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -48,6 +48,7 @@ Java_sun_awt_windows_WMouseInfoPeer_isWindowUnderMouse(JNIEnv *env, jclass cls,
     }
 
     jobject winPeer = AwtObject::GetPeerForTarget(env, window);
+    CHECK_NULL_RETURN(winPeer, JNI_FALSE);
     PDATA pData;
     pData = JNI_GET_PDATA(winPeer);
     env->DeleteLocalRef(winPeer);

From e1b46ed39293624445dc3284fe6932844124911c Mon Sep 17 00:00:00 2001
From: weijun <unknown>
Date: Fri, 12 Jan 2018 08:06:24 +0800
Subject: [PATCH 011/196] 8189997: Enhance keystore mechanisms 8194259: keytool
 error: java.io.IOException: Invalid secret key format Reviewed-by: mullan,
 valeriep, rriggs, ahgross

---
 .../com/sun/crypto/provider/JceKeyStore.java  |  8 +-
 .../com/sun/crypto/provider/KeyProtector.java |  8 +-
 .../provider/SealedObjectForKeyProtector.java | 97 ++++++++++++++++++-
 .../classes/javax/crypto/SealedObject.java    | 41 ++++----
 .../misc/JavaxCryptoSealedObjectAccess.java}  | 44 ++-------
 .../jdk/internal/misc/SharedSecrets.java      | 13 +++
 .../share/conf/security/java.security         | 20 ++++
 7 files changed, 163 insertions(+), 68 deletions(-)
 rename src/java.base/share/classes/{com/sun/crypto/provider/ai.java => jdk/internal/misc/JavaxCryptoSealedObjectAccess.java} (56%)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
index f3190b39a29..bceb60da76d 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -943,8 +943,10 @@ private static class DeserializationChecker implements ObjectInputFilter {
             // First run a custom filter
             long nestedDepth = info.depth();
             if ((nestedDepth == 1 &&
-                info.serialClass() != SealedObjectForKeyProtector.class) ||
-                nestedDepth > MAX_NESTED_DEPTH) {
+                        info.serialClass() != SealedObjectForKeyProtector.class) ||
+                    (nestedDepth > MAX_NESTED_DEPTH &&
+                        info.serialClass() != null &&
+                        info.serialClass() != Object.class)) {
                 return Status.REJECTED;
             }
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java
index 823d7bdb8d1..7f9d0b2ee0f 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -26,8 +26,6 @@
 package com.sun.crypto.provider;
 
 import java.io.IOException;
-import java.io.Serializable;
-import java.security.Security;
 import java.security.Key;
 import java.security.PrivateKey;
 import java.security.Provider;
@@ -35,7 +33,6 @@
 import java.security.MessageDigest;
 import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.security.UnrecoverableKeyException;
 import java.security.AlgorithmParameters;
 import java.security.spec.InvalidParameterSpecException;
@@ -44,7 +41,6 @@
 import javax.crypto.Cipher;
 import javax.crypto.CipherSpi;
 import javax.crypto.SecretKey;
-import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.SealedObject;
 import javax.crypto.spec.*;
 import sun.security.x509.AlgorithmId;
@@ -347,7 +343,7 @@ Key unseal(SealedObject so)
                                                       SunJCE.getInstance(),
                                                       "PBEWithMD5AndTripleDES");
             cipher.init(Cipher.DECRYPT_MODE, skey, params);
-            return (Key)soForKeyProtector.getObject(cipher);
+            return soForKeyProtector.getKey(cipher);
         } catch (NoSuchAlgorithmException ex) {
             // Note: this catch needed to be here because of the
             // later catch of GeneralSecurityException
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java b/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java
index d88e7668c20..36056896f35 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -25,6 +25,8 @@
 
 package com.sun.crypto.provider;
 
+import jdk.internal.misc.SharedSecrets;
+
 import java.io.*;
 import java.security.*;
 import javax.crypto.*;
@@ -33,6 +35,16 @@ final class SealedObjectForKeyProtector extends SealedObject {
 
     static final long serialVersionUID = -3650226485480866989L;
 
+    /**
+     * The InputStreamFilter for a Key object inside this SealedObject. It can
+     * be either provided as a {@link Security} property or a system property
+     * (when provided as latter, it shadows the former). If the result of this
+     * filter is {@link java.io.ObjectInputFilter.Status.UNDECIDED}, the system
+     * level filter defined by jdk.serialFilter will be consulted. The value
+     * of this property uses the same format of jdk.serialFilter.
+     */
+    private static final String KEY_SERIAL_FILTER = "jceks.key.serialFilter";
+
     SealedObjectForKeyProtector(Serializable object, Cipher c)
             throws IOException, IllegalBlockSizeException {
         super(object, c);
@@ -59,4 +71,87 @@ AlgorithmParameters getParameters() {
         }
         return params;
     }
+
+    final Key getKey(Cipher c)
+            throws IOException, ClassNotFoundException, IllegalBlockSizeException,
+            BadPaddingException {
+
+        try (ObjectInputStream ois = SharedSecrets.getJavaxCryptoSealedObjectAccess()
+                .getExtObjectInputStream(this, c)) {
+            AccessController.doPrivileged(
+                    (PrivilegedAction<Void>) () -> {
+                        ois.setObjectInputFilter(DeserializationChecker.ONE_FILTER);
+                        return null;
+                    });
+            try {
+                @SuppressWarnings("unchecked")
+                Key t = (Key) ois.readObject();
+                return t;
+            } catch (InvalidClassException ice) {
+                String msg = ice.getMessage();
+                if (msg.contains("REJECTED")) {
+                    throw new IOException("Rejected by the"
+                            + " jceks.key.serialFilter or jdk.serialFilter"
+                            + " property", ice);
+                } else {
+                    throw ice;
+                }
+            }
+        }
+    }
+
+    /**
+     * The filter for the content of a SealedObjectForKeyProtector.
+     *
+     * First, the jceks.key.serialFilter will be consulted. If the result
+     * is UNDECIDED, the system level jdk.serialFilter will be consulted.
+     */
+    private static class DeserializationChecker implements ObjectInputFilter {
+
+        private static final ObjectInputFilter ONE_FILTER;
+
+        static {
+            String prop = AccessController.doPrivileged(
+                    (PrivilegedAction<String>) () -> {
+                        String tmp = System.getProperty(KEY_SERIAL_FILTER);
+                        if (tmp != null) {
+                            return tmp;
+                        } else {
+                            return Security.getProperty(KEY_SERIAL_FILTER);
+                        }
+                    });
+            ONE_FILTER = new DeserializationChecker(prop == null ? null
+                    : ObjectInputFilter.Config.createFilter(prop));
+        }
+
+        private final ObjectInputFilter base;
+
+        private DeserializationChecker(ObjectInputFilter base) {
+            this.base = base;
+        }
+
+        @Override
+        public ObjectInputFilter.Status checkInput(
+                ObjectInputFilter.FilterInfo info) {
+
+            if (info.serialClass() == Object.class) {
+                return Status.UNDECIDED;
+            }
+
+            if (base != null) {
+                Status result = base.checkInput(info);
+                if (result != Status.UNDECIDED) {
+                    return result;
+                }
+            }
+
+            ObjectInputFilter defaultFilter =
+                    ObjectInputFilter.Config.getSerialFilter();
+            if (defaultFilter != null) {
+                return defaultFilter.checkInput(info);
+            }
+
+            return Status.UNDECIDED;
+        }
+    }
 }
diff --git a/src/java.base/share/classes/javax/crypto/SealedObject.java b/src/java.base/share/classes/javax/crypto/SealedObject.java
index 3d657423aa4..9c31f375325 100644
--- a/src/java.base/share/classes/javax/crypto/SealedObject.java
+++ b/src/java.base/share/classes/javax/crypto/SealedObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -25,6 +25,8 @@
 
 package javax.crypto;
 
+import jdk.internal.misc.SharedSecrets;
+
 import java.io.*;
 import java.security.AlgorithmParameters;
 import java.security.Key;
@@ -287,17 +289,7 @@ public final Object getObject(Cipher c)
         throws IOException, ClassNotFoundException, IllegalBlockSizeException,
             BadPaddingException
     {
-        /*
-         * Unseal the object
-         */
-        byte[] content = c.doFinal(this.encryptedContent);
-
-        /*
-         * De-serialize it
-         */
-        // creating a stream pipe-line, from b to a
-        ByteArrayInputStream b = new ByteArrayInputStream(content);
-        ObjectInput a = new extObjectInputStream(b);
+        ObjectInput a = getExtObjectInputStream(c);
         try {
             Object obj = a.readObject();
             return obj;
@@ -417,17 +409,7 @@ private Object unseal(Key key, String provider)
             throw new RuntimeException(iape.getMessage());
         }
 
-        /*
-         * Unseal the object
-         */
-        byte[] content = c.doFinal(this.encryptedContent);
-
-        /*
-         * De-serialize it
-         */
-        // creating a stream pipe-line, from b to a
-        ByteArrayInputStream b = new ByteArrayInputStream(content);
-        ObjectInput a = new extObjectInputStream(b);
+        ObjectInput a = getExtObjectInputStream(c);
         try {
             Object obj = a.readObject();
             return obj;
@@ -450,6 +432,19 @@ private void readObject(java.io.ObjectInputStream s)
         if (encodedParams != null)
             encodedParams = encodedParams.clone();
     }
+
+    // This method is also called inside SealedObjectForKeyProtector.java.
+    private ObjectInputStream getExtObjectInputStream(Cipher c)
+            throws BadPaddingException, IllegalBlockSizeException, IOException {
+
+        byte[] content = c.doFinal(this.encryptedContent);
+        ByteArrayInputStream b = new ByteArrayInputStream(content);
+        return new extObjectInputStream(b);
+    }
+
+    static {
+        SharedSecrets.setJavaxCryptoSealedObjectAccess((obj,c) -> obj.getExtObjectInputStream(c));
+    }
 }
 
 final class extObjectInputStream extends ObjectInputStream {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ai.java b/src/java.base/share/classes/jdk/internal/misc/JavaxCryptoSealedObjectAccess.java
similarity index 56%
rename from src/java.base/share/classes/com/sun/crypto/provider/ai.java
rename to src/java.base/share/classes/jdk/internal/misc/JavaxCryptoSealedObjectAccess.java
index 853307396ff..291ee9e3aaa 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ai.java
+++ b/src/java.base/share/classes/jdk/internal/misc/JavaxCryptoSealedObjectAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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,43 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package jdk.internal.misc;
 
-package com.sun.crypto.provider;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.ObjectStreamException;
-import java.security.AlgorithmParameters;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
+import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.SealedObject;
-import javax.crypto.spec.*;
-
-/**
- * This class is introduced to workaround a problem in
- * the SunJCE provider shipped in JCE 1.2.1: the class
- * SealedObjectForKeyProtector was obfuscated due to a mistake.
- *
- * In order to retrieve secret keys in a JCEKS KeyStore written
- * by the SunJCE provider in JCE 1.2.1, this class will be used.
- *
- * @author Valerie Peng
- *
- *
- * @see JceKeyStore
- */
-
-final class ai extends javax.crypto.SealedObject {
-
-    static final long serialVersionUID = -7051502576727967444L;
-
-    ai(SealedObject so) {
-        super(so);
-    }
+import java.io.IOException;
+import java.io.ObjectInputStream;
 
-    Object readResolve() throws ObjectStreamException {
-        return new SealedObjectForKeyProtector(this);
-    }
+public interface JavaxCryptoSealedObjectAccess {
+    ObjectInputStream getExtObjectInputStream(
+            SealedObject sealed, Cipher cipher)
+            throws BadPaddingException, IllegalBlockSizeException, IOException;
 }
diff --git a/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
index fd792cd847f..04439fba710 100644
--- a/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
+++ b/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
@@ -25,6 +25,7 @@
 
 package jdk.internal.misc;
 
+import javax.crypto.SealedObject;
 import java.io.ObjectInputFilter;
 import java.lang.module.ModuleDescriptor;
 import java.util.ResourceBundle;
@@ -71,6 +72,7 @@ public class SharedSecrets {
     private static JavaObjectInputStreamAccess javaObjectInputStreamAccess;
     private static JavaObjectInputFilterAccess javaObjectInputFilterAccess;
     private static JavaIORandomAccessFileAccess javaIORandomAccessFileAccess;
+    private static JavaxCryptoSealedObjectAccess javaxCryptoSealedObjectAccess;
 
     public static JavaUtilJarAccess javaUtilJarAccess() {
         if (javaUtilJarAccess == null) {
@@ -324,4 +326,15 @@ public static JavaIORandomAccessFileAccess getJavaIORandomAccessFileAccess() {
         }
         return javaIORandomAccessFileAccess;
     }
+
+    public static void setJavaxCryptoSealedObjectAccess(JavaxCryptoSealedObjectAccess jcsoa) {
+        javaxCryptoSealedObjectAccess = jcsoa;
+    }
+
+    public static JavaxCryptoSealedObjectAccess getJavaxCryptoSealedObjectAccess() {
+        if (javaxCryptoSealedObjectAccess == null) {
+            unsafe.ensureClassInitialized(SealedObject.class);
+        }
+        return javaxCryptoSealedObjectAccess;
+    }
 }
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index deb5a2e26c2..12cb112819f 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -895,6 +895,9 @@ jdk.xml.dsig.secureValidationPolicy=\
 # Patterns are separated by ";" (semicolon).
 # Whitespace is significant and is considered part of the pattern.
 #
+# If the system property jdk.serialFilter is also specified, it supersedes
+# the security property value defined here.
+#
 # If a pattern includes a "=", it sets a limit.
 # If a limit appears more than once the last value is used.
 # Limits are checked before classes regardless of the order in the
@@ -1005,3 +1008,20 @@ jdk.xml.dsig.secureValidationPolicy=\
 # It is not guaranteed to be examined and used by other implementations.
 #
 #com.sun.CORBA.ORBIorTypeCheckRegistryFilter=binary_class_name;binary_class_name
+
+#
+# JCEKS Encrypted Key Serial Filter
+#
+# This filter, if configured, is used by the JCEKS KeyStore during the
+# deserialization of the encrypted Key object stored inside a key entry.
+# If not configured or the filter result is UNDECIDED (i.e. none of the patterns
+# matches), the filter configured by jdk.serialFilter will be consulted.
+#
+# If the system property jceks.key.serialFilter is also specified, it supersedes
+# the security property value defined here.
+#
+# The filter pattern uses the same format as jdk.serialFilter. The default
+# pattern allows java.lang.Enum, java.security.KeyRep, java.security.KeyRep$Type,
+# and javax.crypto.spec.SecretKeySpec and rejects all the others.
+jceks.key.serialFilter = java.base/java.lang.Enum;java.base/java.security.KeyRep;\
+  java.base/java.security.KeyRep$Type;java.base/javax.crypto.spec.SecretKeySpec;!*

From 64c50226369ab2926449be859b4dde9029a961b3 Mon Sep 17 00:00:00 2001
From: weijun <unknown>
Date: Thu, 18 Jan 2018 11:03:30 +0800
Subject: [PATCH 012/196] 8195662: Add T6587786.java to problem list before
 JDK-8195589 is resolved Reviewed-by: mullan, jjg

---
 test/langtools/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/langtools/ProblemList.txt b/test/langtools/ProblemList.txt
index f94a7f30fcc..d7896926cac 100644
--- a/test/langtools/ProblemList.txt
+++ b/test/langtools/ProblemList.txt
@@ -63,6 +63,7 @@ tools/javac/jvm/VerboseOutTest.java
 # javap
 
 tools/javap/output/RepeatingTypeAnnotations.java                                8057687    generic-all    emit correct byte code an attributes for type annotations
+tools/javap/T6587786.java                                                       8195589    generic-all    T6587786.java failed after JDK-8189997
 
 ###########################################################################
 #

From f9369684021e232708b79651c1d9923af090923c Mon Sep 17 00:00:00 2001
From: joehw <unknown>
Date: Wed, 17 Jan 2018 22:24:46 -0800
Subject: [PATCH 013/196] 8189993: Improve document portability Reviewed-by:
 rriggs, lancea, dfuchs, skoivu

---
 .../org/apache/xerces/internal/dom/NamedNodeMapImpl.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
index 051237b2561..27086ee5bed 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -56,7 +56,7 @@
  * @xerces.internal
  *
  * @since  PR-DOM-Level-1-19980818.
- * @LastModified: Oct 2017
+ * @LastModified: Jan 2018
  */
 public class NamedNodeMapImpl
     implements NamedNodeMap, Serializable {
@@ -595,12 +595,14 @@ public void removeAll (){
         }
     }
 
+    @SuppressWarnings("unchecked")
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         if (nodes != null) {
             // nodes are written as a Vector for compatibility.
-            nodes = new ArrayList<>(nodes);
+            // cast to Vector is required
+            nodes = new ArrayList<>((Vector<Node>)nodes);
         }
     }
 

From a5abe837f64b2016bc53f92f291c7886ef185168 Mon Sep 17 00:00:00 2001
From: igerasim <unknown>
Date: Fri, 19 Jan 2018 11:24:39 -0800
Subject: [PATCH 014/196] 8175075: Add 3DES to the default disabled algorithm
 security property Reviewed-by: xuelei, mullan, rhalade

---
 src/java.base/share/conf/security/java.security   |  2 +-
 .../java/net/httpclient/http2/TLSConnection.java  |  3 +++
 test/jdk/javax/net/ssl/DTLS/CipherSuite.java      |  9 +++++++--
 .../https/NewImpl/ComHostnameVerifier.java        | 15 ++++++++-------
 .../https/NewImpl/JavaxHostnameVerifier.java      | 15 ++++++++-------
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index 12cb112819f..35e466804e2 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -676,7 +676,7 @@ jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
 # Example:
 #   jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
 jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024, \
-    EC keySize < 224, DES40_CBC, RC4_40
+    EC keySize < 224, DES40_CBC, RC4_40, 3DES_EDE_CBC
 
 #
 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS)
diff --git a/test/jdk/java/net/httpclient/http2/TLSConnection.java b/test/jdk/java/net/httpclient/http2/TLSConnection.java
index 6c1cb89ed80..e0179dd16d6 100644
--- a/test/jdk/java/net/httpclient/http2/TLSConnection.java
+++ b/test/jdk/java/net/httpclient/http2/TLSConnection.java
@@ -27,6 +27,7 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.security.Security;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpRequest.BodyPublishers;
@@ -57,6 +58,8 @@ public class TLSConnection {
     private static final SSLParameters USE_DEFAULT_SSL_PARAMETERS = new SSLParameters();
 
     public static void main(String[] args) throws Exception {
+        // re-enable 3DES
+        Security.setProperty("jdk.tls.disabledAlgorithms", "");
 
         // enable all logging
         System.setProperty("jdk.httpclient.HttpClient.log", "all,frames:all");
diff --git a/test/jdk/javax/net/ssl/DTLS/CipherSuite.java b/test/jdk/javax/net/ssl/DTLS/CipherSuite.java
index cfca351e1cb..59639f1ea18 100644
--- a/test/jdk/javax/net/ssl/DTLS/CipherSuite.java
+++ b/test/jdk/javax/net/ssl/DTLS/CipherSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -38,7 +38,7 @@
  * @run main/othervm CipherSuite TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
  * @run main/othervm CipherSuite TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
  * @run main/othervm CipherSuite TLS_DHE_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm CipherSuite TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
+ * @run main/othervm CipherSuite TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA re-enable
  * @run main/othervm CipherSuite TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
  * @run main/othervm CipherSuite TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
  * @run main/othervm CipherSuite TLS_RSA_WITH_AES_128_GCM_SHA256
@@ -49,6 +49,7 @@
  */
 
 import javax.net.ssl.SSLEngine;
+import java.security.Security;
 
 /**
  * Test common DTLS cipher suites.
@@ -59,6 +60,10 @@ public class CipherSuite extends DTLSOverDatagram {
     volatile static String cipherSuite;
 
     public static void main(String[] args) throws Exception {
+        if (args.length > 1 && "re-enable".equals(args[1])) {
+            Security.setProperty("jdk.tls.disabledAlgorithms", "");
+        }
+
         cipherSuite = args[0];
 
         CipherSuite testCase = new CipherSuite();
diff --git a/test/jdk/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java b/test/jdk/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java
index 6e9972444e5..2a1f80a4cac 100644
--- a/test/jdk/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java
+++ b/test/jdk/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -21,23 +21,22 @@
  * questions.
  */
 
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
 /*
  * @test
- * @bug 4474255
- * @test 1.1 01/06/27
- * @bug 4484246
+ * @bug 4474255 4484246
  * @summary When an application enables anonymous SSL cipher suite,
  *        Hostname verification is not required
  * @modules java.base/com.sun.net.ssl
  *          java.base/com.sun.net.ssl.internal.www.protocol.https
  * @run main/othervm ComHostnameVerifier
- *
- *     SunJSSE does not support dynamic system properties, no way to re-use
- *     system properties in samevm/agentvm mode.
  */
 
 import java.io.*;
 import java.net.*;
+import java.security.Security;
 import javax.net.ssl.*;
 import javax.security.cert.*;
 import com.sun.net.ssl.HostnameVerifier;
@@ -261,6 +260,8 @@ void doClientSide() throws Exception {
     volatile Exception clientException = null;
 
     public static void main(String[] args) throws Exception {
+        // re-enable 3DES
+        Security.setProperty("jdk.tls.disabledAlgorithms", "");
 
         if (debug)
             System.setProperty("javax.net.debug", "all");
diff --git a/test/jdk/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java b/test/jdk/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java
index 3337871fbdf..a02d7622c8b 100644
--- a/test/jdk/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java
+++ b/test/jdk/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -21,21 +21,20 @@
  * questions.
  */
 
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
 /*
  * @test
- * @bug 4474255
- * @test 1.1 01/06/27
- * @bug 4484246
+ * @bug 4474255 4484246
  * @summary When an application enables anonymous SSL cipher suite,
  *        Hostname verification is not required
  * @run main/othervm JavaxHostnameVerifier
- *
- *     SunJSSE does not support dynamic system properties, no way to re-use
- *     system properties in samevm/agentvm mode.
  */
 
 import java.io.*;
 import java.net.*;
+import java.security.Security;
 import java.security.cert.*;
 import javax.net.ssl.*;
 
@@ -244,6 +243,8 @@ void doClientSide() throws Exception {
     volatile Exception clientException = null;
 
     public static void main(String[] args) throws Exception {
+        // re-enable 3DES
+        Security.setProperty("jdk.tls.disabledAlgorithms", "");
 
         if (debug)
             System.setProperty("javax.net.debug", "all");

From bc53d4a59594046a66732ec93d84e9e311958788 Mon Sep 17 00:00:00 2001
From: psandoz <unknown>
Date: Mon, 22 Jan 2018 13:27:28 -0800
Subject: [PATCH 015/196] 8194233: Improve support for array handles
 Reviewed-by: jrose, vlivanov, ahgross, rhalade

---
 .../lang/invoke/X-VarHandle.java.template     |  50 ++++++---
 .../invoke/VarHandles/VarHandleBaseTest.java  |   8 ++
 .../VarHandleTestAccessBoolean.java           |   3 +-
 .../VarHandles/VarHandleTestAccessByte.java   |   3 +-
 .../VarHandles/VarHandleTestAccessChar.java   |   3 +-
 .../VarHandles/VarHandleTestAccessDouble.java |   3 +-
 .../VarHandles/VarHandleTestAccessFloat.java  |   3 +-
 .../VarHandles/VarHandleTestAccessInt.java    |   3 +-
 .../VarHandles/VarHandleTestAccessLong.java   |   3 +-
 .../VarHandles/VarHandleTestAccessShort.java  |   3 +-
 .../VarHandles/VarHandleTestAccessString.java |  90 +++++++++++++++-
 .../X-VarHandleTestAccess.java.template       | 100 +++++++++++++++++-
 12 files changed, 248 insertions(+), 24 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
index 71419c36548..505a8dad470 100644
--- a/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
+++ b/src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
@@ -592,6 +592,28 @@ final class VarHandle$Type$s {
             return accessMode.at.accessModeType({#if[Object]?arrayType:$type$[].class}, {#if[Object]?arrayType.getComponentType():$type$.class}, int.class);
         }
 
+#if[Object]
+        @ForceInline
+        static Object runtimeTypeCheck(Array handle, Object[] oarray, Object value) {
+            if (handle.arrayType == oarray.getClass()) {
+                // Fast path: static array type same as argument array type
+                return handle.componentType.cast(value);
+            } else {
+                // Slow path: check value against argument array component type
+                return reflectiveTypeCheck(oarray, value);
+            }
+        }
+
+        @ForceInline
+        static Object reflectiveTypeCheck(Object[] oarray, Object value) {
+            try {
+                return oarray.getClass().getComponentType().cast(value);
+            } catch (ClassCastException e) {
+                throw new ArrayStoreException();
+            }
+        }
+#end[Object]
+
         @ForceInline
         static $type$ get(Array handle, Object oarray, int index) {
 #if[Object]
@@ -632,7 +654,7 @@ final class VarHandle$Type$s {
 #end[Object]
             UNSAFE.put$Type$Volatile(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -655,7 +677,7 @@ final class VarHandle$Type$s {
 #end[Object]
             UNSAFE.put$Type$Opaque(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -678,7 +700,7 @@ final class VarHandle$Type$s {
 #end[Object]
             UNSAFE.put$Type$Release(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 #if[CAS]
 
@@ -692,7 +714,7 @@ final class VarHandle$Type$s {
             return UNSAFE.compareAndSet$Type$(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -705,7 +727,7 @@ final class VarHandle$Type$s {
             return UNSAFE.compareAndExchange$Type$(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -718,7 +740,7 @@ final class VarHandle$Type$s {
             return UNSAFE.compareAndExchange$Type$Acquire(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -731,7 +753,7 @@ final class VarHandle$Type$s {
             return UNSAFE.compareAndExchange$Type$Release(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -744,7 +766,7 @@ final class VarHandle$Type$s {
             return UNSAFE.weakCompareAndSet$Type$Plain(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -757,7 +779,7 @@ final class VarHandle$Type$s {
             return UNSAFE.weakCompareAndSet$Type$(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -770,7 +792,7 @@ final class VarHandle$Type$s {
             return UNSAFE.weakCompareAndSet$Type$Acquire(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -783,7 +805,7 @@ final class VarHandle$Type$s {
             return UNSAFE.weakCompareAndSet$Type$Release(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
                     {#if[Object]?handle.componentType.cast(expected):expected},
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -795,7 +817,7 @@ final class VarHandle$Type$s {
 #end[Object]
             return UNSAFE.getAndSet$Type$(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -807,7 +829,7 @@ final class VarHandle$Type$s {
 #end[Object]
             return UNSAFE.getAndSet$Type$Acquire(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 
         @ForceInline
@@ -819,7 +841,7 @@ final class VarHandle$Type$s {
 #end[Object]
             return UNSAFE.getAndSet$Type$Release(array,
                     (((long) Preconditions.checkIndex(index, array.length, AIOOBE_SUPPLIER)) << handle.ashift) + handle.abase,
-                    {#if[Object]?handle.componentType.cast(value):value});
+                    {#if[Object]?runtimeTypeCheck(handle, array, value):value});
         }
 #end[CAS]
 #if[AtomicAdd]
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java
index 30469225067..7792df89155 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java
@@ -70,6 +70,14 @@ static void checkIOOBE(Object message, ThrowingRunnable r) {
         checkWithThrowable(IndexOutOfBoundsException.class, message, r);
     }
 
+    static void checkASE(ThrowingRunnable r) {
+        checkWithThrowable(ArrayStoreException.class, null, r);
+    }
+
+    static void checkASE(Object message, ThrowingRunnable r) {
+        checkWithThrowable(ArrayStoreException.class, message, r);
+    }
+
     static void checkISE(ThrowingRunnable r) {
         checkWithThrowable(IllegalStateException.class, null, r);
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
index a4d54635d95..ea85761a9a9 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
@@ -60,6 +60,7 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -210,7 +211,6 @@ public Object[][] accessTestCaseProvider() throws Exception {
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccessBoolean::testArrayIndexOutOfBounds,
                                               false));
-
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1255,5 +1255,6 @@ static void testArrayIndexOutOfBounds(VarHandle vh) throws Throwable {
             });
         }
     }
+
 }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
index be79776202b..033451a7753 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
@@ -60,6 +60,7 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -210,7 +211,6 @@ public Object[][] accessTestCaseProvider() throws Exception {
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccessByte::testArrayIndexOutOfBounds,
                                               false));
-
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1292,5 +1292,6 @@ static void testArrayIndexOutOfBounds(VarHandle vh) throws Throwable {
             });
         }
     }
+
 }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
index 6e2f42cee14..ecd685f073e 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
@@ -60,6 +60,7 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -210,7 +211,6 @@ public Object[][] accessTestCaseProvider() throws Exception {
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccessChar::testArrayIndexOutOfBounds,
                                               false));
-
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1292,5 +1292,6 @@ static void testArrayIndexOutOfBounds(VarHandle vh) throws Throwable {
             });
         }
     }
+
 }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
index e0564d5d002..3aa12aa4098 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
@@ -60,6 +60,7 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -210,7 +211,6 @@ public Object[][] accessTestCaseProvider() throws Exception {
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccessDouble::testArrayIndexOutOfBounds,
                                               false));
-
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1183,5 +1183,6 @@ static void testArrayIndexOutOfBounds(VarHandle vh) throws Throwable {
 
         }
     }
+
 }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
index 4fa6b41fd3c..81f19fb91dd 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
@@ -60,6 +60,7 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -210,7 +211,6 @@ public Object[][] accessTestCaseProvider() throws Exception {
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccessFloat::testArrayIndexOutOfBounds,
                                               false));
-
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1183,5 +1183,6 @@ static void testArrayIndexOutOfBounds(VarHandle vh) throws Throwable {
 
         }
     }
+
 }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
index 2fbcc9cb46d..bfa7665a8f5 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
@@ -60,6 +60,7 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -210,7 +211,6 @@ public Object[][] accessTestCaseProvider() throws Exception {
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccessInt::testArrayIndexOutOfBounds,
                                               false));
-
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1292,5 +1292,6 @@ static void testArrayIndexOutOfBounds(VarHandle vh) throws Throwable {
             });
         }
     }
+
 }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
index d94cdc131d2..6d948593f86 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
@@ -60,6 +60,7 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -210,7 +211,6 @@ public Object[][] accessTestCaseProvider() throws Exception {
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccessLong::testArrayIndexOutOfBounds,
                                               false));
-
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1292,5 +1292,6 @@ static void testArrayIndexOutOfBounds(VarHandle vh) throws Throwable {
             });
         }
     }
+
 }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
index 7ff96eb10ea..088de606734 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
@@ -60,6 +60,7 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -210,7 +211,6 @@ public Object[][] accessTestCaseProvider() throws Exception {
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccessShort::testArrayIndexOutOfBounds,
                                               false));
-
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1292,5 +1292,6 @@ static void testArrayIndexOutOfBounds(VarHandle vh) throws Throwable {
             });
         }
     }
+
 }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
index 0904505db40..04ed5de6c35 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
@@ -60,6 +60,8 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+    VarHandle vhArrayObject;
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -75,6 +77,7 @@ public void setup() throws Exception {
             VarHandleTestAccessString.class, "static_v", String.class);
 
         vhArray = MethodHandles.arrayElementVarHandle(String[].class);
+        vhArrayObject = MethodHandles.arrayElementVarHandle(Object[].class);
     }
 
 
@@ -204,13 +207,17 @@ public Object[][] accessTestCaseProvider() throws Exception {
 
         cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestAccessString::testArray));
+        cases.add(new VarHandleAccessTestCase("Array Object[]",
+                                              vhArrayObject, VarHandleTestAccessString::testArray));
         cases.add(new VarHandleAccessTestCase("Array unsupported",
                                               vhArray, VarHandleTestAccessString::testArrayUnsupported,
                                               false));
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccessString::testArrayIndexOutOfBounds,
                                               false));
-
+        cases.add(new VarHandleAccessTestCase("Array store exception",
+                                              vhArrayObject, VarHandleTestAccessString::testArrayStoreException,
+                                              false));
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1146,5 +1153,86 @@ static void testArrayIndexOutOfBounds(VarHandle vh) throws Throwable {
 
         }
     }
+
+    static void testArrayStoreException(VarHandle vh) throws Throwable {
+        Object[] array = new String[10];
+        Arrays.fill(array, "foo");
+        Object value = new Object();
+
+        // Set
+        checkASE(() -> {
+            vh.set(array, 0, value);
+        });
+
+        // SetVolatile
+        checkASE(() -> {
+            vh.setVolatile(array, 0, value);
+        });
+
+        // SetOpaque
+        checkASE(() -> {
+            vh.setOpaque(array, 0, value);
+        });
+
+        // SetRelease
+        checkASE(() -> {
+            vh.setRelease(array, 0, value);
+        });
+
+        // CompareAndSet
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.compareAndSet(array, 0, "foo", value);
+        });
+
+        // WeakCompareAndSet
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.weakCompareAndSetPlain(array, 0, "foo", value);
+        });
+
+        // WeakCompareAndSetVolatile
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.weakCompareAndSet(array, 0, "foo", value);
+        });
+
+        // WeakCompareAndSetAcquire
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.weakCompareAndSetAcquire(array, 0, "foo", value);
+        });
+
+        // WeakCompareAndSetRelease
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.weakCompareAndSetRelease(array, 0, "foo", value);
+        });
+
+        // CompareAndExchange
+        checkASE(() -> { // receiver reference class
+            String x = (String) vh.compareAndExchange(array, 0, "foo", value);
+        });
+
+        // CompareAndExchangeAcquire
+        checkASE(() -> { // receiver reference class
+            String x = (String) vh.compareAndExchangeAcquire(array, 0, "foo", value);
+        });
+
+        // CompareAndExchangeRelease
+        checkASE(() -> { // receiver reference class
+            String x = (String) vh.compareAndExchangeRelease(array, 0, "foo", value);
+        });
+
+        // GetAndSet
+        checkASE(() -> { // receiver reference class
+            String x = (String) vh.getAndSet(array, 0, value);
+        });
+
+        // GetAndSetAcquire
+        checkASE(() -> { // receiver reference class
+            String x = (String) vh.getAndSetAcquire(array, 0, value);
+        });
+
+        // GetAndSetRelease
+        checkASE(() -> { // receiver reference class
+            String x = (String) vh.getAndSetRelease(array, 0, value);
+        });
+    }
 }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
index 3d36bd35efc..5014fc1b187 100644
--- a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
+++ b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
@@ -60,6 +60,10 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
+#if[String]
+    VarHandle vhArrayObject;
+#end[String]
+
     @BeforeClass
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
@@ -75,6 +79,9 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             VarHandleTestAccess$Type$.class, "static_v", $type$.class);
 
         vhArray = MethodHandles.arrayElementVarHandle($type$[].class);
+#if[String]
+        vhArrayObject = MethodHandles.arrayElementVarHandle(Object[].class);
+#end[String]
     }
 
 
@@ -236,13 +243,21 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
 
         cases.add(new VarHandleAccessTestCase("Array",
                                               vhArray, VarHandleTestAccess$Type$::testArray));
+#if[String]
+        cases.add(new VarHandleAccessTestCase("Array Object[]",
+                                              vhArrayObject, VarHandleTestAccess$Type$::testArray));
+#end[String]
         cases.add(new VarHandleAccessTestCase("Array unsupported",
                                               vhArray, VarHandleTestAccess$Type$::testArrayUnsupported,
                                               false));
         cases.add(new VarHandleAccessTestCase("Array index out of bounds",
                                               vhArray, VarHandleTestAccess$Type$::testArrayIndexOutOfBounds,
                                               false));
-
+#if[String]
+        cases.add(new VarHandleAccessTestCase("Array store exception",
+                                              vhArrayObject, VarHandleTestAccess$Type$::testArrayStoreException,
+                                              false));
+#end[String]
         // Work around issue with jtreg summary reporting which truncates
         // the String result of Object.toString to 30 characters, hence
         // the first dummy argument
@@ -1823,5 +1838,88 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
 #end[Bitwise]
         }
     }
+
+#if[String]
+    static void testArrayStoreException(VarHandle vh) throws Throwable {
+        Object[] array = new $type$[10];
+        Arrays.fill(array, $value1$);
+        Object value = new Object();
+
+        // Set
+        checkASE(() -> {
+            vh.set(array, 0, value);
+        });
+
+        // SetVolatile
+        checkASE(() -> {
+            vh.setVolatile(array, 0, value);
+        });
+
+        // SetOpaque
+        checkASE(() -> {
+            vh.setOpaque(array, 0, value);
+        });
+
+        // SetRelease
+        checkASE(() -> {
+            vh.setRelease(array, 0, value);
+        });
+
+        // CompareAndSet
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.compareAndSet(array, 0, $value1$, value);
+        });
+
+        // WeakCompareAndSet
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.weakCompareAndSetPlain(array, 0, $value1$, value);
+        });
+
+        // WeakCompareAndSetVolatile
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.weakCompareAndSet(array, 0, $value1$, value);
+        });
+
+        // WeakCompareAndSetAcquire
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.weakCompareAndSetAcquire(array, 0, $value1$, value);
+        });
+
+        // WeakCompareAndSetRelease
+        checkASE(() -> { // receiver reference class
+            boolean r = vh.weakCompareAndSetRelease(array, 0, $value1$, value);
+        });
+
+        // CompareAndExchange
+        checkASE(() -> { // receiver reference class
+            $type$ x = ($type$) vh.compareAndExchange(array, 0, $value1$, value);
+        });
+
+        // CompareAndExchangeAcquire
+        checkASE(() -> { // receiver reference class
+            $type$ x = ($type$) vh.compareAndExchangeAcquire(array, 0, $value1$, value);
+        });
+
+        // CompareAndExchangeRelease
+        checkASE(() -> { // receiver reference class
+            $type$ x = ($type$) vh.compareAndExchangeRelease(array, 0, $value1$, value);
+        });
+
+        // GetAndSet
+        checkASE(() -> { // receiver reference class
+            $type$ x = ($type$) vh.getAndSet(array, 0, value);
+        });
+
+        // GetAndSetAcquire
+        checkASE(() -> { // receiver reference class
+            $type$ x = ($type$) vh.getAndSetAcquire(array, 0, value);
+        });
+
+        // GetAndSetRelease
+        checkASE(() -> { // receiver reference class
+            $type$ x = ($type$) vh.getAndSetRelease(array, 0, value);
+        });
+    }
+#end[String]
 }
 

From 87c8de7d5f1f36d662a5f271c525e5366acec3bd Mon Sep 17 00:00:00 2001
From: apetcher <unknown>
Date: Tue, 23 Jan 2018 11:18:11 -0500
Subject: [PATCH 016/196] 8193409: Improve AES supporting classes Reviewed-by:
 valeriep

---
 .../sun/crypto/provider/DESedeWrapCipher.java |  18 +-
 .../sun/crypto/provider/FeedbackCipher.java   |   6 +-
 .../crypto/provider/GaloisCounterMode.java    |  15 +-
 .../security/ucrypto/NativeGCMCipher.java     |  14 +-
 .../security/ucrypto/UcryptoException.java    | 188 ++++++++++--------
 5 files changed, 143 insertions(+), 98 deletions(-)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
index df00ec2736c..8c1a5a3b3af 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
@@ -470,6 +470,9 @@ protected byte[] engineWrap(Key key)
         } catch (InvalidKeyException ike) {
             // should never happen
             throw new RuntimeException("Internal cipher key is corrupted");
+        } catch (InvalidAlgorithmParameterException iape) {
+            // should never happen
+            throw new RuntimeException("Internal cipher IV is invalid");
         }
         byte[] out2 = new byte[out.length];
         cipher.encrypt(out, 0, out.length, out2, 0);
@@ -481,6 +484,9 @@ protected byte[] engineWrap(Key key)
         } catch (InvalidKeyException ike) {
             // should never happen
             throw new RuntimeException("Internal cipher key is corrupted");
+        } catch (InvalidAlgorithmParameterException iape) {
+            // should never happen
+            throw new RuntimeException("Internal cipher IV is invalid");
         }
         return out2;
     }
@@ -524,8 +530,12 @@ protected Key engineUnwrap(byte[] wrappedKey,
         }
         iv = new byte[IV_LEN];
         System.arraycopy(buffer, 0, iv, 0, iv.length);
-        cipher.init(true, cipherKey.getAlgorithm(), cipherKey.getEncoded(),
+        try {
+            cipher.init(true, cipherKey.getAlgorithm(), cipherKey.getEncoded(),
                     iv);
+        } catch (InvalidAlgorithmParameterException iape) {
+            throw new InvalidKeyException("IV in wrapped key is invalid");
+        }
         byte[] buffer2 = new byte[buffer.length - iv.length];
         cipher.decrypt(buffer, iv.length, buffer2.length,
                        buffer2, 0);
@@ -538,8 +548,12 @@ protected Key engineUnwrap(byte[] wrappedKey,
             }
         }
         // restore cipher state to prior to this call
-        cipher.init(decrypting, cipherKey.getAlgorithm(),
+        try {
+          cipher.init(decrypting, cipherKey.getAlgorithm(),
                     cipherKey.getEncoded(), IV2);
+        } catch (InvalidAlgorithmParameterException iape) {
+            throw new InvalidKeyException("IV in wrapped key is invalid");
+        }
         byte[] out = new byte[keyValLen];
         System.arraycopy(buffer2, 0, out, 0, keyValLen);
         return ConstructKeys.constructKey(out, wrappedKeyAlgorithm,
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java
index 8d03913e284..b21f96227a4 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -26,6 +26,7 @@
 package com.sun.crypto.provider;
 
 import java.security.InvalidKeyException;
+import java.security.InvalidAlgorithmParameterException;
 import javax.crypto.*;
 
 /**
@@ -99,7 +100,8 @@ final int getBlockSize() {
      * initializing this cipher
      */
     abstract void init(boolean decrypting, String algorithm, byte[] key,
-                       byte[] iv) throws InvalidKeyException;
+                       byte[] iv) throws InvalidKeyException,
+                                         InvalidAlgorithmParameterException;
 
    /**
      * Gets the initialization vector.
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java b/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
index 7dd9791f1b1..6ea2b3a66eb 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -262,8 +262,9 @@ void restore() {
      * @exception InvalidKeyException if the given key is inappropriate for
      * initializing this cipher
      */
+    @Override
     void init(boolean decrypting, String algorithm, byte[] key, byte[] iv)
-            throws InvalidKeyException {
+            throws InvalidKeyException, InvalidAlgorithmParameterException {
         init(decrypting, algorithm, key, iv, DEFAULT_TAG_LEN);
     }
 
@@ -282,10 +283,16 @@ void init(boolean decrypting, String algorithm, byte[] key, byte[] iv)
      */
     void init(boolean decrypting, String algorithm, byte[] keyValue,
               byte[] ivValue, int tagLenBytes)
-              throws InvalidKeyException {
-        if (keyValue == null || ivValue == null) {
+              throws InvalidKeyException, InvalidAlgorithmParameterException {
+        if (keyValue == null) {
             throw new InvalidKeyException("Internal error");
         }
+        if (ivValue == null) {
+            throw new InvalidAlgorithmParameterException("Internal error");
+        }
+        if (ivValue.length == 0) {
+            throw new InvalidAlgorithmParameterException("IV is empty");
+        }
 
         // always encrypt mode for embedded cipher
         this.embeddedCipher.init(false, algorithm, keyValue);
diff --git a/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java
index 0d5b4325b99..6fa8ef34f2a 100644
--- a/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java
+++ b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -246,7 +246,17 @@ protected synchronized void engineInit(int opmode, Key key,
             requireReinit = false;
             ibuffer = new ByteArrayOutputStream();
         }
-        init(doEncrypt, keyBytes, ivBytes, tagLen, null);
+        try {
+            init(doEncrypt, keyBytes, ivBytes, tagLen, null);
+        } catch (UcryptoException ex) {
+            if (ex.getError() ==
+                UcryptoException.Error.CRYPTO_MECHANISM_PARAM_INVALID) {
+
+                throw new InvalidAlgorithmParameterException(ex.getMessage());
+            } else {
+                throw ex;
+            }
+        }
     }
 
     // see JCE spec
diff --git a/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java
index 0ba6c198ed3..4c1e98e1f4d 100644
--- a/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java
+++ b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -40,93 +40,105 @@ public final class UcryptoException extends ProviderException {
     private static final long serialVersionUID = -933864511110035746L;
 
     // NOTE: check /usr/include/sys/crypto/common.h for updates
-    private static final String[] ERROR_MSG = {
-        "CRYPTO_SUCCESS",
-        "CRYPTO_CANCEL",
-        "CRYPTO_HOST_MEMORY",
-        "CRYPTO_GENERAL_ERROR",
-        "CRYPTO_FAILED",
-        "CRYPTO_ARGUMENTS_BAD",
-        "CRYPTO_ATTRIBUTE_READ_ONLY",
-        "CRYPTO_ATTRIBUTE_SENSITIVE",
-        "CRYPTO_ATTRIBUTE_TYPE_INVALID",
-        "CRYPTO_ATTRIBUTE_VALUE_INVALID",
-        "CRYPTO_CANCELED",
-        "CRYPTO_DATA_INVALID",
-        "CRYPTO_DATA_LEN_RANGE",
-        "CRYPTO_DEVICE_ERROR",
-        "CRYPTO_DEVICE_MEMORY",
-        "CRYPTO_DEVICE_REMOVED",
-        "CRYPTO_ENCRYPTED_DATA_INVALID",
-        "CRYPTO_ENCRYPTED_DATA_LEN_RANGE",
-        "CRYPTO_KEY_HANDLE_INVALID",
-        "CRYPTO_KEY_SIZE_RANGE",
-        "CRYPTO_KEY_TYPE_INCONSISTENT",
-        "CRYPTO_KEY_NOT_NEEDED",
-        "CRYPTO_KEY_CHANGED",
-        "CRYPTO_KEY_NEEDED",
-        "CRYPTO_KEY_INDIGESTIBLE",
-        "CRYPTO_KEY_FUNCTION_NOT_PERMITTED",
-        "CRYPTO_KEY_NOT_WRAPPABLE",
-        "CRYPTO_KEY_UNEXTRACTABLE",
-        "CRYPTO_MECHANISM_INVALID",
-        "CRYPTO_MECHANISM_PARAM_INVALID",
-        "CRYPTO_OBJECT_HANDLE_INVALID",
-        "CRYPTO_OPERATION_IS_ACTIVE",
-        "CRYPTO_OPERATION_NOT_INITIALIZED",
-        "CRYPTO_PIN_INCORRECT",
-        "CRYPTO_PIN_INVALID",
-        "CRYPTO_PIN_LEN_RANGE",
-        "CRYPTO_PIN_EXPIRED",
-        "CRYPTO_PIN_LOCKED",
-        "CRYPTO_SESSION_CLOSED",
-        "CRYPTO_SESSION_COUNT",
-        "CRYPTO_SESSION_HANDLE_INVALID",
-        "CRYPTO_SESSION_READ_ONLY",
-        "CRYPTO_SESSION_EXISTS",
-        "CRYPTO_SESSION_READ_ONLY_EXISTS",
-        "CRYPTO_SESSION_READ_WRITE_SO_EXISTS",
-        "CRYPTO_SIGNATURE_INVALID",
-        "CRYPTO_SIGNATURE_LEN_RANGE",
-        "CRYPTO_TEMPLATE_INCOMPLETE",
-        "CRYPTO_TEMPLATE_INCONSISTENT",
-        "CRYPTO_UNWRAPPING_KEY_HANDLE_INVALID",
-        "CRYPTO_UNWRAPPING_KEY_SIZE_RANGE",
-        "CRYPTO_UNWRAPPING_KEY_TYPE_INCONSISTENT",
-        "CRYPTO_USER_ALREADY_LOGGED_IN",
-        "CRYPTO_USER_NOT_LOGGED_IN",
-        "CRYPTO_USER_PIN_NOT_INITIALIZED",
-        "CRYPTO_USER_TYPE_INVALID",
-        "CRYPTO_USER_ANOTHER_ALREADY_LOGGED_IN",
-        "CRYPTO_USER_TOO_MANY_TYPES",
-        "CRYPTO_WRAPPED_KEY_INVALID",
-        "CRYPTO_WRAPPED_KEY_LEN_RANGE",
-        "CRYPTO_WRAPPING_KEY_HANDLE_INVALID",
-        "CRYPTO_WRAPPING_KEY_SIZE_RANGE",
-        "CRYPTO_WRAPPING_KEY_TYPE_INCONSISTENT",
-        "CRYPTO_RANDOM_SEED_NOT_SUPPORTED",
-        "CRYPTO_RANDOM_NO_RNG",
-        "CRYPTO_DOMAIN_PARAMS_INVALID",
-        "CRYPTO_BUFFER_TOO_SMALL",
-        "CRYPTO_INFORMATION_SENSITIVE",
-        "CRYPTO_NOT_SUPPORTED",
-        "CRYPTO_QUEUED",
-        "CRYPTO_BUFFER_TOO_BIG",
-        "CRYPTO_INVALID_CONTEXT",
-        "CRYPTO_INVALID_MAC",
-        "CRYPTO_MECH_NOT_SUPPORTED",
-        "CRYPTO_INCONSISTENT_ATTRIBUTE",
-        "CRYPTO_NO_PERMISSION",
-        "CRYPTO_INVALID_PROVIDER_ID",
-        "CRYPTO_VERSION_MISMATCH",
-        "CRYPTO_BUSY",
-        "CRYPTO_UNKNOWN_PROVIDER",
-        "CRYPTO_MODVERIFICATION_FAILED",
-        "CRYPTO_OLD_CTX_TEMPLATE",
-        "CRYPTO_WEAK_KEY",
-        "CRYPTO_FIPS140_ERROR"
+    public enum Error {
+        CRYPTO_SUCCESS,
+        CRYPTO_CANCEL,
+        CRYPTO_HOST_MEMORY,
+        CRYPTO_GENERAL_ERROR,
+        CRYPTO_FAILED,
+        CRYPTO_ARGUMENTS_BAD,
+        CRYPTO_ATTRIBUTE_READ_ONLY,
+        CRYPTO_ATTRIBUTE_SENSITIVE,
+        CRYPTO_ATTRIBUTE_TYPE_INVALID,
+        CRYPTO_ATTRIBUTE_VALUE_INVALID,
+        CRYPTO_CANCELED,
+        CRYPTO_DATA_INVALID,
+        CRYPTO_DATA_LEN_RANGE,
+        CRYPTO_DEVICE_ERROR,
+        CRYPTO_DEVICE_MEMORY,
+        CRYPTO_DEVICE_REMOVED,
+        CRYPTO_ENCRYPTED_DATA_INVALID,
+        CRYPTO_ENCRYPTED_DATA_LEN_RANGE,
+        CRYPTO_KEY_HANDLE_INVALID,
+        CRYPTO_KEY_SIZE_RANGE,
+        CRYPTO_KEY_TYPE_INCONSISTENT,
+        CRYPTO_KEY_NOT_NEEDED,
+        CRYPTO_KEY_CHANGED,
+        CRYPTO_KEY_NEEDED,
+        CRYPTO_KEY_INDIGESTIBLE,
+        CRYPTO_KEY_FUNCTION_NOT_PERMITTED,
+        CRYPTO_KEY_NOT_WRAPPABLE,
+        CRYPTO_KEY_UNEXTRACTABLE,
+        CRYPTO_MECHANISM_INVALID,
+        CRYPTO_MECHANISM_PARAM_INVALID,
+        CRYPTO_OBJECT_HANDLE_INVALID,
+        CRYPTO_OPERATION_IS_ACTIVE,
+        CRYPTO_OPERATION_NOT_INITIALIZED,
+        CRYPTO_PIN_INCORRECT,
+        CRYPTO_PIN_INVALID,
+        CRYPTO_PIN_LEN_RANGE,
+        CRYPTO_PIN_EXPIRED,
+        CRYPTO_PIN_LOCKED,
+        CRYPTO_SESSION_CLOSED,
+        CRYPTO_SESSION_COUNT,
+        CRYPTO_SESSION_HANDLE_INVALID,
+        CRYPTO_SESSION_READ_ONLY,
+        CRYPTO_SESSION_EXISTS,
+        CRYPTO_SESSION_READ_ONLY_EXISTS,
+        CRYPTO_SESSION_READ_WRITE_SO_EXISTS,
+        CRYPTO_SIGNATURE_INVALID,
+        CRYPTO_SIGNATURE_LEN_RANGE,
+        CRYPTO_TEMPLATE_INCOMPLETE,
+        CRYPTO_TEMPLATE_INCONSISTENT,
+        CRYPTO_UNWRAPPING_KEY_HANDLE_INVALID,
+        CRYPTO_UNWRAPPING_KEY_SIZE_RANGE,
+        CRYPTO_UNWRAPPING_KEY_TYPE_INCONSISTENT,
+        CRYPTO_USER_ALREADY_LOGGED_IN,
+        CRYPTO_USER_NOT_LOGGED_IN,
+        CRYPTO_USER_PIN_NOT_INITIALIZED,
+        CRYPTO_USER_TYPE_INVALID,
+        CRYPTO_USER_ANOTHER_ALREADY_LOGGED_IN,
+        CRYPTO_USER_TOO_MANY_TYPES,
+        CRYPTO_WRAPPED_KEY_INVALID,
+        CRYPTO_WRAPPED_KEY_LEN_RANGE,
+        CRYPTO_WRAPPING_KEY_HANDLE_INVALID,
+        CRYPTO_WRAPPING_KEY_SIZE_RANGE,
+        CRYPTO_WRAPPING_KEY_TYPE_INCONSISTENT,
+        CRYPTO_RANDOM_SEED_NOT_SUPPORTED,
+        CRYPTO_RANDOM_NO_RNG,
+        CRYPTO_DOMAIN_PARAMS_INVALID,
+        CRYPTO_BUFFER_TOO_SMALL,
+        CRYPTO_INFORMATION_SENSITIVE,
+        CRYPTO_NOT_SUPPORTED,
+        CRYPTO_QUEUED,
+        CRYPTO_BUFFER_TOO_BIG,
+        CRYPTO_INVALID_CONTEXT,
+        CRYPTO_INVALID_MAC,
+        CRYPTO_MECH_NOT_SUPPORTED,
+        CRYPTO_INCONSISTENT_ATTRIBUTE,
+        CRYPTO_NO_PERMISSION,
+        CRYPTO_INVALID_PROVIDER_ID,
+        CRYPTO_VERSION_MISMATCH,
+        CRYPTO_BUSY,
+        CRYPTO_UNKNOWN_PROVIDER,
+        CRYPTO_MODVERIFICATION_FAILED,
+        CRYPTO_OLD_CTX_TEMPLATE,
+        CRYPTO_WEAK_KEY,
+        CRYPTO_FIPS140_ERROR;
     };
 
+    // Array used to look up error by ordinal
+    private static final Error[] ALL_ERRORS = Error.values();
+
+    /**
+     * Get the error enum value (if any) associated with this exception.
+     */
+    public Error getError() {
+        return errorCode < ALL_ERRORS.length ?
+            ALL_ERRORS[errorCode] :
+            null;
+    }
+
     /**
      * The error code if this exception is triggered by a Ucrypto error.
      */
@@ -142,8 +154,8 @@ public final class UcryptoException extends ProviderException {
      */
     static String getErrorMessage(int errorCode) {
         String message;
-        if (errorCode < ERROR_MSG.length) {
-            message = ERROR_MSG[errorCode];
+        if (errorCode < ALL_ERRORS.length) {
+            message = ALL_ERRORS[errorCode].name();
         } else {
             message = "0x" + Integer.toHexString(errorCode);
         }

From 07bf504b87c407cbf74b31f692644b298dcaaabf Mon Sep 17 00:00:00 2001
From: psandoz <unknown>
Date: Wed, 24 Jan 2018 16:44:31 -0800
Subject: [PATCH 017/196] 8194238: Trying exceptions in MethodHandles
 Reviewed-by: jrose, vlivanov, ahgross

---
 .../java/lang/invoke/MethodHandles.java       | 18 +++++++++-
 test/jdk/java/lang/invoke/TryFinallyTest.java | 34 +++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index e0d078dcc1f..0277a8e24e2 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -5893,6 +5893,19 @@ private static Class<?> iteratedLoopChecks(MethodHandle iterator, MethodHandle i
      * In rare cases where exceptions must be converted in that way, first wrap
      * the target with {@link #catchException(MethodHandle, Class, MethodHandle)}
      * to capture an outgoing exception, and then wrap with {@code tryFinally}.
+     * <p>
+     * It is recommended that the first parameter type of {@code cleanup} be
+     * declared {@code Throwable} rather than a narrower subtype.  This ensures
+     * {@code cleanup} will always be invoked with whatever exception that
+     * {@code target} throws.  Declaring a narrower type may result in a
+     * {@code ClassCastException} being thrown by the {@code try-finally}
+     * handle if the type of the exception thrown by {@code target} is not
+     * assignable to the first parameter type of {@code cleanup}.  Note that
+     * various exception types of {@code VirtualMachineError},
+     * {@code LinkageError}, and {@code RuntimeException} can in principle be
+     * thrown by almost any kind of Java code, and a finally clause that
+     * catches (say) only {@code IOException} would mask any of the others
+     * behind a {@code ClassCastException}.
      *
      * @param target the handle whose execution is to be wrapped in a {@code try} block.
      * @param cleanup the handle that is invoked in the finally block.
@@ -5909,7 +5922,6 @@ private static Class<?> iteratedLoopChecks(MethodHandle iterator, MethodHandle i
      */
     public static MethodHandle tryFinally(MethodHandle target, MethodHandle cleanup) {
         List<Class<?>> targetParamTypes = target.type().parameterList();
-        List<Class<?>> cleanupParamTypes = cleanup.type().parameterList();
         Class<?> rtype = target.type().returnType();
 
         tryFinallyChecks(target, cleanup);
@@ -5919,6 +5931,10 @@ public static MethodHandle tryFinally(MethodHandle target, MethodHandle cleanup)
         // target parameter list.
         cleanup = dropArgumentsToMatch(cleanup, (rtype == void.class ? 1 : 2), targetParamTypes, 0);
 
+        // Ensure that the intrinsic type checks the instance thrown by the
+        // target against the first parameter of cleanup
+        cleanup = cleanup.asType(cleanup.type().changeParameterType(0, Throwable.class));
+
         // Use asFixedArity() to avoid unnecessary boxing of last argument for VarargsCollector case.
         return MethodHandleImpl.makeTryFinally(target.asFixedArity(), cleanup.asFixedArity(), rtype, targetParamTypes);
     }
diff --git a/test/jdk/java/lang/invoke/TryFinallyTest.java b/test/jdk/java/lang/invoke/TryFinallyTest.java
index abf79f38703..5e66360eedf 100644
--- a/test/jdk/java/lang/invoke/TryFinallyTest.java
+++ b/test/jdk/java/lang/invoke/TryFinallyTest.java
@@ -24,9 +24,7 @@
  */
 
 /* @test
- * @bug 8139885
- * @bug 8150824
- * @bug 8150825
+ * @bug 8139885 8150824 8150825 8194238
  * @run testng/othervm -ea -esa test.java.lang.invoke.TryFinallyTest
  */
 
@@ -126,6 +124,19 @@ public static void testTryFinallyNegative(MethodHandle target, MethodHandle clea
         assertTrue(caught);
     }
 
+    @Test
+    public static void testTryFinallyThrowableCheck() {
+        MethodHandle mh = MethodHandles.tryFinally(TryFinally.MH_throwingTarget,
+                                                   TryFinally.MH_catchingCleanup);
+        try {
+            mh.invoke();
+            fail("ClassCastException expected");
+        } catch (Throwable t) {
+            assertTrue("Throwable not assignable to ClassCastException: " + t,
+                       ClassCastException.class.isAssignableFrom(t.getClass()));
+        }
+    }
+
     static class TryFinally {
 
         static String greet(String whom) {
@@ -156,6 +167,17 @@ static void voidTarget() {}
 
         static void voidCleanup(Throwable t) {}
 
+        static class T1 extends Throwable {}
+
+        static class T2 extends Throwable {}
+
+        static void throwingTarget() throws Throwable {
+            throw new T1();
+        }
+
+        static void catchingCleanup(T2 t) throws Throwable {
+        }
+
         static final Class<TryFinally> TRY_FINALLY = TryFinally.class;
 
         static final MethodType MT_greet = methodType(String.class, String.class);
@@ -166,6 +188,8 @@ static void voidCleanup(Throwable t) {}
         static final MethodType MT_exclaimMore = methodType(String.class, Throwable.class, String.class, String.class);
         static final MethodType MT_voidTarget = methodType(void.class);
         static final MethodType MT_voidCleanup = methodType(void.class, Throwable.class);
+        static final MethodType MT_throwingTarget = methodType(void.class);
+        static final MethodType MT_catchingCleanup = methodType(void.class, T2.class);
 
         static final MethodHandle MH_greet;
         static final MethodHandle MH_exclaim;
@@ -175,6 +199,8 @@ static void voidCleanup(Throwable t) {}
         static final MethodHandle MH_exclaimMore;
         static final MethodHandle MH_voidTarget;
         static final MethodHandle MH_voidCleanup;
+        static final MethodHandle MH_throwingTarget;
+        static final MethodHandle MH_catchingCleanup;
 
         static final MethodHandle MH_dummyTarget;
 
@@ -192,6 +218,8 @@ static void voidCleanup(Throwable t) {}
                 MH_exclaimMore = LOOKUP.findStatic(TRY_FINALLY, "exclaimMore", MT_exclaimMore);
                 MH_voidTarget = LOOKUP.findStatic(TRY_FINALLY, "voidTarget", MT_voidTarget);
                 MH_voidCleanup = LOOKUP.findStatic(TRY_FINALLY, "voidCleanup", MT_voidCleanup);
+                MH_throwingTarget = LOOKUP.findStatic(TRY_FINALLY, "throwingTarget", MT_throwingTarget);
+                MH_catchingCleanup = LOOKUP.findStatic(TRY_FINALLY, "catchingCleanup", MT_catchingCleanup);
                 MH_dummyTarget = MethodHandles.dropArguments(MH_voidTarget, 0, int.class, long.class, Object.class,
                         int.class, long.class, Object.class);
             } catch (Exception e) {

From b6d40e7837f48c68b65ef033b71bd45f60ef11e6 Mon Sep 17 00:00:00 2001
From: prr <unknown>
Date: Fri, 26 Jan 2018 12:01:08 -0800
Subject: [PATCH 018/196] 8196289: Update src/java.desktop/share/legal/lcms.md
 for LCMS 2.9 Reviewed-by: mchung

---
 src/java.desktop/share/legal/lcms.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/share/legal/lcms.md b/src/java.desktop/share/legal/lcms.md
index d74475540d5..a8a06325cd0 100644
--- a/src/java.desktop/share/legal/lcms.md
+++ b/src/java.desktop/share/legal/lcms.md
@@ -1,10 +1,10 @@
-## Little Color Management System (LCMS) v2.8
+## Little Color Management System (LCMS) v2.9
 
 ### LCMS License
 <pre>
 
 Little Color Management System
-Copyright (c) 1998-2016 Marti Maria Saguer
+Copyright (c) 1998-2011 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the "Software"),

From ca32703592a1d03290aeff6d51854b27bcc396ea Mon Sep 17 00:00:00 2001
From: smarks <unknown>
Date: Fri, 2 Feb 2018 10:56:12 -0800
Subject: [PATCH 019/196] 8189981: Improve queuing portability Reviewed-by:
 skoivu, rhalade, chegar, igerasim

---
 .../classes/java/util/concurrent/PriorityBlockingQueue.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
index 8a362274749..7b19c13bb0d 100644
--- a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
@@ -51,6 +51,7 @@
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
+import jdk.internal.misc.SharedSecrets;
 
 /**
  * An unbounded {@linkplain BlockingQueue blocking queue} that uses
@@ -921,7 +922,9 @@ private void readObject(java.io.ObjectInputStream s)
         throws java.io.IOException, ClassNotFoundException {
         try {
             s.defaultReadObject();
-            this.queue = new Object[q.size()];
+            int sz = q.size();
+            SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, sz);
+            this.queue = new Object[sz];
             comparator = q.comparator();
             addAll(q);
         } finally {

From d81fd882b90d5294475a68d15f8dea70aa4fc8f2 Mon Sep 17 00:00:00 2001
From: apetcher <unknown>
Date: Mon, 12 Feb 2018 11:38:35 -0500
Subject: [PATCH 020/196] 8197443: ArrayIndexOutOfBoundsException in
 UcryptoException.getError Reviewed-by: mullan

---
 .../classes/com/oracle/security/ucrypto/UcryptoException.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java
index 4c1e98e1f4d..34dbe8ae5bb 100644
--- a/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java
+++ b/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoException.java
@@ -134,7 +134,7 @@ public enum Error {
      * Get the error enum value (if any) associated with this exception.
      */
     public Error getError() {
-        return errorCode < ALL_ERRORS.length ?
+        return (errorCode >= 0 && errorCode < ALL_ERRORS.length) ?
             ALL_ERRORS[errorCode] :
             null;
     }
@@ -154,7 +154,7 @@ public Error getError() {
      */
     static String getErrorMessage(int errorCode) {
         String message;
-        if (errorCode < ALL_ERRORS.length) {
+        if (errorCode >= 0 && errorCode < ALL_ERRORS.length) {
             message = ALL_ERRORS[errorCode].name();
         } else {
             message = "0x" + Integer.toHexString(errorCode);

From 236fdea8ae5c0dd4246519b437e7371926ccda30 Mon Sep 17 00:00:00 2001
From: asapre <unknown>
Date: Wed, 14 Feb 2018 15:36:59 +0530
Subject: [PATCH 021/196] 8189985: Improve tabular data portability
 Reviewed-by: dfuchs, mchung, skoivu

---
 .../javax/management/openmbean/TabularDataSupport.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
index bcbd176266e..c46e0edfd83 100644
--- a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
+++ b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -45,6 +45,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import jdk.internal.misc.SharedSecrets;
 
 // jmx import
 //
@@ -922,6 +923,8 @@ private void readObject(ObjectInputStream in)
             throws IOException, ClassNotFoundException {
       in.defaultReadObject();
       List<String> tmpNames = tabularType.getIndexNames();
-      indexNamesArray = tmpNames.toArray(new String[tmpNames.size()]);
+      int size = tmpNames.size();
+      SharedSecrets.getJavaObjectInputStreamAccess().checkArray(in, String[].class, size);
+      indexNamesArray = tmpNames.toArray(new String[size]);
     }
 }

From 63b4f04aa603ca763909f582edb08243ff26e227 Mon Sep 17 00:00:00 2001
From: cjplummer <unknown>
Date: Sat, 24 Mar 2018 13:39:07 -0700
Subject: [PATCH 022/196] 8198655: test/lib/jdk/test/lib/apps/LingeredApp
 shouldn't inherit cout/cerr Summary: no longer force stderr to console. Copy
 app's output to Sytem.err. Reviewed-by: sspitsyn, dholmes, iignatyev, clanger

---
 .../jtreg/serviceability/sa/ClhsdbSymbol.java |   4 +-
 test/lib/jdk/test/lib/apps/LingeredApp.java   | 128 ++++++++++--------
 2 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
index e03610e0e89..6435e5d0eb7 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -55,7 +55,7 @@ public static void main(String[] args) throws Exception {
                     "Ljava/io/InputStream", "LambdaMetafactory", "PerfCounter",
                     "isAnonymousClass", "JVMTI_THREAD_STATE_TERMINATED", "jdi",
                     "checkGetClassLoaderPermission", "lockCreationTime",
-                    "storedAppOutput", "storedAppOutput", "getProcess",
+                    "stderrBuffer", "stdoutBuffer", "getProcess",
                     "LingeredApp"));
 
             test.run(theApp.getPid(), cmds, expStrMap, null);
diff --git a/test/lib/jdk/test/lib/apps/LingeredApp.java b/test/lib/jdk/test/lib/apps/LingeredApp.java
index 22a123ccbb5..7bff8b5c60f 100644
--- a/test/lib/jdk/test/lib/apps/LingeredApp.java
+++ b/test/lib/jdk/test/lib/apps/LingeredApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,9 +24,12 @@
 package jdk.test.lib.apps;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.StringReader;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
@@ -37,7 +40,11 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.UUID;
+import jdk.test.lib.process.OutputBuffer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.StreamPumper;
 
 /**
  * This is a framework to launch an app that could be synchronized with caller
@@ -69,39 +76,16 @@ public class LingeredApp {
     private static final long spinDelay = 1000;
 
     private long lockCreationTime;
-    private final ArrayList<String> storedAppOutput;
+    private ByteArrayOutputStream stderrBuffer;
+    private ByteArrayOutputStream stdoutBuffer;
+    private Thread outPumperThread;
+    private Thread errPumperThread;
 
     protected Process appProcess;
+    protected OutputBuffer output;
     protected static final int appWaitTime = 100;
     protected final String lockFileName;
 
-    /*
-     * Drain child process output, store it into string array
-     */
-    class InputGobbler extends Thread {
-
-        InputStream is;
-        List<String> astr;
-
-        InputGobbler(InputStream is, List<String> astr) {
-            this.is = is;
-            this.astr = astr;
-        }
-
-        public void run() {
-            try {
-                InputStreamReader isr = new InputStreamReader(is);
-                BufferedReader br = new BufferedReader(isr);
-                String line = null;
-                while ((line = br.readLine()) != null) {
-                    astr.add(line);
-                }
-            } catch (IOException ex) {
-                // pass
-            }
-        }
-    }
-
     /**
      * Create LingeredApp object on caller side. Lock file have be a valid filename
      * at writable location
@@ -110,13 +94,11 @@ public void run() {
      */
     public LingeredApp(String lockFileName) {
         this.lockFileName = lockFileName;
-        this.storedAppOutput = new ArrayList<String>();
     }
 
     public LingeredApp() {
         final String lockName = UUID.randomUUID().toString() + ".lck";
         this.lockFileName = lockName;
-        this.storedAppOutput = new ArrayList<String>();
     }
 
     /**
@@ -156,13 +138,48 @@ public Process getProcess() {
 
     /**
      *
-     * @return application output as string array. Empty array if application produced no output
+     * @return OutputBuffer object for the LingeredApp's output. Can only be called
+     * after LingeredApp has exited.
+     */
+    public OutputBuffer getOutput() {
+        if (appProcess.isAlive()) {
+            throw new RuntimeException("Process is still alive. Can't get its output.");
+        }
+        if (output == null) {
+            output = new OutputBuffer(stdoutBuffer.toString(), stderrBuffer.toString());
+        }
+        return output;
+    }
+
+    /*
+     * Capture all stdout and stderr output from the LingeredApp so it can be returned
+     * to the driver app later. This code is modeled after ProcessTools.getOutput().
+     */
+    private void startOutputPumpers() {
+        stderrBuffer = new ByteArrayOutputStream();
+        stdoutBuffer = new ByteArrayOutputStream();
+        StreamPumper outPumper = new StreamPumper(appProcess.getInputStream(), stdoutBuffer);
+        StreamPumper errPumper = new StreamPumper(appProcess.getErrorStream(), stderrBuffer);
+        outPumperThread = new Thread(outPumper);
+        errPumperThread = new Thread(errPumper);
+
+        outPumperThread.setDaemon(true);
+        errPumperThread.setDaemon(true);
+
+        outPumperThread.start();
+        errPumperThread.start();
+    }
+
+    /**
+     *
+     * @return application output as List. Empty List if application produced no output
      */
     public List<String> getAppOutput() {
         if (appProcess.isAlive()) {
             throw new RuntimeException("Process is still alive. Can't get its output.");
         }
-        return storedAppOutput;
+        BufferedReader bufReader = new BufferedReader(new StringReader(output.getStdout()));
+        return bufReader.lines().collect(Collectors.toList());
     }
 
     /* Make sure all part of the app use the same method to get dates,
@@ -211,13 +228,14 @@ public void deleteLock() throws IOException {
     }
 
     public void waitAppTerminate() {
-        while (true) {
-            try {
-                appProcess.waitFor();
-                break;
-            } catch (InterruptedException ex) {
-                // pass
-            }
+        // This code is modeled after tail end of ProcessTools.getOutput().
+        try {
+            appProcess.waitFor();
+            outPumperThread.join();
+            errPumperThread.join();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            // pass
         }
     }
 
@@ -280,7 +298,6 @@ public List<String> runAppPrepare(List<String> vmArguments) {
         List<String> cmd = new ArrayList<String>();
         cmd.add(javapath);
 
-
         if (vmArguments == null) {
             // Propagate test.vm.options to LingeredApp, filter out possible empty options
             String testVmOpts[] = System.getProperty("test.vm.opts","").split("\\s+");
@@ -289,8 +306,7 @@ public List<String> runAppPrepare(List<String> vmArguments) {
                     cmd.add(s);
                 }
             }
-        }
-        else{
+        } else {
             // Lets user manage LingeredApp options
             cmd.addAll(vmArguments);
         }
@@ -313,13 +329,7 @@ public void printCommandLine(List<String> cmd) {
             cmdLine.append("'").append(strCmd).append("' ");
         }
 
-        System.out.println("Command line: [" + cmdLine.toString() + "]");
-    }
-
-    public void startGobblerPipe() {
-      // Create pipe reader for process, and read stdin and stderr to array of strings
-      InputGobbler gb = new InputGobbler(appProcess.getInputStream(), storedAppOutput);
-      gb.start();
+        System.err.println("Command line: [" + cmdLine.toString() + "]");
     }
 
     /**
@@ -339,13 +349,20 @@ public void runApp(List<String> vmArguments)
         printCommandLine(cmd);
 
         ProcessBuilder pb = new ProcessBuilder(cmd);
-        // we don't expect any error output but make sure we are not stuck on pipe
-        // pb.redirectErrorStream(false);
         // ProcessBuilder.start can throw IOException
-        pb.redirectError(ProcessBuilder.Redirect.INHERIT);
         appProcess = pb.start();
 
-        startGobblerPipe();
+        startOutputPumpers();
+    }
+
+    private void finishApp() {
+        OutputBuffer output = getOutput();
+        String msg =
+            " LingeredApp stdout: [" + output.getStdout() + "];\n" +
+            " LingeredApp stderr: [" + output.getStderr() + "]\n" +
+            " LingeredApp exitValue = " + appProcess.exitValue();
+
+        System.err.println(msg);
     }
 
     /**
@@ -364,6 +381,7 @@ public void stopApp() throws IOException {
                 throw new IOException("LingeredApp terminated with non-zero exit code " + exitcode);
             }
         }
+        finishApp();
     }
 
     /**
@@ -384,6 +402,8 @@ public static LingeredApp startApp(List<String> cmd) throws IOException {
             a.waitAppReady(appWaitTime);
         } catch (Exception ex) {
             a.deleteLock();
+            System.err.println("LingeredApp failed to start: " + ex);
+            a.finishApp();
             throw ex;
         }
 

From e9c10043078c405eaec2dee1a67b032f55f43ecd Mon Sep 17 00:00:00 2001
From: glaubitz <unknown>
Date: Mon, 26 Mar 2018 10:03:31 +0200
Subject: [PATCH 023/196] 8200203: Missing platform definitions for ia64
 Reviewed-by: ihse, stuefe

---
 make/autoconf/platform.m4 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
index 9de0f01d789..a6a1ba1a36a 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -60,6 +60,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
       VAR_CPU_BITS=64
       VAR_CPU_ENDIAN=little
       ;;
+    ia64)
+      VAR_CPU=ia64
+      VAR_CPU_ARCH=ia64
+      VAR_CPU_BITS=64
+      VAR_CPU_ENDIAN=little
+      ;;
     m68k)
       VAR_CPU=m68k
       VAR_CPU_ARCH=m68k

From fab4977150a38dfbdb9ff46051315627ec8a63f4 Mon Sep 17 00:00:00 2001
From: pliden <unknown>
Date: Mon, 26 Mar 2018 12:44:39 +0200
Subject: [PATCH 024/196] 8199850: Move parsing of VerifyGCType to G1
 Reviewed-by: sjohanss, tschatzl

---
 .../gtest/gc/g1/test_g1HeapVerifier.cpp       | 65 +++++++++----------
 .../hotspot/jtreg/gc/g1/TestVerifyGCType.java | 22 +------
 2 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/test/hotspot/gtest/gc/g1/test_g1HeapVerifier.cpp b/test/hotspot/gtest/gc/g1/test_g1HeapVerifier.cpp
index 76a5e235344..9e44321b1a9 100644
--- a/test/hotspot/gtest/gc/g1/test_g1HeapVerifier.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1HeapVerifier.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/g1/g1Arguments.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
 #include "logging/logConfiguration.hpp"
 #include "logging/logTestFixture.hpp"
@@ -32,50 +33,48 @@ class G1HeapVerifierTest : public LogTestFixture {
 };
 
 TEST_F(G1HeapVerifierTest, parse) {
-  G1HeapVerifier verifier(NULL);
-
   LogConfiguration::configure_stdout(LogLevel::Off, true, LOG_TAGS(gc, verify));
 
   // Default is to verify everything.
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyAll));
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyInitialMark));
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyFull));
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyAll));
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyYoungOnly));
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyInitialMark));
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyMixed));
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyRemark));
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyCleanup));
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyFull));
 
   // Setting one will disable all other.
-  verifier.parse_verification_type("full");
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyAll));
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyInitialMark));
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyFull));
+  G1Arguments::parse_verification_type("full");
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyAll));
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyYoungOnly));
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyInitialMark));
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyMixed));
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyRemark));
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyCleanup));
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyFull));
 
   // Verify case sensitivity.
-  verifier.parse_verification_type("YOUNG-ONLY");
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
-  verifier.parse_verification_type("young-only");
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyYoungOnly));
+  G1Arguments::parse_verification_type("YOUNG-ONLY");
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyYoungOnly));
+  G1Arguments::parse_verification_type("young-only");
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyYoungOnly));
 
   // Verify perfect match
-  verifier.parse_verification_type("mixedgc");
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
-  verifier.parse_verification_type("mixe");
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
-  verifier.parse_verification_type("mixed");
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyMixed));
+  G1Arguments::parse_verification_type("mixedgc");
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyMixed));
+  G1Arguments::parse_verification_type("mixe");
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyMixed));
+  G1Arguments::parse_verification_type("mixed");
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyMixed));
 
   // Verify the last three
-  verifier.parse_verification_type("initial-mark");
-  verifier.parse_verification_type("remark");
-  verifier.parse_verification_type("cleanup");
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyRemark));
-  ASSERT_TRUE(verifier.should_verify(G1HeapVerifier::G1VerifyCleanup));
+  G1Arguments::parse_verification_type("initial-mark");
+  G1Arguments::parse_verification_type("remark");
+  G1Arguments::parse_verification_type("cleanup");
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyRemark));
+  ASSERT_TRUE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyCleanup));
 
   // Enabling all is not the same as G1VerifyAll
-  ASSERT_FALSE(verifier.should_verify(G1HeapVerifier::G1VerifyAll));
+  ASSERT_FALSE(G1HeapVerifier::should_verify(G1HeapVerifier::G1VerifyAll));
 }
diff --git a/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java b/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java
index c227be9f54e..84ae43ae2b4 100644
--- a/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java
+++ b/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -53,7 +53,6 @@ public static void main(String args[]) throws Exception {
         testFullAndRemark();
         testConcurrentMark();
         testBadVerificationType();
-        testUnsupportedCollector();
     }
 
     private static void testAllVerificationEnabled() throws Exception {
@@ -127,14 +126,6 @@ private static void testBadVerificationType() throws Exception {
         verifyCollection("Pause Full", true, true, true, output.getStdout());
     }
 
-    private static void testUnsupportedCollector() throws Exception {
-        OutputAnalyzer output;
-        // Test bad gc
-        output = testWithBadGC();
-        output.shouldHaveExitValue(0);
-        output.shouldMatch("VerifyGCType is not supported by this collector.");
-    }
-
     private static OutputAnalyzer testWithVerificationType(String[] types) throws Exception {
         ArrayList<String> basicOpts = new ArrayList<>();
         Collections.addAll(basicOpts, new String[] {
@@ -161,17 +152,6 @@ private static OutputAnalyzer testWithVerificationType(String[] types) throws Ex
         return analyzer;
     }
 
-    private static OutputAnalyzer testWithBadGC() throws Exception {
-        ProcessBuilder procBuilder =  ProcessTools.createJavaProcessBuilder(new String[] {
-                "-XX:+UseParallelGC",
-                "-XX:+UnlockDiagnosticVMOptions",
-                "-XX:VerifyGCType=full",
-                "-version"});
-
-        OutputAnalyzer analyzer = new OutputAnalyzer(procBuilder.start());
-        return analyzer;
-    }
-
     private static void verifyCollection(String name, boolean expectBefore, boolean expectDuring, boolean expectAfter, String data) {
         CollectionInfo ci = CollectionInfo.parseFirst(name, data);
         Asserts.assertTrue(ci != null, "Expected GC not found: " + name + "\n" + data);

From 7dc307b1ea07555733288784a7cff742219c6089 Mon Sep 17 00:00:00 2001
From: tschatzl <unknown>
Date: Mon, 26 Mar 2018 16:51:43 +0200
Subject: [PATCH 025/196] 8180415: Rebuild remembered sets during the
 concurrent cycle Summary: In general maintain remembered sets of old regions
 only from the start of the concurrent cycle to the mixed gc they are used, at
 most until the end of the mixed phase. Reviewed-by: sjohanss, sangheki

---
 .../TestConcurrentPhaseControlG1.java                         | 4 ++--
 .../TestConcurrentPhaseControlG1Basics.java                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java
index 8c3775b927b..48c5b5212b5 100644
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -53,7 +53,7 @@ public class TestConcurrentPhaseControlG1 {
         {"MARK_FROM_ROOTS", "Concurrent Mark From Roots"},
         {"BEFORE_REMARK", null},
         {"REMARK", "Pause Remark"},
-        {"CREATE_LIVE_DATA", "Concurrent Create Live Data"},
+        {"REBUILD_REMEMBERED_SETS", "Concurrent Rebuild Remembered Sets"},
         // "COMPLETE_CLEANUP",  -- optional phase, not reached by this test
         {"CLEANUP_FOR_NEXT_MARK", "Concurrent Cleanup for Next Mark"},
         // Clear request
diff --git a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java
index 8097bb412a0..7b8d662579e 100644
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -53,7 +53,7 @@ public class TestConcurrentPhaseControlG1Basics {
         "MARK_FROM_ROOTS",
         "BEFORE_REMARK",
         "REMARK",
-        "CREATE_LIVE_DATA",
+        "REBUILD_REMEMBERED_SETS",
         "COMPLETE_CLEANUP",
         "CLEANUP_FOR_NEXT_MARK",
     };

From c98ea5dfbde99d71de90297eca66bd1dc96c7ead Mon Sep 17 00:00:00 2001
From: tschatzl <unknown>
Date: Mon, 26 Mar 2018 16:51:43 +0200
Subject: [PATCH 026/196] 8196485: FromCardCache default card index can cause
 crashes Summary: The default value of -1 for 32 bit card indices is a regular
 card value at the border of 2TB heap addresses in the from card cache, so G1
 may loose remembered set entries. Extend from card cache entries to 64 bits.
 Reviewed-by: shade, sjohanss Contributed-by: Thomas Schatzl
 <thomas.schatzl@oracle.com>, Jarkko Miettinen <jarkko.miettinen@relex.fi>

---
 .../jtreg/gc/g1/TestFromCardCacheIndex.java   | 120 ++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 test/hotspot/jtreg/gc/g1/TestFromCardCacheIndex.java

diff --git a/test/hotspot/jtreg/gc/g1/TestFromCardCacheIndex.java b/test/hotspot/jtreg/gc/g1/TestFromCardCacheIndex.java
new file mode 100644
index 00000000000..f2332306dae
--- /dev/null
+++ b/test/hotspot/jtreg/gc/g1/TestFromCardCacheIndex.java
@@ -0,0 +1,120 @@
+/*
+ * @test TestFromCardCacheIndex.java
+ * @bug 8196485
+ * @summary Ensure that G1 does not miss a remembered set entry due to from card cache default value indices.
+ * @key gc
+ * @requires vm.gc.G1
+ * @requires vm.debug
+ * @requires vm.bits != "32"
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. -Xms20M -Xmx20M -XX:+UseCompressedOops -XX:G1HeapRegionSize=1M -XX:HeapBaseMinAddress=2199011721216 -XX:+UseG1GC -verbose:gc TestFromCardCacheIndex
+ */
+
+import sun.hotspot.WhiteBox;
+
+/**
+ * Repeatedly tries to generate references from objects that contained a card with the same index
+ * of the from card cache default value.
+ */
+public class TestFromCardCacheIndex {
+    private static WhiteBox WB;
+
+    // Shift value to calculate card indices from addresses.
+    private static final int CardSizeShift = 9;
+
+    /**
+     * Returns the last address on the heap within the object.
+     *
+     * @param The Object array to get the last address from.
+     */
+    private static long getObjectLastAddress(Object[] o) {
+        return WB.getObjectAddress(o) + WB.getObjectSize(o) - 1;
+    }
+
+    /**
+     * Returns the (truncated) 32 bit card index for the given address.
+     *
+     * @param The address to get the 32 bit card index from.
+     */
+    private static int getCardIndex32bit(long address) {
+        return (int)(address >> CardSizeShift);
+    }
+
+    // The source arrays that are placed on the heap in old gen.
+    private static int numArrays = 7000;
+    private static int arraySize = 508;
+    // Size of a humongous byte array, a bit less than a 1M region. This makes sure
+    // that we always create a cross-region reference when referencing it.
+    private static int byteArraySize = 1024*1023;
+
+    public static void main(String[] args) {
+        WB = sun.hotspot.WhiteBox.getWhiteBox();
+        for (int i = 0; i < 5; i++) {
+          runTest();
+          WB.fullGC();
+        }
+    }
+
+    public static void runTest() {
+        System.out.println("Starting test");
+
+        // Spray the heap with random object arrays in the hope that we get one
+        // at the proper place.
+        Object[][] arrays = new Object[numArrays][];
+        for (int i = 0; i < numArrays; i++) {
+            arrays[i] = new Object[arraySize];
+        }
+
+        // Make sure that everything is in old gen.
+        WB.fullGC();
+
+        // Find if we got an allocation at the right spot.
+        Object[] arrayWithCardMinus1 = findArray(arrays);
+
+        if (arrayWithCardMinus1 == null) {
+            System.out.println("Array with card -1 not found. Trying again.");
+            return;
+        } else {
+            System.out.println("Array with card -1 found.");
+        }
+
+        System.out.println("Modifying the last card in the array with a new object in a different region...");
+        // Create a target object that is guaranteed to be in a different region.
+        byte[] target = new byte[byteArraySize];
+
+        // Modify the last entry of the object we found.
+        arrayWithCardMinus1[arraySize - 1] = target;
+
+        target = null;
+        // Make sure that the dirty cards are flushed by doing a GC.
+        System.out.println("Doing a GC.");
+        WB.youngGC();
+
+        System.out.println("The crash didn't reproduce. Trying again.");
+    }
+
+    /**
+     * Finds an returns an array that contains a (32 bit truncated) card with value -1.
+     */
+    private static Object[] findArray(Object[][] arrays) {
+        for (int i = 0; i < arrays.length; i++) {
+            Object[] target = arrays[i];
+            if (target == null) {
+                continue;
+            }
+            final long startAddress = WB.getObjectAddress(target);
+            final long lastAddress = getObjectLastAddress(target);
+            final int card = getCardIndex32bit(lastAddress);
+            if (card == -1) {
+                Object[] foundArray = target;
+                return foundArray;
+            }
+        }
+        return null;
+    }
+}
+

From b6075a97c9c9823d9a23a4db78301b1bec3f7061 Mon Sep 17 00:00:00 2001
From: amenkov <unknown>
Date: Mon, 26 Mar 2018 09:27:24 -0700
Subject: [PATCH 027/196] 8049695: nsk/jdb/options/connect/connect003 fails
 with "Launched jdb could not attach to debuggee during 300000 milliseconds"
 Reviewed-by: dholmes, sspitsyn, cjplummer

---
 .../share/native/libdt_shmem/shmemBase.c      |  46 ++++---
 .../serviceability/attach/ShMemLongName.java  | 124 ++++++++++++++++++
 2 files changed, 146 insertions(+), 24 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/attach/ShMemLongName.java

diff --git a/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c b/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c
index 1001ef3a912..77266af3627 100644
--- a/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c
+++ b/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -404,25 +404,25 @@ static int
 createStream(char *name, Stream *stream)
 {
     jint error;
-    char prefix[MAX_IPC_PREFIX];
+    char objectName[MAX_IPC_NAME];
 
-    sprintf(prefix, "%s.mutex", name);
-    error = createWithGeneratedName(prefix, stream->shared->mutexName,
+    sprintf(objectName, "%s.mutex", name);
+    error = createWithGeneratedName(objectName, stream->shared->mutexName,
                                     createMutex, &stream->mutex);
     if (error != SYS_OK) {
         return error;
     }
 
-    sprintf(prefix, "%s.hasData", name);
-    error = createWithGeneratedName(prefix, stream->shared->hasDataEventName,
+    sprintf(objectName, "%s.hasData", name);
+    error = createWithGeneratedName(objectName, stream->shared->hasDataEventName,
                                     createEvent, &stream->hasData);
     if (error != SYS_OK) {
         (void)closeStream(stream, JNI_FALSE);
         return error;
     }
 
-    sprintf(prefix, "%s.hasSpace", name);
-    error = createWithGeneratedName(prefix, stream->shared->hasSpaceEventName,
+    sprintf(objectName, "%s.hasSpace", name);
+    error = createWithGeneratedName(objectName, stream->shared->hasSpaceEventName,
                                     createEvent, &stream->hasSpace);
     if (error != SYS_OK) {
         (void)closeStream(stream, JNI_FALSE);
@@ -598,7 +598,7 @@ createConnection(SharedMemoryTransport *transport, jlong otherPID,
                  SharedMemoryConnection **connectionPtr)
 {
     jint error;
-    char streamPrefix[MAX_IPC_NAME];
+    char streamName[MAX_IPC_NAME];
 
     SharedMemoryConnection *connection = allocConnection();
     if (connection == NULL) {
@@ -619,17 +619,17 @@ createConnection(SharedMemoryTransport *transport, jlong otherPID,
     connection->incoming.shared = &connection->shared->toServer;
     connection->outgoing.shared = &connection->shared->toClient;
 
-    strcpy(streamPrefix, connection->name);
-    strcat(streamPrefix, ".ctos");
-    error = createStream(streamPrefix, &connection->incoming);
+    strcpy(streamName, connection->name);
+    strcat(streamName, ".ctos");
+    error = createStream(streamName, &connection->incoming);
     if (error != SYS_OK) {
         closeConnection(connection);
         return error;
     }
 
-    strcpy(streamPrefix, connection->name);
-    strcat(streamPrefix, ".stoc");
-    error = createStream(streamPrefix, &connection->outgoing);
+    strcpy(streamName, connection->name);
+    strcat(streamName, ".stoc");
+    error = createStream(streamName, &connection->outgoing);
     if (error != SYS_OK) {
         closeConnection(connection);
         return error;
@@ -746,9 +746,7 @@ createTransport(const char *address, SharedMemoryTransport **transportPtr)
 {
     SharedMemoryTransport *transport;
     jint error;
-    char prefix[MAX_IPC_PREFIX];
-
-
+    char objectName[MAX_IPC_NAME];
 
     transport = allocTransport();
     if (transport == NULL) {
@@ -784,24 +782,24 @@ createTransport(const char *address, SharedMemoryTransport **transportPtr)
     memset(transport->shared, 0, sizeof(SharedListener));
     transport->shared->acceptingPID = sysProcessGetID();
 
-    sprintf(prefix, "%s.mutex", transport->name);
-    error = createWithGeneratedName(prefix, transport->shared->mutexName,
+    sprintf(objectName, "%s.mutex", transport->name);
+    error = createWithGeneratedName(objectName, transport->shared->mutexName,
                                     createMutex, &transport->mutex);
     if (error != SYS_OK) {
         closeTransport(transport);
         return error;
     }
 
-    sprintf(prefix, "%s.accept", transport->name);
-    error = createWithGeneratedName(prefix, transport->shared->acceptEventName,
+    sprintf(objectName, "%s.accept", transport->name);
+    error = createWithGeneratedName(objectName, transport->shared->acceptEventName,
                                     createEvent, &transport->acceptEvent);
     if (error != SYS_OK) {
         closeTransport(transport);
         return error;
     }
 
-    sprintf(prefix, "%s.attach", transport->name);
-    error = createWithGeneratedName(prefix, transport->shared->attachEventName,
+    sprintf(objectName, "%s.attach", transport->name);
+    error = createWithGeneratedName(objectName, transport->shared->attachEventName,
                                     createEvent, &transport->attachEvent);
     if (error != SYS_OK) {
         closeTransport(transport);
diff --git a/test/hotspot/jtreg/serviceability/attach/ShMemLongName.java b/test/hotspot/jtreg/serviceability/attach/ShMemLongName.java
new file mode 100644
index 00000000000..bd491a1628b
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/attach/ShMemLongName.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8049695
+ * @summary Ensure shmem transport works with long names
+ * @requires os.family == "windows"
+ * @library /test/lib
+ * @run main/othervm ShMemLongName
+ */
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.Map;
+
+import com.sun.jdi.Bootstrap;
+import com.sun.jdi.VirtualMachine;
+import com.sun.jdi.connect.AttachingConnector;
+import com.sun.jdi.connect.Connector;
+import jdk.test.lib.process.ProcessTools;
+
+
+public class ShMemLongName {
+
+    private static final int maxShMemLength = 49;
+
+    private static final String transport = "dt_shmem";
+
+    public static void main(String[] args) throws Exception {
+        // test with the maximum supported shmem name length
+        String shmemName = ("ShMemLongName" + ProcessHandle.current().pid()
+                                    + String.join("", Collections.nCopies(maxShMemLength, "x"))
+                                 ).substring(0, maxShMemLength);
+        Process target = getTarget(shmemName).start();
+        try {
+            waitForReady(target);
+
+            log("attaching to the VM...");
+            AttachingConnector ac = Bootstrap.virtualMachineManager().attachingConnectors()
+                    .stream()
+                    .filter(c -> transport.equals(c.transport().name()))
+                    .findFirst()
+                    .orElseThrow(() -> new RuntimeException("Failed to find transport " + transport));
+            Map<String, Connector.Argument> acArgs = ac.defaultArguments();
+            acArgs.get("name").setValue(shmemName);
+
+            VirtualMachine vm = ac.attach(acArgs);
+
+            log("attached. test(1) PASSED.");
+
+            vm.dispose();
+        } finally {
+            target.destroy();
+            target.waitFor();
+        }
+
+        // extra test: ensure using of too-long name fails gracefully
+        // (shmemName + "X") is expected to be "too long".
+        ProcessTools.executeProcess(getTarget(shmemName + "X"))
+                .shouldContain("address strings longer than")
+                .shouldHaveExitValue(2);
+        log("test(2) PASSED.");
+    }
+
+    private static void log(String s) {
+        System.out.println(s);
+        System.out.flush();
+    }
+
+    // creates target process builder for the specified shmem transport name
+    private static ProcessBuilder getTarget(String shmemName) throws IOException {
+        log("starting target with shmem name: '" + shmemName + "'...");
+        return ProcessTools.createJavaProcessBuilder(
+                "-Xdebug",
+                "-Xrunjdwp:transport=" + transport + ",server=y,suspend=n,address=" + shmemName,
+                "ShMemLongName$Target");
+    }
+
+    private static void waitForReady(Process target) throws Exception {
+        InputStream os = target.getInputStream();
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(os))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.equals(Target.readyString)) {
+                    return;
+                }
+            }
+        }
+    }
+
+    public static class Target {
+        public static final String readyString = "Ready";
+        public static void main(String[] args) throws Exception {
+            log(readyString);
+            while (true) {
+                Thread.sleep(1000);
+            }
+        }
+    }
+}

From dc4db1f0d49edd2241fec17a2ad3734429d14161 Mon Sep 17 00:00:00 2001
From: gadams <unknown>
Date: Mon, 26 Mar 2018 08:17:56 -0400
Subject: [PATCH 028/196] 8057732:
 sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java: Invalid
 PerfMemory size Reviewed-by: cjplummer

---
 .../sun/tools/attach/VirtualMachineImpl.java   | 18 ++++++++++++++----
 test/jdk/ProblemList.txt                       |  1 -
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
index bf2a3dc081d..a6f2279ecfc 100644
--- a/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -80,9 +80,19 @@ InputStream execute(String cmd, Object ... args)
         assert args.length <= 3;        // includes null
 
         // create a pipe using a random name
-        int r = (new Random()).nextInt();
-        String pipename = "\\\\.\\pipe\\javatool" + r;
-        long hPipe = createPipe(pipename);
+        Random rnd = new Random();
+        int r = rnd.nextInt();
+        String pipeprefix = "\\\\.\\pipe\\javatool";
+        String pipename = pipeprefix + r;
+        long hPipe;
+        try {
+            hPipe = createPipe(pipename);
+        } catch (IOException ce) {
+            // Retry with another random pipe name.
+            r = rnd.nextInt();
+            pipename = pipeprefix + r;
+            hPipe = createPipe(pipename);
+        }
 
         // check if we are detached - in theory it's possible that detach is invoked
         // after this check but before we enqueue the command.
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 94c3610b7b3..6c24e2a6d3b 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -768,7 +768,6 @@ com/sun/jdi/NashornPopFrameTest.java                            8187143 generic-
 
 sun/tools/jstat/jstatClassloadOutput1.sh                        8173942 generic-all
 
-sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java    8057732 generic-all
 
 ############################################################################
 

From 1446052a25a8ab20af9cb05791db1aaa1dc40bbc Mon Sep 17 00:00:00 2001
From: tschatzl <unknown>
Date: Tue, 27 Mar 2018 11:05:01 +0200
Subject: [PATCH 029/196] 8193067: gc/g1/TestVerifyGCType.java still unstable
 Summary: Fix number of gc threads and heap waste percentage to trigger mixed
 gcs reproducibly Reviewed-by: sjohanss, pliden

---
 test/hotspot/jtreg/ProblemList.txt             | 1 -
 test/hotspot/jtreg/gc/g1/TestVerifyGCType.java | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index f67ec676dbd..87ee16063c9 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -63,7 +63,6 @@ gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java 8156755 gener
 gc/survivorAlignment/TestPromotionToSurvivor.java 8129886 generic-all
 gc/g1/logging/TestG1LoggingFailure.java 8169634 generic-all
 gc/g1/humongousObjects/TestHeapCounters.java 8178918 generic-all
-gc/g1/TestVerifyGCType.java 8193067 generic-all
 gc/stress/gclocker/TestGCLockerWithParallel.java 8180622 generic-all
 gc/stress/gclocker/TestGCLockerWithG1.java 8180622 generic-all
 gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java 8177765 generic-all
diff --git a/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java b/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java
index 84ae43ae2b4..f5450c7cfa7 100644
--- a/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java
+++ b/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java
@@ -136,6 +136,8 @@ private static OutputAnalyzer testWithVerificationType(String[] types) throws Ex
                                        "-Xlog:gc,gc+start,gc+verify=info",
                                        "-Xms16m",
                                        "-Xmx16m",
+                                       "-XX:ParallelGCThreads=1",
+                                       "-XX:G1HeapWastePercent=1",
                                        "-XX:+VerifyBeforeGC",
                                        "-XX:+VerifyAfterGC",
                                        "-XX:+VerifyDuringGC"});

From 82f6545399fc8abecb5011ca09a3ef321610e08c Mon Sep 17 00:00:00 2001
From: thartmann <unknown>
Date: Tue, 27 Mar 2018 11:13:11 +0200
Subject: [PATCH 030/196] 8200227: [Graal] Test times out with Graal due to low
 compile threshold Summary: Removed unnecessary VM options from test to avoid
 timeouts with Graal. Reviewed-by: kvn

---
 .../intrinsics/string/TestStringIntrinsicRangeChecks.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java
index 3486950413e..5f37c54f97a 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java
@@ -29,7 +29,7 @@
  * @summary Verifies that string intrinsics throw array out of bounds exceptions.
  * @library /compiler/patches /test/lib
  * @build java.base/java.lang.Helper
- * @run main/othervm -Xbatch -XX:CompileThreshold=100 -XX:-TieredCompilation compiler.intrinsics.string.TestStringIntrinsicRangeChecks
+ * @run main/othervm -Xbatch -XX:CompileThreshold=100 compiler.intrinsics.string.TestStringIntrinsicRangeChecks
  */
 package compiler.intrinsics.string;
 

From 71ff7276f8e01feaeddcb46ea8a070d3b424f750 Mon Sep 17 00:00:00 2001
From: simonis <unknown>
Date: Wed, 28 Mar 2018 11:27:35 +0200
Subject: [PATCH 031/196] 8198915: [Graal] 3rd testcase of
 compiler/types/TestMeetIncompatibleInterfaceArrays.java takes more than 10
 mins Reviewed-by: kvn, thartmann

---
 .../TestMeetIncompatibleInterfaceArrays.java  | 59 ++++++++++++-------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java b/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
index 180508664ce..8df5b0e4832 100644
--- a/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
+++ b/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2018 SAP SE. 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
@@ -27,7 +27,7 @@
  * @summary C2 can not handle returns with inccompatible interface arrays
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
- * @library /test/lib
+ * @library /test/lib /
  *
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
@@ -37,7 +37,6 @@
  *        -XX:+UnlockDiagnosticVMOptions
  *        -XX:+WhiteBoxAPI
  *        -Xbatch
- *        -XX:CompileThreshold=1
  *        -XX:-TieredCompilation
  *        -XX:CICompilerCount=1
  *        -XX:+PrintCompilation
@@ -51,7 +50,6 @@
  *        -XX:+UnlockDiagnosticVMOptions
  *        -XX:+WhiteBoxAPI
  *        -Xbatch
- *        -XX:CompileThreshold=1
  *        -XX:-TieredCompilation
  *        -XX:CICompilerCount=1
  *        -XX:+PrintCompilation
@@ -65,11 +63,6 @@
  *        -XX:+UnlockDiagnosticVMOptions
  *        -XX:+WhiteBoxAPI
  *        -Xbatch
- *        -XX:CompileThreshold=1
- *        -XX:Tier0InvokeNotifyFreqLog=0 -XX:Tier2InvokeNotifyFreqLog=0 -XX:Tier3InvokeNotifyFreqLog=0 -XX:Tier23InlineeNotifyFreqLog=0
- *        -XX:Tier3InvocationThreshold=2 -XX:Tier3MinInvocationThreshold=2 -XX:Tier3CompileThreshold=2
- *        -XX:Tier4InvocationThreshold=1 -XX:Tier4MinInvocationThreshold=1 -XX:Tier4CompileThreshold=1
- *        -XX:+TieredCompilation
  *        -XX:CICompilerCount=2
  *        -XX:+PrintCompilation
  *        -XX:+PrintInlining
@@ -84,6 +77,7 @@
 
 package compiler.types;
 
+import compiler.whitebox.CompilerWhiteBoxTest;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import sun.hotspot.WhiteBox;
@@ -190,8 +184,8 @@ public static I2[][][][][] createI21Array5() {
      *     return Helper.createI2Array3(); // returns I1[][][] which gives a verifier error because return expects I1[][][][]
      *   }
      *   public static void test() {
-     *     I1[][][][][] i1 = run();
-     *     System.out.println(i1[0][0][0][0][0].getName());
+     *     I1[][][][] i1 = run();
+     *     System.out.println(i1[0][0][0][0].getName());
      *   }
      * ...
      * public class MeetIncompatibleInterfaceArrays5ASM {
@@ -306,9 +300,25 @@ static void generateTestClass(int dim, boolean good) throws Exception {
 
     }
 
-    public static String[][] tier = { { "interpreted", "C2 (tier 4) without inlining", "C2 (tier4) without inlining" },
-            { "interpreted", "C2 (tier 4) with inlining", "C2 (tier4) with inlining" },
-            { "interpreted", "C1 (tier 3) with inlining", "C2 (tier4) with inlining" } };
+    public static String[][] tier = { { "interpreted (tier 0)",
+                                        "C2 (tier 4) without inlining",
+                                        "C2 (tier 4) without inlining" },
+                                      { "interpreted (tier 0)",
+                                        "C2 (tier 4) with inlining",
+                                        "C2 (tier 4) with inlining" },
+                                      { "interpreted (tier 0)",
+                                        "C1 (tier 3) with inlining",
+                                        "C2 (tier 4) with inlining" } };
+
+    public static int[][] level = { { CompilerWhiteBoxTest.COMP_LEVEL_NONE,
+                                      CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION,
+                                      CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION },
+                                    { CompilerWhiteBoxTest.COMP_LEVEL_NONE,
+                                      CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION,
+                                      CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION },
+                                    { CompilerWhiteBoxTest.COMP_LEVEL_NONE,
+                                      CompilerWhiteBoxTest.COMP_LEVEL_FULL_PROFILE,
+                                      CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION } };
 
     public static void main(String[] args) throws Exception {
         final int pass = Integer.parseInt(args.length > 0 ? args[0] : "0");
@@ -344,8 +354,11 @@ public static void main(String[] args) throws Exception {
                 Method m = c.getMethod("test");
                 Method r = c.getMethod("run");
                 for (int j = 0; j < 3; j++) {
-                    System.out.println((j + 1) + ". invokation of " + baseClassName + i + "ASM.test() [should be "
-                            + tier[pass][j] + "]");
+                    System.out.println((j + 1) + ". invokation of " + baseClassName + i + "ASM.test() [::" +
+                                       r.getName() + "() should be '" + tier[pass][j] + "' compiled]");
+
+                    WB.enqueueMethodForCompilation(r, level[pass][j]);
+
                     try {
                         m.invoke(null);
                     } catch (InvocationTargetException ite) {
@@ -360,10 +373,16 @@ public static void main(String[] args) throws Exception {
                             }
                         }
                     }
-                }
-                System.out.println("Method " + r + (WB.isMethodCompiled(r) ? " has" : " has not") + " been compiled.");
-                if (!WB.isMethodCompiled(r)) {
-                    throw new Exception("Method " + r + " must be compiled!");
+
+                    int r_comp_level = WB.getMethodCompilationLevel(r);
+                    System.out.println("   invokation of " + baseClassName + i + "ASM.test() [::" +
+                                       r.getName() + "() was compiled at tier " + r_comp_level + "]");
+
+                    if (r_comp_level != level[pass][j]) {
+                      throw new Exception("Method " + r + " must be compiled at tier " + r_comp_level + " !");
+                    }
+
+                    WB.deoptimizeMethod(r);
                 }
             }
         }

From 912b8cf2b57048048647c0f1584dbedba6bd4db0 Mon Sep 17 00:00:00 2001
From: pliden <unknown>
Date: Wed, 28 Mar 2018 11:38:47 +0200
Subject: [PATCH 032/196] 8199918: Shorten names of CollectedHeap::Name members
 Reviewed-by: shade, eosterlund

---
 test/hotspot/jtreg/serviceability/sa/TestIntConstant.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java b/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
index 67209cda743..58b637cd68b 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
@@ -110,7 +110,7 @@ public static void testIntConstant() throws Exception {
             // with names and the values derived from enums and #define preprocessor
             // macros in hotspot.
             String[] defaultOutputStrings =
-                {"CollectedHeap::G1CollectedHeap 2",
+                {"CollectedHeap::G1 3",
                  "RUNNABLE 2",
                  "Deoptimization::Reason_class_check 4",
                  "InstanceKlass::_misc_is_anonymous 32",

From 71c836788e8e1665010e1d934ec48797a582e9d3 Mon Sep 17 00:00:00 2001
From: pliden <unknown>
Date: Wed, 28 Mar 2018 11:38:47 +0200
Subject: [PATCH 033/196] 8199925: Break out GC selection logic from
 GCArguments to GCConfig Reviewed-by: eosterlund, rkennke

---
 test/hotspot/jtreg/serviceability/sa/TestIntConstant.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java b/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
index 58b637cd68b..a73884770ea 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
@@ -110,7 +110,7 @@ public static void testIntConstant() throws Exception {
             // with names and the values derived from enums and #define preprocessor
             // macros in hotspot.
             String[] defaultOutputStrings =
-                {"CollectedHeap::G1 3",
+                {"CollectedHeap::G1 4",
                  "RUNNABLE 2",
                  "Deoptimization::Reason_class_check 4",
                  "InstanceKlass::_misc_is_anonymous 32",

From 4073142cf08e0a9611f5c03755a5e1ba43e023fc Mon Sep 17 00:00:00 2001
From: pliden <unknown>
Date: Wed, 28 Mar 2018 11:38:47 +0200
Subject: [PATCH 034/196] 8199927: Make WhiteBox more GC agnostic Reviewed-by:
 shade, eosterlund

---
 test/jtreg-ext/requires/VMProps.java |  8 +---
 test/lib/sun/hotspot/WhiteBox.java   |  6 +--
 test/lib/sun/hotspot/gc/GC.java      | 71 ++++++++--------------------
 3 files changed, 24 insertions(+), 61 deletions(-)

diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 8b0e41a5239..8b7e6f41d8a 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -228,13 +228,9 @@ protected String cpuFeatures() {
      *    User either set G1 explicitely (-XX:+UseG1GC) or did not set any GC
      * @param map - property-value pairs
      */
-    protected void vmGC(Map<String, String> map){
-        GC currentGC = GC.current();
-        boolean isByErgo = GC.currentSetByErgo();
-        List<GC> supportedGC = GC.allSupported();
+    protected void vmGC(Map<String, String> map) {
         for (GC gc: GC.values()) {
-            boolean isSupported = supportedGC.contains(gc);
-            boolean isAcceptable = isSupported && (gc == currentGC || isByErgo);
+            boolean isAcceptable = gc.isSupported() && (gc.isSelected() || GC.isSelectedErgonomically());
             map.put("vm.gc." + gc.name(), "" + isAcceptable);
         }
     }
diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java
index 79674649dac..6e906c9dcab 100644
--- a/test/lib/sun/hotspot/WhiteBox.java
+++ b/test/lib/sun/hotspot/WhiteBox.java
@@ -382,9 +382,9 @@ public void clearInlineCaches(boolean preserve_static_stubs) {
 
   // Don't use these methods directly
   // Use sun.hotspot.gc.GC class instead.
-  public native int currentGC();
-  public native int allSupportedGC();
-  public native boolean gcSelectedByErgo();
+  public native boolean isGCSupported(int name);
+  public native boolean isGCSelected(int name);
+  public native boolean isGCSelectedErgonomically();
 
   // Force Young GC
   public native void youngGC();
diff --git a/test/lib/sun/hotspot/gc/GC.java b/test/lib/sun/hotspot/gc/GC.java
index 0fcc3222eea..900346a6ac4 100644
--- a/test/lib/sun/hotspot/gc/GC.java
+++ b/test/lib/sun/hotspot/gc/GC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,8 +23,6 @@
 
 package sun.hotspot.gc;
 
-import java.util.ArrayList;
-import java.util.List;
 import sun.hotspot.WhiteBox;
 
 /**
@@ -32,72 +30,41 @@
  * retrieved from the VM with the WhiteBox API.
  */
 public enum GC {
+    /*
+     * Enum values much match CollectedHeap::Name
+     */
     Serial(1),
     Parallel(2),
-    ConcMarkSweep(4),
-    G1(8);
+    ConcMarkSweep(3),
+    G1(4);
 
-    private static final GC CURRENT_GC;
-    private static final int ALL_GC_CODES;
-    private static final boolean IS_BY_ERGO;
-    static {
-        WhiteBox WB = WhiteBox.getWhiteBox();
-        ALL_GC_CODES = WB.allSupportedGC();
-        IS_BY_ERGO = WB.gcSelectedByErgo();
+    private static final WhiteBox WB = WhiteBox.getWhiteBox();
 
-        int currentCode = WB.currentGC();
-        GC tmp = null;
-        for (GC gc: GC.values()) {
-            if (gc.code == currentCode) {
-                tmp = gc;
-                break;
-            }
-        }
-        if (tmp == null) {
-            throw new Error("Unknown current GC code " + currentCode);
-        }
-        CURRENT_GC = tmp;
-    }
+    private final int name;
 
-    private final int code;
-    private GC(int code) {
-        this.code = code;
+    private GC(int name) {
+        this.name = name;
     }
 
     /**
-     * @return true if the collector is supported by the VM, false otherwise.
+     * @return true if this GC is supported by the VM
      */
     public boolean isSupported() {
-        return (ALL_GC_CODES & code) != 0;
-    }
-
-
-    /**
-     * @return the current collector used by VM.
-     */
-    public static GC current() {
-        return CURRENT_GC;
+        return WB.isGCSupported(name);
     }
 
     /**
-     * @return true if GC was selected by ergonomic, false if specified
-     * explicitly by the command line flag.
+     * @return true if this GC is currently selected/used
      */
-    public static boolean currentSetByErgo() {
-        return IS_BY_ERGO;
+    public boolean isSelected() {
+        return WB.isGCSelected(name);
     }
 
     /**
-     * @return List of collectors supported by the VM.
+     * @return true if GC was selected ergonomically, as opposed
+     *         to being explicitly specified on the command line
      */
-    public static List<GC> allSupported() {
-        List<GC> list = new ArrayList<>();
-        for (GC gc: GC.values()) {
-            if (gc.isSupported()) {
-                list.add(gc);
-            }
-        }
-        return list;
+    public static boolean isSelectedErgonomically() {
+        return WB.isGCSelectedErgonomically();
     }
 }
-

From 6b94c8bfc3520724ef83fc5496a4a6ad3737b637 Mon Sep 17 00:00:00 2001
From: mseledtsov <unknown>
Date: Tue, 3 Apr 2018 08:56:46 -0700
Subject: [PATCH 035/196] 8200126: [TESTBUG] Open source VM runtime signal
 tests Summary: Open sourced the signal tests, updated make files and test
 groups accordingly Reviewed-by: dholmes, ctornqvi, ihse

---
 make/test/JtregNativeHotspot.gmk              |   3 +
 test/hotspot/jtreg/TEST.groups                |   6 +-
 test/hotspot/jtreg/runtime/signal/README      |  59 +++
 .../jtreg/runtime/signal/SigTestDriver.java   | 178 +++++++
 .../jtreg/runtime/signal/TestSigalrm.java     |  35 ++
 .../jtreg/runtime/signal/TestSigbus.java      |  35 ++
 .../jtreg/runtime/signal/TestSigcld.java      |  35 ++
 .../jtreg/runtime/signal/TestSigcont.java     |  35 ++
 .../jtreg/runtime/signal/TestSigemt.java      |  35 ++
 .../jtreg/runtime/signal/TestSigfpe.java      |  35 ++
 .../jtreg/runtime/signal/TestSigfreeze.java   |  35 ++
 .../jtreg/runtime/signal/TestSighup.java      |  35 ++
 .../jtreg/runtime/signal/TestSigill.java      |  35 ++
 .../jtreg/runtime/signal/TestSigint.java      |  35 ++
 .../jtreg/runtime/signal/TestSigiot.java      |  35 ++
 .../jtreg/runtime/signal/TestSiglost.java     |  35 ++
 .../jtreg/runtime/signal/TestSiglwp.java      |  35 ++
 .../jtreg/runtime/signal/TestSigpipe.java     |  35 ++
 .../jtreg/runtime/signal/TestSigpoll.java     |  35 ++
 .../jtreg/runtime/signal/TestSigprof.java     |  35 ++
 .../jtreg/runtime/signal/TestSigpwr.java      |  35 ++
 .../jtreg/runtime/signal/TestSigquit.java     |  35 ++
 .../jtreg/runtime/signal/TestSigsegv.java     |  35 ++
 .../jtreg/runtime/signal/TestSigstop.java     |  35 ++
 .../jtreg/runtime/signal/TestSigsys.java      |  35 ++
 .../jtreg/runtime/signal/TestSigterm.java     |  35 ++
 .../jtreg/runtime/signal/TestSigthaw.java     |  35 ++
 .../jtreg/runtime/signal/TestSigtrap.java     |  35 ++
 .../jtreg/runtime/signal/TestSigtstp.java     |  35 ++
 .../jtreg/runtime/signal/TestSigttin.java     |  35 ++
 .../jtreg/runtime/signal/TestSigttou.java     |  35 ++
 .../jtreg/runtime/signal/TestSigurg.java      |  35 ++
 .../jtreg/runtime/signal/TestSigusr1.java     |  35 ++
 .../jtreg/runtime/signal/TestSigusr2.java     |  35 ++
 .../jtreg/runtime/signal/TestSigvtalrm.java   |  35 ++
 .../jtreg/runtime/signal/TestSigwinch.java    |  35 ++
 .../jtreg/runtime/signal/TestSigxcpu.java     |  35 ++
 .../jtreg/runtime/signal/TestSigxfsz.java     |  35 ++
 .../jtreg/runtime/signal/TestSigxres.java     |  35 ++
 .../hotspot/jtreg/runtime/signal/exesigtest.c | 462 ++++++++++++++++++
 40 files changed, 1931 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/signal/README
 create mode 100644 test/hotspot/jtreg/runtime/signal/SigTestDriver.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigalrm.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigbus.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigcld.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigcont.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigemt.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigfpe.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigfreeze.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSighup.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigill.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigint.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigiot.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSiglost.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSiglwp.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigpipe.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigpoll.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigprof.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigpwr.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigquit.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigsegv.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigstop.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigsys.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigterm.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigthaw.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigtrap.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigtstp.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigttin.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigttou.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigurg.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigusr1.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigusr2.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigvtalrm.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigwinch.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigxcpu.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigxfsz.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/TestSigxres.java
 create mode 100644 test/hotspot/jtreg/runtime/signal/exesigtest.c

diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index 2c3cd31395c..1e5fc8b4a49 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -65,8 +65,11 @@ else
       exeinvoke.c exestack-gap.c
 endif
 
+BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
+
 ifeq ($(OPENJDK_TARGET_OS), windows)
     BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
+    BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c
 endif
 
 $(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_LIBRARIES, \
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index dc8afeb73e7..b4b06329530 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -220,7 +220,8 @@ tier1_runtime = \
  -runtime/containers/ \
   sanity/ \
   testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java \
- -:tier1_runtime_appcds_exclude
+ -:tier1_runtime_appcds_exclude \
+ -runtime/signal
 
 hotspot_cds = \
   runtime/SharedArchiveFile/ \
@@ -263,7 +264,8 @@ hotspot_tier2_runtime = \
  -runtime/containers/ \
  -:tier1_runtime \
  -:tier1_serviceability \
- -:hotspot_tier2_runtime_platform_agnostic
+ -:hotspot_tier2_runtime_platform_agnostic \
+ -runtime/signal
 
 hotspot_tier2_runtime_platform_agnostic = \
   runtime/SelectionResolution \
diff --git a/test/hotspot/jtreg/runtime/signal/README b/test/hotspot/jtreg/runtime/signal/README
new file mode 100644
index 00000000000..4a83fb5a911
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/README
@@ -0,0 +1,59 @@
+Copyright (c) 2008, 2018, 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.
+
+
+Briefly, the tests cover the following scenarios:
+1. prepre
+   set signal handlers -> create JVM -> send signals -> destroy JVM -> check signal handlers were called
+
+2. prepost
+   set signal handlers -> create JVM -> destroy JVM -> send signals  -> check signal handlers were called
+
+3. postpre
+   create JVM ->set signal handlers -> send signals -> destroy JVM -> check signal handlers were called
+
+4. postpost
+   create JVM -> set signal handlers -> destroy JVM -> send signals  -> check signal handlers were called
+
+There is one more scenario called 'nojvm'.
+In this case no jvm is created, so pure signal testing is done.
+
+Signal handlers don't do anything, so the only fact that signal handler was called is checked.
+Also 2 different ways of setting signal handlers are tested: sigaction, sigset.
+
+For 'postpre' and 'postpro' libjsig.so is used to chain signal handlers behind VM installed ones.
+
+=> Current tests cover the following cases (don't count 'nojvm' scenario):
+1. Support for pre-installed signal handlers when the HotSpot VM is created.
+2. Support for signal handler installation after the HotSpot VM is created inside JNI code
+
+
+Notes:
+
+SIGQUIT, SIGTERM, SIGINT, and SIGHUP signals cannot be chained.
+If the application needs to handle these signals, the -Xrs option needs
+to be specified. So, test these signals only with -Xrs flag.
+
+On Linux and Mac OS X, SIGUSR2 is used to implement suspend and resume. So,
+don't test SIGUSR2 on Linux and Mac OS X.
+
+SIGJVM1 and SIGJVM2 exist only on Solaris and are reserved for exclusive use
+by the JVM. So don't test SIGJVM1 and SIGJVM2.
diff --git a/test/hotspot/jtreg/runtime/signal/SigTestDriver.java b/test/hotspot/jtreg/runtime/signal/SigTestDriver.java
new file mode 100644
index 00000000000..ea548f3b97c
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/SigTestDriver.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2007, 2018, 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 jdk.test.lib.Platform;
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class SigTestDriver {
+    public static void main(String[] args) {
+        // No signal tests on Windows yet; so setting to no-op
+        if (Platform.isWindows()) {
+            System.out.println("SKIPPED: no signal tests on Windows, ignore.");
+            return;
+        }
+
+        // At least one argument should be specified
+        if ( (args == null) || (args.length < 1) ) {
+            throw new IllegalArgumentException("At lease one argument should be specified, the signal name");
+        }
+
+        String signame = args[0];
+        switch (signame) {
+            case "SIGWAITING":
+            case "SIGKILL":
+            case "SIGSTOP": {
+                System.out.println("SKIPPED: signals SIGWAITING, SIGKILL and SIGSTOP can't be tested, ignore.");
+                return;
+            }
+            case "SIGUSR2": {
+                if (Platform.isLinux()) {
+                    System.out.println("SKIPPED: SIGUSR2 can't be tested on Linux, ignore.");
+                    return;
+                } else if (Platform.isOSX()) {
+                    System.out.println("SKIPPED: SIGUSR2 can't be tested on OS X, ignore.");
+                    return;
+                }
+            }
+        }
+
+        Path test = Paths.get(System.getProperty("test.nativepath"))
+                         .resolve("sigtest")
+                         .toAbsolutePath();
+        String envVar = Platform.isWindows() ? "PATH" :
+                (Platform.isOSX() ? "DYLD_LIBRARY_PATH" : "LD_LIBRARY_PATH");
+
+        List<String> cmd = new ArrayList<>();
+        Collections.addAll(cmd,
+                test.toString(),
+                "-sig",
+                signame,
+                "-mode",
+                null, // modeIdx
+                "-scenario",
+                null // scenarioIdx
+        );
+        int modeIdx = 4;
+        int scenarioIdx = 6;
+
+        // add external flags
+        cmd.addAll(vmargs());
+
+        // add test specific arguments w/o signame
+        cmd.addAll(Arrays.asList(args)
+                         .subList(1, args.length));
+
+        boolean passed = true;
+
+        for (String mode : new String[]{"sigset", "sigaction"}) {
+            for (String scenario : new String[] {"nojvm", "prepre", "prepost", "postpre", "postpost"}) {
+                cmd.set(modeIdx, mode);
+                cmd.set(scenarioIdx, scenario);
+                System.out.printf("START TESTING: SIGNAL = %s, MODE = %s, SCENARIO=%s%n",signame, mode, scenario);
+                System.out.printf("Do execute: %s%n", cmd.toString());
+
+                ProcessBuilder pb = new ProcessBuilder(cmd);
+                pb.environment().merge(envVar, jvmLibDir().toString(),
+                        (x, y) -> y + File.pathSeparator + x);
+                pb.environment().put("CLASSPATH", Utils.TEST_CLASS_PATH);
+
+                switch (scenario) {
+                    case "postpre":
+                    case "postpost": {
+                        pb.environment().merge("LD_PRELOAD", libjsig().toString(),
+                                (x, y) -> y + File.pathSeparator + x);
+                    }
+                }
+
+                try {
+                    OutputAnalyzer oa = ProcessTools.executeProcess(pb);
+                    oa.reportDiagnosticSummary();
+                    int exitCode = oa.getExitValue();
+                    if (exitCode == 0) {
+                       System.out.println("PASSED with exit code 0");
+                    } else {
+                        System.out.println("FAILED with exit code " + exitCode);
+                        passed = false;
+                    }
+                } catch (Exception e) {
+                    throw new Error("execution failed", e);
+                }
+            }
+        }
+
+        if (!passed) {
+            throw new Error("test failed");
+        }
+    }
+
+    private static List<String> vmargs() {
+        return Stream.concat(Arrays.stream(Utils.VM_OPTIONS.split(" ")),
+                             Arrays.stream(Utils.JAVA_OPTIONS.split(" ")))
+                     .filter(s -> !s.isEmpty())
+                     .filter(s -> s.startsWith("-X"))
+                     .flatMap(arg -> Stream.of("-vmopt", arg))
+                     .collect(Collectors.toList());
+    }
+
+    private static Path libjsig() {
+        return jvmLibDir().resolve((Platform.isWindows() ? "" : "lib")
+                + "jsig." + Platform.sharedLibraryExt());
+    }
+
+    private static Path jvmLibDir() {
+        Path dir = Paths.get(Utils.TEST_JDK);
+        if (Platform.isWindows()) {
+            return dir.resolve("bin")
+                      .resolve(variant())
+                      .toAbsolutePath();
+        } else {
+            return dir.resolve("lib")
+                      .resolve(variant())
+                      .toAbsolutePath();
+        }
+    }
+
+    private static String variant() {
+        if (Platform.isServer()) {
+            return "server";
+        } else if (Platform.isClient()) {
+            return "client";
+        } else if (Platform.isMinimal()) {
+            return "minimal";
+        } else {
+            throw new Error("TESTBUG: unsupported vm variant");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigalrm.java b/test/hotspot/jtreg/runtime/signal/TestSigalrm.java
new file mode 100644
index 00000000000..337a97e0706
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigalrm.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigalrm01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGALRM
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigbus.java b/test/hotspot/jtreg/runtime/signal/TestSigbus.java
new file mode 100644
index 00000000000..ce1c04e50ea
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigbus.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigbus01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGBUS
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigcld.java b/test/hotspot/jtreg/runtime/signal/TestSigcld.java
new file mode 100644
index 00000000000..8b84ed97951
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigcld.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigcld01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGCLD
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigcont.java b/test/hotspot/jtreg/runtime/signal/TestSigcont.java
new file mode 100644
index 00000000000..d0e3106f251
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigcont.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigcont01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGCONT
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigemt.java b/test/hotspot/jtreg/runtime/signal/TestSigemt.java
new file mode 100644
index 00000000000..0614f87fbcc
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigemt.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigemt01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGEMT
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigfpe.java b/test/hotspot/jtreg/runtime/signal/TestSigfpe.java
new file mode 100644
index 00000000000..bd9977f3855
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigfpe.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigfpe01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+  * @library /test/lib
+ * @run main/native SigTestDriver SIGFPE
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigfreeze.java b/test/hotspot/jtreg/runtime/signal/TestSigfreeze.java
new file mode 100644
index 00000000000..d335fd7b129
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigfreeze.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigfreeze01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGFREEZE
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSighup.java b/test/hotspot/jtreg/runtime/signal/TestSighup.java
new file mode 100644
index 00000000000..6ac820d4a1f
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSighup.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sighup01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGHUP   -vmopt -XX:+PrintCommandLineFlags -vmopt -Xrs
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigill.java b/test/hotspot/jtreg/runtime/signal/TestSigill.java
new file mode 100644
index 00000000000..f24d9a024d5
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigill.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigill01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGILL
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigint.java b/test/hotspot/jtreg/runtime/signal/TestSigint.java
new file mode 100644
index 00000000000..4c6f8eafb52
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigint.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigint01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGINT   -vmopt -XX:+PrintCommandLineFlags -vmopt -Xrs
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigiot.java b/test/hotspot/jtreg/runtime/signal/TestSigiot.java
new file mode 100644
index 00000000000..107c04422bf
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigiot.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigiot01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGIOT
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSiglost.java b/test/hotspot/jtreg/runtime/signal/TestSiglost.java
new file mode 100644
index 00000000000..0b2582a61ea
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSiglost.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/siglost01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGLOST
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSiglwp.java b/test/hotspot/jtreg/runtime/signal/TestSiglwp.java
new file mode 100644
index 00000000000..3641c827785
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSiglwp.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/siglwp01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGLWP
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigpipe.java b/test/hotspot/jtreg/runtime/signal/TestSigpipe.java
new file mode 100644
index 00000000000..98476b71912
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigpipe.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigpipe01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGPIPE
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigpoll.java b/test/hotspot/jtreg/runtime/signal/TestSigpoll.java
new file mode 100644
index 00000000000..777ea2d97ad
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigpoll.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigpoll01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGPOLL
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigprof.java b/test/hotspot/jtreg/runtime/signal/TestSigprof.java
new file mode 100644
index 00000000000..e9185146c4d
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigprof.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigprof01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGPROF
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigpwr.java b/test/hotspot/jtreg/runtime/signal/TestSigpwr.java
new file mode 100644
index 00000000000..50c670d468e
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigpwr.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigpwr01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGPWR
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigquit.java b/test/hotspot/jtreg/runtime/signal/TestSigquit.java
new file mode 100644
index 00000000000..f83b9f64a20
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigquit.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigquit01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGQUIT   -vmopt -XX:+PrintCommandLineFlags -vmopt -Xrs
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigsegv.java b/test/hotspot/jtreg/runtime/signal/TestSigsegv.java
new file mode 100644
index 00000000000..2524e6d6dff
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigsegv.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigsegv01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGSEGV
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigstop.java b/test/hotspot/jtreg/runtime/signal/TestSigstop.java
new file mode 100644
index 00000000000..a6ce690da0f
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigstop.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigstop01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGSTOP
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigsys.java b/test/hotspot/jtreg/runtime/signal/TestSigsys.java
new file mode 100644
index 00000000000..32fc4dcc07f
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigsys.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigsys01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGSYS
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigterm.java b/test/hotspot/jtreg/runtime/signal/TestSigterm.java
new file mode 100644
index 00000000000..b61897dc210
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigterm.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigterm01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGTERM   -vmopt -XX:+PrintCommandLineFlags -vmopt -Xrs
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigthaw.java b/test/hotspot/jtreg/runtime/signal/TestSigthaw.java
new file mode 100644
index 00000000000..01e163c4083
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigthaw.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigthaw01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGTHAW
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigtrap.java b/test/hotspot/jtreg/runtime/signal/TestSigtrap.java
new file mode 100644
index 00000000000..46ead06c6b0
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigtrap.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigtrap01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGTRAP
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigtstp.java b/test/hotspot/jtreg/runtime/signal/TestSigtstp.java
new file mode 100644
index 00000000000..fcb5e6a0ce9
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigtstp.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigtstp01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGTSTP
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigttin.java b/test/hotspot/jtreg/runtime/signal/TestSigttin.java
new file mode 100644
index 00000000000..48e35345546
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigttin.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigttin01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGTTIN
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigttou.java b/test/hotspot/jtreg/runtime/signal/TestSigttou.java
new file mode 100644
index 00000000000..1a3ffd60d52
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigttou.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigttou01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGTTOU
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigurg.java b/test/hotspot/jtreg/runtime/signal/TestSigurg.java
new file mode 100644
index 00000000000..05fb609a06a
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigurg.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigurg01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGURG
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigusr1.java b/test/hotspot/jtreg/runtime/signal/TestSigusr1.java
new file mode 100644
index 00000000000..9f1fadc1968
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigusr1.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigusr101.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGUSR1
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigusr2.java b/test/hotspot/jtreg/runtime/signal/TestSigusr2.java
new file mode 100644
index 00000000000..915c2e97aa8
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigusr2.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigusr201.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGUSR2
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigvtalrm.java b/test/hotspot/jtreg/runtime/signal/TestSigvtalrm.java
new file mode 100644
index 00000000000..031e3c679ca
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigvtalrm.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigvtalrm01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGVTALRM
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigwinch.java b/test/hotspot/jtreg/runtime/signal/TestSigwinch.java
new file mode 100644
index 00000000000..de169ffea24
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigwinch.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigwinch01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGWINCH
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigxcpu.java b/test/hotspot/jtreg/runtime/signal/TestSigxcpu.java
new file mode 100644
index 00000000000..c63c68922b6
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigxcpu.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigxcpu01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGXCPU
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigxfsz.java b/test/hotspot/jtreg/runtime/signal/TestSigxfsz.java
new file mode 100644
index 00000000000..1aecbfdd040
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigxfsz.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigxfsz01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGXFSZ
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/TestSigxres.java b/test/hotspot/jtreg/runtime/signal/TestSigxres.java
new file mode 100644
index 00000000000..7d099e4e8b6
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/TestSigxres.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @requires os.family != "windows"
+ *
+ * @summary converted from VM testbase runtime/signal/sigxres01.
+ * VM testbase keywords: [signal, runtime, linux, solaris, macosx]
+ *
+ * @library /test/lib
+ * @run main/native SigTestDriver SIGXRES
+ */
+
diff --git a/test/hotspot/jtreg/runtime/signal/exesigtest.c b/test/hotspot/jtreg/runtime/signal/exesigtest.c
new file mode 100644
index 00000000000..02dd7625599
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/signal/exesigtest.c
@@ -0,0 +1,462 @@
+/*
+ * Copyright (c) 2007, 2018, 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.
+ */
+
+#include <jni.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+
+/*
+ * This is the main program to test the signal chaining/ handling functionality
+ * See bugs 6277077 and 6414402
+ */
+
+#define TRUE  1
+#define FALSE 0
+typedef int boolean;
+
+static JNIEnv *env;
+static JavaVM *vm;
+
+// static int sigid = 0;
+
+// Define the test pass/ fail codes, may be we can use
+// nsk/share/native/native_consts.h in future
+static int TEST_PASSED=0;
+static int TEST_FAILED=1;
+
+// This variable is used to notify whether signal has been received or not.
+static volatile sig_atomic_t sig_received = 0;
+
+static char *mode = 0;
+static char *scenario = 0;
+static char *signal_name;
+static int signal_num = -1;
+
+static JavaVMOption *options = 0;
+static int numOptions = 0;
+
+typedef struct
+{
+    int sigNum;
+    const char* sigName;
+} signalDefinition;
+
+static signalDefinition signals[] =
+{
+    {SIGINT, "SIGINT"},
+    {SIGQUIT, "SIGQUIT"},
+    {SIGILL, "SIGILL"},
+    {SIGTRAP, "SIGTRAP"},
+    {SIGIOT, "SIGIOT"},
+#ifdef SIGEMT
+    {SIGEMT, "SIGEMT"},
+#endif
+    {SIGFPE, "SIGFPE"},
+    {SIGBUS, "SIGBUS"},
+    {SIGSEGV, "SIGSEGV"},
+    {SIGSYS, "SIGSYS"},
+    {SIGPIPE, "SIGPIPE"},
+    {SIGALRM, "SIGALRM"},
+    {SIGTERM, "SIGTERM"},
+    {SIGUSR1, "SIGUSR1"},
+    {SIGUSR2, "SIGUSR2"},
+#ifdef SIGCLD
+    {SIGCLD, "SIGCLD"},
+#endif
+#ifdef SIGPWR
+    {SIGPWR, "SIGPWR"},
+#endif
+    {SIGWINCH, "SIGWINCH"},
+    {SIGURG, "SIGURG"},
+#ifdef SIGPOLL
+    {SIGPOLL, "SIGPOLL"},
+#endif
+    {SIGSTOP, "SIGSTOP"},
+    {SIGTSTP, "SIGTSTP"},
+    {SIGCONT, "SIGCONT"},
+    {SIGTTIN, "SIGTTIN"},
+    {SIGTTOU, "SIGTTOU"},
+    {SIGVTALRM, "SIGVTALRM"},
+    {SIGPROF, "SIGPROF"},
+    {SIGXCPU, "SIGXCPU"},
+    {SIGXFSZ, "SIGXFSZ"},
+#ifdef SIGWAITING
+    {SIGWAITING, "SIGWAITING"},
+#endif
+#ifdef SIGLWP
+    {SIGLWP, "SIGLWP"},
+#endif
+#ifdef SIGFREEZE
+    {SIGFREEZE, "SIGFREEZE"},
+#endif
+#ifdef SIGTHAW
+    {SIGTHAW, "SIGTHAW"},
+#endif
+#ifdef SIGLOST
+    {SIGLOST, "SIGLOST"},
+#endif
+#ifdef SIGXRES
+    {SIGXRES, "SIGXRES"},
+#endif
+    {SIGHUP, "SIGHUP"}
+};
+
+boolean isSupportedSigScenario ()
+{
+    if ( (!strcmp(scenario, "nojvm")) || (!strcmp(scenario, "prepre")) || (!strcmp(scenario, "prepost")) ||
+                (!strcmp(scenario, "postpost")) || (!strcmp(scenario, "postpre")) )
+    {
+        // printf("%s is a supported scenario\n", scenario);
+        return TRUE;
+    }
+    else
+    {
+        printf("ERROR: %s is not a supported scenario\n", scenario);
+        return FALSE;
+    }
+}
+
+boolean isSupportedSigMode ()
+{
+    if ( (!strcmp(mode, "sigset")) || (!strcmp(mode, "sigaction")) )
+    {
+        // printf("%s is a supported mode\n", mode);
+        return TRUE;
+    }
+    else
+    {
+        printf("ERROR: %s is not a supported mode\n", mode);
+        return FALSE;
+    }
+}
+
+int getSigNumBySigName(const char* sigName)
+{
+    int signals_len, sigdef_len, total_sigs, i=0;
+
+    if (sigName == NULL) return -1;
+
+    signals_len = sizeof(signals);
+    sigdef_len = sizeof(signalDefinition);
+    total_sigs = signals_len / sigdef_len;
+    for (i = 0; i < total_sigs; i++)
+    {
+        // printf("Inside for loop, i = %d\n", i);
+        if (!strcmp(sigName, signals[i].sigName))
+            return signals[i].sigNum;
+    }
+
+    return -1;
+}
+
+// signal handler
+void handler(int sig)
+{
+    printf("%s: signal handler for signal %d has been processed\n", signal_name, signal_num);
+    sig_received = 1;
+}
+
+// Initialize VM with given options
+void initVM()
+{
+    JavaVMInitArgs vm_args;
+    int i =0;
+    jint result;
+
+    vm_args.nOptions = numOptions;
+    vm_args.version = JNI_VERSION_1_2;
+    vm_args.ignoreUnrecognized = JNI_FALSE;
+    vm_args.options = options;
+
+/* try hardcoding options
+    JavaVMOption option1[2];
+    option1[0].optionString="-XX:+PrintCommandLineFlags";
+    option1[1].optionString="-Xrs";
+*/
+    vm_args.options=options;
+    vm_args.nOptions=numOptions;
+
+    // Print the VM options in use
+    printf("initVM: numOptions = %d\n", vm_args.nOptions);
+    for (i = 0; i < vm_args.nOptions; i++)
+    {
+        printf("\tvm_args.options[%d].optionString = %s\n", i, vm_args.options[i].optionString);
+    }
+
+    // Initialize VM with given options
+    result = JNI_CreateJavaVM( &vm, (void **) &env, &vm_args );
+
+    // Did the VM initialize successfully ?
+    if (result != 0)
+    {
+        printf("ERROR: cannot create Java VM.\n");
+        exit(TEST_FAILED);
+    }
+
+    (*vm)->AttachCurrentThread(vm, (void **) &env,  (void *) 0);
+    printf("initVM: JVM started and attached\n");
+}
+
+// Function to set up signal handler
+void setSignalHandler()
+{
+    int retval = 0 ;
+
+    if (!strcmp(mode, "sigaction"))
+    {
+        struct sigaction act;
+        act.sa_handler = handler;
+        sigemptyset(&act.sa_mask);
+        act.sa_flags = 0;
+        retval = sigaction(signal_num, &act, 0);
+        if (retval != 0) {
+           printf("ERROR: failed to set signal handler using function %s, error=%s\n", mode, strerror(errno));
+           exit(TEST_FAILED);
+        }
+    } // end - dealing with sigaction
+    else if (!strcmp(mode, "sigset"))
+    {
+        sigset(signal_num, handler);
+    } // end dealing with sigset
+    printf("%s: signal handler using function '%s' has been set\n", signal_name, mode);
+}
+
+// Function to invoke given signal
+void invokeSignal()
+{
+    int pid, retval;
+    sigset_t new_set, old_set;
+
+    pid = getpid();
+    retval = 0;
+
+    // we need to unblock the signal in case it was previously blocked by JVM
+    // and as result inherited by child process
+    // (this is at least the case for SIGQUIT in case -Xrs flag is not used).
+    // Otherwise the test will timeout.
+    sigemptyset(&new_set);
+    sigaddset(&new_set, signal_num);
+    sigprocmask(SIG_UNBLOCK, &new_set, &old_set);
+    if (retval != 0) {
+        printf("ERROR: failed to unblock signal, error=%s\n", strerror(errno));
+        exit(TEST_FAILED);
+    }
+
+    // send the signal
+    retval = kill(pid, signal_num);
+    if (retval != 0)
+    {
+        printf("ERROR: failed to send signal %s, error=%s\n", signal_name, strerror(errno));
+        exit(TEST_FAILED);
+    }
+
+    // set original mask for the signal
+    retval = sigprocmask(SIG_SETMASK, &old_set, NULL);
+    if (retval != 0) {
+        printf("ERROR: failed to set original mask for signal, error=%s\n", strerror(errno));
+        exit(TEST_FAILED);
+    }
+
+    printf("%s: signal has been sent successfully\n", signal_name);
+}
+
+// Usage function
+void printUsage()
+{
+    printf("Usage: sigtest -sig {signal_name} -mode {signal | sigset | sigaction } -scenario {nojvm | postpre | postpost | prepre | prepost}> [-vmopt jvm_option] \n");
+    printf("\n");
+    exit(TEST_FAILED);
+}
+
+// signal handler BEFORE VM initialization AND
+// Invoke signal BEFORE VM exits
+void scen_prepre()
+{
+    setSignalHandler();
+    initVM();
+    invokeSignal();
+    (*vm)->DestroyJavaVM(vm);
+}
+
+// signal handler BEFORE VM initialization AND
+// Invoke signal AFTER VM exits
+void scen_prepost()
+{
+    setSignalHandler();
+    initVM();
+    (*vm)->DestroyJavaVM(vm);
+    invokeSignal();
+}
+
+// signal handler AFTER VM initialization AND
+// Invoke signal BEFORE VM exits
+void scen_postpre()
+{
+    initVM();
+    setSignalHandler();
+    invokeSignal();
+    (*vm)->DestroyJavaVM(vm);
+}
+
+// signal handler AFTER VM initializationAND
+// Invoke signal AFTER VM exits
+void scen_postpost()
+{
+    initVM();
+    setSignalHandler();
+    (*vm)->DestroyJavaVM(vm);
+    invokeSignal();
+}
+
+// signal handler with no JVM in picture
+void scen_nojvm()
+{
+    setSignalHandler();
+    invokeSignal();
+}
+
+void run()
+{
+    // print the current scenario
+    if (!strcmp(scenario, "postpre"))
+        scen_postpre();
+    else if (!strcmp(scenario, "postpost"))
+        scen_postpost();
+    else if (!strcmp(scenario, "prepre"))
+        scen_prepre();
+    else if (!strcmp(scenario, "prepost"))
+        scen_prepost();
+    else if (!strcmp(scenario, "nojvm"))
+        scen_nojvm();
+}
+
+// main main
+int main(int argc, char **argv)
+{
+    int i=0, j;
+
+    signal_num = -1;
+    signal_name = NULL;
+
+    // Parse the arguments and find out how many vm args we have
+    for (i=1; i<argc; i++)
+    {
+        if (! strcmp(argv[i], "-sig") )
+        {
+            i++;
+            if ( i >= argc )
+            {
+                printUsage();
+            }
+            signal_name = argv[i];
+
+        }
+        else if (!strcmp(argv[i], "-mode"))
+        {
+            i++;
+            if ( i >= argc )
+            {
+                printUsage();
+            }
+            mode = argv[i];
+        }
+        else if (!strcmp(argv[i], "-scenario"))
+        {
+            i++;
+            if ( i >= argc )
+            {
+                printUsage();
+            }
+            scenario = argv[i];
+        }
+        else if (!strcmp(argv[i], "-vmopt"))
+        {
+            i++;
+            if ( i >= argc )
+            {
+                printUsage();
+            }
+            numOptions++;
+        }
+        else
+        {
+            printUsage();
+        }
+    }
+
+    if ( !isSupportedSigScenario() || !isSupportedSigMode() )
+    {
+        printUsage();
+    }
+
+    // get signal number by it's name
+    signal_num = getSigNumBySigName(signal_name);
+    if (signal_num == -1)
+    {
+      printf("%s: unknown signal, perhaps is not supported on this platform, ignore\n",
+            signal_name);
+      exit(TEST_PASSED);
+    }
+
+    j = 0;
+    // Initialize given number of VM options
+    if (numOptions > 0)
+    {
+        options = (JavaVMOption *) malloc(numOptions * sizeof(JavaVMOption));
+        for (i=0; i<argc; i++)
+        {
+            // parse VM options
+            if (!strcmp(argv[i], "-vmopt"))
+            {
+                i++;
+                if ( i >= argc )
+                {
+                    printUsage();
+                }
+                options[j].optionString = argv[i];
+                j++;
+            }
+        }
+    }
+
+    // do signal invocation
+    printf("%s: start testing: signal_num=%d,  mode=%s, scenario=%s\n", signal_name, signal_num, mode, scenario);
+    run();
+
+    while (!sig_received) {
+      sleep(1);
+      printf("%s: waiting for getting signal 1sec ...\n", signal_name);
+    }
+
+    printf("%s: signal has been received\n", signal_name);
+
+    free(options);
+
+    return (sig_received ? TEST_PASSED : TEST_FAILED);
+}

From eff34e0937cae317a6c8f54bbf64128c4b8577ce Mon Sep 17 00:00:00 2001
From: rwestberg <unknown>
Date: Wed, 28 Mar 2018 15:30:43 +0200
Subject: [PATCH 036/196] 8199619: Building HotSpot on Windows should define
 NOMINMAX Reviewed-by: erikj, kbarrett, ihse

---
 make/autoconf/flags-cflags.m4 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 8e8d0b5eb0c..8bdb3c76ad3 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -455,6 +455,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE \
         -D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
+    ALWAYS_DEFINES_JVM="-DNOMINMAX"
   fi
 
   ###############################################################################

From c9ad5485818805f06737a96a2b389a262ec4ac46 Mon Sep 17 00:00:00 2001
From: tschatzl <unknown>
Date: Wed, 28 Mar 2018 16:39:32 +0200
Subject: [PATCH 037/196] 8197573: Remove concurrent cleanup and secondary free
 list handling Summary: Remove secondary free list and all associated
 functionality, moving the cleanup work into the Cleanup pause instead.
 Reviewed-by: sangheki, sjohanss

---
 .../concurrent_phase_control/TestConcurrentPhaseControlG1.java  | 2 --
 .../TestConcurrentPhaseControlG1Basics.java                     | 1 -
 2 files changed, 3 deletions(-)

diff --git a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java
index 48c5b5212b5..e339f57fcab 100644
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java
@@ -54,8 +54,6 @@ public class TestConcurrentPhaseControlG1 {
         {"BEFORE_REMARK", null},
         {"REMARK", "Pause Remark"},
         {"REBUILD_REMEMBERED_SETS", "Concurrent Rebuild Remembered Sets"},
-        // "COMPLETE_CLEANUP",  -- optional phase, not reached by this test
-        {"CLEANUP_FOR_NEXT_MARK", "Concurrent Cleanup for Next Mark"},
         // Clear request
         {"IDLE", null},
         {"ANY", null},
diff --git a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java
index 7b8d662579e..2adec2aacfa 100644
--- a/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java
@@ -54,7 +54,6 @@ public class TestConcurrentPhaseControlG1Basics {
         "BEFORE_REMARK",
         "REMARK",
         "REBUILD_REMEMBERED_SETS",
-        "COMPLETE_CLEANUP",
         "CLEANUP_FOR_NEXT_MARK",
     };
 

From a1e9dfc449b4adcd8ef51498dedf0f0e92972fee Mon Sep 17 00:00:00 2001
From: amenkov <unknown>
Date: Wed, 28 Mar 2018 12:10:24 -0700
Subject: [PATCH 038/196] 8198393: Instrumentation.retransformClasses() throws
 NullPointerException when handling a zero-length array Reviewed-by: sspitsyn,
 cjplummer

---
 .../sun/instrument/InstrumentationImpl.java   |  5 +-
 .../jvmti/RetransformClassesZeroLength.java   | 95 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/RetransformClassesZeroLength.java

diff --git a/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java b/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java
index 5cf0c21361f..3241c086d90 100644
--- a/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java
+++ b/src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -161,6 +161,9 @@ public boolean isModifiableModule(Module module) {
             throw new UnsupportedOperationException(
               "retransformClasses is not supported in this environment");
         }
+        if (classes.length == 0) {
+            return; // no-op
+        }
         retransformClasses0(mNativeAgent, classes);
     }
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RetransformClassesZeroLength.java b/test/hotspot/jtreg/serviceability/jvmti/RetransformClassesZeroLength.java
new file mode 100644
index 00000000000..3d546556f1b
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/RetransformClassesZeroLength.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8198393
+ * @summary Instrumentation.retransformClasses(new Class[0]) should be NOP
+ * @library /test/lib
+ * @modules java.instrument
+ * @compile RetransformClassesZeroLength.java
+ * @run main RetransformClassesZeroLength
+ */
+
+import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.IllegalClassFormatException;
+import java.lang.instrument.Instrumentation;
+import java.lang.instrument.UnmodifiableClassException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.ProtectionDomain;
+
+import jdk.test.lib.process.ProcessTools;
+
+
+public class RetransformClassesZeroLength {
+
+    private static String manifest =
+            "Premain-Class: " + RetransformClassesZeroLength.Agent.class.getName() + "\n"
+            + "Can-Retransform-Classes: true\n";
+
+    private static String CP = System.getProperty("test.classes");
+
+    public static void main(String args[]) throws Throwable {
+        String agentJar = buildAgent();
+        ProcessTools.executeProcess(
+                ProcessTools.createJavaProcessBuilder(
+                        "-javaagent:" + agentJar,
+                        "-version")
+        ).shouldHaveExitValue(0);
+    }
+
+    private static String buildAgent() throws Exception {
+        Path jar = Files.createTempFile(Paths.get("."), null, ".jar");
+        String jarPath = jar.toAbsolutePath().toString();
+        ClassFileInstaller.writeJar(jarPath,
+                ClassFileInstaller.Manifest.fromString(manifest),
+                RetransformClassesZeroLength.class.getName());
+        return jarPath;
+    }
+
+
+    public static class Agent implements ClassFileTransformer {
+        public static void premain(String args, Instrumentation inst) {
+            inst.addTransformer(new NoOpTransformer());
+            try {
+                inst.retransformClasses(new Class[0]);
+            } catch (UnmodifiableClassException ex) {
+                throw new AssertionError(ex);
+            }
+        }
+    }
+
+    private static class NoOpTransformer implements ClassFileTransformer {
+        @Override
+        public byte[] transform(ClassLoader loader,
+                                String className,
+                                Class<?> classBeingRedefined,
+                                ProtectionDomain protectionDomain,
+                                byte[] classfileBuffer
+                                ) throws IllegalClassFormatException {
+            return null;    // no transform
+        }
+    }
+}

From a2605d930175b316dfca5b9677ce0dd3273b04e9 Mon Sep 17 00:00:00 2001
From: lmesnik <unknown>
Date: Wed, 28 Mar 2018 13:38:08 -0700
Subject: [PATCH 039/196] 8200091: [TESTBUG] Update jittester for jdk11
 Reviewed-by: iignatyev

---
 test/hotspot/jtreg/testlibrary/jittester/Makefile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/testlibrary/jittester/Makefile b/test/hotspot/jtreg/testlibrary/jittester/Makefile
index e4dd97cff23..a5786a50201 100644
--- a/test/hotspot/jtreg/testlibrary/jittester/Makefile
+++ b/test/hotspot/jtreg/testlibrary/jittester/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, 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
@@ -69,7 +69,7 @@ DIST_DIR = dist
 DIST_JAR = $(DIST_DIR)/JITtester.jar
 
 SRC_FILES = $(shell find $(SRC_DIR) -name '*.java')
-TESTLIBRARY_SRC_DIR = ../../../../test/lib/jdk/test/lib
+TESTLIBRARY_SRC_DIR = ../../../../lib/jdk/test/lib
 TESTLIBRARY_SRC_FILES = $(TESTLIBRARY_SRC_DIR)/Asserts.java \
                         $(TESTLIBRARY_SRC_DIR)/JDKToolFinder.java \
                         $(TESTLIBRARY_SRC_DIR)/JDKToolLauncher.java \
@@ -125,13 +125,20 @@ copyaot: $(TESTBASE_DIR)/compiler/aot
 	@cp ../../compiler/aot/AotCompiler.java $(TESTBASE_DIR)/compiler/aot
 
 testgroup: $(TESTBASE_DIR)
-	@echo 'jittester_all = \\' > $(TESTGROUP_FILE)
+	@echo 'jittester_all = \' > $(TESTGROUP_FILE)
 	@echo '	/' >> $(TESTGROUP_FILE)
 	@echo '' >> $(TESTGROUP_FILE)
+	@echo 'jit_tests = \' >> $(TESTGROUP_FILE)
+	@echo ' java_tests \' >> $(TESTGROUP_FILE)
+	@echo ' bytecode_tests' >> $(TESTGROUP_FILE)
+	@echo '' >> $(TESTGROUP_FILE)
+	@echo 'aot_tests = \' >> $(TESTGROUP_FILE)
+	@echo ' aot_bytecode_tests \' >> $(TESTGROUP_FILE)
+	@echo ' aot_java_tests' >> $(TESTGROUP_FILE)
+	@echo '' >> $(TESTGROUP_FILE)
 
 testroot: $(TESTBASE_DIR)
 	@echo 'groups=TEST.groups' > $(TESTROOT_FILE)
 
 $(TESTBASE_DIR) $(DIST_DIR) $(TESTBASE_DIR)/jdk/test/lib/jittester/jtreg $(TESTBASE_DIR)/compiler/aot:
 	$(shell if [ ! -d $@ ]; then mkdir -p $@; fi)
-

From da2714aa56d980349c3d6b77ccacf346e1da7f29 Mon Sep 17 00:00:00 2001
From: lmesnik <unknown>
Date: Wed, 28 Mar 2018 13:25:15 -0700
Subject: [PATCH 040/196] 8200187: Exclude 3 long-running tests from tier1
 Reviewed-by: dholmes, cjplummer

---
 test/hotspot/jtreg/TEST.groups | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index abf48e48c3c..dc8afeb73e7 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -143,14 +143,15 @@ tier1_gc = \
   :tier1_gc_1 \
   :tier1_gc_2 \
   :tier1_gc_gcold \
-  :tier1_gc_gcbasher 
+  :tier1_gc_gcbasher
 
 hotspot_not_fast_gc = \
   :hotspot_gc \
   -:tier1_gc
 
 tier1_gc_1 = \
-  gc/g1/
+  gc/g1/ \
+  -gc/g1/ihop/TestIHOPErgo.java
 
 tier1_gc_2 = \
   sanity/ExecuteInternalVMTests.java \
@@ -243,7 +244,9 @@ tier1_runtime_appcds_exclude = \
 tier1_serviceability = \
   serviceability/dcmd/compiler \
   serviceability/logging \
-  serviceability/sa
+  serviceability/sa \
+  -serviceability/sa/ClhsdbScanOops.java \
+  -serviceability/sa/TestHeapDumpForLargeArray.java
 
 tier1 = \
   :tier1_common \
@@ -289,4 +292,3 @@ hotspot_rest_runtime = \
   -:tier1_runtime_appcds_exclude \
   -:hotspot_nmt \
   -:hotspot_tier2_runtime_platform_agnostic
-

From b977a0a10e81a2142ddacdbe7707b4b07b04d145 Mon Sep 17 00:00:00 2001
From: kvn <unknown>
Date: Wed, 28 Mar 2018 17:20:06 -0700
Subject: [PATCH 041/196] 8200383: Can't build on SPARC Hotspot with code which
 use math functions Summary: remove old hack which supports Solaris 8 and 9
 Reviewed-by: erikj, ihse

---
 make/autoconf/libraries.m4  | 12 +-----------
 make/lib/Awt2dLibraries.gmk |  6 +-----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
index c40a55589be..1d33778e2ad 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -114,17 +114,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   fi
 
   # Math library
-  if test "x$OPENJDK_TARGET_OS" != xsolaris; then
-    BASIC_JVM_LIBS="$LIBM"
-  else
-    # FIXME: This hard-coded path is not really proper.
-    if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-      BASIC_SOLARIS_LIBM_LIBS="/usr/lib/amd64/libm.so.1"
-    elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
-      BASIC_SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1"
-    fi
-    BASIC_JVM_LIBS="$BASIC_SOLARIS_LIBM_LIBS"
-  fi
+  BASIC_JVM_LIBS="$LIBM"
 
   # Dynamic loading library
   if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then
diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index e77c5f2a34e..f2d14e5de08 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -409,11 +409,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
-    LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
-    LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \
-    LIBS_linux := $(LIBM), \
-    LIBS_macosx := $(LIBM), \
-    LIBS_aix := $(LIBM),\
+    LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS) $(LIBM), \
     LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
 ))
 

From c7aa4f20655364f460b77326e06b35fb3485d121 Mon Sep 17 00:00:00 2001
From: redestad <unknown>
Date: Thu, 29 Mar 2018 10:38:29 +0200
Subject: [PATCH 042/196] 8200238: Reduce number of exceptions created when
 calling MemberName$Factory::resolveOrNull Reviewed-by: lfoltan, acorn,
 dholmes

---
 .../share/classes/java/lang/invoke/MemberName.java | 14 +++++++++-----
 .../java/lang/invoke/MethodHandleNatives.java      |  3 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/MemberName.java b/src/java.base/share/classes/java/lang/invoke/MemberName.java
index 8471adea570..ed25dca7c81 100644
--- a/src/java.base/share/classes/java/lang/invoke/MemberName.java
+++ b/src/java.base/share/classes/java/lang/invoke/MemberName.java
@@ -1047,7 +1047,8 @@ List<MemberName> getMembers(Class<?> defc,
          *  If lookup fails or access is not permitted, null is returned.
          *  Otherwise a fresh copy of the given member is returned, with modifier bits filled in.
          */
-        private MemberName resolve(byte refKind, MemberName ref, Class<?> lookupClass) {
+        private MemberName resolve(byte refKind, MemberName ref, Class<?> lookupClass,
+                                   boolean speculativeResolve) {
             MemberName m = ref.clone();  // JVM will side-effect the ref
             assert(refKind == m.getReferenceKind());
             try {
@@ -1066,7 +1067,10 @@ private MemberName resolve(byte refKind, MemberName ref, Class<?> lookupClass) {
                 //
                 // REFC view on PTYPES doesn't matter, since it is used only as a starting point for resolution and doesn't
                 // participate in method selection.
-                m = MethodHandleNatives.resolve(m, lookupClass);
+                m = MethodHandleNatives.resolve(m, lookupClass, speculativeResolve);
+                if (m == null && speculativeResolve) {
+                    return null;
+                }
                 m.checkForTypeAlias(m.getDeclaringClass());
                 m.resolution = null;
             } catch (ClassNotFoundException | LinkageError ex) {
@@ -1091,7 +1095,7 @@ private MemberName resolve(byte refKind, MemberName ref, Class<?> lookupClass) {
         MemberName resolveOrFail(byte refKind, MemberName m, Class<?> lookupClass,
                                  Class<NoSuchMemberException> nsmClass)
                 throws IllegalAccessException, NoSuchMemberException {
-            MemberName result = resolve(refKind, m, lookupClass);
+            MemberName result = resolve(refKind, m, lookupClass, false);
             if (result.isResolved())
                 return result;
             ReflectiveOperationException ex = result.makeAccessException();
@@ -1106,8 +1110,8 @@ MemberName resolveOrFail(byte refKind, MemberName m, Class<?> lookupClass,
          */
         public
         MemberName resolveOrNull(byte refKind, MemberName m, Class<?> lookupClass) {
-            MemberName result = resolve(refKind, m, lookupClass);
-            if (result.isResolved())
+            MemberName result = resolve(refKind, m, lookupClass, true);
+            if (result != null && result.isResolved())
                 return result;
             return null;
         }
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
index c288f6d7a57..3e872414b6c 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
@@ -49,7 +49,8 @@ private MethodHandleNatives() { } // static only
 
     static native void init(MemberName self, Object ref);
     static native void expand(MemberName self);
-    static native MemberName resolve(MemberName self, Class<?> caller) throws LinkageError, ClassNotFoundException;
+    static native MemberName resolve(MemberName self, Class<?> caller,
+            boolean speculativeResolve) throws LinkageError, ClassNotFoundException;
     static native int getMembers(Class<?> defc, String matchName, String matchSig,
             int matchFlags, Class<?> caller, int skip, MemberName[] results);
 

From 7b2082b4840f25858fc4311a76db6c697e8b4231 Mon Sep 17 00:00:00 2001
From: simonis <unknown>
Date: Thu, 29 Mar 2018 14:50:25 +0200
Subject: [PATCH 043/196] 8200360: MeetIncompatibleInterfaceArrays fails with
 "MeetIncompatibleInterfaceArrays0ASM.run() must be compiled at tier 0 !"
 Reviewed-by: kvn, thartmann

---
 .../types/TestMeetIncompatibleInterfaceArrays.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java b/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
index 8df5b0e4832..dd01fba95e6 100644
--- a/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
+++ b/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
@@ -38,6 +38,7 @@
  *        -XX:+WhiteBoxAPI
  *        -Xbatch
  *        -XX:-TieredCompilation
+ *        -XX:TieredStopAtLevel=4
  *        -XX:CICompilerCount=1
  *        -XX:+PrintCompilation
  *        -XX:+PrintInlining
@@ -51,6 +52,7 @@
  *        -XX:+WhiteBoxAPI
  *        -Xbatch
  *        -XX:-TieredCompilation
+ *        -XX:TieredStopAtLevel=4
  *        -XX:CICompilerCount=1
  *        -XX:+PrintCompilation
  *        -XX:+PrintInlining
@@ -63,6 +65,8 @@
  *        -XX:+UnlockDiagnosticVMOptions
  *        -XX:+WhiteBoxAPI
  *        -Xbatch
+ *        -XX:+TieredCompilation
+ *        -XX:TieredStopAtLevel=4
  *        -XX:CICompilerCount=2
  *        -XX:+PrintCompilation
  *        -XX:+PrintInlining
@@ -379,7 +383,8 @@ public static void main(String[] args) throws Exception {
                                        r.getName() + "() was compiled at tier " + r_comp_level + "]");
 
                     if (r_comp_level != level[pass][j]) {
-                      throw new Exception("Method " + r + " must be compiled at tier " + r_comp_level + " !");
+                      throw new Exception("Method " + r + " must be compiled at tier " + level[pass][j] +
+                                          " but was compiled at " + r_comp_level + " instead!");
                     }
 
                     WB.deoptimizeMethod(r);

From d2c8b8af55a5c5bd9435eb335d84f714abf81fa8 Mon Sep 17 00:00:00 2001
From: kvn <unknown>
Date: Thu, 29 Mar 2018 09:52:53 -0700
Subject: [PATCH 044/196] 8200391: clean up test/hotspot/jtreg/ProblemList.txt
 (compiler related) Reviewed-by: mseledtsov

---
 test/hotspot/jtreg/ProblemList-graal.txt | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-graal.txt b/test/hotspot/jtreg/ProblemList-graal.txt
index 469144946c1..4de9eb0503d 100644
--- a/test/hotspot/jtreg/ProblemList-graal.txt
+++ b/test/hotspot/jtreg/ProblemList-graal.txt
@@ -47,10 +47,6 @@ compiler/jvmci/SecurityRestrictionsTest.java                    8181837   generi
 compiler/jvmci/TestValidateModules.java                         8194942   generic-all
 gc/arguments/TestVerifyBeforeAndAfterGCFlags.java               8194942   generic-all
 
-compiler/rangechecks/TestRangeCheckSmearing.java                8195632   generic-all
-compiler/uncommontrap/Test8009761.java                          8195632   generic-all
-compiler/whitebox/ForceNMethodSweepTest.java                    8195632   generic-all
-
 compiler/unsafe/UnsafeGetConstantField.java                     8181833   generic-all
 compiler/unsafe/UnsafeGetStableArrayElement.java                8181833   generic-all
 compiler/unsafe/UnsafeOffHeapBooleanTest.java                   8181833   generic-all
@@ -70,12 +66,10 @@ gc/g1/plab/TestPLABResize.java                                  8191048   generi
 
 gc/TestNUMAPageSize.java                                        8194949   generic-all
 
-runtime/appcds/UseAppCDS.java                                   8196626   generic-all
-
 runtime/ReservedStack/ReservedStackTestCompiler.java            8181855   generic-all
 
 serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java 8195156   generic-all
 
-compiler/compilercontrol/directives/LogTest.java                8197446   generic-all
+compiler/compilercontrol/directives/LogTest.java                8181753   generic-all
 
 gc/g1/ihop/TestIHOPStatic.java                                  8199486   generic-all

From bca1d40d8c533d055daac3624b3f890ef9cc7b34 Mon Sep 17 00:00:00 2001
From: iklam <unknown>
Date: Thu, 29 Mar 2018 20:15:23 -0700
Subject: [PATCH 045/196] 8183238: Obsolete CheckEndorsedAndExtDirs and remove
 checks for lib/endorsed and lib/ext Reviewed-by: dholmes, mchung, alanb

---
 src/bsd/doc/man/java.1              | 61 +----------------------------
 src/linux/doc/man/java.1            | 61 +----------------------------
 src/solaris/doc/sun/man/man1/java.1 | 61 +----------------------------
 3 files changed, 3 insertions(+), 180 deletions(-)

diff --git a/src/bsd/doc/man/java.1 b/src/bsd/doc/man/java.1
index 4615bad506a..b75bcf1a6e2 100644
--- a/src/bsd/doc/man/java.1
+++ b/src/bsd/doc/man/java.1
@@ -1,5 +1,5 @@
 '\" t
-.\" Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1994, 2018, 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
@@ -1178,65 +1178,6 @@ Verify all classes\&.
 .PP
 These options control the runtime behavior of the Java HotSpot VM\&.
 .PP
-\-XX:+CheckEndorsedAndExtDirs
-.RS 4
-Enables the option to prevent the
-\fBjava\fR
-command from running a Java application if it uses the endorsed\-standards override mechanism or the extension mechanism\&. This option checks if an application is using one of these mechanisms by checking the following:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The
-\fBjava\&.ext\&.dirs\fR
-or
-\fBjava\&.endorsed\&.dirs\fR
-system property is set\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The
-\fBlib/endorsed\fR
-directory exists and is not empty\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The
-\fBlib/ext\fR
-directory contains any JAR files other than those of the JDK\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The system\-wide platform\-specific extension directory contains any JAR files\&.
-.RE
-.RE
-.PP
 \-XX:+DisableAttachMechanism
 .RS 4
 Enables the option that disables the mechanism that lets tools attach to the JVM\&. By default, this option is disabled, meaning that the attach mechanism is enabled and you can use tools such as
diff --git a/src/linux/doc/man/java.1 b/src/linux/doc/man/java.1
index afa5693cf7d..bec6bf80210 100644
--- a/src/linux/doc/man/java.1
+++ b/src/linux/doc/man/java.1
@@ -1,5 +1,5 @@
 '\" t
-.\" Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1994, 2018, 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
@@ -1173,65 +1173,6 @@ Verify all classes\&.
 .PP
 These options control the runtime behavior of the Java HotSpot VM\&.
 .PP
-\-XX:+CheckEndorsedAndExtDirs
-.RS 4
-Enables the option to prevent the
-\fBjava\fR
-command from running a Java application if it uses the endorsed\-standards override mechanism or the extension mechanism\&. This option checks if an application is using one of these mechanisms by checking the following:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The
-\fBjava\&.ext\&.dirs\fR
-or
-\fBjava\&.endorsed\&.dirs\fR
-system property is set\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The
-\fBlib/endorsed\fR
-directory exists and is not empty\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The
-\fBlib/ext\fR
-directory contains any JAR files other than those of the JDK\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The system\-wide platform\-specific extension directory contains any JAR files\&.
-.RE
-.RE
-.PP
 \-XX:+DisableAttachMechanism
 .RS 4
 Enables the option that disables the mechanism that lets tools attach to the JVM\&. By default, this option is disabled, meaning that the attach mechanism is enabled and you can use tools such as
diff --git a/src/solaris/doc/sun/man/man1/java.1 b/src/solaris/doc/sun/man/man1/java.1
index afa5693cf7d..bec6bf80210 100644
--- a/src/solaris/doc/sun/man/man1/java.1
+++ b/src/solaris/doc/sun/man/man1/java.1
@@ -1,5 +1,5 @@
 '\" t
-.\" Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1994, 2018, 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
@@ -1173,65 +1173,6 @@ Verify all classes\&.
 .PP
 These options control the runtime behavior of the Java HotSpot VM\&.
 .PP
-\-XX:+CheckEndorsedAndExtDirs
-.RS 4
-Enables the option to prevent the
-\fBjava\fR
-command from running a Java application if it uses the endorsed\-standards override mechanism or the extension mechanism\&. This option checks if an application is using one of these mechanisms by checking the following:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The
-\fBjava\&.ext\&.dirs\fR
-or
-\fBjava\&.endorsed\&.dirs\fR
-system property is set\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The
-\fBlib/endorsed\fR
-directory exists and is not empty\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The
-\fBlib/ext\fR
-directory contains any JAR files other than those of the JDK\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-The system\-wide platform\-specific extension directory contains any JAR files\&.
-.RE
-.RE
-.PP
 \-XX:+DisableAttachMechanism
 .RS 4
 Enables the option that disables the mechanism that lets tools attach to the JVM\&. By default, this option is disabled, meaning that the attach mechanism is enabled and you can use tools such as

From 7a19dda33fcbf4c6de6d064d97269a12023528b4 Mon Sep 17 00:00:00 2001
From: ccheung <unknown>
Date: Thu, 29 Mar 2018 21:48:38 -0700
Subject: [PATCH 046/196] 8200078: [Graal]
 runtime/appcds/GraalWithLimitedMetaspace.java crashes in visit_all_interfaces
 Summary: stop CDS dumping right away when an OOM due to insufficient
 metaspace is encountered Reviewed-by: iklam, mseledtsov

---
 .../runtime/SharedArchiveFile/MaxMetaspaceSize.java  |  6 +++---
 .../runtime/appcds/GraalWithLimitedMetaspace.java    | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java
index f8799b3843d..020c3219c64 100644
--- a/test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java
+++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,7 +24,7 @@
 /**
  * @test
  * @requires vm.cds
- * @bug 8067187
+ * @bug 8067187 8200078
  * @summary Testing CDS dumping with the -XX:MaxMetaspaceSize=<size> option
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -50,7 +50,7 @@ public static void main(String[] args) throws Exception {
       processArgs.add("-XX:MaxMetaspaceSize=1m");
     }
 
-    String msg = "OutOfMemoryError: Metaspace";
+    String msg = "Failed allocating metaspace object";
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(processArgs.toArray(new String[0]));
     CDSTestUtils.executeAndLog(pb, "dump").shouldContain(msg).shouldHaveExitValue(1);
   }
diff --git a/test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java b/test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java
index 91d8aa8ec9d..1cc230f33fa 100644
--- a/test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java
+++ b/test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java
@@ -125,8 +125,14 @@ static void dumpArchive() throws Exception {
             "-XX:MetaspaceSize=12M",
             "-XX:MaxMetaspaceSize=12M"));
 
-        OutputAnalyzer output = TestCommon.executeAndLog(pb, "dump-archive")
-            .shouldHaveExitValue(1)
-            .shouldContain("Failed allocating metaspace object type");
+        OutputAnalyzer output = TestCommon.executeAndLog(pb, "dump-archive");
+        int exitValue = output.getExitValue();
+        if (exitValue == 1) {
+            output.shouldContain("Failed allocating metaspace object type");
+        } else if (exitValue == 0) {
+            output.shouldContain("Loading classes to share");
+        } else {
+            throw new RuntimeException("Unexpected exit value " + exitValue);
+        }
     }
 }

From 453f0650fe1efd83d219e2457940beab678c383f Mon Sep 17 00:00:00 2001
From: stuefe <unknown>
Date: Fri, 30 Mar 2018 06:31:16 +0200
Subject: [PATCH 047/196] 8191101: Show register content in hs-err file on
 assert Reviewed-by: adinn, clanger, simonis

---
 .../ShowRegistersOnAssertTest.java            | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java

diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java
new file mode 100644
index 00000000000..732729f8ed4
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8191101
+ * @summary Show Registers on assert/guarantee
+ * @library /test/lib
+ * @requires (vm.debug == true) & (os.family == "linux")
+ * @author Thomas Stuefe (SAP)
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ */
+
+// Note: this test can only run on debug since it relies on VMError::controlled_crash() which
+// only exists in debug builds.
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.regex.Pattern;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+
+public class ShowRegistersOnAssertTest {
+
+    private static void do_test(boolean do_assert, // true - assert, false - guarantee
+        boolean suppress_assert,
+        boolean show_registers_on_assert) throws Exception
+    {
+        System.out.println("Testing " + (suppress_assert ? "suppressed" : "normal") + " " + (do_assert ? "assert" : "guarantee") +
+                           " with " + (show_registers_on_assert ? "-XX:+ShowRegistersOnAssert" : "-XX:-ShowRegistersOnAssert") + "...");
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+            "-XX:+UnlockDiagnosticVMOptions", "-Xmx100M", "-XX:-CreateCoredumpOnCrash",
+            "-XX:ErrorHandlerTest=" + (do_assert ? "1" : "3"),
+            (suppress_assert ? "-XX:SuppressErrorAt=/vmError.cpp" : ""),
+            (show_registers_on_assert ? "-XX:+ShowRegistersOnAssert" : "-XX:-ShowRegistersOnAssert"),
+            "-version");
+
+        OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
+
+        if (suppress_assert) {
+            // we should have not have crashed. See VMError::controlled_crash().
+            output_detail.shouldMatch(".*survived intentional crash.*");
+        } else {
+            // we should have crashed with an internal error. We should definitly NOT have crashed with a segfault
+            // (which would be a sign that the assert poison page mechanism does not work).
+            output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
+            output_detail.shouldMatch("# +Internal Error.*");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        // Note: for now, this is only a regression test testing that the addition of ShowRegistersOnAssert does
+        // not break normal assert/guarantee handling. The feature is not implemented on all platforms and really testing
+        // it requires more effort.
+        do_test(false, false, false);
+        do_test(false, false, true);
+        do_test(false, true, false);
+        do_test(false, true, true);
+        do_test(true, false, false);
+        do_test(true, false, true);
+        do_test(true, true, false);
+        do_test(true, true, true);
+    }
+
+}
+

From 69dfd0f3dc12e6a1eb7e8bed51c133207565098c Mon Sep 17 00:00:00 2001
From: kvn <unknown>
Date: Fri, 30 Mar 2018 07:47:20 -0700
Subject: [PATCH 048/196] 8200461: MeetIncompatibleInterfaceArrays test fails
 with -Xcomp Summary: Add requires to run test only in Xmixed mode.
 Reviewed-by: simonis

---
 .../compiler/types/TestMeetIncompatibleInterfaceArrays.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java b/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
index dd01fba95e6..f64253db950 100644
--- a/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
+++ b/test/hotspot/jtreg/compiler/types/TestMeetIncompatibleInterfaceArrays.java
@@ -25,6 +25,7 @@
  * @test
  * @bug 8141551
  * @summary C2 can not handle returns with inccompatible interface arrays
+ * @requires vm.compMode == "Xmixed" & vm.flavor == "server"
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  * @library /test/lib /

From 3eb39e1c02389f641708bdf4872495b4de443fce Mon Sep 17 00:00:00 2001
From: serb <unknown>
Date: Fri, 30 Mar 2018 13:57:19 -0700
Subject: [PATCH 049/196] 8198335:
 java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java
 fails in headless mode Reviewed-by: prr

---
 .../classes/sun/awt/windows/WToolkit.java       | 17 ++++++++++-------
 test/jdk/ProblemList.txt                        |  1 -
 .../UninitializedDisplayModeChangeTest.java     |  3 ++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java b/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
index 82ea9d709b9..812ea7a2985 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -47,6 +47,7 @@
 import sun.awt.AWTAutoShutdown;
 import sun.awt.AWTPermissions;
 import sun.awt.AppContext;
+import sun.awt.DisplayChangedListener;
 import sun.awt.LightweightFrame;
 import sun.awt.SunToolkit;
 import sun.awt.util.ThreadGroupUtils;
@@ -802,9 +803,10 @@ public Dimension getBestCursorSize(int preferredWidth, int preferredHeight) {
     public native int getMaximumCursorColors();
 
     static void paletteChanged() {
-        ((Win32GraphicsEnvironment)GraphicsEnvironment
-        .getLocalGraphicsEnvironment())
-        .paletteChanged();
+        Object lge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        if (lge instanceof DisplayChangedListener) {
+            ((DisplayChangedListener) lge).paletteChanged();
+        }
     }
 
     /*
@@ -816,9 +818,10 @@ public static void displayChanged() {
         EventQueue.invokeLater(new Runnable() {
             @Override
             public void run() {
-                ((Win32GraphicsEnvironment)GraphicsEnvironment
-                .getLocalGraphicsEnvironment())
-                .displayChanged();
+                Object lge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+                if (lge instanceof DisplayChangedListener) {
+                    ((DisplayChangedListener) lge).displayChanged();
+                }
             }
         });
     }
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 94c3610b7b3..4b8039d098f 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -171,7 +171,6 @@ java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 815
 java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java 6990210 generic-all
 java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html 4931413 windows-all
 java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java 7019055 windows-all
-java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java 8198335 windows-all
 java/awt/Focus/8013611/JDK8013611.java 8175366 windows-all,macosx-all
 java/awt/Focus/6378278/InputVerifierTest.java 8198616 macosx-all
 java/awt/Focus/6382144/EndlessLoopTest.java 8198617 macosx-all
diff --git a/test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java b/test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java
index 11b0b941b6c..c9ee4991421 100644
--- a/test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java
+++ b/test/jdk/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java
@@ -23,12 +23,13 @@
 
 /**
  * @test
- * @bug 6358034 6568560 8198613
+ * @bug 6358034 6568560 8198613 8198335
  * @key headful
  * @summary Tests that no exception is thrown when display mode is changed
  *          externally
  * @compile UninitializedDisplayModeChangeTest.java DisplayModeChanger.java
  * @run main/othervm UninitializedDisplayModeChangeTest
+ * @run main/othervm -Djava.awt.headless=true UninitializedDisplayModeChangeTest
  */
 
 import java.awt.EventQueue;

From 7acc5d00510697e1b39d6ad949c66affc3410d79 Mon Sep 17 00:00:00 2001
From: kaddepalli <unknown>
Date: Mon, 2 Apr 2018 16:52:11 +0530
Subject: [PATCH 050/196] 8200525: test
 java/awt/event/SequencedEvent/SequencedEventTest.java fails to compile
 Reviewed-by: prr, serb

---
 .../java/awt/event/SequencedEvent/SequencedEventTest.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/jdk/java/awt/event/SequencedEvent/SequencedEventTest.java b/test/jdk/java/awt/event/SequencedEvent/SequencedEventTest.java
index 12e849f074e..b8df72e187c 100644
--- a/test/jdk/java/awt/event/SequencedEvent/SequencedEventTest.java
+++ b/test/jdk/java/awt/event/SequencedEvent/SequencedEventTest.java
@@ -25,7 +25,8 @@
  * @test
  * @bug 8152974
  * @key headful
- * @summary AWT hang occurrs when sequenced events arrive out of sequence
+ * @modules java.desktop/sun.awt
+ * @summary AWT hang occurs when sequenced events arrive out of sequence
  * @run main SequencedEventTest
  */
 import sun.awt.AppContext;
@@ -84,7 +85,8 @@ public static void main(String[] args) throws Exception {
                     peekEvent(java.awt.event.FocusEvent.FOCUS_LAST + 1);
 
             if (ev != null)
-                throw new RuntimeException("Test case failed!");
+                throw new RuntimeException("Test case failed, since all the sequenced events" +
+                "are not flushed!" + ev);
         } catch (InterruptedException e) {
             throw new RuntimeException("Test case failed." + e.getMessage());
         }
@@ -163,7 +165,7 @@ private AWTEvent getSequencedEvent()
              */
             Class<? extends AWTEvent> seqClass = (Class<? extends AWTEvent>) Class.forName("java.awt.SequencedEvent");
             Constructor<? extends AWTEvent> seqConst = seqClass.getConstructor(AWTEvent.class);
-            seqConst.setAccessible(true);;
+            seqConst.setAccessible(true);
             return seqConst.newInstance(wrapMe);
         } catch (Throwable err) {
             throw new RuntimeException("Unable to instantiate SequencedEvent",err);

From fefcc5244858822a7f643bbf65a7192f4a385cd9 Mon Sep 17 00:00:00 2001
From: kaddepalli <unknown>
Date: Mon, 2 Apr 2018 16:56:58 +0530
Subject: [PATCH 051/196] 8200343: Minor JViewport documentation typo
 Reviewed-by: serb, pkbalakr

---
 src/java.desktop/share/classes/javax/swing/JViewport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.desktop/share/classes/javax/swing/JViewport.java b/src/java.desktop/share/classes/javax/swing/JViewport.java
index 44576585435..3fb3b6d76ec 100644
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java
@@ -61,7 +61,7 @@
  * <p>
  * <b>NOTE:</b>We have implemented a faster scrolling algorithm that
  * does not require a buffer to draw in. The algorithm works as follows:
- * <ol><li>The view and parent view and checked to see if they are
+ * <ol><li>The view and parent view are checked to see if they are
  * <code>JComponents</code>,
  * if they aren't, stop and repaint the whole viewport.
  * <li>If the viewport is obscured by an ancestor, stop and repaint the whole

From 3e9764ae7d145637489b1fc509c6658e38d488e3 Mon Sep 17 00:00:00 2001
From: iignatyev <unknown>
Date: Tue, 3 Apr 2018 10:01:04 -0700
Subject: [PATCH 052/196] 8200538: cl : Command line warning D9014 : invalid
 value '2220' for '/wd' Reviewed-by: ihse

---
 make/lib/Awt2dLibraries.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index b5391fd2643..5edc62a8ff2 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -543,7 +543,7 @@ else
       DISABLED_WARNINGS_solstudio := \
          E_STATEMENT_NOT_REACHED \
          E_END_OF_LOOP_CODE_NOT_REACHED, \
-      DISABLED_WARNINGS_microsoft := 4267 2220 4244, \
+      DISABLED_WARNINGS_microsoft := 4267 4244, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
   ))

From 6e2a4c163c6f701b269ba876ba8b9268dfdd6873 Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Tue, 3 Apr 2018 21:50:35 +0200
Subject: [PATCH 053/196] 8200267: a.out created at top dir by Solaris build
 Reviewed-by: erikj

---
 make/autoconf/toolchain.m4 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index ea03071f3e3..a95759f4768 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -597,8 +597,9 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
 
     # solstudio cc requires us to have an existing file to pass as argument,
     # but it need not be a syntactically correct C file, so just use
-    # ourself. :)
-    LINKER_VERSION_STRING=`$LD -Wl,-V $TOPDIR/configure 2>&1 | $HEAD -n 1 | $SED -e 's/ld: //'`
+    # ourself. :) The intermediate 'cat' is needed to stop ld from leaving
+    # a lingering a.out (!).
+    LINKER_VERSION_STRING=`$LD -Wl,-V $TOPDIR/configure 2>&1 | $CAT | $HEAD -n 1 | $SED -e 's/ld: //'`
     # Extract version number
     [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
         $SED -e 's/.* \([0-9][0-9]*\.[0-9][0-9]*\)-\([0-9][0-9]*\.[0-9][0-9]*\)/\1.\2/'` ]

From 8556dda8dab87231884fb52615b7fab6a6ece76e Mon Sep 17 00:00:00 2001
From: rfield <unknown>
Date: Tue, 3 Apr 2018 13:27:58 -0700
Subject: [PATCH 054/196] 8198801: JShell: user exception chained cause not
 retained Reviewed-by: jlahoda

---
 .../jdk/internal/jshell/tool/JShellTool.java  |  83 +++++++---
 .../jshell/tool/resources/l10n.properties     |   5 +
 .../share/classes/jdk/jshell/Eval.java        |  38 ++++-
 .../classes/jdk/jshell/EvalException.java     |  25 ++-
 .../classes/jdk/jshell/JShellException.java   |   6 +-
 .../jshell/UnresolvedReferenceException.java  |   2 +-
 .../execution/DirectExecutionControl.java     |  19 ++-
 .../execution/ExecutionControlForwarder.java  |  45 ++++--
 .../jdk/jshell/execution/RemoteCodes.java     |  10 +-
 .../execution/StreamingExecutionControl.java  |  61 ++++++--
 test/langtools/jdk/jshell/ExceptionsTest.java | 142 +++++++++++++++---
 test/langtools/jdk/jshell/ToolSimpleTest.java |  28 +++-
 12 files changed, 382 insertions(+), 82 deletions(-)

diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
index b123782bf92..0bdd37afe6a 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
@@ -81,6 +81,7 @@
 import jdk.jshell.ImportSnippet;
 import jdk.jshell.JShell;
 import jdk.jshell.JShell.Subscription;
+import jdk.jshell.JShellException;
 import jdk.jshell.MethodSnippet;
 import jdk.jshell.Snippet;
 import jdk.jshell.Snippet.Kind;
@@ -3357,21 +3358,61 @@ List<Diag> errorsOnly(List<Diag> diagnostics) {
     /**
      * Print out a snippet exception.
      *
-     * @param exception the exception to print
+     * @param exception the throwable to print
      * @return true on fatal exception
      */
-    private boolean displayException(Exception exception) {
+    private boolean displayException(Throwable exception) {
+        Throwable rootCause = exception;
+        while (rootCause instanceof EvalException) {
+            rootCause = rootCause.getCause();
+        }
+        if (rootCause != exception && rootCause instanceof UnresolvedReferenceException) {
+            // An unresolved reference caused a chained exception, just show the unresolved
+            return displayException(rootCause, null);
+        } else {
+            return displayException(exception, null);
+        }
+    }
+    //where
+    private boolean displayException(Throwable exception, StackTraceElement[] caused) {
         if (exception instanceof EvalException) {
-            printEvalException((EvalException) exception);
-            return true;
+            // User exception
+            return displayEvalException((EvalException) exception, caused);
         } else if (exception instanceof UnresolvedReferenceException) {
-            printUnresolvedException((UnresolvedReferenceException) exception);
-            return false;
+            // Reference to an undefined snippet
+            return displayUnresolvedException((UnresolvedReferenceException) exception);
         } else {
+            // Should never occur
             error("Unexpected execution exception: %s", exception);
             return true;
         }
     }
+    //where
+    private boolean displayUnresolvedException(UnresolvedReferenceException ex) {
+        // Display the resolution issue
+        printSnippetStatus(ex.getSnippet(), false);
+        return false;
+    }
+
+    //where
+    private boolean displayEvalException(EvalException ex, StackTraceElement[] caused) {
+        // The message for the user exception is configured based on the
+        // existance of an exception message and if this is a recursive
+        // invocation for a chained exception.
+        String msg = ex.getMessage();
+        String key = "jshell.err.exception" +
+                (caused == null? ".thrown" : ".cause") +
+                (msg == null? "" : ".message");
+        errormsg(key, ex.getExceptionClassName(), msg);
+        // The caused trace is sent to truncate duplicate elements in the cause trace
+        printStackTrace(ex.getStackTrace(), caused);
+        JShellException cause = ex.getCause();
+        if (cause != null) {
+            // Display the cause (recursively)
+            displayException(cause, ex.getStackTrace());
+        }
+        return true;
+    }
 
     /**
      * Display a list of diagnostics.
@@ -3518,9 +3559,19 @@ private boolean handleEvent(SnippetEvent ste) {
         }
         return false;
     }
-    //where
-    void printStackTrace(StackTraceElement[] stes) {
-        for (StackTraceElement ste : stes) {
+
+    // Print a stack trace, elide frames displayed for the caused exception
+    void printStackTrace(StackTraceElement[] stes, StackTraceElement[] caused) {
+        int overlap = 0;
+        if (caused != null) {
+            int maxOverlap = Math.min(stes.length, caused.length);
+            while (overlap < maxOverlap
+                    && stes[stes.length - (overlap + 1)].equals(caused[caused.length - (overlap + 1)])) {
+                ++overlap;
+            }
+        }
+        for (int i = 0; i < stes.length - overlap; ++i) {
+            StackTraceElement ste = stes[i];
             StringBuilder sb = new StringBuilder();
             String cn = ste.getClassName();
             if (!cn.isEmpty()) {
@@ -3548,19 +3599,9 @@ void printStackTrace(StackTraceElement[] stes) {
             error("      at %s(%s)", sb, loc);
 
         }
-    }
-    //where
-    void printUnresolvedException(UnresolvedReferenceException ex) {
-        printSnippetStatus(ex.getSnippet(), false);
-    }
-    //where
-    void printEvalException(EvalException ex) {
-        if (ex.getMessage() == null) {
-            error("%s thrown", ex.getExceptionClassName());
-        } else {
-            error("%s thrown: %s", ex.getExceptionClassName(), ex.getMessage());
+        if (overlap != 0) {
+            error("      ...");
         }
-        printStackTrace(ex.getStackTrace());
     }
 
     private FormatAction toAction(Status status, Status previousStatus, boolean isSignatureChange) {
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
index 6b526691571..0bc471c9630 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
@@ -163,6 +163,11 @@ jshell.err.retained.mode.failure = Failure in retained modes (modes cleared) --
 
 jshell.err.corrupted.stored.startup = Corrupted stored startup, using default -- {0}
 
+jshell.err.exception.thrown = Exception {0}
+jshell.err.exception.thrown.message = Exception {0}: {1}
+jshell.err.exception.cause = Caused by: {0}
+jshell.err.exception.cause.message = Caused by: {0}: {1}
+
 jshell.console.see.synopsis = <press tab again to see synopsis>
 jshell.console.see.full.documentation = <press tab again to see full documentation>
 jshell.console.see.documentation = <press tab again to see documentation>
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Eval.java b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
index f2f40aa04dc..9f64a9326da 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
@@ -850,17 +850,15 @@ private List<SnippetEvent> declare(Snippet si, DiagList generatedDiagnostics) {
                             ? expunge(value)
                             : "";
                 } catch (ResolutionException ex) {
-                    DeclarationSnippet sn = (DeclarationSnippet) state.maps.getSnippetDeadOrAlive(ex.id());
-                    exception = new UnresolvedReferenceException(sn, translateExceptionStack(ex));
+                    exception = asUnresolvedReferenceException(ex);
                 } catch (UserException ex) {
-                    exception = new EvalException(ex.getMessage(),
-                            ex.causeExceptionClass(),
-                            translateExceptionStack(ex));
+                    exception = asEvalException(ex);
                 } catch (RunException ex) {
                     // StopException - no-op
                 } catch (InternalException ex) {
                     state.debug(ex, "invoke");
                 } catch (EngineTerminationException ex) {
+                    state.debug(ex, "termination");
                     state.closeDown();
                 }
             } else if (si.subKind() == SubKind.VAR_DECLARATION_SUBKIND) {
@@ -890,6 +888,36 @@ private List<SnippetEvent> declare(Snippet si, DiagList generatedDiagnostics) {
         return events(c, outs, value, exception);
     }
 
+    // Convert an internal UserException to an API EvalException, translating
+    // the stack to snippet form.  Convert any chained exceptions
+    private EvalException asEvalException(UserException ue) {
+        return new EvalException(ue.getMessage(),
+                ue.causeExceptionClass(),
+                translateExceptionStack(ue),
+                asJShellException(ue.getCause()));
+    }
+
+    // Convert an internal ResolutionException to an API UnresolvedReferenceException,
+    // translating the snippet id to snipper and the stack to snippet form
+    private UnresolvedReferenceException asUnresolvedReferenceException(ResolutionException re) {
+        DeclarationSnippet sn = (DeclarationSnippet) state.maps.getSnippetDeadOrAlive(re.id());
+        return new UnresolvedReferenceException(sn, translateExceptionStack(re));
+    }
+
+    // Convert an internal UserException/ResolutionException to an API
+    // EvalException/UnresolvedReferenceException
+    private JShellException asJShellException(Throwable e) {
+        if (e == null) {
+            return null;
+        } else if (e instanceof UserException) {
+            return asEvalException((UserException) e);
+        } else if (e instanceof ResolutionException) {
+            return asUnresolvedReferenceException((ResolutionException) e);
+        } else {
+            throw new AssertionError(e);
+        }
+    }
+
     private boolean interestingEvent(SnippetEvent e) {
         return e.isSignatureChange()
                     || e.causeSnippet() == null
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java b/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java
index 70883742d59..01721db3fa6 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -26,10 +26,10 @@
 package jdk.jshell;
 
 /**
- * Wraps an exception thrown in the remotely executing client.
+ * Wraps an throwable thrown in the executing client.
  * An instance of <code>EvalException</code> can be returned in the
  * {@link jdk.jshell.SnippetEvent#exception()} query.
- * The name of the exception thrown is available from
+ * The name of the throwable thrown is available from
  * {@link jdk.jshell.EvalException#getExceptionClassName()}.
  * Message and stack can be queried by methods on <code>Exception</code>.
  * <p>
@@ -45,8 +45,9 @@
 public class EvalException extends JShellException {
     private final String exceptionClass;
 
-    EvalException(String message, String exceptionClass, StackTraceElement[] stackElements) {
-        super(message);
+    EvalException(String message, String exceptionClass,
+            StackTraceElement[] stackElements, JShellException cause) {
+        super(message, cause);
         this.exceptionClass = exceptionClass;
         this.setStackTrace(stackElements);
     }
@@ -63,4 +64,18 @@ public String getExceptionClassName() {
         return exceptionClass;
     }
 
+    /**
+     * Returns the wrapped cause of the throwable in the executing client
+     * represented by this {@code EvalException} or {@code null} if the cause is
+     * nonexistent or unknown.
+     *
+     * @return the cause wrapped in a {@code EvalException} or
+     * {@link UnresolvedReferenceException} or return {@code null} if the cause
+     * is nonexistent or unknown.
+     * @since 11
+     */
+    @Override
+    public JShellException getCause() {
+        return (JShellException) super.getCause();
+    }
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/JShellException.java b/src/jdk.jshell/share/classes/jdk/jshell/JShellException.java
index a9fe6a0caf8..637b50d2b9b 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/JShellException.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/JShellException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -36,4 +36,8 @@ public class JShellException extends Exception {
     JShellException(String message) {
         super(message);
     }
+
+    JShellException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java b/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java
index 0bc2918d75f..44c33e6a074 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java
@@ -45,7 +45,7 @@ public class UnresolvedReferenceException extends JShellException {
     final DeclarationSnippet snippet;
 
     UnresolvedReferenceException(DeclarationSnippet snippet, StackTraceElement[] stackElements) {
-        super("Attempt to use definition snippet with unresolved references");
+        super("Attempt to use definition snippet with unresolved references in " + snippet);
         this.snippet = snippet;
         this.setStackTrace(stackElements);
     }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java
index a1e9d1f2273..67255823adb 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -288,11 +288,20 @@ protected static String valueString(Object value) {
      * @throws ExecutionControl.InternalException for internal problems
      */
     protected String throwConvertedInvocationException(Throwable cause) throws RunException, InternalException {
-        if (cause instanceof SPIResolutionException) {
-            SPIResolutionException spire = (SPIResolutionException) cause;
-            throw new ResolutionException(spire.id(), spire.getStackTrace());
+        throw asRunException(cause);
+    }
+
+    private RunException asRunException(Throwable ex) {
+        if (ex instanceof SPIResolutionException) {
+            SPIResolutionException spire = (SPIResolutionException) ex;
+            return new ResolutionException(spire.id(), spire.getStackTrace());
         } else {
-            throw new UserException(cause.getMessage(), cause.getClass().getName(), cause.getStackTrace());
+            UserException ue = new UserException(ex.getMessage(),
+                    ex.getClass().getName(),
+                    ex.getStackTrace());
+            Throwable cause = ex.getCause();
+            ue.initCause(cause == null ? null : asRunException(cause));
+            return ue;
         }
     }
 
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/ExecutionControlForwarder.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/ExecutionControlForwarder.java
index ff1cdd5cb50..061e548878b 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/ExecutionControlForwarder.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/ExecutionControlForwarder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -195,8 +195,7 @@ private boolean processCommand() throws IOException {
             flush();
             return true;
         } catch (InternalException ex) {
-            writeStatus(RESULT_INTERNAL_PROBLEM);
-            writeUTF(ex.getMessage());
+            writeInternalException(ex);
             flush();
             return true;
         } catch (ClassInstallException ex) {
@@ -206,16 +205,24 @@ private boolean processCommand() throws IOException {
             flush();
             return true;
         } catch (UserException ex) {
-            writeStatus(RESULT_USER_EXCEPTION);
-            writeNullOrUTF(ex.getMessage());
-            writeUTF(ex.causeExceptionClass());
-            writeObject(ex.getStackTrace());
+            writeStatus(RESULT_USER_EXCEPTION_CHAINED);
+            for (Throwable e = ex; e != null; ) {
+                if (e instanceof UserException) {
+                    writeUserException((UserException) e);
+                    e = e.getCause();
+                } else if (e instanceof ResolutionException) {
+                    writeResolutionException((ResolutionException) e);
+                    e = null;
+                } else {
+                    writeInternalException(e);
+                    e = null;
+                }
+            }
+            writeStatus(RESULT_SUCCESS);
             flush();
             return true;
         } catch (ResolutionException ex) {
-            writeStatus(RESULT_CORRALLED);
-            writeInt(ex.id());
-            writeObject(ex.getStackTrace());
+            writeResolutionException(ex);
             flush();
             return true;
         } catch (StoppedException ex) {
@@ -232,6 +239,24 @@ private boolean processCommand() throws IOException {
         }
     }
 
+    void writeInternalException(Throwable ex) throws IOException {
+        writeStatus(RESULT_INTERNAL_PROBLEM);
+        writeUTF(ex.getMessage());
+    }
+
+    void writeUserException(UserException ex) throws IOException {
+        writeStatus(RESULT_USER_EXCEPTION);
+        writeNullOrUTF(ex.getMessage());
+        writeUTF(ex.causeExceptionClass());
+        writeObject(ex.getStackTrace());
+    }
+
+    void writeResolutionException(ResolutionException ex) throws IOException {
+        writeStatus(RESULT_CORRALLED);
+        writeInt(ex.id());
+        writeObject(ex.getStackTrace());
+    }
+
     void commandLoop() {
         try {
             while (processCommand()) {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteCodes.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteCodes.java
index c841adb253b..e7b3f2c65cd 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteCodes.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteCodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -89,7 +89,7 @@ class RemoteCodes {
      */
     static final int RESULT_INTERNAL_PROBLEM        = 103;
     /**
-     * User exception encountered.
+     * User exception encountered. Legacy and used within RESULT_USER_EXCEPTION_CHAINED
      */
     static final int RESULT_USER_EXCEPTION          = 104;
     /**
@@ -104,5 +104,9 @@ class RemoteCodes {
      * The invoke has been stopped.
      */
     static final int RESULT_STOPPED                 = 107;
-
+    /**
+     * User exception encountered.
+     * @since 11
+     */
+    static final int RESULT_USER_EXCEPTION_CHAINED  = 108;
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/StreamingExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/StreamingExecutionControl.java
index 8c8f2f00821..a2c70a1bdaa 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/StreamingExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/StreamingExecutionControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -283,18 +283,46 @@ private void readAndReportExecutionResult() throws RunException,
                     throw new NotImplementedException(message);
                 }
                 case RESULT_USER_EXCEPTION: {
-                    // A user exception was encountered.
-                    String message = readNullOrUTF();
-                    String exceptionClassName = in.readUTF();
-                    StackTraceElement[] elems = (StackTraceElement[]) in.readObject();
-                    throw new UserException(message, exceptionClassName, elems);
+                    // A user exception was encountered.  Handle pre JDK 11 back-ends
+                    throw readUserException();
                 }
                 case RESULT_CORRALLED: {
                     // An unresolved reference was encountered.
-                    int id = in.readInt();
-                    StackTraceElement[] elems = (StackTraceElement[]) in.readObject();
-                    ResolutionException re = new ResolutionException(id, elems);
-                    throw re;
+                    throw readResolutionException();
+                }
+                case RESULT_USER_EXCEPTION_CHAINED: {
+                    // A user exception was encountered -- transmit chained.
+                    in.readInt(); // always RESULT_USER_EXCEPTION
+                    UserException result = readUserException();
+                    RunException caused = result;
+                    // Loop through the chained causes (if any) building a chained exception
+                    loop: while (true) {
+                        RunException ex;
+                        int cstatus = in.readInt();
+                        switch (cstatus) {
+                            case RESULT_USER_EXCEPTION: {
+                                // A user exception was the proximal cause.
+                                ex = readUserException();
+                                break;
+                            }
+                            case RESULT_CORRALLED: {
+                                // An unresolved reference was the underlying cause.
+                                ex = readResolutionException();
+                                break;
+                            }
+                            case RESULT_SUCCESS: {
+                                // End of chained exceptions
+                                break loop;
+                            }
+                            default: {
+                                throw new EngineTerminationException("Bad chained remote result code: " + cstatus);
+                            }
+                        }
+                        caused.initCause(ex);
+                        caused = ex;
+                    }
+                    caused.initCause(null); // root cause has no cause
+                    throw result;
                 }
                 case RESULT_STOPPED: {
                     // Execution was aborted by the stop()
@@ -314,8 +342,21 @@ private void readAndReportExecutionResult() throws RunException,
                 }
             }
         } catch (IOException | ClassNotFoundException ex) {
+            ex.printStackTrace();
             throw new EngineTerminationException(ex.toString());
         }
     }
 
+    private UserException readUserException() throws IOException, ClassNotFoundException {
+        String message = readNullOrUTF();
+        String exceptionClassName = in.readUTF();
+        StackTraceElement[] elems = (StackTraceElement[]) in.readObject();
+        return new UserException(message, exceptionClassName, elems);
+    }
+
+    private ResolutionException readResolutionException() throws IOException, ClassNotFoundException {
+        int id = in.readInt();
+        StackTraceElement[] elems = (StackTraceElement[]) in.readObject();
+        return new ResolutionException(id, elems);
+    }
 }
diff --git a/test/langtools/jdk/jshell/ExceptionsTest.java b/test/langtools/jdk/jshell/ExceptionsTest.java
index a5dde23cb19..b9ff29bd63c 100644
--- a/test/langtools/jdk/jshell/ExceptionsTest.java
+++ b/test/langtools/jdk/jshell/ExceptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,16 +24,20 @@
 /*
  * @test
  * @summary Tests for exceptions
+ * @bug 8198801
  * @build KullaTesting TestingInputStream
  * @run testng ExceptionsTest
  */
 
-import jdk.jshell.SnippetEvent;
-import jdk.jshell.EvalException;
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-
+import jdk.jshell.EvalException;
+import jdk.jshell.JShellException;
 import jdk.jshell.Snippet;
+import jdk.jshell.SnippetEvent;
+import jdk.jshell.UnresolvedReferenceException;
+
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.*;
@@ -81,6 +85,54 @@ public void throwFromStaticMethodOfInterface() {
                         newStackTraceElement("", "", cr3.snippet(), 1)));
     }
 
+    public void throwChained() {
+        String message1 = "error_message1";
+        String message2 = "error_message2";
+        Snippet s1 = methodKey(assertEval("void p() throws Exception { ((String) null).toString(); }"));
+        Snippet s2 = methodKey(assertEval("void n() throws Exception { try { p(); } catch (Exception ex) { throw new java.io.IOException(\"" + message2 + "\", ex); }}"));
+        Snippet s3 = methodKey(assertEval("void m() {\n"
+                + "try { n(); }\n"
+                + "catch (Exception ex) {\n"
+                + "    throw new RuntimeException(\"" + message1 + "\", ex);\n"
+                + "}}"));
+        SnippetEvent cr4 = assertEvalException("m();");
+        assertExceptionMatch(cr4,
+                new ExceptionInfo(RuntimeException.class, message1,
+                        new ExceptionInfo(IOException.class, message2,
+                                new ExceptionInfo(NullPointerException.class, null,
+                                        newStackTraceElement("", "p", s1, 1),
+                                        newStackTraceElement("", "n", s2, 1),
+                                        newStackTraceElement("", "m", s3, 2),
+                                        newStackTraceElement("", "", cr4.snippet(), 1)),
+                                newStackTraceElement("", "n", s2, 1),
+                                newStackTraceElement("", "m", s3, 2),
+                                newStackTraceElement("", "", cr4.snippet(), 1)),
+                        newStackTraceElement("", "m", s3, 4),
+                        newStackTraceElement("", "", cr4.snippet(), 1)));
+    }
+
+    public void throwChainedUnresolved() {
+        String message1 = "error_message1";
+        String message2 = "error_message2";
+        Snippet s1 = methodKey(assertEval("void p() throws Exception { ((String) null).toString(); }"));
+        Snippet s2 = methodKey(assertEval("void n() throws Exception { try { p(); } catch (Exception ex) { throw new java.io.IOException(\"" + message2 + "\", ex); }}"));
+        Snippet s3 = methodKey(assertEval("void m() {\n"
+                + "try { n(); }\n"
+                + "catch (Exception ex) {\n"
+                + "    throw new RuntimeException(\"" + message1 + "\", ex);\n"
+                + "}}"));
+        getState().drop(s1);
+        SnippetEvent cr4 = assertEvalException("m();");
+        assertExceptionMatch(cr4,
+                new ExceptionInfo(RuntimeException.class, message1,
+                        new UnresolvedExceptionInfo(s2,
+                                newStackTraceElement("", "n", s2, 1),
+                                newStackTraceElement("", "m", s3, 2),
+                                newStackTraceElement("", "", cr4.snippet(), 1)),
+                        newStackTraceElement("", "m", s3, 4),
+                        newStackTraceElement("", "", cr4.snippet(), 1)));
+    }
+
     public void throwFromConstructor() {
         String message = "error_message";
         Snippet s1 = methodKey(assertEval("void f() { throw new RuntimeException(\"" + message + "\"); }"));
@@ -171,15 +223,42 @@ private StackTraceElement newStackTraceElement(String className, String methodNa
         return new StackTraceElement(className, methodName, "#" + key.id(), lineNumber);
     }
 
-    private static class ExceptionInfo {
+    private static class AnyExceptionInfo {
+
+        public final StackTraceElement[] stackTraceElements;
+
+        public AnyExceptionInfo(StackTraceElement... stackTraceElements) {
+            this.stackTraceElements = stackTraceElements.length == 0 ? null : stackTraceElements;
+        }
+    }
+
+    private static class UnresolvedExceptionInfo extends AnyExceptionInfo {
+
+        public final Snippet sn;
+
+        public UnresolvedExceptionInfo(Snippet sn, StackTraceElement... stackTraceElements) {
+            super(stackTraceElements);
+            this.sn = sn;
+        }
+    }
+
+    private static class ExceptionInfo extends AnyExceptionInfo {
+
         public final Class<? extends Throwable> exception;
         public final String message;
-        public final StackTraceElement[] stackTraceElements;
+        public final AnyExceptionInfo cause;
+
+        public ExceptionInfo(Class<? extends Throwable> exception, String message,
+                StackTraceElement... stackTraceElements) {
+            this(exception, message, null, stackTraceElements);
+        }
 
-        public ExceptionInfo(Class<? extends Throwable> exception, String message, StackTraceElement...stackTraceElements) {
+        public ExceptionInfo(Class<? extends Throwable> exception, String message,
+                AnyExceptionInfo cause, StackTraceElement... stackTraceElements) {
+            super(stackTraceElements);
             this.exception = exception;
             this.message = message;
-            this.stackTraceElements = stackTraceElements.length == 0 ? null : stackTraceElements;
+            this.cause = cause;
         }
     }
 
@@ -188,28 +267,51 @@ private void assertExecuteException(String input, Class<? extends Throwable> exc
     }
 
     private void assertExceptionMatch(SnippetEvent cr, ExceptionInfo exceptionInfo) {
-        assertNotNull(cr.exception(), "Expected exception was not thrown: " + exceptionInfo.exception);
-        if (cr.exception() instanceof EvalException) {
-            EvalException ex = (EvalException) cr.exception();
+        assertExceptionMatch(cr.exception(), cr.snippet().source(), exceptionInfo);
+    }
+
+    private void assertExceptionMatch(Throwable exception, String source, ExceptionInfo exceptionInfo) {
+        assertNotNull(exception, "Expected exception was not thrown: " + exceptionInfo.exception);
+        if (exception instanceof EvalException) {
+            EvalException ex = (EvalException) exception;
             String actualException = ex.getExceptionClassName();
             String expectedException = exceptionInfo.exception.getCanonicalName();
-            String stackTrace = getStackTrace(ex);
-            String source = cr.snippet().source();
             assertEquals(actualException, expectedException,
                     String.format("Given \"%s\" expected exception: %s, got: %s%nStack trace:%n%s",
-                            source, expectedException, actualException, stackTrace));
+                            source, expectedException, actualException, getStackTrace(ex)));
             if (exceptionInfo.message != null) {
                 assertEquals(ex.getMessage(), exceptionInfo.message,
                         String.format("Given \"%s\" expected message: %s, got: %s",
                                 source, exceptionInfo.message, ex.getMessage()));
             }
-            if (exceptionInfo.stackTraceElements != null) {
-                assertStackTrace(ex.getStackTrace(), exceptionInfo.stackTraceElements,
-                        String.format("Given \"%s\"%nStack trace:%n%s%n",
-                                source, stackTrace));
+            assertStackMatch(ex, source, exceptionInfo);
+            if (exceptionInfo.cause != null) {
+                assertAnyExceptionMatch(exception.getCause(), exceptionInfo.cause);
             }
         } else {
-            fail("Unexpected execution exceptionInfo: " + cr.exception());
+            fail("Unexpected exception: " + exception + " or exceptionInfo: " + exceptionInfo);
+        }
+    }
+
+    private void assertStackMatch(JShellException exception, String source, AnyExceptionInfo exceptionInfo) {
+        if (exceptionInfo.stackTraceElements != null) {
+            assertStackTrace(exception.getStackTrace(), exceptionInfo.stackTraceElements,
+                    String.format("Given \"%s\"%nStack trace:%n%s%n",
+                            source, getStackTrace(exception)));
+        }
+    }
+
+    private void assertAnyExceptionMatch(Throwable exception, AnyExceptionInfo exceptionInfo) {
+        if (exceptionInfo instanceof ExceptionInfo) {
+            assertExceptionMatch(exception, "", (ExceptionInfo) exceptionInfo);
+        } else {
+            assertTrue(exceptionInfo instanceof UnresolvedExceptionInfo, "Bad exceptionInfo: " + exceptionInfo);
+            assertTrue(exception instanceof UnresolvedReferenceException,
+                    "Expected UnresolvedReferenceException: " + exception);
+            UnresolvedExceptionInfo uei = (UnresolvedExceptionInfo) exceptionInfo;
+            UnresolvedReferenceException ure = (UnresolvedReferenceException) exception;
+            assertEquals(ure.getSnippet(), uei.sn);
+            assertStackMatch(ure, "", exceptionInfo);
         }
     }
 
@@ -236,7 +338,7 @@ private void assertStackTrace(StackTraceElement[] actual, StackTraceElement[] ex
         }
     }
 
-    private String getStackTrace(EvalException ex) {
+    private String getStackTrace(Throwable ex) {
         StringWriter st = new StringWriter();
         ex.printStackTrace(new PrintWriter(st));
         return st.toString();
diff --git a/test/langtools/jdk/jshell/ToolSimpleTest.java b/test/langtools/jdk/jshell/ToolSimpleTest.java
index 0393d5b26b6..dfe5009e29e 100644
--- a/test/langtools/jdk/jshell/ToolSimpleTest.java
+++ b/test/langtools/jdk/jshell/ToolSimpleTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8153716 8143955 8151754 8150382 8153920 8156910 8131024 8160089 8153897 8167128 8154513 8170015 8170368 8172102 8172103  8165405 8173073 8173848 8174041 8173916 8174028 8174262 8174797 8177079 8180508 8177466 8172154 8192979 8191842 8198573
+ * @bug 8153716 8143955 8151754 8150382 8153920 8156910 8131024 8160089 8153897 8167128 8154513 8170015 8170368 8172102 8172103  8165405 8173073 8173848 8174041 8173916 8174028 8174262 8174797 8177079 8180508 8177466 8172154 8192979 8191842 8198573 8198801
  * @summary Simple jshell tool tests
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -86,6 +86,32 @@ public void testLessThan() {
         );
     }
 
+    @Test
+    public void testChainedThrow() {
+        test(
+                (a) -> assertCommand(a, "void p() throws Exception { ((String) null).toString(); }",
+                        "|  created method p()"),
+                (a) -> assertCommand(a, "void n() throws Exception { try { p(); } catch (Exception ex) { throw new IOException(\"bar\", ex); }}",
+                        "|  created method n()"),
+                (a) -> assertCommand(a, "void m() { try { n(); } catch (Exception ex) { throw new RuntimeException(\"foo\", ex); }}",
+                        "|  created method m()"),
+                (a) -> assertCommand(a, "m()",
+                          "|  Exception java.lang.RuntimeException: foo\n"
+                        + "|        at m (#3:1)\n"
+                        + "|        at (#4:1)\n"
+                        + "|  Caused by: java.io.IOException: bar\n"
+                        + "|        at n (#2:1)\n"
+                        + "|        ...\n"
+                        + "|  Caused by: java.lang.NullPointerException\n"
+                        + "|        at p (#1:1)\n"
+                        + "|        ..."),
+                (a) -> assertCommand(a, "/drop p",
+                        "|  dropped method p()"),
+                (a) -> assertCommand(a, "m()",
+                        "|  attempted to call method n() which cannot be invoked until method p() is declared")
+        );
+    }
+
     @Test
     public void oneLineOfError() {
         test(

From 4e67fb8218fee8d9e8568a26794aee9e35655c27 Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Tue, 3 Apr 2018 22:33:58 +0200
Subject: [PATCH 055/196] 8200375: Change to GCC 7.3.0 for building Linux at
 Oracle Reviewed-by: ihse, tbell

---
 make/conf/jib-profiles.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index c97abaf8a16..6a7b51df644 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -816,7 +816,7 @@ var getJibProfilesProfiles = function (input, common, data) {
 var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
-        linux_x64: "gcc4.9.2-OEL6.4+1.3",
+        linux_x64: "gcc7.3.0-OEL6.4+1.0",
         macosx_x64: "Xcode6.3-MacOSX10.9+1.0",
         solaris_x64: "SS12u4-Solaris11u1+1.0",
         solaris_sparcv9: "SS12u4-Solaris11u1+1.1",

From 31c4e18c3fca7a051e33a5366f219795bf1166fc Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Tue, 3 Apr 2018 22:37:43 +0200
Subject: [PATCH 056/196] 8200658: Fix incremental builds of hotspot on solaris
 Reviewed-by: erikj

---
 make/common/NativeCompilation.gmk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 36697776aee..569ee1321b0 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -292,8 +292,7 @@ define SetupCompileNativeFileBody
     endif
 
     ifneq ($$(strip $$($1_CFLAGS) $$($1_CXXFLAGS) $$($1_OPTIMIZATION)), )
-      $1_VARDEPS := $$($1_CFLAGS) $$($1_CXXFLAGS) $$($1_OPT_CFLAGS) \
-          $$($1_OPT_CXXFLAGS)
+      $1_VARDEPS := $$($1_CFLAGS) $$($1_CXXFLAGS) $$($1_OPTIMIZATION)
       $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_OBJ).vardeps)
     endif
 

From 29f7467ce0d896b929e3055a78f8f795cf3c371d Mon Sep 17 00:00:00 2001
From: vromero <unknown>
Date: Tue, 3 Apr 2018 23:58:52 -0400
Subject: [PATCH 057/196] 8198314: javac hidden options violate standard syntax
 for options Reviewed-by: jjg

---
 .../com/sun/tools/javac/main/Option.java      | 37 +++++++++----------
 .../com/sun/tools/sjavac/options/Options.java |  4 +-
 .../share/classes/jdk/jshell/TaskFactory.java |  2 +-
 .../ClassFileModifiers/ClassModifiers.java    |  4 +-
 .../ClassFileModifiers/MemberModifiers.java   |  4 +-
 .../javac/Diagnostics/6722234/T6722234a.java  |  4 +-
 .../javac/Diagnostics/6722234/T6722234b.java  |  4 +-
 .../javac/Diagnostics/6722234/T6722234c.java  |  2 +-
 .../javac/Diagnostics/6722234/T6722234d.java  |  4 +-
 .../javac/Diagnostics/6862608/T6862608a.java  |  2 +-
 .../javac/Diagnostics/6862608/T6862608b.java  |  2 +-
 .../tools/javac/Diagnostics/7010608/Test.java |  6 +--
 .../javac/Diagnostics/8010387/T8010387.java   |  2 +-
 .../javac/InterfaceMemberClassModifiers.java  |  2 +-
 test/langtools/tools/javac/T6214885.java      |  4 +-
 ...AnnotationsCrashWithErroneousTreeTest.java |  2 +-
 .../VerifyErroneousAnnotationsAttributed.java |  4 +-
 .../newlocations/AfterMethodTypeParams.java   |  4 +-
 .../tools/javac/api/6731573/T6731573.java     |  6 +--
 .../api/taskListeners/EventsBalancedTest.java | 10 ++---
 .../javac/completionDeps/DepsAndAnno.java     |  4 +-
 .../javac/completionDeps/DepsAndDocLint.java  |  4 +-
 .../diags/examples/ApplicableMethodFound.java |  4 +-
 .../examples/ApplicableMethodFound1.java      |  4 +-
 .../diags/examples/DeferredMethodInst.java    |  4 +-
 .../diags/examples/LambdaDeduplicate.java     |  2 +-
 .../javac/diags/examples/LambdaStat.java      |  4 +-
 .../tools/javac/diags/examples/MrefStat.java  |  4 +-
 .../tools/javac/diags/examples/MrefStat1.java |  4 +-
 .../examples/NotApplicableMethodFound.java    |  4 +-
 .../javac/diags/examples/PartialInstSig.java  |  4 +-
 .../diags/examples/VerboseResolveMulti.java   |  4 +-
 .../diags/examples/VerboseResolveMulti1.java  |  4 +-
 .../javac/diags/examples/WhereCaptured.java   |  4 +-
 .../javac/diags/examples/WhereCaptured1.java  |  4 +-
 .../javac/diags/examples/WhereFreshTvar.java  |  4 +-
 .../diags/examples/WhereIntersection.java     |  4 +-
 .../diags/examples/WhereIntersection2.java    |  4 +-
 .../javac/diags/examples/WhereTypeVar.java    |  4 +-
 .../javac/diags/examples/WhereTypeVar2.java   |  4 +-
 .../javac/failover/CheckAttributedTree.java   |  4 +-
 .../tools/javac/failover/FailOver01.java      |  2 +-
 .../tools/javac/failover/FailOver02.java      |  2 +-
 .../tools/javac/failover/FailOver03.java      |  2 +-
 .../tools/javac/failover/FailOver04.java      |  2 +-
 .../tools/javac/failover/FailOver05.java      |  2 +-
 .../tools/javac/failover/FailOver06.java      |  2 +-
 .../tools/javac/failover/FailOver07.java      |  2 +-
 .../tools/javac/failover/FailOver08.java      |  2 +-
 .../tools/javac/failover/FailOver09.java      |  2 +-
 .../tools/javac/failover/FailOver10.java      |  2 +-
 .../tools/javac/failover/FailOver11.java      |  2 +-
 .../tools/javac/failover/FailOver12.java      |  2 +-
 .../tools/javac/failover/FailOver13.java      |  2 +-
 .../tools/javac/failover/FailOver14.java      |  2 +-
 .../tools/javac/failover/FailOver15.java      |  2 +-
 .../generics/inference/8158355/T8158355.java  |  4 +-
 .../tools/javac/lambda/MostSpecific09.java    |  2 +-
 .../javac/lambda/TestLambdaToMethodStats.java |  4 +-
 .../lambda/XDdumpLambdaToMethodStats.java     |  4 +-
 .../lambda/bridge/TestMetafactoryBridges.java |  4 +-
 .../StructuralMostSpecificTest.java           |  4 +-
 .../MissingSuperRecovery.java                 |  2 +-
 .../tools/javac/modules/AddLimitMods.java     | 14 +++----
 .../javac/options/IsSupportedOptionTest.java  |  4 +-
 .../tools/javac/policy/test3/Test.java        |  6 +--
 .../tools/javac/positions/TreeEndPosTest.java |  4 +-
 .../ProtectedMemberAccess2.java               |  2 +-
 .../ProtectedMemberAccess3.java               |  2 +-
 .../ProtectedMemberAccess4.java               |  2 +-
 .../tools/javac/resolve/ResolveHarness.java   |  6 +--
 test/langtools/tools/javac/tree/VarTree.java  |  4 +-
 .../tools/javac/unicode/UnicodeNewline.java   |  2 +-
 .../tools/sjavac/JavacOptionPrep.java         |  4 +-
 74 files changed, 146 insertions(+), 149 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index 65cf5dffea3..23bfdec575e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -520,24 +520,24 @@ public void process(OptionHelper helper, String option, String p) {
 
     XDIAGS("-Xdiags:", "opt.diags", EXTENDED, BASIC, ONEOF, "compact", "verbose"),
 
-    DEBUG("--debug:", null, HIDDEN, BASIC) {
+    DEBUG("--debug", null, HIDDEN, BASIC, ArgKind.REQUIRED) {
         @Override
-        public void process(OptionHelper helper, String option) throws InvalidValueException {
-            HiddenGroup.DEBUG.process(helper, option);
+        public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
+            HiddenGroup.DEBUG.process(helper, option, arg);
         }
     },
 
-    SHOULDSTOP("--should-stop:", null, HIDDEN, BASIC) {
+    SHOULDSTOP("--should-stop", null, HIDDEN, BASIC, ArgKind.REQUIRED) {
         @Override
-        public void process(OptionHelper helper, String option) throws InvalidValueException {
-            HiddenGroup.SHOULDSTOP.process(helper, option);
+        public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
+            HiddenGroup.SHOULDSTOP.process(helper, option, arg);
         }
     },
 
-    DIAGS("--diags:", null, HIDDEN, BASIC) {
+    DIAGS("--diags", null, HIDDEN, BASIC, ArgKind.REQUIRED) {
         @Override
-        public void process(OptionHelper helper, String option) throws InvalidValueException {
-            HiddenGroup.DIAGS.process(helper, option);
+        public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
+            HiddenGroup.DIAGS.process(helper, option, arg);
         }
     },
 
@@ -846,27 +846,19 @@ enum HiddenGroup {
         DEBUG("debug"),
         SHOULDSTOP("should-stop");
 
-        static final Set<String> skipSet = new java.util.HashSet<>(
-                Arrays.asList("--diags:", "--debug:", "--should-stop:"));
-
         final String text;
 
         HiddenGroup(String text) {
             this.text = text;
         }
 
-        public void process(OptionHelper helper, String option) throws InvalidValueException {
-            String p = option.substring(option.indexOf(':') + 1).trim();
-            String[] subOptions = p.split(";");
+        public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
+            String[] subOptions = arg.split(";");
             for (String subOption : subOptions) {
                 subOption = text + "." + subOption.trim();
                 XD.process(helper, subOption, subOption);
             }
         }
-
-        static boolean skip(String name) {
-            return skipSet.contains(name);
-        }
     }
 
     /**
@@ -957,6 +949,11 @@ public int compare(Option o1, Option o2) {
         this(text, null, descrKey, kind, group, null, null, ArgKind.NONE);
     }
 
+    Option(String text, String descrKey,
+            OptionKind kind, OptionGroup group, ArgKind argKind) {
+        this(text, null, descrKey, kind, group, null, null, argKind);
+    }
+
     Option(String text, String argsNameKey, String descrKey,
             OptionKind kind, OptionGroup group) {
         this(text, argsNameKey, descrKey, kind, group, null, null, ArgKind.REQUIRED);
@@ -1025,7 +1022,7 @@ public boolean matches(String option) {
     }
 
     private boolean matches(String option, String name) {
-        if (name.startsWith("--") && !HiddenGroup.skip(name)) {
+        if (name.startsWith("--")) {
             return option.equals(name)
                     || hasArg() && option.startsWith(name + "=");
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
index 4f212a86a19..b06e209816f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -313,7 +313,7 @@ public String[] prepJavacArgs() {
         }
 
         // Enable dependency generation
-        args.add("--debug:completionDeps=source,class");
+        args.add("--debug=completionDeps=source,class");
 
         // This can't be anything but 'none'. Enforced by sjavac main method.
         args.add("-implicit:" + implicitPolicy);
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java b/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
index d9f09db6418..18f9eb300a8 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
@@ -167,7 +167,7 @@ public <Z> Z analyze(Collection<OuterWrap> wraps,
         WrapSourceHandler sh = new WrapSourceHandler();
         List<String> allOptions = new ArrayList<>();
 
-        allOptions.add("--should-stop:at=FLOW");
+        allOptions.add("--should-stop=at=FLOW");
         allOptions.add("-Xlint:unchecked");
         allOptions.add("-proc:none");
         allOptions.addAll(extraArgs);
diff --git a/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.java b/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.java
index 77bf387f7e7..3663f2f11aa 100644
--- a/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.java
+++ b/test/langtools/tools/javac/ClassFileModifiers/ClassModifiers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -28,7 +28,7 @@
  * file are correct, including those within InnerClasses attributes.
  * @author John Rose (jrose). Entered as a regression test by Bill Maddox (maddox).
  *
- * @compile/ref=ClassModifiers.out --debug:dumpmodifiers=ci ClassModifiers.java
+ * @compile/ref=ClassModifiers.out --debug=dumpmodifiers=ci ClassModifiers.java
  *
  */
 
diff --git a/test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.java b/test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.java
index fa134f816ae..7ff3a80cf7c 100644
--- a/test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.java
+++ b/test/langtools/tools/javac/ClassFileModifiers/MemberModifiers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -26,7 +26,7 @@
  * @bug 4249112 4785453
  * @summary Verify that implicit member modifiers are set correctly.
  *
- * @compile/ref=MemberModifiers.out --debug:dumpmodifiers=cfm MemberModifiers.java
+ * @compile/ref=MemberModifiers.out --debug=dumpmodifiers=cfm MemberModifiers.java
  */
 
 // Currently, we check only that members of final classes are not final.
diff --git a/test/langtools/tools/javac/Diagnostics/6722234/T6722234a.java b/test/langtools/tools/javac/Diagnostics/6722234/T6722234a.java
index 04008efcfb3..3bce9308254 100644
--- a/test/langtools/tools/javac/Diagnostics/6722234/T6722234a.java
+++ b/test/langtools/tools/javac/Diagnostics/6722234/T6722234a.java
@@ -3,8 +3,8 @@
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
- * @compile/fail/ref=T6722234a_1.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars T6722234a.java
- * @compile/fail/ref=T6722234a_2.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars,where T6722234a.java
+ * @compile/fail/ref=T6722234a_1.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars T6722234a.java
+ * @compile/fail/ref=T6722234a_2.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars,where T6722234a.java
  */
 
 class T6722234a<T extends String> {
diff --git a/test/langtools/tools/javac/Diagnostics/6722234/T6722234b.java b/test/langtools/tools/javac/Diagnostics/6722234/T6722234b.java
index 47a1716cf2a..6b8fb798228 100644
--- a/test/langtools/tools/javac/Diagnostics/6722234/T6722234b.java
+++ b/test/langtools/tools/javac/Diagnostics/6722234/T6722234b.java
@@ -3,8 +3,8 @@
  * @bug     6722234 8078024
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
- * @compile/fail/ref=T6722234b_1.out -XDrawDiagnostics --diags:formatterOptions=simpleNames T6722234b.java
- * @compile/fail/ref=T6722234b_2.out -XDrawDiagnostics --diags:formatterOptions=simpleNames,where T6722234b.java
+ * @compile/fail/ref=T6722234b_1.out -XDrawDiagnostics --diags=formatterOptions=simpleNames T6722234b.java
+ * @compile/fail/ref=T6722234b_2.out -XDrawDiagnostics --diags=formatterOptions=simpleNames,where T6722234b.java
  */
 
 import java.util.*;
diff --git a/test/langtools/tools/javac/Diagnostics/6722234/T6722234c.java b/test/langtools/tools/javac/Diagnostics/6722234/T6722234c.java
index 4b12953003d..8884d788f9e 100644
--- a/test/langtools/tools/javac/Diagnostics/6722234/T6722234c.java
+++ b/test/langtools/tools/javac/Diagnostics/6722234/T6722234c.java
@@ -3,7 +3,7 @@
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
- * @compile/fail/ref=T6722234c.out -XDrawDiagnostics --diags:formatterOptions=simpleNames T6722234c.java
+ * @compile/fail/ref=T6722234c.out -XDrawDiagnostics --diags=formatterOptions=simpleNames T6722234c.java
  */
 
 class T6722234c {
diff --git a/test/langtools/tools/javac/Diagnostics/6722234/T6722234d.java b/test/langtools/tools/javac/Diagnostics/6722234/T6722234d.java
index 95fa4fb24ab..4dc9fe7a3da 100644
--- a/test/langtools/tools/javac/Diagnostics/6722234/T6722234d.java
+++ b/test/langtools/tools/javac/Diagnostics/6722234/T6722234d.java
@@ -3,8 +3,8 @@
  * @bug     6722234 8078024
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
- * @compile/fail/ref=T6722234d_1.out -XDrawDiagnostics --diags:formatterOptions=where T6722234d.java
- * @compile/fail/ref=T6722234d_2.out -XDrawDiagnostics --diags:formatterOptions=where,simpleNames T6722234d.java
+ * @compile/fail/ref=T6722234d_1.out -XDrawDiagnostics --diags=formatterOptions=where T6722234d.java
+ * @compile/fail/ref=T6722234d_2.out -XDrawDiagnostics --diags=formatterOptions=where,simpleNames T6722234d.java
  */
 
 class T6722234d {
diff --git a/test/langtools/tools/javac/Diagnostics/6862608/T6862608a.java b/test/langtools/tools/javac/Diagnostics/6862608/T6862608a.java
index 1713c05e202..90b7953f1bd 100644
--- a/test/langtools/tools/javac/Diagnostics/6862608/T6862608a.java
+++ b/test/langtools/tools/javac/Diagnostics/6862608/T6862608a.java
@@ -3,7 +3,7 @@
  * @bug     6862608
  * @summary rich diagnostic sometimes contain wrong type variable numbering
  * @author  mcimadamore
- * @compile/fail/ref=T6862608a.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars,where T6862608a.java
+ * @compile/fail/ref=T6862608a.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars,where T6862608a.java
  */
 
 
diff --git a/test/langtools/tools/javac/Diagnostics/6862608/T6862608b.java b/test/langtools/tools/javac/Diagnostics/6862608/T6862608b.java
index 14c61a33142..6946728abb5 100644
--- a/test/langtools/tools/javac/Diagnostics/6862608/T6862608b.java
+++ b/test/langtools/tools/javac/Diagnostics/6862608/T6862608b.java
@@ -3,7 +3,7 @@
  * @bug     6862608
  * @summary rich diagnostic sometimes contain wrong type variable numbering
  * @author  mcimadamore
- * @compile/fail/ref=T6862608b.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars,where T6862608b.java
+ * @compile/fail/ref=T6862608b.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars,where T6862608b.java
  */
 
 class T66862608b<T extends String, S> {
diff --git a/test/langtools/tools/javac/Diagnostics/7010608/Test.java b/test/langtools/tools/javac/Diagnostics/7010608/Test.java
index 332d26a0d9d..7b8ae31ba52 100644
--- a/test/langtools/tools/javac/Diagnostics/7010608/Test.java
+++ b/test/langtools/tools/javac/Diagnostics/7010608/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -46,9 +46,9 @@ void run() throws Exception {
         try {
             test(Arrays.<String>asList(),
                     "myfo://test:1: error: cannot find symbol");
-            test(Arrays.asList("--diags:layout=OLD"),
+            test(Arrays.asList("--diags=layout=OLD"),
                     "myfo://test:1: cannot find symbol");
-            test(Arrays.asList("--diags:legacy"),
+            test(Arrays.asList("--diags=legacy"),
                     "myfo://test:1: cannot find symbol");
         } finally {
             Locale.setDefault(prev);
diff --git a/test/langtools/tools/javac/Diagnostics/8010387/T8010387.java b/test/langtools/tools/javac/Diagnostics/8010387/T8010387.java
index 74a664cd160..b6cfc7c4830 100644
--- a/test/langtools/tools/javac/Diagnostics/8010387/T8010387.java
+++ b/test/langtools/tools/javac/Diagnostics/8010387/T8010387.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug     8010387
  * @summary rich diagnostic sometimes contain wrong type variable numbering
- * @compile/fail/ref=T8010387.out -XDrawDiagnostics --diags:formatterOptions=disambiguateTvars,where T8010387.java
+ * @compile/fail/ref=T8010387.out -XDrawDiagnostics --diags=formatterOptions=disambiguateTvars,where T8010387.java
  */
 abstract class T8010387<X> {
 
diff --git a/test/langtools/tools/javac/InterfaceMemberClassModifiers.java b/test/langtools/tools/javac/InterfaceMemberClassModifiers.java
index bb5fd1367e6..995653fccef 100644
--- a/test/langtools/tools/javac/InterfaceMemberClassModifiers.java
+++ b/test/langtools/tools/javac/InterfaceMemberClassModifiers.java
@@ -4,7 +4,7 @@
  * @summary Verify that invalid access modifiers on interface members don't cause crash.
  * @author maddox
  *
- * @compile/fail/ref=InterfaceMemberClassModifiers.out --diags:layout=%b:%l:%_%m InterfaceMemberClassModifiers.java
+ * @compile/fail/ref=InterfaceMemberClassModifiers.out --diags=layout=%b:%l:%_%m InterfaceMemberClassModifiers.java
  */
 
 public interface InterfaceMemberClassModifiers {
diff --git a/test/langtools/tools/javac/T6214885.java b/test/langtools/tools/javac/T6214885.java
index f79b752ecbc..c667bc3e897 100644
--- a/test/langtools/tools/javac/T6214885.java
+++ b/test/langtools/tools/javac/T6214885.java
@@ -2,8 +2,8 @@
  * @test  /nodynamiccopyright/
  * @bug 6214885
  * @summary This test exercises features provided by the new internal Diagnostics API
- * @compile/fail/ref=T6214885a.out --diags:layout=%b:%l%_%t%m|%p%m T6214885.java
- * @compile/fail/ref=T6214885b.out --diags:layout=%b:%l:%c%_%t%m|%p%m T6214885.java
+ * @compile/fail/ref=T6214885a.out --diags=layout=%b:%l%_%t%m|%p%m T6214885.java
+ * @compile/fail/ref=T6214885b.out --diags=layout=%b:%l:%c%_%t%m|%p%m T6214885.java
  */
 class T6214885
 {
diff --git a/test/langtools/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java b/test/langtools/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java
index 49fd4d46cf7..0a940797039 100644
--- a/test/langtools/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java
+++ b/test/langtools/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8026963
  * @summary type annotations code crashes for lambdas with void argument
- * @compile/fail/ref=TypeAnnotationsCrashWithErroneousTreeTest.out -XDrawDiagnostics --should-stop:at=FLOW TypeAnnotationsCrashWithErroneousTreeTest.java
+ * @compile/fail/ref=TypeAnnotationsCrashWithErroneousTreeTest.out -XDrawDiagnostics --should-stop=at=FLOW TypeAnnotationsCrashWithErroneousTreeTest.java
  */
 
 public class TypeAnnotationsCrashWithErroneousTreeTest {
diff --git a/test/langtools/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java b/test/langtools/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java
index 263a145af38..bbb296d2df7 100644
--- a/test/langtools/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java
+++ b/test/langtools/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -237,7 +237,7 @@ void validate(String code) throws IOException, URISyntaxException {
         JavacTask task = tool.getTask(null,
                                       fm,
                                       devNull,
-                                      Arrays.asList("--should-stop:at=FLOW"),
+                                      Arrays.asList("--should-stop=at=FLOW"),
                                       null,
                                       Arrays.asList(new MyFileObject(code)));
 
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java
index bea25e934c8..cc4d7eaf056 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -54,7 +54,7 @@ void run() throws IOException {
             String test = TEMPLATE.replace("CONTENT", tc.snippet);
             List<JavaFileObject> files = Arrays.asList(new MyFileObject(test));
             StringWriter out = new StringWriter();
-            List<String> options = Arrays.asList("-XDrawDiagnostics", "--should-stop:at=FLOW");
+            List<String> options = Arrays.asList("-XDrawDiagnostics", "--should-stop=at=FLOW");
             JavacTask task = (JavacTask) compiler.getTask(out, null, null, options, null, files);
 
             new TreePathScanner<Void, Void>() {
diff --git a/test/langtools/tools/javac/api/6731573/T6731573.java b/test/langtools/tools/javac/api/6731573/T6731573.java
index 435e2b26f98..0d7ceb8fd2f 100644
--- a/test/langtools/tools/javac/api/6731573/T6731573.java
+++ b/test/langtools/tools/javac/api/6731573/T6731573.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -62,8 +62,8 @@ boolean shouldDisplaySource(SourceLine sourceLine) {
 
     enum SourceLine {
         STANDARD(null),
-        ENABLED("--diags:showSource=true"),
-        DISABLED("--diags:showSource=false");
+        ENABLED("--diags=showSource=true"),
+        DISABLED("--diags=showSource=false");
 
         String optValue;
 
diff --git a/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java b/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
index b55053c7a81..bd01d192b6e 100644
--- a/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
+++ b/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -63,11 +63,11 @@ void test() throws IOException {
         test(null, Arrays.asList(b, a));
 
         for (CompileState stop : CompileState.values()) {
-            test(Arrays.asList("--should-stop:ifNoError=" + stop,
-                               "--should-stop:ifError=" + stop),
+            test(Arrays.asList("--should-stop=ifNoError=" + stop,
+                               "--should-stop=ifError=" + stop),
                  Arrays.asList(a, b));
-            test(Arrays.asList("--should-stop:ifNoError=" + stop,
-                               "--should-stop:ifError=" + stop),
+            test(Arrays.asList("--should-stop=ifNoError=" + stop,
+                               "--should-stop=ifError=" + stop),
                  Arrays.asList(b, a));
         }
     }
diff --git a/test/langtools/tools/javac/completionDeps/DepsAndAnno.java b/test/langtools/tools/javac/completionDeps/DepsAndAnno.java
index 8ba7f54e183..07e70210392 100644
--- a/test/langtools/tools/javac/completionDeps/DepsAndAnno.java
+++ b/test/langtools/tools/javac/completionDeps/DepsAndAnno.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -47,7 +47,7 @@ public class DepsAndAnno {
     public static void main(String[] args) {
         ToolBox toolBox = new ToolBox();
         new JavacTask(toolBox, Task.Mode.CMDLINE)
-               .options("--debug:completionDeps")
+               .options("--debug=completionDeps")
                .outdir(".")
                .files(ToolBox.testSrc + "/DepsAndAnno.java")
                .run();
diff --git a/test/langtools/tools/javac/completionDeps/DepsAndDocLint.java b/test/langtools/tools/javac/completionDeps/DepsAndDocLint.java
index b9df5e72b3d..b2fcf8c130d 100644
--- a/test/langtools/tools/javac/completionDeps/DepsAndDocLint.java
+++ b/test/langtools/tools/javac/completionDeps/DepsAndDocLint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -25,7 +25,7 @@
  * @test
  * @bug 8078389
  * @summary Make sure there is no interference between completionDeps and doclint
- * @compile --debug:completionDeps -Xdoclint DepsAndDocLint.java
+ * @compile --debug=completionDeps -Xdoclint DepsAndDocLint.java
  */
 
 public class DepsAndDocLint {
diff --git a/test/langtools/tools/javac/diags/examples/ApplicableMethodFound.java b/test/langtools/tools/javac/diags/examples/ApplicableMethodFound.java
index bb324afa790..70d53c67fdf 100644
--- a/test/langtools/tools/javac/diags/examples/ApplicableMethodFound.java
+++ b/test/langtools/tools/javac/diags/examples/ApplicableMethodFound.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,7 +23,7 @@
 
 // key: compiler.misc.applicable.method.found
 // key: compiler.note.verbose.resolve.multi
-// options: --debug:verboseResolution=applicable,success
+// options: --debug=verboseResolution=applicable,success
 
 class ApplicableMethodFound {
 
diff --git a/test/langtools/tools/javac/diags/examples/ApplicableMethodFound1.java b/test/langtools/tools/javac/diags/examples/ApplicableMethodFound1.java
index 5ecca3a329f..21f5f49cc59 100644
--- a/test/langtools/tools/javac/diags/examples/ApplicableMethodFound1.java
+++ b/test/langtools/tools/javac/diags/examples/ApplicableMethodFound1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -24,7 +24,7 @@
 // key: compiler.misc.applicable.method.found.1
 // key: compiler.note.verbose.resolve.multi
 // key: compiler.misc.partial.inst.sig
-// options: --debug:verboseResolution=applicable,success
+// options: --debug=verboseResolution=applicable,success
 
 class ApplicableMethodFound1 {
 
diff --git a/test/langtools/tools/javac/diags/examples/DeferredMethodInst.java b/test/langtools/tools/javac/diags/examples/DeferredMethodInst.java
index 59bfd4c37f8..d641d41946f 100644
--- a/test/langtools/tools/javac/diags/examples/DeferredMethodInst.java
+++ b/test/langtools/tools/javac/diags/examples/DeferredMethodInst.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -25,7 +25,7 @@
 // key: compiler.note.verbose.resolve.multi
 // key: compiler.note.deferred.method.inst
 // key: compiler.misc.partial.inst.sig
-// options: --debug:verboseResolution=applicable,success,deferred-inference
+// options: --debug=verboseResolution=applicable,success,deferred-inference
 
 class DeferredMethodInst {
 
diff --git a/test/langtools/tools/javac/diags/examples/LambdaDeduplicate.java b/test/langtools/tools/javac/diags/examples/LambdaDeduplicate.java
index da6c4e3f720..8dda7bb2dd9 100644
--- a/test/langtools/tools/javac/diags/examples/LambdaDeduplicate.java
+++ b/test/langtools/tools/javac/diags/examples/LambdaDeduplicate.java
@@ -23,7 +23,7 @@
 
 
 // key: compiler.note.verbose.l2m.deduplicate
-// options: --debug:dumpLambdaToMethodDeduplication
+// options: --debug=dumpLambdaToMethodDeduplication
 
 import java.util.function.Function;
 
diff --git a/test/langtools/tools/javac/diags/examples/LambdaStat.java b/test/langtools/tools/javac/diags/examples/LambdaStat.java
index c3ee38d6f8e..23b5809ea2c 100644
--- a/test/langtools/tools/javac/diags/examples/LambdaStat.java
+++ b/test/langtools/tools/javac/diags/examples/LambdaStat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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,7 +22,7 @@
  */
 
 // key: compiler.note.lambda.stat
-// options: --debug:dumpLambdaToMethodStats
+// options: --debug=dumpLambdaToMethodStats
 
 class LambdaStat {
     Runnable r = ()->{};
diff --git a/test/langtools/tools/javac/diags/examples/MrefStat.java b/test/langtools/tools/javac/diags/examples/MrefStat.java
index 7f84baa8ca0..ef11f97b82f 100644
--- a/test/langtools/tools/javac/diags/examples/MrefStat.java
+++ b/test/langtools/tools/javac/diags/examples/MrefStat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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,7 +22,7 @@
  */
 
 // key: compiler.note.mref.stat
-// options: --debug:dumpLambdaToMethodStats
+// options: --debug=dumpLambdaToMethodStats
 
 class MrefStat {
     Runnable r = MrefStat::m;
diff --git a/test/langtools/tools/javac/diags/examples/MrefStat1.java b/test/langtools/tools/javac/diags/examples/MrefStat1.java
index c4bdf4cff2d..6250fd7f33f 100644
--- a/test/langtools/tools/javac/diags/examples/MrefStat1.java
+++ b/test/langtools/tools/javac/diags/examples/MrefStat1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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,7 +22,7 @@
  */
 
 // key: compiler.note.mref.stat.1
-// options: --debug:dumpLambdaToMethodStats
+// options: --debug=dumpLambdaToMethodStats
 
 class MrefStat1 {
 
diff --git a/test/langtools/tools/javac/diags/examples/NotApplicableMethodFound.java b/test/langtools/tools/javac/diags/examples/NotApplicableMethodFound.java
index dc199bc3e38..ef23a3d8f10 100644
--- a/test/langtools/tools/javac/diags/examples/NotApplicableMethodFound.java
+++ b/test/langtools/tools/javac/diags/examples/NotApplicableMethodFound.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -26,7 +26,7 @@
 // key: compiler.err.cant.apply.symbol
 // key: compiler.misc.no.conforming.assignment.exists
 // key: compiler.misc.inconvertible.types
-// options: --debug:verboseResolution=inapplicable,failure
+// options: --debug=verboseResolution=inapplicable,failure
 
 class NotApplicableMethodFound {
 
diff --git a/test/langtools/tools/javac/diags/examples/PartialInstSig.java b/test/langtools/tools/javac/diags/examples/PartialInstSig.java
index 4a56058856f..41d8355742c 100644
--- a/test/langtools/tools/javac/diags/examples/PartialInstSig.java
+++ b/test/langtools/tools/javac/diags/examples/PartialInstSig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -24,7 +24,7 @@
 // key: compiler.misc.applicable.method.found.1
 // key: compiler.note.verbose.resolve.multi
 // key: compiler.misc.partial.inst.sig
-// options: --debug:verboseResolution=applicable,success
+// options: --debug=verboseResolution=applicable,success
 
 class PartialInstSig {
 
diff --git a/test/langtools/tools/javac/diags/examples/VerboseResolveMulti.java b/test/langtools/tools/javac/diags/examples/VerboseResolveMulti.java
index c097c74085a..107cd2fbd25 100644
--- a/test/langtools/tools/javac/diags/examples/VerboseResolveMulti.java
+++ b/test/langtools/tools/javac/diags/examples/VerboseResolveMulti.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,7 +23,7 @@
 
 // key: compiler.misc.applicable.method.found
 // key: compiler.note.verbose.resolve.multi
-// options: --debug:verboseResolution=applicable,success
+// options: --debug=verboseResolution=applicable,success
 
 class VerboseResolveMulti {
 
diff --git a/test/langtools/tools/javac/diags/examples/VerboseResolveMulti1.java b/test/langtools/tools/javac/diags/examples/VerboseResolveMulti1.java
index 33e7a2deef4..152bbe54d7d 100644
--- a/test/langtools/tools/javac/diags/examples/VerboseResolveMulti1.java
+++ b/test/langtools/tools/javac/diags/examples/VerboseResolveMulti1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -26,7 +26,7 @@
 // key: compiler.err.cant.apply.symbol
 // key: compiler.misc.no.conforming.assignment.exists
 // key: compiler.misc.inconvertible.types
-// options: --debug:verboseResolution=inapplicable,failure
+// options: --debug=verboseResolution=inapplicable,failure
 
 class VerboseResolveMulti1 {
 
diff --git a/test/langtools/tools/javac/diags/examples/WhereCaptured.java b/test/langtools/tools/javac/diags/examples/WhereCaptured.java
index 22fc86530dd..532be002234 100644
--- a/test/langtools/tools/javac/diags/examples/WhereCaptured.java
+++ b/test/langtools/tools/javac/diags/examples/WhereCaptured.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -28,7 +28,7 @@
 // key: compiler.err.cant.apply.symbol
 // key: compiler.misc.incompatible.eq.bounds
 // key: compiler.misc.captured.type
-// options: --diags:formatterOptions=where,simpleNames
+// options: --diags=formatterOptions=where,simpleNames
 // run: simple
 
 import java.util.*;
diff --git a/test/langtools/tools/javac/diags/examples/WhereCaptured1.java b/test/langtools/tools/javac/diags/examples/WhereCaptured1.java
index 26fdf3e8f5b..7a71e52432f 100644
--- a/test/langtools/tools/javac/diags/examples/WhereCaptured1.java
+++ b/test/langtools/tools/javac/diags/examples/WhereCaptured1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -29,7 +29,7 @@
 // key: compiler.misc.incompatible.eq.bounds
 // key: compiler.misc.captured.type
 // key: compiler.misc.type.null
-// options: --diags:formatterOptions=where,simpleNames
+// options: --diags=formatterOptions=where,simpleNames
 // run: simple
 
 import java.util.*;
diff --git a/test/langtools/tools/javac/diags/examples/WhereFreshTvar.java b/test/langtools/tools/javac/diags/examples/WhereFreshTvar.java
index fb060c89c1e..5d796c6108d 100644
--- a/test/langtools/tools/javac/diags/examples/WhereFreshTvar.java
+++ b/test/langtools/tools/javac/diags/examples/WhereFreshTvar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -25,7 +25,7 @@
 // key: compiler.misc.where.description.typevar
 // key: compiler.err.prob.found.req
 // key: compiler.misc.inconvertible.types
-// options: --diags:formatterOptions=where,simpleNames
+// options: --diags=formatterOptions=where,simpleNames
 // run: simple
 
 import java.util.*;
diff --git a/test/langtools/tools/javac/diags/examples/WhereIntersection.java b/test/langtools/tools/javac/diags/examples/WhereIntersection.java
index beec1d7cd6e..65c959136e0 100644
--- a/test/langtools/tools/javac/diags/examples/WhereIntersection.java
+++ b/test/langtools/tools/javac/diags/examples/WhereIntersection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -26,7 +26,7 @@
 // key: compiler.misc.where.description.intersection.1
 // key: compiler.misc.where.intersection
 // key: compiler.err.prob.found.req
-// options: --diags:formatterOptions=where
+// options: --diags=formatterOptions=where
 // run: simple
 
 class WhereIntersection {
diff --git a/test/langtools/tools/javac/diags/examples/WhereIntersection2.java b/test/langtools/tools/javac/diags/examples/WhereIntersection2.java
index 91cab029c46..5732a822e3c 100644
--- a/test/langtools/tools/javac/diags/examples/WhereIntersection2.java
+++ b/test/langtools/tools/javac/diags/examples/WhereIntersection2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -29,7 +29,7 @@
 // key: compiler.misc.where.description.intersection
 // key: compiler.misc.where.intersection
 // key: compiler.err.prob.found.req
-// options: --diags:formatterOptions=where
+// options: --diags=formatterOptions=where
 // run: simple
 
 class WhereIntersection2 {
diff --git a/test/langtools/tools/javac/diags/examples/WhereTypeVar.java b/test/langtools/tools/javac/diags/examples/WhereTypeVar.java
index 55097a8ce6a..69aee4bf738 100644
--- a/test/langtools/tools/javac/diags/examples/WhereTypeVar.java
+++ b/test/langtools/tools/javac/diags/examples/WhereTypeVar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -27,7 +27,7 @@
 // key: compiler.err.cant.apply.symbol
 // key: compiler.misc.no.conforming.assignment.exists
 // key: compiler.misc.inconvertible.types
-// options: --diags:formatterOptions=where,disambiguateTvars
+// options: --diags=formatterOptions=where,disambiguateTvars
 // run: simple
 
 class WhereTypeVar<T extends String> {
diff --git a/test/langtools/tools/javac/diags/examples/WhereTypeVar2.java b/test/langtools/tools/javac/diags/examples/WhereTypeVar2.java
index 1f6f51b9431..38d160f0e12 100644
--- a/test/langtools/tools/javac/diags/examples/WhereTypeVar2.java
+++ b/test/langtools/tools/javac/diags/examples/WhereTypeVar2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -25,7 +25,7 @@
 // key: compiler.misc.where.description.typevar
 // key: compiler.misc.where.typevar
 // key: compiler.err.prob.found.req
-// options: --diags:formatterOptions=where
+// options: --diags=formatterOptions=where
 // run: simple
 
 class WhereTypeVar2 {
diff --git a/test/langtools/tools/javac/failover/CheckAttributedTree.java b/test/langtools/tools/javac/failover/CheckAttributedTree.java
index 88d8e974fae..91b80eef0dd 100644
--- a/test/langtools/tools/javac/failover/CheckAttributedTree.java
+++ b/test/langtools/tools/javac/failover/CheckAttributedTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -315,7 +315,7 @@ void readAndCheck(File file, BiConsumer<JCCompilationUnit, JCTree> c) throws IOE
             totalNumberOfCompilations++;
             newCompilationTask()
                 .withWriter(pw)
-                    .withOption("--should-stop:at=ATTR")
+                    .withOption("--should-stop=at=ATTR")
                     .withOption("-XDverboseCompilePolicy")
                     .withOption("-Xdoclint:none")
                     .withSource(files.iterator().next())
diff --git a/test/langtools/tools/javac/failover/FailOver01.java b/test/langtools/tools/javac/failover/FailOver01.java
index e8d4da79272..79181e10a8c 100644
--- a/test/langtools/tools/javac/failover/FailOver01.java
+++ b/test/langtools/tools/javac/failover/FailOver01.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver01.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver01.java
+ * @compile/fail/ref=FailOver01.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver01.java
  */
 
 class Test { { x = "" } }
diff --git a/test/langtools/tools/javac/failover/FailOver02.java b/test/langtools/tools/javac/failover/FailOver02.java
index 0aac6fa4546..0835ae2d155 100644
--- a/test/langtools/tools/javac/failover/FailOver02.java
+++ b/test/langtools/tools/javac/failover/FailOver02.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver02.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver02.java
+ * @compile/fail/ref=FailOver02.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver02.java
  */
 
 class Test implements AutoCloseable {
diff --git a/test/langtools/tools/javac/failover/FailOver03.java b/test/langtools/tools/javac/failover/FailOver03.java
index cdfe3a8d81c..6638480f54f 100644
--- a/test/langtools/tools/javac/failover/FailOver03.java
+++ b/test/langtools/tools/javac/failover/FailOver03.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver03.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver03.java
+ * @compile/fail/ref=FailOver03.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver03.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver04.java b/test/langtools/tools/javac/failover/FailOver04.java
index e9a723d1a19..893f2aaa3fb 100644
--- a/test/langtools/tools/javac/failover/FailOver04.java
+++ b/test/langtools/tools/javac/failover/FailOver04.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver04.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver04.java
+ * @compile/fail/ref=FailOver04.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver04.java
  */
 
 class Test {
diff --git a/test/langtools/tools/javac/failover/FailOver05.java b/test/langtools/tools/javac/failover/FailOver05.java
index cbbbc222b7c..cfd8d49da6b 100644
--- a/test/langtools/tools/javac/failover/FailOver05.java
+++ b/test/langtools/tools/javac/failover/FailOver05.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver05.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver05.java
+ * @compile/fail/ref=FailOver05.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver05.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver06.java b/test/langtools/tools/javac/failover/FailOver06.java
index 14f7fa34f97..cde419c3d98 100644
--- a/test/langtools/tools/javac/failover/FailOver06.java
+++ b/test/langtools/tools/javac/failover/FailOver06.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver06.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver06.java
+ * @compile/fail/ref=FailOver06.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver06.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver07.java b/test/langtools/tools/javac/failover/FailOver07.java
index a73037a0e99..21b1688e13f 100644
--- a/test/langtools/tools/javac/failover/FailOver07.java
+++ b/test/langtools/tools/javac/failover/FailOver07.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver07.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver07.java
+ * @compile/fail/ref=FailOver07.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver07.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver08.java b/test/langtools/tools/javac/failover/FailOver08.java
index d2446ae59af..59eea3414b1 100644
--- a/test/langtools/tools/javac/failover/FailOver08.java
+++ b/test/langtools/tools/javac/failover/FailOver08.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver08.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver08.java
+ * @compile/fail/ref=FailOver08.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver08.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver09.java b/test/langtools/tools/javac/failover/FailOver09.java
index bc126e140f6..67b83e527a5 100644
--- a/test/langtools/tools/javac/failover/FailOver09.java
+++ b/test/langtools/tools/javac/failover/FailOver09.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver09.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver09.java
+ * @compile/fail/ref=FailOver09.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver09.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver10.java b/test/langtools/tools/javac/failover/FailOver10.java
index 5d32c85437d..288337f16f2 100644
--- a/test/langtools/tools/javac/failover/FailOver10.java
+++ b/test/langtools/tools/javac/failover/FailOver10.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver10.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver10.java
+ * @compile/fail/ref=FailOver10.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver10.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver11.java b/test/langtools/tools/javac/failover/FailOver11.java
index 863053982bc..13fe3a83b45 100644
--- a/test/langtools/tools/javac/failover/FailOver11.java
+++ b/test/langtools/tools/javac/failover/FailOver11.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver11.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver11.java
+ * @compile/fail/ref=FailOver11.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver11.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver12.java b/test/langtools/tools/javac/failover/FailOver12.java
index ed8699e039c..99ad97445a7 100644
--- a/test/langtools/tools/javac/failover/FailOver12.java
+++ b/test/langtools/tools/javac/failover/FailOver12.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver12.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver12.java
+ * @compile/fail/ref=FailOver12.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver12.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver13.java b/test/langtools/tools/javac/failover/FailOver13.java
index f85249d0833..02606b4d7b0 100644
--- a/test/langtools/tools/javac/failover/FailOver13.java
+++ b/test/langtools/tools/javac/failover/FailOver13.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver13.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver13.java
+ * @compile/fail/ref=FailOver13.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver13.java
  */
 
 class Test extends Test {
diff --git a/test/langtools/tools/javac/failover/FailOver14.java b/test/langtools/tools/javac/failover/FailOver14.java
index c0d3ab78abd..fc9e0fe3df8 100644
--- a/test/langtools/tools/javac/failover/FailOver14.java
+++ b/test/langtools/tools/javac/failover/FailOver14.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver14.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver14.java
+ * @compile/fail/ref=FailOver14.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver14.java
  */
 
 class Test extends Test  {
diff --git a/test/langtools/tools/javac/failover/FailOver15.java b/test/langtools/tools/javac/failover/FailOver15.java
index 619cfd3a5ac..de64f4fb386 100644
--- a/test/langtools/tools/javac/failover/FailOver15.java
+++ b/test/langtools/tools/javac/failover/FailOver15.java
@@ -3,7 +3,7 @@
  * @bug 6970584 7060926
  * @summary Attr.PostAttrAnalyzer misses a case
  *
- * @compile/fail/ref=FailOver15.out -XDrawDiagnostics --should-stop:at=FLOW -XDdev FailOver15.java
+ * @compile/fail/ref=FailOver15.out -XDrawDiagnostics --should-stop=at=FLOW -XDdev FailOver15.java
  */
 
 class Test {
diff --git a/test/langtools/tools/javac/generics/inference/8158355/T8158355.java b/test/langtools/tools/javac/generics/inference/8158355/T8158355.java
index edc6fe95254..08c7ae280a3 100644
--- a/test/langtools/tools/javac/generics/inference/8158355/T8158355.java
+++ b/test/langtools/tools/javac/generics/inference/8158355/T8158355.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -27,7 +27,7 @@
  * @test
  * @bug 8158355
  * @summary Inference graph dot support broken
- * @compile --debug:dumpInferenceGraphsTo=. T8158355.java
+ * @compile --debug=dumpInferenceGraphsTo=. T8158355.java
  */
 import java.util.List;
 
diff --git a/test/langtools/tools/javac/lambda/MostSpecific09.java b/test/langtools/tools/javac/lambda/MostSpecific09.java
index d7883a45c55..ef685ab541e 100644
--- a/test/langtools/tools/javac/lambda/MostSpecific09.java
+++ b/test/langtools/tools/javac/lambda/MostSpecific09.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8029718 8065800
  * @summary Should always use lambda body structure to disambiguate overload resolution
- * @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics --should-stop:at=ATTR --debug:verboseResolution=applicable,success MostSpecific09.java
+ * @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics --should-stop=at=ATTR --debug=verboseResolution=applicable,success MostSpecific09.java
  */
 
 class MostSpecific09 {
diff --git a/test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java b/test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java
index bd8f219fcfb..dad07d1b2d4 100644
--- a/test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java
+++ b/test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -122,7 +122,7 @@ public static void main(String... args) throws Exception {
     @Override
     public void doWork() throws IOException {
         newCompilationTask()
-                .withOption("--debug:dumpLambdaToMethodStats")
+                .withOption("--debug=dumpLambdaToMethodStats")
                 .withSourceFromTemplate(template)
                 .generate(this::check);
     }
diff --git a/test/langtools/tools/javac/lambda/XDdumpLambdaToMethodStats.java b/test/langtools/tools/javac/lambda/XDdumpLambdaToMethodStats.java
index 53b42d9d14a..e1b399ee6b0 100644
--- a/test/langtools/tools/javac/lambda/XDdumpLambdaToMethodStats.java
+++ b/test/langtools/tools/javac/lambda/XDdumpLambdaToMethodStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -25,7 +25,7 @@
  * @test
  * @bug 8143217
  * @summary javac throws NPE when printing diagnostics for Lambda expressions
- * @compile XDdumpLambdaToMethodStats.java --debug:dumpLambdaToMethodStats
+ * @compile XDdumpLambdaToMethodStats.java --debug=dumpLambdaToMethodStats
  *
  */
 
diff --git a/test/langtools/tools/javac/lambda/bridge/TestMetafactoryBridges.java b/test/langtools/tools/javac/lambda/bridge/TestMetafactoryBridges.java
index a61c9d4b344..6542d83b582 100644
--- a/test/langtools/tools/javac/lambda/bridge/TestMetafactoryBridges.java
+++ b/test/langtools/tools/javac/lambda/bridge/TestMetafactoryBridges.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -274,7 +274,7 @@ void run(JavaCompiler tool) throws Exception {
             sourcefiles.add(new JavaSource(ck));
         }
         JavacTask ct = (JavacTask)tool.getTask(debugWriter, null, diagChecker,
-                    Arrays.asList("--debug:dumpLambdaToMethodStats", "-d", outDir.getAbsolutePath(),
+                    Arrays.asList("--debug=dumpLambdaToMethodStats", "-d", outDir.getAbsolutePath(),
                                   "-sourcepath", srcDir.getAbsolutePath(),
                                   "-classpath", classesDir.getAbsolutePath(),
                                   pp.preferOpt), null, sourcefiles);
diff --git a/test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java b/test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java
index 5a016c9c08c..1234e6bdd8c 100644
--- a/test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java
+++ b/test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -210,7 +210,7 @@ boolean hasSameOverloadPhase() {
     public void doWork() throws Throwable {
         newCompilationTask()
                 .withSourceFromTemplate(sourceTemplate)
-                .withOption("--debug:verboseResolution=all,-predef,-internal,-object-init")
+                .withOption("--debug=verboseResolution=all,-predef,-internal,-object-init")
                 .analyze(this::check);
     }
 
diff --git a/test/langtools/tools/javac/missingSuperRecovery/MissingSuperRecovery.java b/test/langtools/tools/javac/missingSuperRecovery/MissingSuperRecovery.java
index 5e58732f04c..e5ef4725a0f 100644
--- a/test/langtools/tools/javac/missingSuperRecovery/MissingSuperRecovery.java
+++ b/test/langtools/tools/javac/missingSuperRecovery/MissingSuperRecovery.java
@@ -5,7 +5,7 @@
  * class is no longer available during a subsequent compilation.
  * @author maddox
  * @build impl
- * @compile/fail/ref=MissingSuperRecovery.out --diags:layout=%b:%l:%_%m MissingSuperRecovery.java
+ * @compile/fail/ref=MissingSuperRecovery.out --diags=layout=%b:%l:%_%m MissingSuperRecovery.java
  */
 
 // Requires "golden" class file 'impl.class', which contains
diff --git a/test/langtools/tools/javac/modules/AddLimitMods.java b/test/langtools/tools/javac/modules/AddLimitMods.java
index 0b87acd6fe6..e1f6b884b00 100644
--- a/test/langtools/tools/javac/modules/AddLimitMods.java
+++ b/test/langtools/tools/javac/modules/AddLimitMods.java
@@ -120,7 +120,7 @@ public void testManual(Path base) throws Exception {
         //real test
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
-                         "--should-stop:ifNoError=FLOW",
+                         "--should-stop=ifNoError=FLOW",
                          "--limit-modules", "java.base")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
@@ -129,7 +129,7 @@ public void testManual(Path base) throws Exception {
 
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
-                         "--should-stop:ifNoError=FLOW",
+                         "--should-stop=ifNoError=FLOW",
                          "--limit-modules", "java.base",
                          "--add-modules", "m2x")
                 .outdir(modulePath)
@@ -139,7 +139,7 @@ public void testManual(Path base) throws Exception {
 
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
-                         "--should-stop:ifNoError=FLOW",
+                         "--should-stop=ifNoError=FLOW",
                          "--limit-modules", "java.base",
                          "--add-modules", "m2x,m3x")
                 .outdir(modulePath)
@@ -149,7 +149,7 @@ public void testManual(Path base) throws Exception {
 
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
-                         "--should-stop:ifNoError=FLOW",
+                         "--should-stop=ifNoError=FLOW",
                          "--limit-modules", "m2x")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
@@ -158,7 +158,7 @@ public void testManual(Path base) throws Exception {
 
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
-                         "--should-stop:ifNoError=FLOW",
+                         "--should-stop=ifNoError=FLOW",
                          "--limit-modules", "m3x")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
@@ -167,7 +167,7 @@ public void testManual(Path base) throws Exception {
 
         new JavacTask(tb)
                 .options("--module-path", modulePath.toString(),
-                         "--should-stop:ifNoError=FLOW",
+                         "--should-stop=ifNoError=FLOW",
                          "--limit-modules", "m3x",
                          "--add-modules", "m2x")
                 .outdir(modulePath)
@@ -430,7 +430,7 @@ public void testRuntime2Compile(Path base) throws Exception {
                                            auxOptions,
                                            "--module-path", modulePath.toString(),
                                            "--class-path", classpathOut.toString(),
-                                           "--should-stop:ifNoError=FLOW"))
+                                           "--should-stop=ifNoError=FLOW"))
                    .outdir(modulePath)
                    .files(findJavaFiles(m2))
                    .run(success ? Task.Expect.SUCCESS : Task.Expect.FAIL)
diff --git a/test/langtools/tools/javac/options/IsSupportedOptionTest.java b/test/langtools/tools/javac/options/IsSupportedOptionTest.java
index 1dbf52d52d5..b70230e34dc 100644
--- a/test/langtools/tools/javac/options/IsSupportedOptionTest.java
+++ b/test/langtools/tools/javac/options/IsSupportedOptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -52,7 +52,7 @@ public void run() throws Exception {
         check(tool, "-Xdoclint", 0);
         check(tool, "-Xdoclint:stats", 0);
         check(tool, "-Xdoclint/package:foo", 0);
-        check(tool, "--debug:any", 0);
+        check(tool, "--debug=any", 1);
         check(tool, "-g", 0);
         check(tool, "-g:vars", 0);
         check(tool, "-g:none", 0);
diff --git a/test/langtools/tools/javac/policy/test3/Test.java b/test/langtools/tools/javac/policy/test3/Test.java
index 8f620a700b7..4b3352eb842 100644
--- a/test/langtools/tools/javac/policy/test3/Test.java
+++ b/test/langtools/tools/javac/policy/test3/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, 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
@@ -30,7 +30,7 @@
 import java.io.*;
 import java.util.*;
 
-// Simple test of --should-stop:at.
+// Simple test of --should-stop=at.
 // For each of the permissable values, we compile a file with an error in it,
 // then using -XDverboseCompilePolicy we check that the compilation gets as
 // far as expected, but no further.
@@ -83,7 +83,7 @@ public void test(CompilePolicy cp, ShouldStopPolicy ssp) {
         args.add("-d");
         args.add(".");
         if (ssp.needOption)
-            args.add("--should-stop:at=" + ssp);
+            args.add("--should-stop=at=" + ssp);
         args.add(new File(System.getProperty("test.src", "."), "A.java").getPath());
 
         StringWriter sw = new StringWriter();
diff --git a/test/langtools/tools/javac/positions/TreeEndPosTest.java b/test/langtools/tools/javac/positions/TreeEndPosTest.java
index 523ec5dcf3c..007a71db55c 100644
--- a/test/langtools/tools/javac/positions/TreeEndPosTest.java
+++ b/test/langtools/tools/javac/positions/TreeEndPosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -145,7 +145,7 @@ static void compile(JavaSource src) throws IOException {
             options.add(tempDir.getPath());
             options.add("-d");
             options.add(tempDir.getPath());
-            options.add("--should-stop:at=GENERATE");
+            options.add("--should-stop=at=GENERATE");
 
             List<JavaFileObject> sources = new ArrayList<>();
             sources.add(src);
diff --git a/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess2.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess2.java
index 5910eaa73c4..b90e6dee6ff 100644
--- a/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess2.java
+++ b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess2.java
@@ -4,7 +4,7 @@
  * @summary Verify correct implementation of JLS2e 6.6.2.1
  * @author maddox
  *
- * @compile/fail/ref=ProtectedMemberAccess2.out --diags:formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess2.java
+ * @compile/fail/ref=ProtectedMemberAccess2.out --diags=formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess2.java
  */
 
 // 71 errors expected.
diff --git a/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess3.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess3.java
index 82b8d1b51a1..814f50e9dc1 100644
--- a/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess3.java
+++ b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess3.java
@@ -4,7 +4,7 @@
  * @summary Verify correct implementation of JLS2e 6.6.2.1
  * @author maddox
  *
- * @compile/fail/ref=ProtectedMemberAccess3.out --diags:formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess3.java
+ * @compile/fail/ref=ProtectedMemberAccess3.out --diags=formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess3.java
  */
 
 // 46 errors expected.
diff --git a/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess4.java b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess4.java
index d8a55813524..bd3ce83b0fe 100644
--- a/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess4.java
+++ b/test/langtools/tools/javac/protectedAccess/ProtectedMemberAccess4.java
@@ -4,7 +4,7 @@
  * @summary Verify correct implementation of JLS2e 6.6.2.1
  * @author maddox
  *
- * @compile/fail/ref=ProtectedMemberAccess4.out --diags:formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess4.java
+ * @compile/fail/ref=ProtectedMemberAccess4.out --diags=formatterOptions=-simpleNames;layout=%b:%l:%_%m ProtectedMemberAccess4.java
  */
 
 // 33 errors expected.
diff --git a/test/langtools/tools/javac/resolve/ResolveHarness.java b/test/langtools/tools/javac/resolve/ResolveHarness.java
index 8de0a6b2432..23cfa776b3b 100644
--- a/test/langtools/tools/javac/resolve/ResolveHarness.java
+++ b/test/langtools/tools/javac/resolve/ResolveHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -132,8 +132,8 @@ protected ResolveHarness(JavaFileObject jfo) {
 
     protected void check() throws Exception {
         String[] options = {
-            "--should-stop:at=ATTR",
-            "--debug:verboseResolution=success,failure,applicable,inapplicable,deferred-inference,predef"
+            "--should-stop=at=ATTR",
+            "--debug=verboseResolution=success,failure,applicable,inapplicable,deferred-inference,predef"
         };
 
         AbstractProcessor[] processors = { new ResolveCandidateFinder(), null };
diff --git a/test/langtools/tools/javac/tree/VarTree.java b/test/langtools/tools/javac/tree/VarTree.java
index 99bfdb35ddd..7d1f9f2204c 100644
--- a/test/langtools/tools/javac/tree/VarTree.java
+++ b/test/langtools/tools/javac/tree/VarTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -77,7 +77,7 @@ void run(String code, String expected) throws IOException {
         String src = prefix + parts[0] + parts[1] + parts[2] + " } }";
 
         JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, d -> {},
-                                                        List.of("--should-stop:at=FLOW"),
+                                                        List.of("--should-stop=at=FLOW"),
                                                         null, Arrays.asList(new MyFileObject(src)));
 
         Iterable<? extends CompilationUnitTree> units = ct.parse();
diff --git a/test/langtools/tools/javac/unicode/UnicodeNewline.java b/test/langtools/tools/javac/unicode/UnicodeNewline.java
index 535be3f8bd9..847b1fcc661 100644
--- a/test/langtools/tools/javac/unicode/UnicodeNewline.java
+++ b/test/langtools/tools/javac/unicode/UnicodeNewline.java
@@ -3,7 +3,7 @@
  * @bug 4739428 4785453
  * @summary when \u000a is used, diagnostics are reported on the wrong line.
  *
- * @compile/fail/ref=UnicodeNewline.out --diags:layout=%b:%l:%_%m UnicodeNewline.java
+ * @compile/fail/ref=UnicodeNewline.out --diags=layout=%b:%l:%_%m UnicodeNewline.java
  */
 
 class UnicodeNewline {
diff --git a/test/langtools/tools/sjavac/JavacOptionPrep.java b/test/langtools/tools/sjavac/JavacOptionPrep.java
index 9e3bb21b1e0..c5023c890d6 100644
--- a/test/langtools/tools/sjavac/JavacOptionPrep.java
+++ b/test/langtools/tools/sjavac/JavacOptionPrep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -96,7 +96,7 @@ public static void main(String[] unused) throws IOException {
 
             // Ignore this option for now. When the file=... requirement goes
             // away, this will be easier to handle.
-            if (option.startsWith("--debug:completionDeps"))
+            if (option.startsWith("--debug=completionDeps"))
                 continue;
 
             switch (option) {

From 8ade45dcb454a101cd35c730f7b2a25bd9073f2b Mon Sep 17 00:00:00 2001
From: amlu <unknown>
Date: Wed, 4 Apr 2018 16:57:01 +0800
Subject: [PATCH 058/196] 8200703: Problem list jdk/jshell/ExceptionsTest.java
 fails on windows Reviewed-by: jlahoda

---
 test/langtools/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/langtools/ProblemList.txt b/test/langtools/ProblemList.txt
index 265dbca45ff..f94a7f30fcc 100644
--- a/test/langtools/ProblemList.txt
+++ b/test/langtools/ProblemList.txt
@@ -38,6 +38,7 @@ jdk/javadoc/doclet/testIOException/TestIOException.java
 
 jdk/jshell/UserJdiUserRemoteTest.java                                           8173079    linux-all
 jdk/jshell/UserInputTest.java                                                   8169536    generic-all
+jdk/jshell/ExceptionsTest.java                                                  8200701    windows-all
 
 ###########################################################################
 #

From 1eff00e94580337c58fb7a1617a126820260f9bf Mon Sep 17 00:00:00 2001
From: mullan <unknown>
Date: Wed, 4 Apr 2018 11:26:10 -0400
Subject: [PATCH 059/196] 8193032: Remove terminally deprecated SecurityManager
 APIs Summary: Remove the checkTopLevelWindow, checkSystemClipboardAccess,
 checkAwtEventQueueAccess, and checkMemberAccess methods. Reviewed-by: alanb,
 mchung, kcr

---
 .../classes/java/lang/SecurityManager.java    | 104 +-----------------
 .../classes/sun/applet/AppletSecurity.java    |  26 +----
 .../sun/applet/resources/MsgAppletViewer.java |   5 +-
 .../RedefineObject/WalkThroughInvoke.java     |   4 +-
 .../DepMethodsRequireAllPerm.java             |  82 --------------
 5 files changed, 5 insertions(+), 216 deletions(-)
 delete mode 100644 test/jdk/java/lang/SecurityManager/DepMethodsRequireAllPerm.java

diff --git a/src/java.base/share/classes/java/lang/SecurityManager.java b/src/java.base/share/classes/java/lang/SecurityManager.java
index 35e30c06cb1..74da4daeda5 100644
--- a/src/java.base/share/classes/java/lang/SecurityManager.java
+++ b/src/java.base/share/classes/java/lang/SecurityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -235,19 +235,6 @@ public class SecurityManager {
      */
     private boolean initialized = false;
 
-
-    /**
-     * returns true if the current context has been granted AllPermission
-     */
-    private boolean hasAllPermission() {
-        try {
-            checkPermission(SecurityConstants.ALL_PERMISSION);
-            return true;
-        } catch (SecurityException se) {
-            return false;
-        }
-    }
-
     /**
      * Constructs a new <code>SecurityManager</code>.
      *
@@ -1080,28 +1067,6 @@ public void checkPropertyAccess(String key) {
             SecurityConstants.PROPERTY_READ_ACTION));
     }
 
-    /**
-     * Returns {@code true} if the calling thread has {@code AllPermission}.
-     *
-     * @param      window   not used except to check if it is {@code null}.
-     * @return     {@code true} if the calling thread has {@code AllPermission}.
-     * @exception  NullPointerException if the {@code window} argument is
-     *             {@code null}.
-     * @deprecated This method was originally used to check if the calling thread
-     *             was trusted to bring up a top-level window. The method has been
-     *             obsoleted and code should instead use {@link #checkPermission}
-     *             to check {@code AWTPermission("showWindowWithoutWarningBanner")}.
-     *             This method is subject to removal in a future version of Java SE.
-     * @see        #checkPermission(java.security.Permission) checkPermission
-     */
-    @Deprecated(since="1.8", forRemoval=true)
-    public boolean checkTopLevelWindow(Object window) {
-        if (window == null) {
-            throw new NullPointerException("window can't be null");
-        }
-        return hasAllPermission();
-    }
-
     /**
      * Throws a <code>SecurityException</code> if the
      * calling thread is not allowed to initiate a print job request.
@@ -1124,44 +1089,6 @@ public void checkPrintJobAccess() {
         checkPermission(new RuntimePermission("queuePrintJob"));
     }
 
-    /**
-     * Throws {@code SecurityException} if the calling thread does
-     * not have {@code AllPermission}.
-     *
-     * @since   1.1
-     * @exception  SecurityException  if the calling thread does not have
-     *             {@code AllPermission}
-     * @deprecated This method was originally used to check if the calling
-     *             thread could access the system clipboard. The method has been
-     *             obsoleted and code should instead use {@link #checkPermission}
-     *             to check {@code AWTPermission("accessClipboard")}.
-     *             This method is subject to removal in a future version of Java SE.
-     * @see        #checkPermission(java.security.Permission) checkPermission
-     */
-    @Deprecated(since="1.8", forRemoval=true)
-    public void checkSystemClipboardAccess() {
-        checkPermission(SecurityConstants.ALL_PERMISSION);
-    }
-
-    /**
-     * Throws {@code SecurityException} if the calling thread does
-     * not have {@code AllPermission}.
-     *
-     * @since   1.1
-     * @exception  SecurityException  if the calling thread does not have
-     *             {@code AllPermission}
-     * @deprecated This method was originally used to check if the calling
-     *             thread could access the AWT event queue. The method has been
-     *             obsoleted and code should instead use {@link #checkPermission}
-     *             to check {@code AWTPermission("accessEventQueue")}.
-     *             This method is subject to removal in a future version of Java SE.
-     * @see        #checkPermission(java.security.Permission) checkPermission
-     */
-    @Deprecated(since="1.8", forRemoval=true)
-    public void checkAwtEventQueueAccess() {
-        checkPermission(SecurityConstants.ALL_PERMISSION);
-    }
-
     /*
      * We have an initial invalid bit (initially false) for the class
      * variables which tell if the cache is valid.  If the underlying
@@ -1474,35 +1401,6 @@ public void checkSetFactory() {
         checkPermission(new RuntimePermission("setFactory"));
     }
 
-    /**
-     * Throws a {@code SecurityException} if the calling thread does
-     * not have {@code AllPermission}.
-     *
-     * @param clazz the class that reflection is to be performed on.
-     * @param which type of access, PUBLIC or DECLARED.
-     * @throws  SecurityException if the caller does not have
-     *          {@code AllPermission}
-     * @throws  NullPointerException if the {@code clazz} argument is
-     *          {@code null}
-     * @deprecated This method was originally used to check if the calling
-     *             thread was allowed to access members. It relied on the
-     *             caller being at a stack depth of 4 which is error-prone and
-     *             cannot be enforced by the runtime. The method has been
-     *             obsoleted and code should instead use
-     *             {@link #checkPermission} to check
-     *             {@code RuntimePermission("accessDeclaredMembers")}. This
-     *             method is subject to removal in a future version of Java SE.
-     * @since 1.1
-     * @see        #checkPermission(java.security.Permission) checkPermission
-     */
-    @Deprecated(since="1.8", forRemoval=true)
-    public void checkMemberAccess(Class<?> clazz, int which) {
-        if (clazz == null) {
-            throw new NullPointerException("class can't be null");
-        }
-        checkPermission(SecurityConstants.ALL_PERMISSION);
-    }
-
     /**
      * Determines whether the permission with the specified permission target
      * name should be granted or denied.
diff --git a/src/java.desktop/share/classes/sun/applet/AppletSecurity.java b/src/java.desktop/share/classes/sun/applet/AppletSecurity.java
index b9155e81072..2d4c7fce90a 100644
--- a/src/java.desktop/share/classes/sun/applet/AppletSecurity.java
+++ b/src/java.desktop/share/classes/sun/applet/AppletSecurity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -370,30 +370,6 @@ public void checkPackageAccess(final String pkgname) {
         }
     }
 
-    /**
-     * Tests if a client can get access to the AWT event queue.
-     * <p>
-     * This method calls {@code checkPermission} with the
-     * {@code AWTPermission("accessEventQueue")} permission.
-     *
-     * @since   1.1
-     * @exception  SecurityException  if the caller does not have
-     *             permission to access the AWT event queue.
-     */
-    @SuppressWarnings({"deprecation",
-                       "removal"}) //  SecurityManager.checkAwtEventQueueAccess
-    public void checkAwtEventQueueAccess() {
-        AppContext appContext = AppContext.getAppContext();
-        AppletClassLoader appletClassLoader = currentAppletClassLoader();
-
-        if (AppContext.isMainContext(appContext) && (appletClassLoader != null)) {
-            // If we're about to allow access to the main EventQueue,
-            // and anything untrusted is on the class context stack,
-            // disallow access.
-            super.checkPermission(AWTPermissions.CHECK_AWT_EVENTQUEUE_PERMISSION);
-        }
-    } // checkAwtEventQueueAccess()
-
     /**
      * Returns the thread group of the applet. We consult the classloader
      * if there is one.
diff --git a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
index d9ba0253213..70e87bd0353 100644
--- a/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
+++ b/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -188,10 +188,7 @@ public Object[][] getContents() {
             {"appletsecurityexception.checkpackageaccess", "Security Exception: cannot access package: {0}"},
             {"appletsecurityexception.checkpackagedefinition", "Security Exception: cannot define package: {0}"},
             {"appletsecurityexception.cannotsetfactory", "Security Exception: cannot set factory"},
-            {"appletsecurityexception.checkmemberaccess", "Security Exception: check member access"},
             {"appletsecurityexception.checkgetprintjob", "Security Exception: getPrintJob"},
-            {"appletsecurityexception.checksystemclipboardaccess", "Security Exception: getSystemClipboard"},
-            {"appletsecurityexception.checkawteventqueueaccess", "Security Exception: getEventQueue"},
             {"appletsecurityexception.checksecurityaccess", "Security Exception: security operation: {0}"},
             {"appletsecurityexception.getsecuritycontext.unknown", "unknown class loader type. unable to check for getContext"},
             {"appletsecurityexception.checkread.unknown", "unknown class loader type. unable to check for checking read {0}"},
diff --git a/test/hotspot/jtreg/runtime/RedefineObject/WalkThroughInvoke.java b/test/hotspot/jtreg/runtime/RedefineObject/WalkThroughInvoke.java
index 51f0e635bca..3738dfd3c99 100644
--- a/test/hotspot/jtreg/runtime/RedefineObject/WalkThroughInvoke.java
+++ b/test/hotspot/jtreg/runtime/RedefineObject/WalkThroughInvoke.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -29,7 +29,7 @@ public void stackWalk() {
           SecurityManager sm = new SecurityManager();
           // Walks the stack with Method.invoke in the stack (which is the
           // purpose of the test) before it gets an AccessControlException.
-          sm.checkMemberAccess(b, Member.DECLARED);
+          sm.checkPermission(new RuntimePermission("accessDeclaredMembers"));
       } catch (java.security.AccessControlException e) {
           // Ignoring an 'AccessControlException' exception since
           // it is expected as part of this test.
diff --git a/test/jdk/java/lang/SecurityManager/DepMethodsRequireAllPerm.java b/test/jdk/java/lang/SecurityManager/DepMethodsRequireAllPerm.java
deleted file mode 100644
index 77cda7e8fe1..00000000000
--- a/test/jdk/java/lang/SecurityManager/DepMethodsRequireAllPerm.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-/* @test
- * @bug 8004502 8008793 8029886 8186535
- * @summary Sanity check that the SecurityManager checkMemberAccess method and
- *          methods that used to check AWTPermission now check for AllPermission
- */
-
-import java.security.AllPermission;
-import java.security.Permission;
-
-public class DepMethodsRequireAllPerm {
-
-    static class MySecurityManager extends SecurityManager {
-        final Class<?> expectedClass;
-
-        MySecurityManager(Class<?> c) {
-            expectedClass = c;
-        }
-
-        @Override
-        public void checkPermission(Permission perm) {
-            if (perm.getClass() != expectedClass)
-                throw new RuntimeException("Got: " + perm.getClass() + ", expected: " + expectedClass);
-            super.checkPermission(perm);
-        }
-    }
-
-    public static void main(String[] args) {
-        MySecurityManager sm = new MySecurityManager(AllPermission.class);
-
-        try {
-            sm.checkAwtEventQueueAccess();
-            throw new RuntimeException("SecurityException expected");
-        } catch (SecurityException expected) { }
-
-        try {
-            sm.checkSystemClipboardAccess();
-            throw new RuntimeException("SecurityException expected");
-        } catch (SecurityException expected) { }
-
-        try {
-            sm.checkTopLevelWindow(null);
-            throw new RuntimeException("NullPointException expected");
-        } catch (NullPointerException expected) { }
-
-        if (sm.checkTopLevelWindow(new Object())) {
-            throw new RuntimeException("checkTopLevelWindow expected to return false");
-        }
-
-        try {
-            sm.checkMemberAccess(Object.class, java.lang.reflect.Member.DECLARED);
-            throw new RuntimeException("SecurityException expected");
-        } catch (SecurityException expected) { }
-
-        try {
-            sm.checkMemberAccess(null, java.lang.reflect.Member.DECLARED);
-            throw new RuntimeException("NullPointerException expected");
-        } catch (NullPointerException expected) { }
-    }
-}

From 402baca35f138e2c211ce6fe42e0f9f2b07edda2 Mon Sep 17 00:00:00 2001
From: lbourges <unknown>
Date: Wed, 4 Apr 2018 21:36:02 +0200
Subject: [PATCH 060/196] 8200526: Test sun/java2d/marlin/ClipShapeTest.java
 times out Summary: increased timeout to 300s per test Reviewed-by: jdv, prr,
 serb

---
 test/jdk/sun/java2d/marlin/ClipShapeTest.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/jdk/sun/java2d/marlin/ClipShapeTest.java b/test/jdk/sun/java2d/marlin/ClipShapeTest.java
index c219987a169..add7e7c1348 100644
--- a/test/jdk/sun/java2d/marlin/ClipShapeTest.java
+++ b/test/jdk/sun/java2d/marlin/ClipShapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -58,14 +58,14 @@
  * for paths made of either 9 lines, 4 quads, 2 cubics (random)
  * Note: Use the argument -slow to run more intensive tests (too much time)
  *
- * @run main/othervm/timeout=120 -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine ClipShapeTest -poly
- * @run main/othervm/timeout=240 -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine ClipShapeTest -poly -doDash
- * @run main/othervm/timeout=120 -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine ClipShapeTest -cubic
- * @run main/othervm/timeout=240 -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine ClipShapeTest -cubic -doDash
- * @run main/othervm/timeout=120 -Dsun.java2d.renderer=sun.java2d.marlin.DMarlinRenderingEngine ClipShapeTest -poly
- * @run main/othervm/timeout=240 -Dsun.java2d.renderer=sun.java2d.marlin.DMarlinRenderingEngine ClipShapeTest -poly -doDash
- * @run main/othervm/timeout=120 -Dsun.java2d.renderer=sun.java2d.marlin.DMarlinRenderingEngine ClipShapeTest -cubic
- * @run main/othervm/timeout=240 -Dsun.java2d.renderer=sun.java2d.marlin.DMarlinRenderingEngine ClipShapeTest -cubic -doDash
+ * @run main/othervm/timeout=300 -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine ClipShapeTest -poly
+ * @run main/othervm/timeout=300 -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine ClipShapeTest -poly -doDash
+ * @run main/othervm/timeout=300 -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine ClipShapeTest -cubic
+ * @run main/othervm/timeout=300 -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine ClipShapeTest -cubic -doDash
+ * @run main/othervm/timeout=300 -Dsun.java2d.renderer=sun.java2d.marlin.DMarlinRenderingEngine ClipShapeTest -poly
+ * @run main/othervm/timeout=300 -Dsun.java2d.renderer=sun.java2d.marlin.DMarlinRenderingEngine ClipShapeTest -poly -doDash
+ * @run main/othervm/timeout=300 -Dsun.java2d.renderer=sun.java2d.marlin.DMarlinRenderingEngine ClipShapeTest -cubic
+ * @run main/othervm/timeout=300 -Dsun.java2d.renderer=sun.java2d.marlin.DMarlinRenderingEngine ClipShapeTest -cubic -doDash
 */
 public final class ClipShapeTest {
 

From 20bdde4ee99a960cc9ed040e9548e09a7095153f Mon Sep 17 00:00:00 2001
From: igerasim <unknown>
Date: Wed, 4 Apr 2018 14:09:31 -0700
Subject: [PATCH 061/196] 8200696: Optimal initial capacity of
 java.lang.Class.enumConstantDirectory Reviewed-by: dholmes, redestad

---
 .../share/classes/java/lang/Class.java        |   4 +-
 .../ConstantDirectoryOptimalCapacity.java     | 113 ++++++++++++++++++
 .../jdk/testlibrary/OptimalCapacity.java      |  28 ++++-
 3 files changed, 141 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java

diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index cf34ff2d86e..ef959d6a97d 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2018, 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
@@ -3529,7 +3529,7 @@ Map<String, T> enumConstantDirectory() {
             if (universe == null)
                 throw new IllegalArgumentException(
                     getName() + " is not an enum type");
-            directory = new HashMap<>(2 * universe.length);
+            directory = new HashMap<>((int)(universe.length / 0.75f) + 1);
             for (T constant : universe) {
                 directory.put(((Enum<?>)constant).name(), constant);
             }
diff --git a/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java b/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java
new file mode 100644
index 00000000000..de9a235b723
--- /dev/null
+++ b/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8200696
+ * @summary Initial capacity of Class.enumConstantDirectory is not optimal
+ * @library /lib/testlibrary
+ * @modules java.base/java.lang:open
+ * @build jdk.testlibrary.OptimalCapacity
+ * @run main ConstantDirectoryOptimalCapacity
+ */
+
+import jdk.testlibrary.OptimalCapacity;
+
+public class ConstantDirectoryOptimalCapacity {
+
+    public static void main(String[] args) throws Throwable {
+        test(E1.class);
+        test(E2.class);
+        test(E3.class);
+        test(E4.class);
+        test(E5.class);
+        test(E6.class);
+        test(E7.class);
+        test(E8.class);
+        test(E9.class);
+        test(E10.class);
+        test(E11.class);
+        test(E12.class);
+        test(E13.class);
+        test(E14.class);
+        test(E15.class);
+        test(E16.class);
+        test(E17.class);
+        test(E18.class);
+        test(E19.class);
+        test(E20.class);
+        test(E21.class);
+        test(E22.class);
+        test(E23.class);
+        test(E24.class);
+        test(E25.class);
+        test(E26.class);
+    }
+
+    private static void test(Class<? extends Enum> e) {
+        Enum.valueOf(e, "V0"); // trigger init of enumConstantDirectory
+
+        int initialCapacity = (int)(e.getEnumConstants().length / 0.75f) + 1;
+        OptimalCapacity.ofHashMap(e.getClass(), e, "enumConstantDirectory",
+            initialCapacity);
+    }
+
+    enum E1 { V0 }
+    enum E2 { V0, V1 }
+    enum E3 { V0, V1, V2 }
+    enum E4 { V0, V1, V2, V3 }
+    enum E5 { V0, V1, V2, V3, V4 }
+    enum E6 { V0, V1, V2, V3, V4, V5 }
+    enum E7 { V0, V1, V2, V3, V4, V5, V6 }
+    enum E8 { V0, V1, V2, V3, V4, V5, V6, V7 }
+    enum E9 { V0, V1, V2, V3, V4, V5, V6, V7, V8 }
+    enum E10 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9 }
+    enum E11 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10 }
+    enum E12 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11 }
+    enum E13 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12 }
+    enum E14 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13 }
+    enum E15 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14 }
+    enum E16 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15 }
+    enum E17 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16 }
+    enum E18 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16, V17 }
+    enum E19 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16, V17, V18 }
+    enum E20 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16, V17, V18, V19 }
+    enum E21 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16, V17, V18, V19, V20 }
+    enum E22 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16, V17, V18, V19, V20, V21 }
+    enum E23 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16, V17, V18, V19, V20, V21, V22 }
+    enum E24 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16, V17, V18, V19, V20, V21, V22, V23 }
+    enum E25 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16, V17, V18, V19, V20, V21, V22, V23, V24 }
+    enum E26 { V0, V1, V2, V3, V4, V5, V6, V7, V8, V9, V10, V11, V12, V13,
+               V14, V15, V16, V17, V18, V19, V20, V21, V22, V23, V24, V25 }
+}
diff --git a/test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java b/test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java
index 2d1ada3842a..ab74cc26dda 100644
--- a/test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java
+++ b/test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -101,11 +101,35 @@ public static void ofArrayList(Class<?> clazz, String fieldName,
      */
     public static void ofHashMap(Class<?> clazz, String fieldName,
             int initialCapacity)
+    {
+        ofHashMap(clazz, null, fieldName, initialCapacity);
+    }
+
+    /**
+     * Checks adequacy of the initial capacity of a non-static field
+     * of type {@code HashMap}.
+     *
+     * Having
+     * <pre>
+     * class XClass {
+     *     HashMap theMap = new HashMap(N);
+     * }
+     * XClass instance = ...
+     * </pre>
+     *
+     * you should call from the test
+     *
+     * <pre>
+     * OptimalCapacity.ofHashMap(XClass.class, instance, "theMap", N);
+     * </pre>
+     */
+    public static void ofHashMap(Class<?> clazz, Object instance,
+            String fieldName, int initialCapacity)
     {
         try {
             Field field = clazz.getDeclaredField(fieldName);
             field.setAccessible(true);
-            Object obj = field.get(null);
+            Object obj = field.get(instance);
             if (!HashMap.class.equals(obj.getClass())) {
                 throw new RuntimeException(field +
                     " expected to be of type HashMap");

From 12bfb4b91fa064a70f0db576f5b83cd501522de1 Mon Sep 17 00:00:00 2001
From: jjg <unknown>
Date: Wed, 4 Apr 2018 14:42:53 -0700
Subject: [PATCH 062/196] 8200664: fix broken links in java.base docs
 Reviewed-by: alanb, joehw

---
 .../java/net/doc-files/net-properties.html    |  4 +-
 .../java/util/doc-files/coll-designfaq.html   |  4 +-
 .../java/util/doc-files/coll-overview.html    |  4 +-
 .../java/util/doc-files/coll-reference.html   | 62 +++++++++----------
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/java.base/share/classes/java/net/doc-files/net-properties.html b/src/java.base/share/classes/java/net/doc-files/net-properties.html
index acf653ebaed..f6f87b8edc3 100644
--- a/src/java.base/share/classes/java/net/doc-files/net-properties.html
+++ b/src/java.base/share/classes/java/net/doc-files/net-properties.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2018, 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
@@ -35,7 +35,7 @@ <H1 style="text-align:center">Networking Properties</H1>
 java.net package. Some are checked only once at startup of the VM,
 and therefore are best set using the -D option of the java command,
 while others have a more dynamic nature and can also be changed using
-the <a href="../../lang/System.html#setProperty-java.lang.String-java.lang.String-">System.setProperty()</a> API.
+the <a href="../../lang/System.html#setProperty(java.lang.String,java.lang.String)">System.setProperty()</a> API.
 The purpose of this document is to list
 and detail all of these properties.</P>
 <P>If there is no special note, a property value is checked every time it is used.</P>
diff --git a/src/java.base/share/classes/java/util/doc-files/coll-designfaq.html b/src/java.base/share/classes/java/util/doc-files/coll-designfaq.html
index 4928650299f..2a06c1e138e 100644
--- a/src/java.base/share/classes/java/util/doc-files/coll-designfaq.html
+++ b/src/java.base/share/classes/java/util/doc-files/coll-designfaq.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2018, 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
@@ -371,7 +371,7 @@ <h3>Miscellaneous</h3>
 would do away with many useful facilities (like synchronizing
 wrappers). One view that we see as being particularly useful is
 <a href=
-"../List.html#subList-int-int-">List.subList</a>.
+"../List.html#subList(int,int)">List.subList</a>.
 The existence of this method means that people who write methods
 taking List on input do not have to write secondary forms taking an
 offset and a length (as they do for arrays).</p>
diff --git a/src/java.base/share/classes/java/util/doc-files/coll-overview.html b/src/java.base/share/classes/java/util/doc-files/coll-overview.html
index 36a4f42cbd6..bc6b93b1868 100644
--- a/src/java.base/share/classes/java/util/doc-files/coll-overview.html
+++ b/src/java.base/share/classes/java/util/doc-files/coll-overview.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2018, 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
@@ -258,7 +258,7 @@ <h2>Collection Implementations</h2>
 restrictions on the elements they may contain. They are
 unsynchronized, but the <code>Collections</code> class contains static
 factories called <a href=
-"../Collections.html#synchronizedCollection-java.util.Collection-">
+"../Collections.html#synchronizedCollection(java.util.Collection)">
 <em>synchronization wrappers</em></a> that can be used to add
 synchronization to many unsynchronized collections. All of the new
 implementations have <i>fail-fast iterators</i>, which detect
diff --git a/src/java.base/share/classes/java/util/doc-files/coll-reference.html b/src/java.base/share/classes/java/util/doc-files/coll-reference.html
index f7991e59040..95ffcda42c8 100644
--- a/src/java.base/share/classes/java/util/doc-files/coll-reference.html
+++ b/src/java.base/share/classes/java/util/doc-files/coll-reference.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2018, 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
@@ -177,7 +177,7 @@ <h1>Outline of the Collections Framework</h1>
 interface. An insertion-ordered <code>Map</code> implementation that
 runs nearly as fast as <code>HashMap</code>. Also useful for building
 caches (see <a href=
-"../LinkedHashMap.html#removeEldestEntry-java.util.Map.Entry-">
+"../LinkedHashMap.html#removeEldestEntry(java.util.Map.Entry)">
 removeEldestEntry(Map.Entry)</a> ).</li>
 </ul>
 </li>
@@ -186,13 +186,13 @@ <h1>Outline of the Collections Framework</h1>
 implementations. Accessed solely through static factory methods.
 <ul>
 <li><a href=
-"../Collections.html#unmodifiableCollection-java.util.Collection-">
+"../Collections.html#unmodifiableCollection(java.util.Collection)">
 <strong>Collections.unmodifiable<i>Interface</i></strong></a> -
 Returns an unmodifiable view of a specified collection that throws
 an <code>UnsupportedOperationException</code> if the user attempts to
 modify it.</li>
 <li><a href=
-"../Collections.html#synchronizedCollection-java.util.Collection-"
+"../Collections.html#synchronizedCollection(java.util.Collection)"
 id=
 "synchWrappers"><strong>Collections.synchronized<i>Interface</i></strong></a>
 - Returns a synchronized collection that is backed by the specified
@@ -200,7 +200,7 @@ <h1>Outline of the Collections Framework</h1>
 the backing collection are through the returned collection, thread
 safety is guaranteed.</li>
 <li><a href=
-"../Collections.html#checkedCollection-java.util.Collection-java.lang.Class-">
+"../Collections.html#checkedCollection(java.util.Collection,java.lang.Class)">
 <strong>Collections.checked<i>Interface</i></strong></a> - Returns
 a dynamically type-safe view of the specified collection, which
 throws a <code>ClassCastException</code> if a client attempts to add an
@@ -214,12 +214,12 @@ <h1>Outline of the Collections Framework</h1>
 adapt one collections interface to another:
 <ul>
 <li><strong><a href=
-"../Collections.html#newSetFromMap-java.util.Map-">
+"../Collections.html#newSetFromMap(java.util.Map)">
 newSetFromMap(Map)</a></strong> - Creates a general-purpose
 <code>Set</code> implementation from a general-purpose <code>Map</code>
 implementation.</li>
 <li><strong><a href=
-"../Collections.html#asLifoQueue-java.util.Deque-">
+"../Collections.html#asLifoQueue(java.util.Deque)">
 asLifoQueue(Deque)</a></strong> - Returns a view of a
 <code>Deque</code> as a Last In First Out (LIFO) <code>Queue</code>.</li>
 </ul>
@@ -228,25 +228,25 @@ <h1>Outline of the Collections Framework</h1>
 "mini-implementations" of the collection interfaces.
 <ul>
 <li><a href=
-"../Arrays.html#asList-T...-"><strong>Arrays.asList</strong></a>
+"../Arrays.html#asList(T...)"><strong>Arrays.asList</strong></a>
 - Enables an array to be viewed as a list.</li>
 <li><strong><a href=
-"../Collections.html#emptySet--">emptySet</a>,
+"../Collections.html#emptySet()">emptySet</a>,
 <a href=
-"../Collections.html#emptyList--">emptyList</a>
+"../Collections.html#emptyList()">emptyList</a>
 and <a href=
-"../Collections.html#emptyMap--">emptyMap</a></strong>
+"../Collections.html#emptyMap()">emptyMap</a></strong>
 - Return an immutable empty set, list, or map.</li>
 <li><strong><a href=
-"../Collections.html#singleton-java.lang.Object-">
+"../Collections.html#singleton(java.lang.Object)">
 singleton</a>, <a href=
-"../Collections.html#singletonList-java.lang.Object-">
+"../Collections.html#singletonList(java.lang.Object)">
 singletonList</a>, and <a href=
-"../Collections.html#singletonMap-K-V-">singletonMap</a></strong>
+"../Collections.html#singletonMap(K,V)">singletonMap</a></strong>
 - Return an immutable singleton set, list, or map, containing only
 the specified object (or key-value mapping).</li>
 <li><a href=
-"../Collections.html#nCopies-int-T-"><strong>
+"../Collections.html#nCopies(int,T)"><strong>
 nCopies</strong></a> - Returns an immutable list consisting of n
 copies of a specified object.</li>
 </ul>
@@ -410,71 +410,71 @@ <h1>Outline of the Collections Framework</h1>
 class contains these useful static methods.
 <ul>
 <li><strong><a href=
-"../Collections.html#sort-java.util.List-">sort(List)</a></strong>
+"../Collections.html#sort(java.util.List)">sort(List)</a></strong>
 - Sorts a list using a merge sort algorithm, which provides average
 case performance comparable to a high quality quicksort, guaranteed
 O(n*log n) performance (unlike quicksort), and <em>stability</em>
 (unlike quicksort). A stable sort is one that does not reorder
 equal elements.</li>
 <li><strong><a href=
-"../Collections.html#binarySearch-java.util.List-T-">
+"../Collections.html#binarySearch(java.util.List,T)">
 binarySearch(List, Object)</a></strong> - Searches for an element
 in an ordered list using the binary search algorithm.</li>
 <li><strong><a href=
-"../Collections.html#reverse-java.util.List-">reverse(List)</a></strong>
+"../Collections.html#reverse(java.util.List)">reverse(List)</a></strong>
 - Reverses the order of the elements in a list.</li>
 <li><strong><a href=
-"../Collections.html#shuffle-java.util.List-">shuffle(List)</a></strong>
+"../Collections.html#shuffle(java.util.List)">shuffle(List)</a></strong>
 - Randomly changes the order of the elements in a list.</li>
 <li><strong><a href=
-"../Collections.html#fill-java.util.List-T-">
+"../Collections.html#fill(java.util.List,T)">
 fill(List, Object)</a></strong> - Overwrites every element in a
 list with the specified value.</li>
 <li><strong><a href=
-"../Collections.html#copy-java.util.List-java.util.List-">
+"../Collections.html#copy-java.util.List(java.util.List)">
 copy(List dest, List src)</a></strong> - Copies the source list
 into the destination list.</li>
 <li><strong><a href=
-"../Collections.html#min-java.util.Collection-">
+"../Collections.html#min(java.util.Collection)">
 min(Collection)</a></strong> - Returns the minimum element in a
 collection.</li>
 <li><strong><a href=
-"../Collections.html#max-java.util.Collection-">
+"../Collections.html#max(java.util.Collection)">
 max(Collection)</a></strong> - Returns the maximum element in a
 collection.</li>
 <li><strong><a href=
-"../Collections.html#rotate-java.util.List-int-">
+"../Collections.html#rotate(java.util.List,int)">
 rotate(List list, int distance)</a></strong> - Rotates all of the
 elements in the list by the specified distance.</li>
 <li><strong><a href=
-"../Collections.html#replaceAll-java.util.List-T-T-">
+"../Collections.html#replaceAll(java.util.List,T,T)">
 replaceAll(List list, Object oldVal, Object newVal)</a></strong> -
 Replaces all occurrences of one specified value with another.</li>
 <li><strong><a href=
-"../Collections.html#indexOfSubList-java.util.List-java.util.List-">
+"../Collections.html#indexOfSubList(java.util.List,java.util.List)">
 indexOfSubList(List source, List target)</a></strong> - Returns the
 index of the first sublist of source that is equal to target.</li>
 <li><strong><a href=
-"../Collections.html#lastIndexOfSubList-java.util.List-java.util.List-">
+"../Collections.html#lastIndexOfSubList(java.util.List,java.util.List)">
 lastIndexOfSubList(List source, List target)</a></strong> - Returns
 the index of the last sublist of source that is equal to
 target.</li>
 <li><strong><a href=
-"../Collections.html#swap-java.util.List-int-int-">
+"../Collections.html#swap(java.util.List,int,int)">
 swap(List, int, int)</a></strong> - Swaps the elements at the
 specified positions in the specified list.</li>
 <li><strong><a href=
-"../Collections.html#frequency-java.util.Collection-java.lang.Object-">
+"../Collections.html#frequency(java.util.Collection,java.lang.Object)">
 frequency(Collection, Object)</a></strong> - Counts the number of
 times the specified element occurs in the specified
 collection.</li>
 <li><strong><a href=
-"../Collections.html#disjoint-java.util.Collection-java.util.Collection-">
+"../Collections.html#disjoint(java.util.Collection,java.util.Collection)">
 disjoint(Collection, Collection)</a></strong> - Determines whether
 two collections are disjoint, in other words, whether they contain
 no elements in common.</li>
 <li><strong><a href=
-"../Collections.html#addAll-java.util.Collection-T...-">
+"../Collections.html#addAll(java.util.Collection,T...)">
 addAll(Collection&lt;? super T&gt;, T...)</a></strong> - Adds all
 of the elements in the specified array to the specified
 collection.</li>

From 8c38145c7e47416446021cb96be7116870800015 Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Wed, 4 Apr 2018 16:13:30 -0700
Subject: [PATCH 063/196] 8196724: Change macosx deployment target to 10.9
 Reviewed-by: tbell, gziemski

---
 make/autoconf/flags-ldflags.m4 | 2 +-
 make/autoconf/flags.m4         | 2 +-
 make/conf/jib-profiles.js      | 2 +-
 make/lib/Awt2dLibraries.gmk    | 1 +
 make/lib/Lib-java.desktop.gmk  | 3 ++-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index 2816fca3499..c83f6cbde9f 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -81,7 +81,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \
-        -stdlib=libstdc++ -fPIC"
+        -stdlib=libc++ -fPIC"
 
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     BASIC_LDFLAGS="-Wl,-z,defs"
diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
index bae8503b8c5..1ac9df39ef2 100644
--- a/make/autoconf/flags.m4
+++ b/make/autoconf/flags.m4
@@ -116,7 +116,7 @@ AC_DEFUN([FLAGS_SETUP_MACOSX_VERSION],
     # of the OS. It currently has a hard coded value. Setting this also limits
     # exposure to API changes in header files. Bumping this is likely to
     # require code changes to build.
-    MACOSX_VERSION_MIN=10.7.0
+    MACOSX_VERSION_MIN=10.9.0
     MACOSX_VERSION_MIN_NODOTS=${MACOSX_VERSION_MIN//\./}
 
     AC_SUBST(MACOSX_VERSION_MIN)
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 6a7b51df644..7ccc2e199ab 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -432,7 +432,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_cpu: "x64",
             dependencies: ["devkit", "autoconf"],
             configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
-                "--with-macosx-version-max=10.7.0"),
+                "--with-macosx-version-max=10.9.0"),
         },
 
         "solaris-x64": {
diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index 5edc62a8ff2..06f1b6c8e84 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -993,6 +993,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           -I$(TOPDIR)/src/java.base/share/native/libjava \
           -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
           -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop,  \
+      DISABLED_WARNINGS_clang := deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN) \
           -Wl$(COMMA)-rpath$(COMMA)@loader_path \
diff --git a/make/lib/Lib-java.desktop.gmk b/make/lib/Lib-java.desktop.gmk
index 2144c8b6e04..0c682a46070 100644
--- a/make/lib/Lib-java.desktop.gmk
+++ b/make/lib/Lib-java.desktop.gmk
@@ -105,7 +105,8 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
       CFLAGS := $(CFLAGS_JDKLIB) \
           $(addprefix -I, $(LIBOSXAPP_SRC)) \
           -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
-      DISABLED_WARNINGS_clang := objc-method-access objc-root-class, \
+      DISABLED_WARNINGS_clang := objc-method-access objc-root-class \
+          deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := \

From c5ea502885a27d6ec6c607fb625828867e08be8c Mon Sep 17 00:00:00 2001
From: jjg <unknown>
Date: Wed, 4 Apr 2018 17:50:53 -0700
Subject: [PATCH 064/196] 8200888: typo in name of exception in @throws
 Reviewed-by: bpb, darcy

---
 src/java.base/share/classes/java/text/ChoiceFormat.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/text/ChoiceFormat.java b/src/java.base/share/classes/java/text/ChoiceFormat.java
index e4739f89b38..01db20bb442 100644
--- a/src/java.base/share/classes/java/text/ChoiceFormat.java
+++ b/src/java.base/share/classes/java/text/ChoiceFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -312,7 +312,7 @@ public String toPattern() {
      * Constructs with limits and corresponding formats based on the pattern.
      *
      * @param newPattern the new pattern string
-     * @exception NullPointerExcpetion if {@code newPattern} is
+     * @exception NullPointerException if {@code newPattern} is
      *            {@code null}
      * @see #applyPattern
      */

From b3f43153d3e3d1114b4fd00d57050f18e2f35f30 Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Thu, 5 Apr 2018 09:55:16 +0200
Subject: [PATCH 065/196] 8200727: linux-aarch64 profile should use bundled
 freetype Reviewed-by: erikj

---
 make/conf/jib-profiles.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 7ccc2e199ab..d8167268d2a 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -472,7 +472,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             build_cpu: "x64",
             dependencies: ["devkit", "autoconf", "build_devkit", "cups"],
             configure_args: [
-                "--openjdk-target=aarch64-linux-gnu"
+                "--openjdk-target=aarch64-linux-gnu", "--with-freetype=bundled",
             ],
         },
 

From 6453da838689a92763f89256f1a34d848a6e87c0 Mon Sep 17 00:00:00 2001
From: stefank <unknown>
Date: Fri, 6 Apr 2018 11:37:33 +0200
Subject: [PATCH 066/196] 8201212: Remove INCLUDE_ALL_GCS from OopStorage files
 Reviewed-by: kbarrett

---
 test/hotspot/gtest/gc/shared/test_oopStorage.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/test/hotspot/gtest/gc/shared/test_oopStorage.cpp b/test/hotspot/gtest/gc/shared/test_oopStorage.cpp
index 53cc579d628..3cf9900fd92 100644
--- a/test/hotspot/gtest/gc/shared/test_oopStorage.cpp
+++ b/test/hotspot/gtest/gc/shared/test_oopStorage.cpp
@@ -856,9 +856,6 @@ TEST_VM_F(OopStorageTestIteration, oops_do) {
   vstate.check();
 }
 
-// Parallel iteration not available unless INCLUDE_ALL_GCS
-#if INCLUDE_ALL_GCS
-
 class OopStorageTestParIteration : public OopStorageTestIteration {
 public:
   WorkGang* workers();
@@ -1017,8 +1014,6 @@ TEST_VM_F(OopStorageTestParIteration, par_state_concurrent_const_oops_do) {
   vstate.check();
 }
 
-#endif // INCLUDE_ALL_GCS
-
 TEST_VM_F(OopStorageTestWithAllocation, delete_empty_blocks_safepoint) {
   TestAccess::BlockList& active_list = TestAccess::active_list(_storage);
 
@@ -1384,4 +1379,3 @@ TEST_F(OopStorageBlockListTestWithList, two_lists) {
   }
   EXPECT_EQ(NULL_BLOCK, active_block);
 }
-

From a6077b3110fb01995aa875f60ce99c659bff82bb Mon Sep 17 00:00:00 2001
From: hseigel <unknown>
Date: Fri, 6 Apr 2018 09:59:48 -0400
Subject: [PATCH 067/196] 8198908: Add JVM support for preview features
 Summary: Add new major and minor version checks Reviewed-by: dholmes, lfoltan

---
 .../runtime/ClassFile/PreviewVersion.java     | 116 ++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 test/hotspot/jtreg/runtime/ClassFile/PreviewVersion.java

diff --git a/test/hotspot/jtreg/runtime/ClassFile/PreviewVersion.java b/test/hotspot/jtreg/runtime/ClassFile/PreviewVersion.java
new file mode 100644
index 00000000000..c0cb09a4ac7
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ClassFile/PreviewVersion.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8198908
+ * @summary Check that preview minor version and --enable-preview are handled
+ *          correctly.
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @run main PreviewVersion
+ */
+
+import java.io.File;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
+import jdk.test.lib.ByteCodeLoader;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class PreviewVersion {
+
+    public static void main(String args[]) throws Throwable {
+        System.out.println("Regression test for bug 8198908");
+
+        byte klassbuf[] = InMemoryJavaCompiler.compile("PVTest",
+            "public class PVTest { " +
+                "public static void main(String argv[]) { " +
+                    "System.out.println(\"Hi!\"); } }");
+
+        // Set class's minor version to 65535.
+        klassbuf[4] = -1;
+        klassbuf[5] = -1;
+
+        // Run the test. This should fail because --enable-preview is not specified.
+        ClassFileInstaller.writeClassToDisk("PVTest", klassbuf, System.getProperty("test.classes"));
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+            "-cp", "." + File.pathSeparator + System.getProperty("test.classes"), "PVTest");
+        OutputAnalyzer oa = new OutputAnalyzer(pb.start());
+        oa.shouldContain("Preview features are not enabled");
+        oa.shouldHaveExitValue(1);
+
+        // This should be successful because --enable-preview is specified.
+        pb = ProcessTools.createJavaProcessBuilder("--enable-preview",
+            "-cp", "." + File.pathSeparator + System.getProperty("test.classes"), "PVTest");
+        oa = new OutputAnalyzer(pb.start());
+        oa.shouldContain("Hi!");
+
+        // Test -Xlog:class+preview
+        pb = ProcessTools.createJavaProcessBuilder("--enable-preview", "-Xlog:class+preview",
+            "-cp", "." + File.pathSeparator + System.getProperty("test.classes"), "PVTest");
+        oa = new OutputAnalyzer(pb.start());
+        oa.shouldContain("[info][class,preview] Loading preview feature type PVTest");
+
+        // Subtract 1 from class's major version.  The class should fail to load
+        // because its major_version does not match the JVM current version.
+        int prev_major_version = Runtime.version().feature() - 1;
+        klassbuf[6] = (byte)((prev_major_version >> 8) & 0xff);
+        klassbuf[7] = (byte)(prev_major_version & 0xff);
+        try {
+            ByteCodeLoader.load("PVTest", klassbuf);
+            throw new RuntimeException("UnsupportedClassVersionError exception not thrown");
+        } catch (java.lang.UnsupportedClassVersionError e) {
+            if (!e.getMessage().contains("compiled with preview features that are unsupported")) {
+                throw new RuntimeException(
+                    "Wrong UnsupportedClassVersionError exception: " + e.getMessage());
+            }
+        }
+
+        // Set class's major version to 45.  The class should load because class
+        // version 45.65535 is valid.
+        klassbuf[6] = 0;
+        klassbuf[7] = 45;
+        try {
+            ByteCodeLoader.load("PVTest", klassbuf);
+        } catch (java.lang.UnsupportedClassVersionError e) {
+            throw new RuntimeException(
+                "Unexpected UnsupportedClassVersionError exception thrown: " + e.getMessage());
+        }
+
+        // Check that a class with a recent older major version and a non-zero
+        // minor version fails to load.
+        klassbuf[6] = 0;
+        klassbuf[7] = 53;
+        klassbuf[4] = 0;
+        klassbuf[5] = 2;
+        try {
+            ByteCodeLoader.load("PVTest", klassbuf);
+            throw new RuntimeException("UnsupportedClassVersionError exception not thrown");
+        } catch (java.lang.UnsupportedClassVersionError e) {
+            if (!e.getMessage().contains("was compiled with an invalid non-zero minor version")) {
+                throw new RuntimeException(
+                    "Wrong UnsupportedClassVersionError exception: " + e.getMessage());
+            }
+        }
+    }
+}

From 4cbef4d206ccf08df4955cee487f601f2d2b80d2 Mon Sep 17 00:00:00 2001
From: kbarrett <unknown>
Date: Mon, 9 Apr 2018 01:22:37 -0400
Subject: [PATCH 068/196] 8200697: Add utility for spin wait with fallback to
 yield/sleep Summary: Added SpinYield utility class. Reviewed-by: dcubed,
 coleenp, dholmes Contributed-by: kim.barrett@oracle.com,
 robbin.ehn@oracle.com

---
 .../gtest/utilities/test_spinYield.cpp        | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 test/hotspot/gtest/utilities/test_spinYield.cpp

diff --git a/test/hotspot/gtest/utilities/test_spinYield.cpp b/test/hotspot/gtest/utilities/test_spinYield.cpp
new file mode 100644
index 00000000000..a3697ab7ee6
--- /dev/null
+++ b/test/hotspot/gtest/utilities/test_spinYield.cpp
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/os.hpp"
+#include "utilities/ostream.hpp"
+#include "utilities/spinYield.hpp"
+#include "unittest.hpp"
+
+// Some basic tests of SpinYield, using comparison of report output with
+// expected results to verify state.  This is all very hard-wired to the
+// current implementation of SpinYield, esp. the report function.
+
+static void check_report(const SpinYield* spinner, const char* expected) {
+  char buffer[100];
+  stringStream s(buffer, sizeof(buffer));
+  spinner->report(&s);
+  ASSERT_STREQ(expected, buffer);
+}
+
+TEST(SpinYield, no_waiting) {
+  SpinYield spinner;
+  check_report(&spinner, "no waiting");
+}
+
+TEST(SpinYield, one_wait) {
+  SpinYield spinner(100);
+  spinner.wait();
+  check_report(&spinner, os::is_MP() ? "spins = 1" : "yields = 1");
+}
+
+TEST(SpinYield, ten_waits) {
+  SpinYield spinner(100, 100);
+  for (unsigned i = 0; i < 10; ++i) {
+    spinner.wait();
+  }
+  check_report(&spinner, os::is_MP() ? "spins = 10" : "yields = 10");
+}
+
+TEST(SpinYield, two_yields) {
+  SpinYield spinner(0, 10);
+  spinner.wait();
+  spinner.wait();
+  check_report(&spinner, "yields = 2");
+}
+
+TEST(SpinYield, one_sleep) {
+  SpinYield spinner(0, 0);
+  spinner.wait();
+
+  char buffer[100];
+  stringStream s(buffer, sizeof(buffer));
+  spinner.report(&s);
+
+  const char* expected = "sleep = ";
+  ASSERT_TRUE(strncmp(expected, buffer, strlen(expected)) == 0);
+}
+
+TEST(SpinYield, one_spin_one_sleep) {
+  SpinYield spinner(1, 0);
+  spinner.wait();
+  spinner.wait();
+
+  char buffer[100];
+  stringStream s(buffer, sizeof(buffer));
+  spinner.report(&s);
+
+  const char* expected_MP = "spins = 1, sleep = ";
+  const char* expected_UP = "sleep = ";
+  const char* expected = os::is_MP() ? expected_MP : expected_UP;
+  ASSERT_TRUE(strncmp(expected, buffer, strlen(expected)) == 0);
+}

From f610cabec6da35efdc122fa8957958b47cde207c Mon Sep 17 00:00:00 2001
From: rkennke <unknown>
Date: Thu, 5 Apr 2018 10:54:53 +0200
Subject: [PATCH 069/196] 8199735: Mark word updates need to use Access API
 Reviewed-by: shade, eosterlund

---
 test/hotspot/gtest/gc/shared/test_preservedMarks.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp b/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp
index 690e6740a94..725b74517d7 100644
--- a/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp
+++ b/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018 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,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
+#include "oops/oop.inline.hpp"
 #include "unittest.hpp"
 
 class ScopedDisabledBiasedLocking {
@@ -38,14 +39,14 @@ class FakeOop {
   oopDesc _oop;
 
 public:
-  FakeOop() : _oop() { _oop.set_mark(originalMark()); }
+  FakeOop() : _oop() { _oop.set_mark_raw(originalMark()); }
 
   oop get_oop() { return &_oop; }
-  markOop mark() { return _oop.mark(); }
-  void set_mark(markOop m) { _oop.set_mark(m); }
+  markOop mark() { return _oop.mark_raw(); }
+  void set_mark(markOop m) { _oop.set_mark_raw(m); }
   void forward_to(oop obj) {
     markOop m = markOopDesc::encode_pointer_as_mark(obj);
-    _oop.set_mark(m);
+    _oop.set_mark_raw(m);
   }
 
   static markOop originalMark() { return markOop(markOopDesc::lock_mask_in_place); }

From 392889488a69a4a422490381b8e7f41d753fff06 Mon Sep 17 00:00:00 2001
From: "Keith W. Campbell" <keithc@ca.ibm.com>
Date: Wed, 4 Apr 2018 16:54:30 -0400
Subject: [PATCH 070/196] Enable DDR by default for Linux platforms

* also fix path to closed_make directory to restore
  tools jdmpview, jextract & traceformat

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
---
 closed/OpenJ9.gmk                  | 16 +++++-
 closed/autoconf/custom-hook.m4     | 29 ++++++++++
 closed/autoconf/custom-spec.gmk.in |  3 +
 closed/make/DDR-gensrc.gmk         | 90 ++++++++++++++++++++++++++++++
 closed/make/DDR-jar.gmk            | 64 +++++++++++++++++++++
 closed/make/Main.gmk               | 23 ++++++--
 6 files changed, 217 insertions(+), 8 deletions(-)
 create mode 100644 closed/make/DDR-gensrc.gmk
 create mode 100644 closed/make/DDR-jar.gmk

diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
index f01c107b9ef..0a1c585923c 100644
--- a/closed/OpenJ9.gmk
+++ b/closed/OpenJ9.gmk
@@ -267,8 +267,14 @@ endif
 # Adjust .spec files replacing references to gcc-4.6. Openjdk requires 4.8.2 or newer.
 SPEC_SED_SCRIPT := -e 's/gcc-4.6/gcc/g'
 
-# As DDR is not enabled we use sed to filter .spec files.
-SPEC_SED_SCRIPT += $(call SedDisable,module_ddr)
+# Adjust DDR enablement flags.
+ifeq (true,$(OPENJ9_ENABLE_DDR))
+  FEATURE_SED_SCRIPT += $(call SedEnable,opt_useOmrDdr)
+  SPEC_SED_SCRIPT    += $(call SedEnable,module_ddr)
+else
+  FEATURE_SED_SCRIPT += $(call SedDisable,opt_useOmrDdr)
+  SPEC_SED_SCRIPT    += $(call SedDisable,module_ddr)
+endif
 
 # Disable windows rebase.
 SPEC_SED_SCRIPT += $(call SedDisable,uma_windowsRebase)
@@ -398,6 +404,12 @@ build-j9 : run-preprocessors-j9
 	@$(MKDIR) -p $(MODULES_LIBS_DIR)/java.base/server
 	@$(CP) -p $(OUTPUTDIR)/vm/redirector/$(LIBRARY_PREFIX)jvm_jdk11$(SHARED_LIBRARY_SUFFIX) $(MODULES_LIBS_DIR)/java.base/server/$(LIBRARY_PREFIX)jvm$(SHARED_LIBRARY_SUFFIX)
 
+ifeq (true,$(OPENJ9_ENABLE_DDR))
+	@$(ECHO) Copying j9ddr.dat
+	@$(MKDIR) -p $(MODULES_LIBS_DIR)/java.base/$(OPENJ9_LIBS_SUBDIR)
+	@$(CP) -p $(OUTPUTDIR)/vm/j9ddr.dat $(MODULES_LIBS_DIR)/java.base/$(OPENJ9_LIBS_SUBDIR)/
+endif
+
 J9JCL_SOURCES_DONEFILE := $(MAKESUPPORT_OUTPUTDIR)/j9jcl_sources.done
 
 recur_wildcard = $(foreach dir,$(wildcard $1/*),$(call recur_wildcard,$(dir),$2) $(filter $(subst *,%,$2),$(dir)))
diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4
index de00b554433..e5b12aaddbb 100644
--- a/closed/autoconf/custom-hook.m4
+++ b/closed/autoconf/custom-hook.m4
@@ -39,6 +39,7 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
   OPENJ9_PLATFORM_SETUP
   OPENJDK_VERSION_DETAILS
   OPENJ9_CONFIGURE_CUDA
+  OPENJ9_CONFIGURE_DDR
   OPENJ9_CONFIGURE_NUMA
   OPENJ9_THIRD_PARTY_REQUIREMENTS
 ])
@@ -106,6 +107,34 @@ AC_DEFUN([OPENJ9_CONFIGURE_CUDA],
   AC_SUBST(OPENJ9_GDK_HOME)
 ])
 
+AC_DEFUN([OPENJ9_CONFIGURE_DDR],
+[
+  AC_MSG_CHECKING([for ddr])
+  AC_ARG_ENABLE([ddr], [AS_HELP_STRING([--enable-ddr], [enable DDR support @<:@disabled@:>@])])
+  if test "x$enable_ddr" = xyes ; then
+    AC_MSG_RESULT([yes (explicitly enabled)])
+    OPENJ9_ENABLE_DDR=true
+  elif test "x$enable_ddr" = xno ; then
+    AC_MSG_RESULT([no (explicitly disabled)])
+    OPENJ9_ENABLE_DDR=false
+  elif test "x$enable_ddr" = x ; then
+    case "$OPENJ9_PLATFORM_CODE" in
+      xa64|xl64|xz64)
+        AC_MSG_RESULT([yes (default for $OPENJ9_PLATFORM_CODE)])
+        OPENJ9_ENABLE_DDR=true
+        ;;
+      *)
+        AC_MSG_RESULT([no (default for $OPENJ9_PLATFORM_CODE)])
+        OPENJ9_ENABLE_DDR=false
+        ;;
+    esac
+  else
+    AC_MSG_ERROR([--enable-ddr accepts no argument])
+  fi
+
+  AC_SUBST(OPENJ9_ENABLE_DDR)
+])
+
 AC_DEFUN([OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU],
 [
   # Convert openjdk cpu names to openj9 names
diff --git a/closed/autoconf/custom-spec.gmk.in b/closed/autoconf/custom-spec.gmk.in
index 2028fcde163..8169e334b3e 100644
--- a/closed/autoconf/custom-spec.gmk.in
+++ b/closed/autoconf/custom-spec.gmk.in
@@ -42,6 +42,9 @@ ifneq (,@OPENJ9_GDK_HOME@)
 export GDK_HOME         := @OPENJ9_GDK_HOME@
 endif
 
+# DDR
+OPENJ9_ENABLE_DDR       := @OPENJ9_ENABLE_DDR@
+
 # for constructing version output
 COMPILER_VERSION_STRING := @COMPILER_VERSION_STRING@
 USERNAME                := @USERNAME@
diff --git a/closed/make/DDR-gensrc.gmk b/closed/make/DDR-gensrc.gmk
new file mode 100644
index 00000000000..7c4e393dad7
--- /dev/null
+++ b/closed/make/DDR-gensrc.gmk
@@ -0,0 +1,90 @@
+# ===========================================================================
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+# ===========================================================================
+# 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, see <http://www.gnu.org/licenses/>.
+# ===========================================================================
+
+# The main target.
+all :
+
+ifeq (,$(wildcard $(SPEC)))
+  $(error BuildDDR.gmk needs SPEC set to a proper spec.gmk)
+endif
+
+include $(SPEC)
+include $(TOPDIR)/make/common/MakeBase.gmk
+include $(TOPDIR)/make/common/JavaCompilation.gmk
+include $(TOPDIR)/make/common/SetupJavaCompilers.gmk
+
+# Supporting definitions.
+DDR_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/ddr
+DDR_VM_SRC_ROOT := $(OPENJ9_TOPDIR)/debugtools/DDR_VM/src
+
+#############################################################################
+
+# Build a jar containing the code generators.
+$(eval $(call SetupJavaCompilation,BUILD_DDR_TOOLS, \
+	SETUP := GENERATE_OLDBYTECODE, \
+	BIN := $(DDR_SUPPORT_DIR)/tools, \
+	CLASSPATH := $(addprefix $(JDK_OUTPUTDIR)/modules/, java.base openj9.dtfj), \
+	SRC := $(DDR_VM_SRC_ROOT), \
+	INCLUDE_FILES := $(addsuffix .java,$(subst .,/, \
+		com.ibm.j9ddr.BytecodeGenerator \
+		com.ibm.j9ddr.CTypeParser \
+		com.ibm.j9ddr.StructureHeader \
+		com.ibm.j9ddr.StructureReader \
+		com.ibm.j9ddr.StructureTypeManager \
+		com.ibm.j9ddr.logging.LoggerNames \
+		com.ibm.j9ddr.tools.FlagStructureList \
+		com.ibm.j9ddr.tools.PointerGenerator \
+		com.ibm.j9ddr.tools.StructureStubGenerator \
+		com.ibm.j9ddr.tools.store.J9DDRStructureStore \
+		com.ibm.j9ddr.tools.store.StructureKey \
+		com.ibm.j9ddr.tools.store.StructureMismatchError \
+		)), \
+	))
+
+#############################################################################
+
+# The superset file is built with the VM.
+DDR_SUPERSET_FILE := $(OUTPUTDIR)/vm/superset.dat
+
+# Generate Java pointer classes.
+DDR_POINTERS_MARKER := $(DDR_SUPPORT_DIR)/pointers.done
+
+$(DDR_POINTERS_MARKER) : $(DDR_SUPERSET_FILE) $(BUILD_DDR_TOOLS)
+	@$(ECHO) Generating DDR pointer classes
+	@$(RM) -rf $(DDR_VM_SRC_ROOT)/com/ibm/j9ddr/vm29/pointer/generated/
+	@$(JAVA) -cp $(BUILD_DDR_TOOLS_BIN) com.ibm.j9ddr.tools.PointerGenerator \
+		-f $(dir $(DDR_SUPERSET_FILE)) \
+		-s $(notdir $(DDR_SUPERSET_FILE)) \
+		-p com.ibm.j9ddr.vm29.pointer.generated \
+		-v 29 \
+		-o $(DDR_VM_SRC_ROOT)
+	@$(TOUCH) $@
+
+# Generate Java structure stub classes.
+DDR_STRUCTURES_MARKER := $(DDR_SUPPORT_DIR)/structures.done
+
+$(DDR_STRUCTURES_MARKER) : $(DDR_SUPERSET_FILE) $(BUILD_DDR_TOOLS)
+	@$(ECHO) Generating DDR structure stubs
+	@$(RM) -rf $(DDR_VM_SRC_ROOT)/com/ibm/j9ddr/vm29/structure/
+	@$(JAVA) -cp $(BUILD_DDR_TOOLS_BIN) com.ibm.j9ddr.tools.StructureStubGenerator \
+		-f $(dir $(DDR_SUPERSET_FILE)) \
+		-s $(notdir $(DDR_SUPERSET_FILE)) \
+		-p com.ibm.j9ddr.vm29.structure \
+		-o $(DDR_VM_SRC_ROOT)
+	@$(TOUCH) $@
+
+all : $(DDR_POINTERS_MARKER) $(DDR_STRUCTURES_MARKER)
diff --git a/closed/make/DDR-jar.gmk b/closed/make/DDR-jar.gmk
new file mode 100644
index 00000000000..d5535b8a06d
--- /dev/null
+++ b/closed/make/DDR-jar.gmk
@@ -0,0 +1,64 @@
+# ===========================================================================
+# (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+# ===========================================================================
+# 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, see <http://www.gnu.org/licenses/>.
+# ===========================================================================
+
+# The main target.
+all :
+
+ifeq (,$(wildcard $(SPEC)))
+  $(error BuildDDR.gmk needs SPEC set to a proper spec.gmk)
+endif
+
+include $(SPEC)
+include $(TOPDIR)/make/common/MakeBase.gmk
+include $(TOPDIR)/make/common/JavaCompilation.gmk
+include $(TOPDIR)/make/common/SetupJavaCompilers.gmk
+
+# Supporting definitions.
+DDR_CLASSES_BIN := $(SUPPORT_OUTPUTDIR)/ddr/classes
+
+# We depend upon class files from these modules.
+DDR_CLASSPATH := $(addprefix $(JDK_OUTPUTDIR)/modules/, \
+		java.base \
+		java.desktop \
+		openj9.dtfj \
+		openj9.traceformat \
+	)
+
+DDR_SRC_EXCLUDES := com/ibm/j9ddr/tools/ant
+
+ifeq (,$(filter mz31 mz64,$(OPENJ9_PLATFORM_CODE)))
+DDR_SRC_EXCLUDES += com/ibm/j9ddr/corereaders/tdump
+endif
+
+$(eval $(call SetupJavaCompilation,BUILD_DDR_CLASSES, \
+	SETUP := GENERATE_USINGJDKBYTECODE, \
+	BIN := $(DDR_CLASSES_BIN), \
+	CLASSPATH := $(DDR_CLASSPATH), \
+	SRC := $(OPENJ9_TOPDIR)/debugtools/DDR_VM/src, \
+	EXCLUDES := $(DDR_SRC_EXCLUDES), \
+	COPY := com/ibm/j9ddr/StructureAliases29.dat, \
+	))
+
+$(eval $(call SetupJarArchive,BUILD_DDR_JAR, \
+	DEPENDENCIES := $(BUILD_DDR_CLASSES), \
+	SRCS := $(DDR_CLASSES_BIN), \
+	SUFFIXES := .class .dat .properties, \
+	EXCLUDES := com/ibm/j9ddr/vm29/structure, \
+	JAR := $(call FindLibDirForModule, openj9.dtfj)/ddr/j9ddr.jar, \
+	))
+
+all : $(BUILD_DDR_JAR)
diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk
index 14103415a70..b277ee4dc69 100644
--- a/closed/make/Main.gmk
+++ b/closed/make/Main.gmk
@@ -1,10 +1,9 @@
 # ===========================================================================
 # (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
 # ===========================================================================
-# 
 # 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.  
+# 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
@@ -14,7 +13,6 @@
 #
 # You should have received a copy of the GNU General Public License version
 # 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
-# 
 # ===========================================================================
 
 CLEAN_DIRS += vm
@@ -33,10 +31,9 @@ JVM_TOOLS_TARGETS :=
 JVM_DOCS_TARGETS :=
 JVM_TEST_IMAGE_TARGETS :=
 DEFAULT_JMOD_DEPS := j9vm-compose-buildjvm
-	
-java.base-libs : j9vm-build
+PHASE_MAKEDIRS += $(TOPDIR)/closed/make/closed_make
 
-PHASE_MAKEDIRS += $(TOPDIR)/closed/closed_make
+java.base-libs : j9vm-build
 
 j9vm-build : buildtools-langtools
 	+($(CD) $(TOPDIR)/closed && $(MAKE) -f OpenJ9.gmk SPEC=$(SPEC) VERSION_MAJOR=$(VERSION_FEATURE) build-j9)
@@ -52,4 +49,18 @@ openj9-jdk-image : jdk-image j9vm-build
 openj9-jre-image : jre-image j9vm-build
 	+($(CD) $(TOPDIR)/closed && $(MAKE) -f OpenJ9.gmk SPEC=$(SPEC) stage_openj9_jre_image)
 
+ifeq (true,$(OPENJ9_ENABLE_DDR))
+
+.PHONY : openj9.dtfj-ddr-gensrc openj9.dtfj-ddr-jar
+
+openj9.dtfj-ddr-gensrc : j9vm-build $(addsuffix -java, java.base java.desktop openj9.dtfj openj9.traceformat)
+	+$(MAKE) -f $(TOPDIR)/closed/make/DDR-gensrc.gmk SPEC=$(SPEC)
+
+openj9.dtfj-ddr-jar : openj9.dtfj-ddr-gensrc
+	+$(MAKE) -f $(TOPDIR)/closed/make/DDR-jar.gmk SPEC=$(SPEC)
+
+openj9.dtfj-jmod : openj9.dtfj-ddr-jar
+
+endif # OPENJ9_ENABLE_DDR
+
 ALL_TARGETS += openj9-jdk-image openj9-jre-image

From 84692cf6f126f6f17f37ccc7189005488e6706ad Mon Sep 17 00:00:00 2001
From: alanb <unknown>
Date: Thu, 5 Apr 2018 15:01:57 +0100
Subject: [PATCH 071/196] 8200583: (se) Selector clean-up, part 4 Reviewed-by:
 bpb, chegar

---
 .../classes/sun/nio/ch/EPollSelectorImpl.java |  48 ++------
 .../sun/nio/ch/KQueueSelectorImpl.java        |  46 +++-----
 .../share/classes/sun/nio/ch/SelChImpl.java   |   4 +-
 .../classes/sun/nio/ch/SelectionKeyImpl.java  |  20 +++-
 .../classes/sun/nio/ch/SelectorImpl.java      |  29 +++--
 .../sun/nio/ch/DevPollSelectorImpl.java       |  70 ++++++------
 .../sun/nio/ch/EventPortSelectorImpl.java     |  50 +++------
 .../native/libnio/ch/DevPollArrayWrapper.c    | 104 ++++--------------
 .../classes/sun/nio/ch/PollSelectorImpl.java  |  21 ++--
 .../classes/sun/nio/ch/PollArrayWrapper.java  |   2 +-
 .../sun/nio/ch/WindowsSelectorImpl.java       |  25 ++---
 11 files changed, 153 insertions(+), 266 deletions(-)

diff --git a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
index f54ab1a6fec..189099bcd70 100644
--- a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
+++ b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
@@ -63,20 +63,14 @@ class EPollSelectorImpl extends SelectorImpl {
     // maps file descriptor to selection key, synchronize on selector
     private final Map<Integer, SelectionKeyImpl> fdToKey = new HashMap<>();
 
-    // pending new registrations/updates, queued by implRegister and putEventOpos
+    // pending new registrations/updates, queued by setEventOps
     private final Object updateLock = new Object();
-    private final Deque<SelectionKeyImpl> newKeys = new ArrayDeque<>();
     private final Deque<SelectionKeyImpl> updateKeys = new ArrayDeque<>();
-    private final Deque<Integer> updateEvents = new ArrayDeque<>();
 
     // interrupt triggering and clearing
     private final Object interruptLock = new Object();
     private boolean interruptTriggered;
 
-    /**
-     * Package private constructor called by factory method in
-     * the abstract superclass Selector.
-     */
     EPollSelectorImpl(SelectorProvider sp) throws IOException {
         super(sp);
 
@@ -140,30 +134,21 @@ protected int doSelect(long timeout) throws IOException {
     }
 
     /**
-     * Process new registrations and changes to the interest ops.
+     * Process changes to the interest ops.
      */
     private void processUpdateQueue() {
         assert Thread.holdsLock(this);
 
         synchronized (updateLock) {
             SelectionKeyImpl ski;
-
-            // new registrations
-            while ((ski = newKeys.pollFirst()) != null) {
+            while ((ski = updateKeys.pollFirst()) != null) {
                 if (ski.isValid()) {
-                    int fd = ski.channel.getFDVal();
-                    SelectionKeyImpl previous = fdToKey.put(fd, ski);
-                    assert previous == null;
-                    assert ski.registeredEvents() == 0;
-                }
-            }
+                    int fd = ski.getFDVal();
+                    // add to fdToKey if needed
+                    SelectionKeyImpl previous = fdToKey.putIfAbsent(fd, ski);
+                    assert (previous == null) || (previous == ski);
 
-            // changes to interest ops
-            assert updateKeys.size() == updateEvents.size();
-            while ((ski = updateKeys.pollFirst()) != null) {
-                int newEvents = updateEvents.pollFirst();
-                int fd = ski.channel.getFDVal();
-                if (ski.isValid() && fdToKey.containsKey(fd)) {
+                    int newEvents = ski.translateInterestOps();
                     int registeredEvents = ski.registeredEvents();
                     if (newEvents != registeredEvents) {
                         if (newEvents == 0) {
@@ -206,11 +191,11 @@ private int updateSelectedKeys(int numEntries) throws IOException {
                 if (ski != null) {
                     int rOps = EPoll.getEvents(event);
                     if (selectedKeys.contains(ski)) {
-                        if (ski.channel.translateAndSetReadyOps(rOps, ski)) {
+                        if (ski.translateAndSetReadyOps(rOps)) {
                             numKeysUpdated++;
                         }
                     } else {
-                        ski.channel.translateAndSetReadyOps(rOps, ski);
+                        ski.translateAndSetReadyOps(rOps);
                         if ((ski.nioReadyOps() & ski.nioInterestOps()) != 0) {
                             selectedKeys.add(ski);
                             numKeysUpdated++;
@@ -243,20 +228,12 @@ protected void implClose() throws IOException {
         FileDispatcherImpl.closeIntFD(fd1);
     }
 
-    @Override
-    protected void implRegister(SelectionKeyImpl ski) {
-        ensureOpen();
-        synchronized (updateLock) {
-            newKeys.addLast(ski);
-        }
-    }
-
     @Override
     protected void implDereg(SelectionKeyImpl ski) throws IOException {
         assert !ski.isValid();
         assert Thread.holdsLock(this);
 
-        int fd = ski.channel.getFDVal();
+        int fd = ski.getFDVal();
         if (fdToKey.remove(fd) != null) {
             if (ski.registeredEvents() != 0) {
                 EPoll.ctl(epfd, EPOLL_CTL_DEL, fd, 0);
@@ -268,10 +245,9 @@ protected void implDereg(SelectionKeyImpl ski) throws IOException {
     }
 
     @Override
-    public void putEventOps(SelectionKeyImpl ski, int events) {
+    public void setEventOps(SelectionKeyImpl ski) {
         ensureOpen();
         synchronized (updateLock) {
-            updateEvents.addLast(events);  // events first in case adding key fails
             updateKeys.addLast(ski);
         }
     }
diff --git a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
index 63804f01846..215782b6c7e 100644
--- a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
+++ b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
@@ -62,11 +62,9 @@ class KQueueSelectorImpl extends SelectorImpl {
     // maps file descriptor to selection key, synchronize on selector
     private final Map<Integer, SelectionKeyImpl> fdToKey = new HashMap<>();
 
-    // pending new registrations/updates, queued by implRegister and putEventOps
+    // pending new registrations/updates, queued by setEventOps
     private final Object updateLock = new Object();
-    private final Deque<SelectionKeyImpl> newKeys = new ArrayDeque<>();
     private final Deque<SelectionKeyImpl> updateKeys = new ArrayDeque<>();
-    private final Deque<Integer> updateEvents = new ArrayDeque<>();
 
     // interrupt triggering and clearing
     private final Object interruptLock = new Object();
@@ -138,30 +136,21 @@ protected int doSelect(long timeout) throws IOException {
     }
 
     /**
-     * Process new registrations and changes to the interest ops.
+     * Process changes to the interest ops.
      */
     private void processUpdateQueue() {
         assert Thread.holdsLock(this);
 
         synchronized (updateLock) {
             SelectionKeyImpl ski;
-
-            // new registrations
-            while ((ski = newKeys.pollFirst()) != null) {
+            while ((ski = updateKeys.pollFirst()) != null) {
                 if (ski.isValid()) {
-                    int fd = ski.channel.getFDVal();
-                    SelectionKeyImpl previous = fdToKey.put(fd, ski);
-                    assert previous == null;
-                    assert ski.registeredEvents() == 0;
-                }
-            }
+                    int fd = ski.getFDVal();
+                    // add to fdToKey if needed
+                    SelectionKeyImpl previous = fdToKey.putIfAbsent(fd, ski);
+                    assert (previous == null) || (previous == ski);
 
-            // changes to interest ops
-            assert updateKeys.size() == updateKeys.size();
-            while ((ski = updateKeys.pollFirst()) != null) {
-                int newEvents = updateEvents.pollFirst();
-                int fd = ski.channel.getFDVal();
-                if (ski.isValid() && fdToKey.containsKey(fd)) {
+                    int newEvents = ski.translateInterestOps();
                     int registeredEvents = ski.registeredEvents();
                     if (newEvents != registeredEvents) {
 
@@ -229,16 +218,16 @@ private int updateSelectedKeys(int numEntries) throws IOException {
                     if (selectedKeys.contains(ski)) {
                         // file descriptor may be polled more than once per poll
                         if (ski.lastPolled != pollCount) {
-                            if (ski.channel.translateAndSetReadyOps(rOps, ski)) {
+                            if (ski.translateAndSetReadyOps(rOps)) {
                                 numKeysUpdated++;
                                 ski.lastPolled = pollCount;
                             }
                         } else {
                             // ready ops have already been set on this update
-                            ski.channel.translateAndUpdateReadyOps(rOps, ski);
+                            ski.translateAndUpdateReadyOps(rOps);
                         }
                     } else {
-                        ski.channel.translateAndSetReadyOps(rOps, ski);
+                        ski.translateAndSetReadyOps(rOps);
                         if ((ski.nioReadyOps() & ski.nioInterestOps()) != 0) {
                             selectedKeys.add(ski);
                             numKeysUpdated++;
@@ -272,20 +261,12 @@ protected void implClose() throws IOException {
         FileDispatcherImpl.closeIntFD(fd1);
     }
 
-    @Override
-    protected void implRegister(SelectionKeyImpl ski) {
-        ensureOpen();
-        synchronized (updateLock) {
-            newKeys.addLast(ski);
-        }
-    }
-
     @Override
     protected void implDereg(SelectionKeyImpl ski) throws IOException {
         assert !ski.isValid();
         assert Thread.holdsLock(this);
 
-        int fd = ski.channel.getFDVal();
+        int fd = ski.getFDVal();
         int registeredEvents = ski.registeredEvents();
         if (fdToKey.remove(fd) != null) {
             if (registeredEvents != 0) {
@@ -301,10 +282,9 @@ protected void implDereg(SelectionKeyImpl ski) throws IOException {
     }
 
     @Override
-    public void putEventOps(SelectionKeyImpl ski, int events) {
+    public void setEventOps(SelectionKeyImpl ski) {
         ensureOpen();
         synchronized (updateLock) {
-            updateEvents.addLast(events);  // events first in case adding key fails
             updateKeys.addLast(ski);
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/SelChImpl.java b/src/java.base/share/classes/sun/nio/ch/SelChImpl.java
index 221611e0473..d16988abd8b 100644
--- a/src/java.base/share/classes/sun/nio/ch/SelChImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SelChImpl.java
@@ -49,7 +49,7 @@ public interface SelChImpl extends Channel {
      *          contains at least one bit that the previous value did not
      *          contain
      */
-    boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk);
+    boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl ski);
 
     /**
      * Sets the specified ops if present in interestOps. The specified
@@ -59,7 +59,7 @@ public interface SelChImpl extends Channel {
      *          contains at least one bit that the previous value did not
      *          contain
      */
-    boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk);
+    boolean translateAndSetReadyOps(int ops, SelectionKeyImpl ski);
 
     /**
      * Translates an interest operation set into a native event set
diff --git a/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
index f8d7e149d8f..2f917c8d2e3 100644
--- a/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
@@ -39,7 +39,7 @@
 public final class SelectionKeyImpl
     extends AbstractSelectionKey
 {
-    final SelChImpl channel;                            // package-private
+    private final SelChImpl channel;
     private final SelectorImpl selector;
 
     private volatile int interestOps;
@@ -61,6 +61,10 @@ private void ensureValid() {
             throw new CancelledKeyException();
     }
 
+    int getFDVal() {
+        return channel.getFDVal();
+    }
+
     @Override
     public SelectableChannel channel() {
         return (SelectableChannel)channel;
@@ -103,8 +107,8 @@ public int nioReadyOps() {
     public SelectionKey nioInterestOps(int ops) {
         if ((ops & ~channel().validOps()) != 0)
             throw new IllegalArgumentException();
-        selector.putEventOps(this, channel.translateInterestOps(ops));
         interestOps = ops;
+        selector.setEventOps(this);
         return this;
     }
 
@@ -112,6 +116,18 @@ public int nioInterestOps() {
         return interestOps;
     }
 
+    int translateInterestOps() {
+        return channel.translateInterestOps(interestOps);
+    }
+
+    boolean translateAndSetReadyOps(int ops) {
+        return channel.translateAndSetReadyOps(ops, this);
+    }
+
+    boolean translateAndUpdateReadyOps(int ops) {
+        return channel.translateAndUpdateReadyOps(ops, this);
+    }
+
     void registeredEvents(int events) {
         // assert Thread.holdsLock(selector);
         this.registeredEvents = events;
diff --git a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
index e728064dd82..73792a6d6d1 100644
--- a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
@@ -64,17 +64,20 @@ protected SelectorImpl(SelectorProvider sp) {
         publicSelectedKeys = Util.ungrowableSet(selectedKeys);
     }
 
-    @Override
-    public final Set<SelectionKey> keys() {
+    private void ensureOpen() {
         if (!isOpen())
             throw new ClosedSelectorException();
+    }
+
+    @Override
+    public final Set<SelectionKey> keys() {
+        ensureOpen();
         return publicKeys;
     }
 
     @Override
     public final Set<SelectionKey> selectedKeys() {
-        if (!isOpen())
-            throw new ClosedSelectorException();
+        ensureOpen();
         return publicSelectedKeys;
     }
 
@@ -112,8 +115,7 @@ protected final void end(boolean blocking) {
 
     private int lockAndDoSelect(long timeout) throws IOException {
         synchronized (this) {
-            if (!isOpen())
-                throw new ClosedSelectorException();
+            ensureOpen();
             synchronized (publicKeys) {
                 synchronized (publicSelectedKeys) {
                     return doSelect(timeout);
@@ -176,7 +178,8 @@ protected final SelectionKey register(AbstractSelectableChannel ch,
             throw new IllegalSelectorException();
         SelectionKeyImpl k = new SelectionKeyImpl((SelChImpl)ch, this);
         k.attach(attachment);
-        // register before adding to key set
+
+        // register with selector (if needed) before adding to key set
         implRegister(k);
         synchronized (publicKeys) {
             keys.add(k);
@@ -185,7 +188,15 @@ protected final SelectionKey register(AbstractSelectableChannel ch,
         return k;
     }
 
-    protected abstract void implRegister(SelectionKeyImpl ski);
+    /**
+     * Register the key in the selector.
+     *
+     * The default implementation checks if the selector is open. It should
+     * be overridden by selector implementations as needed.
+     */
+    protected void implRegister(SelectionKeyImpl ski) {
+        ensureOpen();
+    }
 
     protected abstract void implDereg(SelectionKeyImpl ski) throws IOException;
 
@@ -222,5 +233,5 @@ protected final void processDeregisterQueue() throws IOException {
     /**
      * Change the event set in the selector
      */
-    protected abstract void putEventOps(SelectionKeyImpl ski, int events);
+    protected abstract void setEventOps(SelectionKeyImpl ski);
 }
diff --git a/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java b/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
index b302d8f9f42..09fcd9d1834 100644
--- a/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
+++ b/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
@@ -55,17 +55,14 @@ class DevPollSelectorImpl
     // maps file descriptor to selection key, synchronize on selector
     private final Map<Integer, SelectionKeyImpl> fdToKey = new HashMap<>();
 
-    // pending new registrations/updates, queued by implRegister and putEventOps
+    // pending new registrations/updates, queued by setEventOps
     private final Object updateLock = new Object();
-    private final Deque<SelectionKeyImpl> newKeys = new ArrayDeque<>();
     private final Deque<SelectionKeyImpl> updateKeys = new ArrayDeque<>();
-    private final Deque<Integer> updateEvents = new ArrayDeque<>();
 
     // interrupt triggering and clearing
     private final Object interruptLock = new Object();
     private boolean interruptTriggered;
 
-
     DevPollSelectorImpl(SelectorProvider sp) throws IOException {
         super(sp);
         this.pollWrapper = new DevPollArrayWrapper();
@@ -88,18 +85,34 @@ private void ensureOpen() {
     }
 
     @Override
-    protected int doSelect(long timeout)
-        throws IOException
-    {
+    protected int doSelect(long timeout) throws IOException {
         assert Thread.holdsLock(this);
-        boolean blocking = (timeout != 0);
+
+        long to = timeout;
+        boolean blocking = (to != 0);
+        boolean timedPoll = (to > 0);
 
         int numEntries;
         processUpdateQueue();
         processDeregisterQueue();
         try {
             begin(blocking);
-            numEntries = pollWrapper.poll(timeout);
+
+            do {
+                long startTime = timedPoll ? System.nanoTime() : 0;
+                numEntries = pollWrapper.poll(to);
+                if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
+                    // timed poll interrupted so need to adjust timeout
+                    long adjust = System.nanoTime() - startTime;
+                    to -= TimeUnit.MILLISECONDS.convert(adjust, TimeUnit.NANOSECONDS);
+                    if (to <= 0) {
+                        // timeout expired so no retry
+                        numEntries = 0;
+                    }
+                }
+            } while (numEntries == IOStatus.INTERRUPTED);
+            assert IOStatus.check(numEntries);
+
         } finally {
             end(blocking);
         }
@@ -108,7 +121,7 @@ protected int doSelect(long timeout)
     }
 
     /**
-     * Process new registrations and changes to the interest ops.
+     * Process changes to the interest ops.
      */
     private void processUpdateQueue() throws IOException {
         assert Thread.holdsLock(this);
@@ -116,25 +129,18 @@ private void processUpdateQueue() throws IOException {
         synchronized (updateLock) {
             SelectionKeyImpl ski;
 
-            // new registrations
-            while ((ski = newKeys.pollFirst()) != null) {
-                if (ski.isValid()) {
-                    int fd = ski.channel.getFDVal();
-                    SelectionKeyImpl previous = fdToKey.put(fd, ski);
-                    assert previous == null;
-                    assert ski.registeredEvents() == 0;
-                }
-            }
-
             // Translate the queued updates to changes to the set of monitored
             // file descriptors. The changes are written to the /dev/poll driver
             // in bulk.
-            assert updateKeys.size() == updateEvents.size();
             int index = 0;
             while ((ski = updateKeys.pollFirst()) != null) {
-                int newEvents = updateEvents.pollFirst();
-                int fd = ski.channel.getFDVal();
-                if (ski.isValid() && fdToKey.containsKey(fd)) {
+                if (ski.isValid()) {
+                    int fd = ski.getFDVal();
+                    // add to fdToKey if needed
+                    SelectionKeyImpl previous = fdToKey.putIfAbsent(fd, ski);
+                    assert (previous == null) || (previous == ski);
+
+                    int newEvents = ski.translateInterestOps();
                     int registeredEvents = ski.registeredEvents();
                     if (newEvents != registeredEvents) {
                         if (registeredEvents != 0)
@@ -178,11 +184,11 @@ private int updateSelectedKeys(int numEntries) throws IOException {
                 if (ski != null) {
                     int rOps = pollWrapper.getReventOps(i);
                     if (selectedKeys.contains(ski)) {
-                        if (ski.channel.translateAndSetReadyOps(rOps, ski)) {
+                        if (ski.translateAndSetReadyOps(rOps)) {
                             numKeysUpdated++;
                         }
                     } else {
-                        ski.channel.translateAndSetReadyOps(rOps, ski);
+                        ski.translateAndSetReadyOps(rOps);
                         if ((ski.nioReadyOps() & ski.nioInterestOps()) != 0) {
                             selectedKeys.add(ski);
                             numKeysUpdated++;
@@ -214,20 +220,13 @@ protected void implClose() throws IOException {
         FileDispatcherImpl.closeIntFD(fd1);
     }
 
-    @Override
-    protected void implRegister(SelectionKeyImpl ski) {
-        ensureOpen();
-        synchronized (updateLock) {
-            newKeys.addLast(ski);
-        }
-    }
 
     @Override
     protected void implDereg(SelectionKeyImpl ski) throws IOException {
         assert !ski.isValid();
         assert Thread.holdsLock(this);
 
-        int fd = ski.channel.getFDVal();
+        int fd = ski.getFDVal();
         if (fdToKey.remove(fd) != null) {
             if (ski.registeredEvents() != 0) {
                 pollWrapper.register(fd, POLLREMOVE);
@@ -239,10 +238,9 @@ protected void implDereg(SelectionKeyImpl ski) throws IOException {
     }
 
     @Override
-    public void putEventOps(SelectionKeyImpl ski, int events) {
+    public void setEventOps(SelectionKeyImpl ski) {
         ensureOpen();
         synchronized (updateLock) {
-            updateEvents.addLast(events);   // events first in case adding key fails
             updateKeys.addLast(ski);
         }
     }
diff --git a/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java b/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
index 1c49c8f4255..511b988c59c 100644
--- a/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
+++ b/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
@@ -72,12 +72,10 @@ class EventPortSelectorImpl
     // the last update operation, incremented by processUpdateQueue
     private int lastUpdate;
 
-    // pending new registrations/updates, queued by implRegister, putEventOps,
-    // and updateSelectedKeys
+    // pending new registrations/updates, queued by setEventOps and
+    // updateSelectedKeys
     private final Object updateLock = new Object();
-    private final Deque<SelectionKeyImpl> newKeys = new ArrayDeque<>();
     private final Deque<SelectionKeyImpl> updateKeys = new ArrayDeque<>();
-    private final Deque<Integer> updateEvents = new ArrayDeque<>();
 
     // interrupt triggering and clearing
     private final Object interruptLock = new Object();
@@ -146,23 +144,14 @@ private void processUpdateQueue() throws IOException {
 
         synchronized (updateLock) {
             SelectionKeyImpl ski;
-
-            // new registrations
-            while ((ski = newKeys.pollFirst()) != null) {
+            while ((ski = updateKeys.pollFirst()) != null) {
                 if (ski.isValid()) {
-                    int fd = ski.channel.getFDVal();
-                    SelectionKeyImpl previous = fdToKey.put(fd, ski);
-                    assert previous == null;
-                    assert ski.registeredEvents() == 0;
-                }
-            }
+                    int fd = ski.getFDVal();
+                    // add to fdToKey if needed
+                    SelectionKeyImpl previous = fdToKey.putIfAbsent(fd, ski);
+                    assert (previous == null) || (previous == ski);
 
-            // changes to interest ops
-            assert updateKeys.size() == updateEvents.size();
-            while ((ski = updateKeys.pollFirst()) != null) {
-                int newEvents = updateEvents.pollFirst();
-                int fd = ski.channel.getFDVal();
-                if (ski.isValid() && fdToKey.containsKey(fd)) {
+                    int newEvents = ski.translateInterestOps();
                     if (newEvents != ski.registeredEvents()) {
                         if (newEvents == 0) {
                             port_dissociate(pfd, PORT_SOURCE_FD, fd);
@@ -199,22 +188,20 @@ private int processPortEvents(int numEvents) throws IOException {
                     if (ski != null) {
                         int rOps = getEventOps(i);
                         if (selectedKeys.contains(ski)) {
-                            if (ski.channel.translateAndSetReadyOps(rOps, ski)) {
+                            if (ski.translateAndSetReadyOps(rOps)) {
                                 numKeysUpdated++;
                             }
                         } else {
-                            ski.channel.translateAndSetReadyOps(rOps, ski);
+                            ski.translateAndSetReadyOps(rOps);
                             if ((ski.nioReadyOps() & ski.nioInterestOps()) != 0) {
                                 selectedKeys.add(ski);
                                 numKeysUpdated++;
                             }
                         }
 
-                        // re-queue key to head so that it is re-associated at
-                        // next select (and before other changes)
-                        updateEvents.addFirst(ski.registeredEvents());
-                        updateKeys.addFirst(ski);
+                        // re-queue key so it re-associated at next select
                         ski.registeredEvents(0);
+                        updateKeys.addLast(ski);
                     }
                 } else if (source == PORT_SOURCE_USER) {
                     interrupted = true;
@@ -244,20 +231,12 @@ protected void implClose() throws IOException {
         pollArray.free();
     }
 
-    @Override
-    protected void implRegister(SelectionKeyImpl ski) {
-        ensureOpen();
-        synchronized (updateLock) {
-            newKeys.addLast(ski);
-        }
-    }
-
     @Override
     protected void implDereg(SelectionKeyImpl ski) throws IOException {
         assert !ski.isValid();
         assert Thread.holdsLock(this);
 
-        int fd = ski.channel.getFDVal();
+        int fd = ski.getFDVal();
         if (fdToKey.remove(fd) != null) {
             if (ski.registeredEvents() != 0) {
                 port_dissociate(pfd, PORT_SOURCE_FD, fd);
@@ -269,10 +248,9 @@ protected void implDereg(SelectionKeyImpl ski) throws IOException {
     }
 
     @Override
-    public void putEventOps(SelectionKeyImpl ski, int events) {
+    public void setEventOps(SelectionKeyImpl ski) {
         ensureOpen();
         synchronized (updateLock) {
-            updateEvents.addLast(events);  // events first in case adding key fails
             updateKeys.addLast(ski);
         }
     }
diff --git a/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c b/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c
index 7c40ad12208..6b60ddabd71 100644
--- a/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c
+++ b/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c
@@ -23,84 +23,20 @@
  * questions.
  */
 
+#include <sys/devpoll.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <poll.h>
+
 #include "jni.h"
 #include "jni_util.h"
 #include "jvm.h"
 #include "jlong.h"
-#include "sun_nio_ch_DevPollArrayWrapper.h"
-#include <poll.h>
-#include <unistd.h>
-#include <sys/time.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef uint32_t        caddr32_t;
-
-/* /dev/poll ioctl */
-#define         DPIOC   (0xD0 << 8)
-#define DP_POLL         (DPIOC | 1)     /* poll on fds in cached in /dev/poll */
-#define DP_ISPOLLED     (DPIOC | 2)     /* is this fd cached in /dev/poll */
-#define DEVPOLLSIZE     1000            /* /dev/poll table size increment */
-#define POLLREMOVE      0x0800          /* Removes fd from monitored set */
-
-/*
- * /dev/poll DP_POLL ioctl format
- */
-typedef struct dvpoll {
-        pollfd_t        *dp_fds;        /* pollfd array */
-        nfds_t          dp_nfds;        /* num of pollfd's in dp_fds[] */
-        int             dp_timeout;     /* time out in millisec */
-} dvpoll_t;
-
-typedef struct dvpoll32 {
-        caddr32_t       dp_fds;         /* pollfd array */
-        uint32_t        dp_nfds;        /* num of pollfd's in dp_fds[] */
-        int32_t         dp_timeout;     /* time out in millisec */
-} dvpoll32_t;
-
-#ifdef  __cplusplus
-}
-#endif
-
-#define RESTARTABLE(_cmd, _result) do { \
-  do { \
-    _result = _cmd; \
-  } while((_result == -1) && (errno == EINTR)); \
-} while(0)
+#include "nio.h"
+#include "nio_util.h"
 
-static int
-idevpoll(jint wfd, int dpctl, struct dvpoll a)
-{
-    jlong start, now;
-    int remaining = a.dp_timeout;
-    struct timeval t;
-    int diff;
-
-    gettimeofday(&t, NULL);
-    start = t.tv_sec * 1000 + t.tv_usec / 1000;
-
-    for (;;) {
-        /*  poll(7d) ioctl does not return remaining count */
-        int res = ioctl(wfd, dpctl, &a);
-        if (res < 0 && errno == EINTR) {
-            if (remaining >= 0) {
-                gettimeofday(&t, NULL);
-                now = t.tv_sec * 1000 + t.tv_usec / 1000;
-                diff = now - start;
-                remaining -= diff;
-                if (diff < 0 || remaining <= 0) {
-                    return 0;
-                }
-                start = now;
-                a.dp_timeout = remaining;
-            }
-        } else {
-            return res;
-        }
-    }
-}
+#include "sun_nio_ch_DevPollArrayWrapper.h"
 
 JNIEXPORT jint JNICALL
 Java_sun_nio_ch_DevPollArrayWrapper_init(JNIEnv *env, jobject this)
@@ -153,26 +89,24 @@ Java_sun_nio_ch_DevPollArrayWrapper_registerMultiple(JNIEnv *env, jobject this,
 
 JNIEXPORT jint JNICALL
 Java_sun_nio_ch_DevPollArrayWrapper_poll0(JNIEnv *env, jobject this,
-                                       jlong address, jint numfds,
-                                       jlong timeout, jint wfd)
+                                          jlong address, jint numfds,
+                                          jlong timeout, jint wfd)
 {
     struct dvpoll a;
     void *pfd = (void *) jlong_to_ptr(address);
-    int result = 0;
+    int result;
 
     a.dp_fds = pfd;
     a.dp_nfds = numfds;
     a.dp_timeout = (int)timeout;
-
-    if (timeout <= 0) {             /* Indefinite or no wait */
-        RESTARTABLE (ioctl(wfd, DP_POLL, &a), result);
-    } else {                        /* Bounded wait; bounded restarts */
-        result = idevpoll(wfd, DP_POLL, a);
-    }
-
+    result = ioctl(wfd, DP_POLL, &a);
     if (result < 0) {
-        JNU_ThrowIOExceptionWithLastError(env, "Error reading driver");
-        return -1;
+        if (errno == EINTR) {
+            return IOS_INTERRUPTED;
+        } else {
+            JNU_ThrowIOExceptionWithLastError(env, "Error reading driver");
+            return IOS_THROWN;
+        }
     }
     return result;
 }
diff --git a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
index dfc86ee174d..e04d78476ba 100644
--- a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
@@ -60,7 +60,6 @@ class PollSelectorImpl extends SelectorImpl {
     // pending updates, queued by putEventOps
     private final Object updateLock = new Object();
     private final Deque<SelectionKeyImpl> updateKeys = new ArrayDeque<>();
-    private final Deque<Integer> updateEvents = new ArrayDeque<>();
 
     // interrupt triggering and clearing
     private final Object interruptLock = new Object();
@@ -136,10 +135,9 @@ private void processUpdateQueue() {
         assert Thread.holdsLock(this);
 
         synchronized (updateLock) {
-            assert updateKeys.size() == updateEvents.size();
             SelectionKeyImpl ski;
             while ((ski = updateKeys.pollFirst()) != null) {
-                int newEvents = updateEvents.pollFirst();
+                int newEvents = ski.translateInterestOps();
                 if (ski.isValid()) {
                     int index = ski.getIndex();
                     assert index >= 0 && index < pollArraySize;
@@ -173,14 +171,14 @@ private int updateSelectedKeys() throws IOException {
             int rOps = getReventOps(i);
             if (rOps != 0) {
                 SelectionKeyImpl ski = pollKeys.get(i);
-                assert ski.channel.getFDVal() == getDescriptor(i);
+                assert ski.getFDVal() == getDescriptor(i);
                 if (ski.isValid()) {
                     if (selectedKeys.contains(ski)) {
-                        if (ski.channel.translateAndSetReadyOps(rOps, ski)) {
+                        if (ski.translateAndSetReadyOps(rOps)) {
                             numKeysUpdated++;
                         }
                     } else {
-                        ski.channel.translateAndSetReadyOps(rOps, ski);
+                        ski.translateAndSetReadyOps(rOps);
                         if ((ski.nioReadyOps() & ski.nioInterestOps()) != 0) {
                             selectedKeys.add(ski);
                             numKeysUpdated++;
@@ -233,10 +231,9 @@ protected void implDereg(SelectionKeyImpl ski) throws IOException {
     }
 
     @Override
-    public void putEventOps(SelectionKeyImpl ski, int events) {
+    public void setEventOps(SelectionKeyImpl ski) {
         ensureOpen();
         synchronized (updateLock) {
-            updateEvents.addLast(events);  // events first in case adding key fails
             updateKeys.addLast(ski);
         }
     }
@@ -285,7 +282,7 @@ private void add(SelectionKeyImpl ski, int ops) {
 
         int index = pollArraySize;
         assert index > 0;
-        putDescriptor(index, ski.channel.getFDVal());
+        putDescriptor(index, ski.getFDVal());
         putEventOps(index, ops);
         putReventOps(index, 0);
         ski.setIndex(index);
@@ -301,7 +298,7 @@ private void add(SelectionKeyImpl ski, int ops) {
     private void update(SelectionKeyImpl ski, int ops) {
         int index = ski.getIndex();
         assert index > 0 && index < pollArraySize;
-        assert getDescriptor(index) == ski.channel.getFDVal();
+        assert getDescriptor(index) == ski.getFDVal();
         putEventOps(index, ops);
     }
 
@@ -311,7 +308,7 @@ private void update(SelectionKeyImpl ski, int ops) {
     private void remove(SelectionKeyImpl ski) {
         int index = ski.getIndex();
         assert index > 0 && index < pollArraySize;
-        assert getDescriptor(index) == ski.channel.getFDVal();
+        assert getDescriptor(index) == ski.getFDVal();
 
         // replace pollfd at index with the last pollfd in array
         int lastIndex = pollArraySize - 1;
@@ -321,7 +318,7 @@ private void remove(SelectionKeyImpl ski) {
             int lastFd = getDescriptor(lastIndex);
             int lastOps = getEventOps(lastIndex);
             int lastRevents = getReventOps(lastIndex);
-            assert lastKey.channel.getFDVal() == lastFd;
+            assert lastKey.getFDVal() == lastFd;
             putDescriptor(index, lastFd);
             putEventOps(index, lastOps);
             putReventOps(index, lastRevents);
diff --git a/src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java b/src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java
index 3edff1ac734..fac5cfd9de9 100644
--- a/src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java
+++ b/src/java.base/windows/classes/sun/nio/ch/PollArrayWrapper.java
@@ -64,7 +64,7 @@ class PollArrayWrapper {
 
     // Prepare another pollfd struct for use.
     void putEntry(int index, SelectionKeyImpl ski) {
-        putDescriptor(index, ski.channel.getFDVal());
+        putDescriptor(index, ski.getFDVal());
         putEventOps(index, 0);
     }
 
diff --git a/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
index 540f3b99267..b3bb25dbf2a 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
@@ -83,12 +83,12 @@ private MapEntry get(int desc) {
             return get(Integer.valueOf(desc));
         }
         private MapEntry put(SelectionKeyImpl ski) {
-            return put(Integer.valueOf(ski.channel.getFDVal()), new MapEntry(ski));
+            return put(Integer.valueOf(ski.getFDVal()), new MapEntry(ski));
         }
         private MapEntry remove(SelectionKeyImpl ski) {
-            Integer fd = Integer.valueOf(ski.channel.getFDVal());
+            Integer fd = Integer.valueOf(ski.getFDVal());
             MapEntry x = get(fd);
-            if ((x != null) && (x.ski.channel == ski.channel))
+            if ((x != null) && (x.ski.channel() == ski.channel()))
                 return remove(fd);
             return null;
         }
@@ -114,11 +114,10 @@ private static final class MapEntry {
     private final Object interruptLock = new Object();
     private volatile boolean interruptTriggered;
 
-    // pending new registrations/updates, queued by implRegister and putEventOps
+    // pending new registrations/updates, queued by implRegister and setEventOps
     private final Object updateLock = new Object();
     private final Deque<SelectionKeyImpl> newKeys = new ArrayDeque<>();
     private final Deque<SelectionKeyImpl> updateKeys = new ArrayDeque<>();
-    private final Deque<Integer> updateEvents = new ArrayDeque<>();
 
 
     WindowsSelectorImpl(SelectorProvider sp) throws IOException {
@@ -204,10 +203,9 @@ private void processUpdateQueue() {
             }
 
             // changes to interest ops
-            assert updateKeys.size() == updateEvents.size();
             while ((ski = updateKeys.pollFirst()) != null) {
-                int events = updateEvents.pollFirst();
-                int fd = ski.channel.getFDVal();
+                int events = ski.translateInterestOps();
+                int fd = ski.getFDVal();
                 if (ski.isValid() && fdMap.containsKey(fd)) {
                     int index = ski.getIndex();
                     assert index >= 0 && index < totalChannels;
@@ -408,13 +406,13 @@ private int processFDSet(long updateCount, int[] fds, int rOps,
 
                 if (selectedKeys.contains(sk)) { // Key in selected set
                     if (me.clearedCount != updateCount) {
-                        if (sk.channel.translateAndSetReadyOps(rOps, sk) &&
+                        if (sk.translateAndSetReadyOps(rOps) &&
                             (me.updateCount != updateCount)) {
                             me.updateCount = updateCount;
                             numKeysUpdated++;
                         }
                     } else { // The readyOps have been set; now add
-                        if (sk.channel.translateAndUpdateReadyOps(rOps, sk) &&
+                        if (sk.translateAndUpdateReadyOps(rOps) &&
                             (me.updateCount != updateCount)) {
                             me.updateCount = updateCount;
                             numKeysUpdated++;
@@ -423,14 +421,14 @@ private int processFDSet(long updateCount, int[] fds, int rOps,
                     me.clearedCount = updateCount;
                 } else { // Key is not in selected set yet
                     if (me.clearedCount != updateCount) {
-                        sk.channel.translateAndSetReadyOps(rOps, sk);
+                        sk.translateAndSetReadyOps(rOps);
                         if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0) {
                             selectedKeys.add(sk);
                             me.updateCount = updateCount;
                             numKeysUpdated++;
                         }
                     } else { // The readyOps have been set; now add
-                        sk.channel.translateAndUpdateReadyOps(rOps, sk);
+                        sk.translateAndUpdateReadyOps(rOps);
                         if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0) {
                             selectedKeys.add(sk);
                             me.updateCount = updateCount;
@@ -613,10 +611,9 @@ protected void implDereg(SelectionKeyImpl ski) {
     }
 
     @Override
-    public void putEventOps(SelectionKeyImpl ski, int events) {
+    public void setEventOps(SelectionKeyImpl ski) {
         ensureOpen();
         synchronized (updateLock) {
-            updateEvents.addLast(events);  // events first in case adding key fails
             updateKeys.addLast(ski);
         }
     }

From 24e4e72a4a554f412e6cc96ebff45a6ac54e79a8 Mon Sep 17 00:00:00 2001
From: alanb <unknown>
Date: Thu, 5 Apr 2018 15:04:09 +0100
Subject: [PATCH 072/196] 8200458: (se) Readiness information previously
 recorded in the ready set not preserved Reviewed-by: bpb, chegar

---
 .../classes/sun/nio/ch/EPollSelectorImpl.java |   2 +-
 .../sun/nio/ch/KQueueSelectorImpl.java        |   9 +-
 .../sun/nio/ch/DevPollSelectorImpl.java       |   2 +-
 .../sun/nio/ch/EventPortSelectorImpl.java     |   2 +-
 .../classes/sun/nio/ch/PollSelectorImpl.java  |   2 +-
 .../sun/nio/ch/WindowsSelectorImpl.java       |  41 +---
 .../nio/channels/Selector/UpdateReadyOps.java | 176 ++++++++++++++++++
 .../channels/SocketChannel/IsConnectable.java |  87 ---------
 8 files changed, 193 insertions(+), 128 deletions(-)
 create mode 100644 test/jdk/java/nio/channels/Selector/UpdateReadyOps.java
 delete mode 100644 test/jdk/java/nio/channels/SocketChannel/IsConnectable.java

diff --git a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
index 189099bcd70..8996b3c3a64 100644
--- a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
+++ b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
@@ -191,7 +191,7 @@ private int updateSelectedKeys(int numEntries) throws IOException {
                 if (ski != null) {
                     int rOps = EPoll.getEvents(event);
                     if (selectedKeys.contains(ski)) {
-                        if (ski.translateAndSetReadyOps(rOps)) {
+                        if (ski.translateAndUpdateReadyOps(rOps)) {
                             numKeysUpdated++;
                         }
                     } else {
diff --git a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
index 215782b6c7e..6215b1388e2 100644
--- a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
+++ b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
@@ -216,15 +216,12 @@ private int updateSelectedKeys(int numEntries) throws IOException {
                     }
 
                     if (selectedKeys.contains(ski)) {
-                        // file descriptor may be polled more than once per poll
-                        if (ski.lastPolled != pollCount) {
-                            if (ski.translateAndSetReadyOps(rOps)) {
+                        if (ski.translateAndUpdateReadyOps(rOps)) {
+                            // file descriptor may be polled more than once per poll
+                            if (ski.lastPolled != pollCount) {
                                 numKeysUpdated++;
                                 ski.lastPolled = pollCount;
                             }
-                        } else {
-                            // ready ops have already been set on this update
-                            ski.translateAndUpdateReadyOps(rOps);
                         }
                     } else {
                         ski.translateAndSetReadyOps(rOps);
diff --git a/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java b/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
index 09fcd9d1834..67aff8d15a2 100644
--- a/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
+++ b/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
@@ -184,7 +184,7 @@ private int updateSelectedKeys(int numEntries) throws IOException {
                 if (ski != null) {
                     int rOps = pollWrapper.getReventOps(i);
                     if (selectedKeys.contains(ski)) {
-                        if (ski.translateAndSetReadyOps(rOps)) {
+                        if (ski.translateAndUpdateReadyOps(rOps)) {
                             numKeysUpdated++;
                         }
                     } else {
diff --git a/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java b/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
index 511b988c59c..ff5ab900974 100644
--- a/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
+++ b/src/java.base/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java
@@ -188,7 +188,7 @@ private int processPortEvents(int numEvents) throws IOException {
                     if (ski != null) {
                         int rOps = getEventOps(i);
                         if (selectedKeys.contains(ski)) {
-                            if (ski.translateAndSetReadyOps(rOps)) {
+                            if (ski.translateAndUpdateReadyOps(rOps)) {
                                 numKeysUpdated++;
                             }
                         } else {
diff --git a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
index e04d78476ba..cd2a4affd4f 100644
--- a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
@@ -174,7 +174,7 @@ private int updateSelectedKeys() throws IOException {
                 assert ski.getFDVal() == getDescriptor(i);
                 if (ski.isValid()) {
                     if (selectedKeys.contains(ski)) {
-                        if (ski.translateAndSetReadyOps(rOps)) {
+                        if (ski.translateAndUpdateReadyOps(rOps)) {
                             numKeysUpdated++;
                         }
                     } else {
diff --git a/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
index b3bb25dbf2a..7f2f1d6cc85 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
@@ -98,7 +98,6 @@ private MapEntry remove(SelectionKeyImpl ski) {
     private static final class MapEntry {
         final SelectionKeyImpl ski;
         long updateCount = 0;
-        long clearedCount = 0;
         MapEntry(SelectionKeyImpl ski) {
             this.ski = ski;
         }
@@ -368,12 +367,10 @@ private int processSelectedKeys(long updateCount) {
         }
 
         /**
-         * Note, clearedCount is used to determine if the readyOps have
-         * been reset in this select operation. updateCount is used to
-         * tell if a key has been counted as updated in this select
-         * operation.
+         * updateCount is used to tell if a key has been counted as updated
+         * in this select operation.
          *
-         * me.updateCount <= me.clearedCount <= updateCount
+         * me.updateCount <= updateCount
          */
         private int processFDSet(long updateCount, int[] fds, int rOps,
                                  boolean isExceptFds)
@@ -405,37 +402,19 @@ private int processFDSet(long updateCount, int[] fds, int rOps,
                 }
 
                 if (selectedKeys.contains(sk)) { // Key in selected set
-                    if (me.clearedCount != updateCount) {
-                        if (sk.translateAndSetReadyOps(rOps) &&
-                            (me.updateCount != updateCount)) {
-                            me.updateCount = updateCount;
-                            numKeysUpdated++;
-                        }
-                    } else { // The readyOps have been set; now add
-                        if (sk.translateAndUpdateReadyOps(rOps) &&
-                            (me.updateCount != updateCount)) {
+                    if (sk.translateAndUpdateReadyOps(rOps)) {
+                        if (me.updateCount != updateCount) {
                             me.updateCount = updateCount;
                             numKeysUpdated++;
                         }
                     }
-                    me.clearedCount = updateCount;
                 } else { // Key is not in selected set yet
-                    if (me.clearedCount != updateCount) {
-                        sk.translateAndSetReadyOps(rOps);
-                        if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0) {
-                            selectedKeys.add(sk);
-                            me.updateCount = updateCount;
-                            numKeysUpdated++;
-                        }
-                    } else { // The readyOps have been set; now add
-                        sk.translateAndUpdateReadyOps(rOps);
-                        if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0) {
-                            selectedKeys.add(sk);
-                            me.updateCount = updateCount;
-                            numKeysUpdated++;
-                        }
+                    sk.translateAndSetReadyOps(rOps);
+                    if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0) {
+                        selectedKeys.add(sk);
+                        me.updateCount = updateCount;
+                        numKeysUpdated++;
                     }
-                    me.clearedCount = updateCount;
                 }
             }
             return numKeysUpdated;
diff --git a/test/jdk/java/nio/channels/Selector/UpdateReadyOps.java b/test/jdk/java/nio/channels/Selector/UpdateReadyOps.java
new file mode 100644
index 00000000000..57a563c6a59
--- /dev/null
+++ b/test/jdk/java/nio/channels/Selector/UpdateReadyOps.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2018, 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
+ * @run testng UpdateReadyOps
+ * @summary Test that the ready set from a selection operation is bitwise-disjoined
+ *     into a key's ready set when the key is already in the selected-key set
+ */
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+@Test
+public class UpdateReadyOps {
+
+    /**
+     * Test that OP_WRITE is preserved when updating the ready set of a key in
+     * the selected-key set to add OP_READ.
+     */
+    public void testOpWritePreserved() throws Exception {
+        try (ConnectionPair pair = new ConnectionPair();
+             Selector sel = Selector.open()) {
+
+            SocketChannel sc1 = pair.channel1();
+            SocketChannel sc2 = pair.channel2();
+
+            sc1.configureBlocking(false);
+            SelectionKey key = sc1.register(sel, SelectionKey.OP_WRITE);
+
+            int updated = sel.select();
+            assertTrue(updated == 1);
+            assertTrue(sel.selectedKeys().contains(key));
+            assertFalse(key.isReadable());
+            assertTrue(key.isWritable());
+
+            // select again, should be no updates
+            updated = sel.select();
+            assertTrue(updated == 0);
+            assertTrue(sel.selectedKeys().contains(key));
+            assertFalse(key.isReadable());
+            assertTrue(key.isWritable());
+
+            // write some bytes
+            sc2.write(helloMessage());
+
+            // change interest ops to OP_READ, do a selection operation, and
+            // check that the ready set becomes OP_READ|OP_WRITE.
+
+            key.interestOps(SelectionKey.OP_READ);
+            updated = sel.select();
+            assertTrue(updated == 1);
+            assertTrue(sel.selectedKeys().size() == 1);
+            assertTrue(key.isReadable());
+            assertTrue(key.isWritable());
+            assertTrue(key.readyOps() == (SelectionKey.OP_READ|SelectionKey.OP_WRITE));
+
+            // select again, should be no updates
+            updated = sel.select();
+            assertTrue(updated == 0);
+            assertTrue(sel.selectedKeys().size() == 1);
+            assertTrue(key.isReadable());
+            assertTrue(key.isWritable());
+        }
+    }
+
+    /**
+     * Test that OP_READ is preserved when updating the ready set of a key in
+     * the selected-key set to add OP_WRITE.
+     */
+    public void testOpReadPreserved() throws Exception {
+        try (ConnectionPair pair = new ConnectionPair();
+             Selector sel = Selector.open()) {
+
+            SocketChannel sc1 = pair.channel1();
+            SocketChannel sc2 = pair.channel2();
+
+            sc1.configureBlocking(false);
+            SelectionKey key = sc1.register(sel, SelectionKey.OP_READ);
+
+            // write some bytes
+            sc2.write(helloMessage());
+
+            int updated = sel.select();
+            assertTrue(updated == 1);
+            assertTrue(sel.selectedKeys().size() == 1);
+            assertTrue(sel.selectedKeys().contains(key));
+            assertTrue(key.isReadable());
+            assertFalse(key.isWritable());
+
+            // select again, should be no updates
+            updated = sel.select();
+            assertTrue(updated == 0);
+            assertTrue(sel.selectedKeys().contains(key));
+            assertTrue(key.isReadable());
+            assertFalse(key.isWritable());
+
+            key.interestOps(SelectionKey.OP_WRITE);
+            updated = sel.select();
+            assertTrue(updated == 1);
+            assertTrue(sel.selectedKeys().size() == 1);
+            assertTrue(sel.selectedKeys().contains(key));
+            assertTrue(key.isReadable());
+            assertTrue(key.isWritable());
+            assertTrue(key.readyOps() == (SelectionKey.OP_READ|SelectionKey.OP_WRITE));
+
+            // select again, should be no updates
+            updated = sel.select();
+            assertTrue(updated == 0);
+            assertTrue(sel.selectedKeys().size() == 1);
+            assertTrue(key.isReadable());
+            assertTrue(key.isWritable());
+        }
+    }
+
+    static class ConnectionPair implements Closeable {
+
+        private final SocketChannel sc1;
+        private final SocketChannel sc2;
+
+        ConnectionPair() throws IOException {
+            InetAddress lb = InetAddress.getLoopbackAddress();
+            try (ServerSocketChannel ssc = ServerSocketChannel.open()) {
+                ssc.bind(new InetSocketAddress(lb, 0));
+                this.sc1 = SocketChannel.open(ssc.getLocalAddress());
+                this.sc2 = ssc.accept();
+            }
+        }
+
+        SocketChannel channel1() {
+            return sc1;
+        }
+
+        SocketChannel channel2() {
+            return sc2;
+        }
+
+        public void close() throws IOException {
+            sc1.close();
+            sc2.close();
+        }
+    }
+
+    static ByteBuffer helloMessage() throws Exception {
+        return ByteBuffer.wrap("hello".getBytes("UTF-8"));
+    }
+}
diff --git a/test/jdk/java/nio/channels/SocketChannel/IsConnectable.java b/test/jdk/java/nio/channels/SocketChannel/IsConnectable.java
deleted file mode 100644
index 70afafca097..00000000000
--- a/test/jdk/java/nio/channels/SocketChannel/IsConnectable.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2002, 2018, 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
- * @bug 4737146 4750573
- * @summary Test if isConnectable returns true after connected
- * @library .. /test/lib
- * @build jdk.test.lib.Utils TestServers
- * @run main IsConnectable
- */
-
-import java.net.*;
-import java.nio.channels.*;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.*;
-
-public class IsConnectable {
-
-    static void test(TestServers.DayTimeServer daytimeServer) throws Exception {
-        InetSocketAddress isa
-            = new InetSocketAddress(daytimeServer.getAddress(),
-                                    daytimeServer.getPort());
-        SocketChannel sc = SocketChannel.open();
-        sc.configureBlocking(false);
-        final boolean immediatelyConnected = sc.connect(isa);
-
-        Selector selector = SelectorProvider.provider().openSelector();
-        try {
-            SelectionKey key = sc.register(selector, SelectionKey.OP_CONNECT);
-            int keysAdded = selector.select();
-            if (keysAdded > 0) {
-                boolean result = sc.finishConnect();
-                if (result) {
-                    keysAdded = selector.select(5000);
-                    // 4750573: keysAdded should not be incremented when op is dropped
-                    // from a key already in the selected key set
-                    if (keysAdded > 0)
-                        throw new Exception("Test failed: 4750573 detected");
-                    Set<SelectionKey> sel = selector.selectedKeys();
-                    Iterator<SelectionKey> i = sel.iterator();
-                    SelectionKey sk = i.next();
-                    // 4737146: isConnectable should be false while connected
-                    if (sk.isConnectable())
-                        throw new Exception("Test failed: 4737146 detected");
-                }
-            } else {
-                if (!immediatelyConnected) {
-                    throw new Exception("Select failed");
-                } else {
-                    System.out.println("IsConnectable couldn't be fully tested for "
-                            + System.getProperty("os.name"));
-                }
-            }
-        } finally {
-            sc.close();
-            selector.close();
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        try (TestServers.DayTimeServer daytimeServer
-                = TestServers.DayTimeServer.startNewServer(100)) {
-            test(daytimeServer);
-        }
-    }
-
-}

From 40535fc48f3c10ffc673ea374720f4fe91f18a4e Mon Sep 17 00:00:00 2001
From: martin <unknown>
Date: Thu, 5 Apr 2018 09:33:27 -0700
Subject: [PATCH 073/196] 8200125: Fix some classloader/module typos
 Reviewed-by: alanb

---
 .../share/classes/java/lang/ClassLoader.java   | 16 ++++++++--------
 .../share/classes/java/lang/ModuleLayer.java   |  4 ++--
 src/java.base/share/classes/java/net/URL.java  |  2 +-
 .../share/classes/java/net/URLClassLoader.java |  2 +-
 .../jdk/internal/loader/BootLoader.java        |  4 ++--
 .../internal/loader/BuiltinClassLoader.java    | 18 +++++++++---------
 .../classes/jdk/internal/loader/Loader.java    |  4 ++--
 .../internal/module/ModuleHashesBuilder.java   |  6 +++---
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/ClassLoader.java b/src/java.base/share/classes/java/lang/ClassLoader.java
index cb6193f2b1f..a31d40a3d48 100644
--- a/src/java.base/share/classes/java/lang/ClassLoader.java
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -699,7 +699,7 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
     /**
      * Finds the class with the given <a href="#binary-name">binary name</a>
      * in a module defined to this class loader.
-     * Class loader implementations that support the loading from modules
+     * Class loader implementations that support loading from modules
      * should override this method.
      *
      * @apiNote This method returns {@code null} rather than throwing
@@ -1281,7 +1281,7 @@ protected final void setSigners(Class<?> c, Object[] signers) {
 
     /**
      * Returns a URL to a resource in a module defined to this class loader.
-     * Class loader implementations that support the loading from modules
+     * Class loader implementations that support loading from modules
      * should override this method.
      *
      * @apiNote This method is the basis for the {@link
@@ -1417,12 +1417,12 @@ public URL getResource(String name) {
      * @param  name
      *         The resource name
      *
-     * @return  An enumeration of {@link java.net.URL URL} objects for
-     *          the resource. If no resources could  be found, the enumeration
-     *          will be empty. Resources for which a {@code URL} cannot be
-     *          constructed, are in package that is not opened unconditionally,
-     *          or access to the resource is denied by the security manager,
-     *          are not returned in the enumeration.
+     * @return  An enumeration of {@link java.net.URL URL} objects for the
+     *          resource. If no resources could be found, the enumeration will
+     *          be empty. Resources for which a {@code URL} cannot be
+     *          constructed, are in a package that is not opened
+     *          unconditionally, or access to the resource is denied by the
+     *          security manager, are not returned in the enumeration.
      *
      * @throws  IOException
      *          If I/O errors occur
diff --git a/src/java.base/share/classes/java/lang/ModuleLayer.java b/src/java.base/share/classes/java/lang/ModuleLayer.java
index 3dc809632c7..f4ea6553e52 100644
--- a/src/java.base/share/classes/java/lang/ModuleLayer.java
+++ b/src/java.base/share/classes/java/lang/ModuleLayer.java
@@ -152,7 +152,7 @@ public final class ModuleLayer {
     private static final ModuleLayer EMPTY_LAYER
         = new ModuleLayer(Configuration.empty(), List.of(), null);
 
-    // the configuration from which this ;ayer was created
+    // the configuration from which this layer was created
     private final Configuration cf;
 
     // parent layers, empty in the case of the empty layer
@@ -498,7 +498,7 @@ public static Controller defineModulesWithOneLoader(Configuration cf,
         try {
             Loader loader = new Loader(cf.modules(), parentLoader);
             loader.initRemotePackageMap(cf, parents);
-            ModuleLayer layer =  new ModuleLayer(cf, parents, mn -> loader);
+            ModuleLayer layer = new ModuleLayer(cf, parents, mn -> loader);
             return new Controller(layer);
         } catch (IllegalArgumentException | IllegalStateException e) {
             throw new LayerInstantiationException(e.getMessage());
diff --git a/src/java.base/share/classes/java/net/URL.java b/src/java.base/share/classes/java/net/URL.java
index 2917be133bd..e8af5b528cb 100644
--- a/src/java.base/share/classes/java/net/URL.java
+++ b/src/java.base/share/classes/java/net/URL.java
@@ -1411,7 +1411,7 @@ static URLStreamHandler getURLStreamHandler(String protocol) {
                 // Check with factory if another thread set a
                 // factory since our last check
                 if (!checkedWithFactory && (fac = factory) != null) {
-                    handler2 =  fac.createURLStreamHandler(protocol);
+                    handler2 = fac.createURLStreamHandler(protocol);
                 }
 
                 if (handler2 != null) {
diff --git a/src/java.base/share/classes/java/net/URLClassLoader.java b/src/java.base/share/classes/java/net/URLClassLoader.java
index 4bf6666b0f3..37a05aabc35 100644
--- a/src/java.base/share/classes/java/net/URLClassLoader.java
+++ b/src/java.base/share/classes/java/net/URLClassLoader.java
@@ -764,7 +764,7 @@ protected PermissionCollection getPermissions(CodeSource codesource)
             path = ParseUtil.decode(path);
             if (path.endsWith(File.separator))
                 path += "-";
-            p =  new FilePermission(path, SecurityConstants.FILE_READ_ACTION);
+            p = new FilePermission(path, SecurityConstants.FILE_READ_ACTION);
         } else {
             /**
              * Not loading from a 'file:' URL so we want to give the class
diff --git a/src/java.base/share/classes/jdk/internal/loader/BootLoader.java b/src/java.base/share/classes/jdk/internal/loader/BootLoader.java
index 9d5d943b090..c817ae3127b 100644
--- a/src/java.base/share/classes/jdk/internal/loader/BootLoader.java
+++ b/src/java.base/share/classes/jdk/internal/loader/BootLoader.java
@@ -100,8 +100,8 @@ public static boolean hasClassPath() {
     }
 
     /**
-     * Register a module with this class loader so that its classes (and
-     * resources) become visible via this class loader.
+     * Registers a module with this class loader so that its classes
+     * (and resources) become visible via this class loader.
      */
     public static void loadModule(ModuleReference mref) {
         ClassLoaders.bootLoader().loadModule(mref);
diff --git a/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java b/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
index 4cee3bc2de0..bb62cf8291f 100644
--- a/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
+++ b/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
@@ -584,7 +584,7 @@ protected Class<?> loadClass(String cn, boolean resolve)
     }
 
     /**
-     * A variation of {@code loadCass} to load a class with the specified
+     * A variation of {@code loadClass} to load a class with the specified
      * binary name. This method returns {@code null} when the class is not
      * found.
      */
@@ -633,16 +633,16 @@ protected Class<?> loadClassOrNull(String cn, boolean resolve) {
     }
 
     /**
-     * A variation of {@code loadCass} to load a class with the specified
+     * A variation of {@code loadClass} to load a class with the specified
      * binary name. This method returns {@code null} when the class is not
      * found.
      */
-    protected  Class<?> loadClassOrNull(String cn) {
+    protected Class<?> loadClassOrNull(String cn) {
         return loadClassOrNull(cn, false);
     }
 
     /**
-     * Find the candidate loaded module for the given class name.
+     * Finds the candidate loaded module for the given class name.
      * Returns {@code null} if none of the modules defined to this
      * class loader contain the API package for the class.
      */
@@ -656,7 +656,7 @@ private LoadedModule findLoadedModule(String cn) {
     }
 
     /**
-     * Find the candidate loaded module for the given class name
+     * Finds the candidate loaded module for the given class name
      * in the named module.  Returns {@code null} if the named module
      * is not defined to this class loader or does not contain
      * the API package for the class.
@@ -832,8 +832,8 @@ protected Package defineOrCheckPackage(String pn, Manifest man, URL url) {
     }
 
     /**
-     * Get the Package with the specified package name. If defined
-     * then verify that it against the manifest and code source.
+     * Gets the Package with the specified package name. If defined
+     * then verifies it against the manifest and code source.
      *
      * @throws SecurityException if there is a sealing violation (JAR spec)
      */
@@ -859,7 +859,7 @@ private Package getAndVerifyPackage(String pn, Manifest man, URL url) {
 
     /**
      * Defines a new package in this ClassLoader. The attributes in the specified
-     * Manifest are use to get the package version and sealing information.
+     * Manifest are used to get the package version and sealing information.
      *
      * @throws IllegalArgumentException if the package name duplicates an
      * existing package either in this class loader or one of its ancestors
@@ -976,7 +976,7 @@ protected PermissionCollection getPermissions(CodeSource cs) {
     // -- miscellaneous supporting methods
 
     /**
-     * Returns the ModuleReader for the given module, creating it if needed
+     * Returns the ModuleReader for the given module, creating it if needed.
      */
     private ModuleReader moduleReaderFor(ModuleReference mref) {
         ModuleReader reader = moduleToReader.get(mref);
diff --git a/src/java.base/share/classes/jdk/internal/loader/Loader.java b/src/java.base/share/classes/jdk/internal/loader/Loader.java
index d78efe3eaab..d65b8acc229 100644
--- a/src/java.base/share/classes/jdk/internal/loader/Loader.java
+++ b/src/java.base/share/classes/jdk/internal/loader/Loader.java
@@ -90,7 +90,7 @@ public final class Loader extends SecureClassLoader {
         ClassLoader.registerAsParallelCapable();
     }
 
-    // the loader pool is in a pool, can be null
+    // the pool this loader is a member of; can be null
     private final LoaderPool pool;
 
     // parent ClassLoader, can be null
@@ -487,7 +487,7 @@ protected Class<?> findClass(String cn) throws ClassNotFoundException {
     }
 
     /**
-     * Finds the class with the specified binary name in a given module.
+     * Finds the class with the specified binary name in the given module.
      * This method returns {@code null} if the class cannot be found.
      */
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
index 053a42a64c8..3c82c92cbff 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
@@ -173,7 +173,7 @@ public Stream<T> orderedNodes() {
         }
 
         /**
-         * Traverse this graph and performs the given action in topological order
+         * Traverses this graph and performs the given action in topological order.
          */
         public void ordered(Consumer<T> action) {
             TopoSorter<T> sorter = new TopoSorter<>(this);
@@ -181,7 +181,7 @@ public void ordered(Consumer<T> action) {
         }
 
         /**
-         * Traverses this graph and performs the given action in reverse topological order
+         * Traverses this graph and performs the given action in reverse topological order.
          */
         public void reverse(Consumer<T> action) {
             TopoSorter<T> sorter = new TopoSorter<>(this);
@@ -189,7 +189,7 @@ public void reverse(Consumer<T> action) {
         }
 
         /**
-         * Returns a transposed graph from this graph
+         * Returns a transposed graph from this graph.
          */
         public Graph<T> transpose() {
             Builder<T> builder = new Builder<>();

From b0eb62df84ee69d6cac6658866ab03d8d4077925 Mon Sep 17 00:00:00 2001
From: martin <unknown>
Date: Thu, 5 Apr 2018 09:34:46 -0700
Subject: [PATCH 074/196] 8200127: Replace collection.stream().forEach() with
 collection.forEach() Reviewed-by: alanb

---
 .../classes/java/lang/module/ModuleDescriptor.java    |  4 ++--
 .../share/classes/java/lang/reflect/Proxy.java        |  3 +--
 .../jdk/internal/module/ModuleHashesBuilder.java      | 11 +++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
index 626c5200606..cb578423cba 100644
--- a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
+++ b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
@@ -1742,7 +1742,7 @@ public Builder exports(Set<Exports.Modifier> ms,
                 throw new IllegalArgumentException("Empty target set");
             if (strict) {
                 requirePackageName(e.source());
-                targets.stream().forEach(Checks::requireModuleName);
+                targets.forEach(Checks::requireModuleName);
             }
             return exports(e);
         }
@@ -1878,7 +1878,7 @@ public Builder opens(Set<Opens.Modifier> ms,
                 throw new IllegalArgumentException("Empty target set");
             if (strict) {
                 requirePackageName(opens.source());
-                targets.stream().forEach(Checks::requireModuleName);
+                targets.forEach(Checks::requireModuleName);
             }
             return opens(opens);
         }
diff --git a/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java
index 27d33a83d17..456527dd19b 100644
--- a/src/java.base/share/classes/java/lang/reflect/Proxy.java
+++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java
@@ -593,8 +593,7 @@ static void trace(String cn,
                                   module.getName(), cn, loader);
             }
             if (isDebug("debug")) {
-                interfaces.stream()
-                          .forEach(c -> System.out.println(toDetails(c)));
+                interfaces.forEach(c -> System.out.println(toDetails(c)));
             }
         }
 
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
index 3c82c92cbff..7b640633c5b 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
@@ -193,11 +193,10 @@ public void reverse(Consumer<T> action) {
          */
         public Graph<T> transpose() {
             Builder<T> builder = new Builder<>();
-            nodes.stream().forEach(builder::addNode);
+            nodes.forEach(builder::addNode);
             // reverse edges
             edges.keySet().forEach(u -> {
-                edges.get(u).stream()
-                    .forEach(v -> builder.addEdge(v, u));
+                edges.get(u).forEach(v -> builder.addEdge(v, u));
             });
             return builder.build();
         }
@@ -231,8 +230,8 @@ public Set<T> dfs(Set<T> roots) {
 
         public void printGraph(PrintStream out) {
             out.println("graph for " + nodes);
-            nodes.stream()
-                .forEach(u -> adjacentNodes(u).stream()
+            nodes
+                .forEach(u -> adjacentNodes(u)
                     .forEach(v -> out.format("  %s -> %s%n", u, v)));
         }
 
@@ -302,7 +301,7 @@ private void visit(T node, Deque<T> visited, Deque<T> done) {
                 return;
             }
             visited.add(node);
-            graph.edges().get(node).stream()
+            graph.edges().get(node)
                 .forEach(x -> visit(x, visited, done));
             done.add(node);
             result.addLast(node);

From d34ee0de32c23fdc2b97d3d44c49872000079224 Mon Sep 17 00:00:00 2001
From: martin <unknown>
Date: Thu, 5 Apr 2018 09:36:01 -0700
Subject: [PATCH 075/196] 8200128: Fix some "annoations" typos Reviewed-by:
 alanb

---
 .../share/classes/jdk/internal/vm/annotation/Stable.java  | 2 +-
 test/jdk/java/lang/Class/IsAnnotationType.java            | 4 ++--
 test/jdk/java/lang/annotation/ClassFileGenerator.java     | 8 ++++----
 .../repeatingAnnotations/BasicRepeatingAnnotations.java   | 2 +-
 .../referenceinfos/ExceptionParameters.java               | 2 +-
 .../typeAnnotations/referenceinfos/MethodParameters.java  | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java b/src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java
index 2ba6e992adf..0d1eb97b730 100644
--- a/src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java
+++ b/src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java
@@ -81,7 +81,7 @@
  *
  * @implNote
  * This annotation only takes effect for fields of classes loaded by the boot
- * loader.  Annoations on fields of classes loaded outside of the boot loader
+ * loader.  Annotations on fields of classes loaded outside of the boot loader
  * are ignored.
  */
 @Target(ElementType.FIELD)
diff --git a/test/jdk/java/lang/Class/IsAnnotationType.java b/test/jdk/java/lang/Class/IsAnnotationType.java
index 849b13a4264..2189e1c5715 100644
--- a/test/jdk/java/lang/Class/IsAnnotationType.java
+++ b/test/jdk/java/lang/Class/IsAnnotationType.java
@@ -49,7 +49,7 @@ public static void main(String argv[]) {
         failures += test(String.class, false);
         failures += test(Enum.class, false);
         failures += test(java.math.RoundingMode.class, false);
-        // Classes in java.lang.annoation
+        // Classes in java.lang.annotation
         failures += test(Annotation.class, false);
         failures += test(Retention.class, true);
         failures += test(RetentionPolicy.class, false);
@@ -57,7 +57,7 @@ public static void main(String argv[]) {
         failures += test(AnnotationPoseur.class, false);
 
         if (failures > 0) {
-            throw new RuntimeException("Unexepcted annotation " +
+            throw new RuntimeException("Unexpected annotation " +
                                        "status detected.");
         }
     }
diff --git a/test/jdk/java/lang/annotation/ClassFileGenerator.java b/test/jdk/java/lang/annotation/ClassFileGenerator.java
index 13f456696dc..7ee619292b0 100644
--- a/test/jdk/java/lang/annotation/ClassFileGenerator.java
+++ b/test/jdk/java/lang/annotation/ClassFileGenerator.java
@@ -38,8 +38,8 @@
 public class ClassFileGenerator {
 
     public static void main(String... args) throws Exception {
-        classFileWriter("AnnotationWithVoidReturn.class", AnnoationWithVoidReturnDump.dump());
-        classFileWriter("AnnotationWithParameter.class", AnnoationWithParameterDump.dump());
+        classFileWriter("AnnotationWithVoidReturn.class", AnnotationWithVoidReturnDump.dump());
+        classFileWriter("AnnotationWithParameter.class", AnnotationWithParameterDump.dump());
         classFileWriter("AnnotationWithExtraInterface.class", AnnotationWithExtraInterfaceDump.dump());
         classFileWriter("AnnotationWithException.class", AnnotationWithExceptionDump.dump());
         classFileWriter("AnnotationWithHashCode.class", AnnotationWithHashCodeDump.dump());
@@ -65,7 +65,7 @@ private static void classFileWriter(String name, byte[] contents) throws IOExcep
 
     */
 
-    private static class AnnoationWithVoidReturnDump implements Opcodes {
+    private static class AnnotationWithVoidReturnDump implements Opcodes {
         public static byte[] dump() throws Exception {
             ClassWriter cw = new ClassWriter(0);
             MethodVisitor mv;
@@ -106,7 +106,7 @@ public static byte[] dump() throws Exception {
 
     */
 
-    private static class AnnoationWithParameterDump implements Opcodes {
+    private static class AnnotationWithParameterDump implements Opcodes {
         public static byte[] dump() throws Exception {
 
             ClassWriter cw = new ClassWriter(0);
diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java
index 848cd18cc39..77fc2a1151b 100644
--- a/test/langtools/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java
+++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/BasicRepeatingAnnotations.java
@@ -72,7 +72,7 @@ public static void main(String[] args) throws Exception {
         }
         a = BasicNonRepeatingAnno.class.getAnnotation(Foo.class);
         if (a == null) {
-            throw new RuntimeException("Repeated annoation not directly present");
+            throw new RuntimeException("Repeated annotation not directly present");
         }
     }
 }
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
index 1ce865a0fa4..1a18c7ff4f5 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
@@ -84,7 +84,7 @@ public String multipleExceptions3() {
     }
 
     @TADescription(annotation = "RTAs", type = EXCEPTION_PARAMETER, exceptionIndex = 0)
-    public String exceptionRepeatableAnnoation() {
+    public String exceptionRepeatableAnnotation() {
         return "void exception() { try { new Object(); } catch(@RTA @RTA Exception e) { } }";
     }
 
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
index 68d79412084..2aa84c0e605 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
@@ -223,7 +223,7 @@ public String methodParamAsArrayRepeatableAnnotation3() {
             genericLocation = { 0, 0 }, paramIndex = 1)
     @TADescription(annotation = "RTCs", type = METHOD_FORMAL_PARAMETER,
             genericLocation = { 0, 0, 0, 0 }, paramIndex = 1)
-    public String methodParamAsVarargRepeatableAnnoattion() {
+    public String methodParamAsVarargRepeatableAnnotation() {
         return "void test(Object b, @RTC @RTC String @RTA @RTA [] @RTB @RTB ... a) { }";
     }
 

From 11f80a9462732835725f64888987fe027f74cc17 Mon Sep 17 00:00:00 2001
From: martin <unknown>
Date: Thu, 5 Apr 2018 09:37:19 -0700
Subject: [PATCH 076/196] 8200131: Improve lazy init of
 InetAddress.canonicalHostName and NativeObject.pageSize Reviewed-by: alanb

---
 .../share/classes/java/net/InetAddress.java         | 13 ++++++++-----
 .../share/classes/sun/nio/ch/NativeObject.java      | 12 ++++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java
index 84a0c578f5f..044f326e6eb 100644
--- a/src/java.base/share/classes/java/net/InetAddress.java
+++ b/src/java.base/share/classes/java/net/InetAddress.java
@@ -290,7 +290,10 @@ InetAddressHolder holder() {
     /* Used to store the name service provider */
     private static transient NameService nameService = null;
 
-    /* Used to store the best available hostname */
+    /**
+     * Used to store the best available hostname.
+     * Lazily initialized via a data race; safe because Strings are immutable.
+     */
     private transient String canonicalHostName = null;
 
     /** use serialVersionUID from JDK 1.0.2 for interoperability */
@@ -622,11 +625,11 @@ String getHostName(boolean check) {
      * @since 1.4
      */
     public String getCanonicalHostName() {
-        if (canonicalHostName == null) {
-            canonicalHostName =
+        String value = canonicalHostName;
+        if (value == null)
+            canonicalHostName = value =
                 InetAddress.getHostFromNameService(this, true);
-        }
-        return canonicalHostName;
+        return value;
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/nio/ch/NativeObject.java b/src/java.base/share/classes/sun/nio/ch/NativeObject.java
index 839b64df8ad..034e6e138e5 100644
--- a/src/java.base/share/classes/sun/nio/ch/NativeObject.java
+++ b/src/java.base/share/classes/sun/nio/ch/NativeObject.java
@@ -388,7 +388,10 @@ static ByteOrder byteOrder() {
         return byteOrder;
     }
 
-    // Cache for page size
+    /**
+     * Cache for page size.
+     * Lazily initialized via a data race; safe because ints are atomic.
+     */
     private static int pageSize = -1;
 
     /**
@@ -397,9 +400,10 @@ static ByteOrder byteOrder() {
      * @return  The page size, in bytes
      */
     static int pageSize() {
-        if (pageSize == -1)
-            pageSize = unsafe.pageSize();
-        return pageSize;
+        int value = pageSize;
+        if (value == -1)
+            pageSize = value = unsafe.pageSize();
+        return value;
     }
 
 }

From 863eacae783074517da61aff7112488e7085fdf7 Mon Sep 17 00:00:00 2001
From: martin <unknown>
Date: Thu, 5 Apr 2018 09:38:30 -0700
Subject: [PATCH 077/196] 8200134: Improve ModuleHashesBuilder Reviewed-by:
 mchung, alanb

---
 .../internal/module/ModuleHashesBuilder.java  | 78 ++++++++-----------
 1 file changed, 33 insertions(+), 45 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
index 7b640633c5b..d1c225dd167 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
@@ -35,7 +35,6 @@
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -76,16 +75,15 @@ public Map<String, ModuleHashes> computeHashes(Set<String> roots) {
         // build a graph containing the packaged modules and
         // its transitive dependences matching --hash-modules
         Graph.Builder<String> builder = new Graph.Builder<>();
-        Deque<ResolvedModule> deque = new ArrayDeque<>(configuration.modules());
+        Deque<ResolvedModule> todo = new ArrayDeque<>(configuration.modules());
         Set<ResolvedModule> visited = new HashSet<>();
-        while (!deque.isEmpty()) {
-            ResolvedModule rm = deque.pop();
-            if (!visited.contains(rm)) {
-                visited.add(rm);
+        ResolvedModule rm;
+        while ((rm = todo.poll()) != null) {
+            if (visited.add(rm)) {
                 builder.addNode(rm.name());
                 for (ResolvedModule dm : rm.reads()) {
                     if (!visited.contains(dm)) {
-                        deque.push(dm);
+                        todo.push(dm);
                     }
                     builder.addEdge(rm.name(), dm.name());
                 }
@@ -212,17 +210,14 @@ public Set<T> dfs(T root) {
          * Returns all nodes reachable from the given set of roots.
          */
         public Set<T> dfs(Set<T> roots) {
-            Deque<T> deque = new LinkedList<>(roots);
+            ArrayDeque<T> todo = new ArrayDeque<>(roots);
             Set<T> visited = new HashSet<>();
-            while (!deque.isEmpty()) {
-                T u = deque.pop();
-                if (!visited.contains(u)) {
-                    visited.add(u);
-                    if (contains(u)) {
-                        adjacentNodes(u).stream()
-                            .filter(v -> !visited.contains(v))
-                            .forEach(deque::push);
-                    }
+            T u;
+            while ((u = todo.poll()) != null) {
+                if (visited.add(u) && contains(u)) {
+                    adjacentNodes(u).stream()
+                        .filter(v -> !visited.contains(v))
+                        .forEach(todo::push);
                 }
             }
             return visited;
@@ -240,11 +235,9 @@ static class Builder<T> {
             final Map<T, Set<T>> edges = new HashMap<>();
 
             public void addNode(T node) {
-                if (nodes.contains(node)) {
-                    return;
+                if (nodes.add(node)) {
+                    edges.computeIfAbsent(node, _e -> new HashSet<>());
                 }
-                nodes.add(node);
-                edges.computeIfAbsent(node, _e -> new HashSet<>());
             }
 
             public void addEdge(T u, T v) {
@@ -263,18 +256,16 @@ public Graph<T> build() {
      * Topological sort
      */
     private static class TopoSorter<T> {
-        final Deque<T> result = new LinkedList<>();
-        final Deque<T> nodes;
+        final Deque<T> result = new ArrayDeque<>();
         final Graph<T> graph;
 
         TopoSorter(Graph<T> graph) {
             this.graph = graph;
-            this.nodes = new LinkedList<>(graph.nodes);
             sort();
         }
 
         public void ordered(Consumer<T> action) {
-            result.iterator().forEachRemaining(action);
+            result.forEach(action);
         }
 
         public void reverse(Consumer<T> action) {
@@ -282,29 +273,26 @@ public void reverse(Consumer<T> action) {
         }
 
         private void sort() {
-            Deque<T> visited = new LinkedList<>();
-            Deque<T> done = new LinkedList<>();
-            T node;
-            while ((node = nodes.poll()) != null) {
-                if (!visited.contains(node)) {
-                    visit(node, visited, done);
-                }
-            }
+            Set<T> visited = new HashSet<>();
+            Deque<T> stack = new ArrayDeque<>();
+            graph.nodes.forEach(node -> visit(node, visited, stack));
         }
 
-        private void visit(T node, Deque<T> visited, Deque<T> done) {
-            if (visited.contains(node)) {
-                if (!done.contains(node)) {
-                    throw new IllegalArgumentException("Cyclic detected: " +
-                        node + " " + graph.edges().get(node));
-                }
-                return;
+        private Set<T> children(T node) {
+            return graph.edges().get(node);
+        }
+
+        private void visit(T node, Set<T> visited, Deque<T> stack) {
+            if (visited.add(node)) {
+                stack.push(node);
+                children(node).forEach(child -> visit(child, visited, stack));
+                stack.pop();
+                result.addLast(node);
+            }
+            else if (stack.contains(node)) {
+                throw new IllegalArgumentException(
+                    "Cycle detected: " + node + " -> " + children(node));
             }
-            visited.add(node);
-            graph.edges().get(node)
-                .forEach(x -> visit(x, visited, done));
-            done.add(node);
-            result.addLast(node);
         }
     }
 }

From 7660197f4739858fdc3d30d9da014e1c8d9862a3 Mon Sep 17 00:00:00 2001
From: hseigel <unknown>
Date: Thu, 5 Apr 2018 13:19:25 -0400
Subject: [PATCH 078/196] 8200261: Regression with JVM anonymous class Summary:
 Restore resolved anonymous class when creating a new constantpool because of
 overpass methods Reviewed-by: coleenp, lfoltan

---
 .../defineAnonClass/UnsafeDefMeths.java       | 185 ++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 test/hotspot/jtreg/runtime/defineAnonClass/UnsafeDefMeths.java

diff --git a/test/hotspot/jtreg/runtime/defineAnonClass/UnsafeDefMeths.java b/test/hotspot/jtreg/runtime/defineAnonClass/UnsafeDefMeths.java
new file mode 100644
index 00000000000..eff1477397b
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/defineAnonClass/UnsafeDefMeths.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8200261
+ * @summary Tests an anonymous class that implements interfaces with default methods.
+ * @library /testlibrary
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ *          java.management
+ * @compile -XDignore.symbol.file=true UnsafeDefMeths.java
+ * @run main UnsafeDefMeths
+ */
+
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Type;
+import sun.misc.Unsafe;
+
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
+import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP;
+import static jdk.internal.org.objectweb.asm.Opcodes.GETFIELD;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.PUTFIELD;
+import static jdk.internal.org.objectweb.asm.Opcodes.RETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.V1_8;
+
+public class UnsafeDefMeths {
+
+    static final Unsafe UNSAFE;
+
+    static {
+        try {
+            Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
+            unsafeField.setAccessible(true);
+            UNSAFE = (Unsafe) unsafeField.get(null);
+        }
+        catch (Exception e) {
+            throw new InternalError(e);
+        }
+    }
+
+    interface Resource {
+        Pointer ptr();
+    }
+
+    interface Struct extends Resource {
+       StructPointer ptr();
+    }
+
+    interface Pointer { }
+
+    interface StructPointer extends Pointer { }
+
+    interface I extends Struct {
+        void m();
+    }
+
+    static String IMPL_PREFIX = "$$impl";
+    static String PTR_FIELD_NAME = "ptr";
+
+    public static void main(String[] args) throws Throwable {
+        byte[] bytes = new UnsafeDefMeths().generate(I.class);
+        Class<?> cl = UNSAFE.defineAnonymousClass(I.class, bytes, new Object[0]);
+        I i = (I)cl.getConstructors()[0].newInstance(new Object[] { null }); //exception here!
+    }
+
+    // Generate a class similar to:
+    //
+    // public class UnsafeDefMeths$I$$impl implements UnsafeDefMeths$I, UnsafeDefMeths$Struct {
+    //
+    //     public UnsafeDefMeths$StructPointer ptr;
+    //
+    //     public UnsafeDefMeths$I$$impl(UnsafeDefMeths$StructPointer p) {
+    //         ptr = p;
+    //     }
+    //
+    //     public UnsafeDefMeths$StructPointer ptr() {
+    //         return ptr;
+    //     }
+    // }
+    //
+    byte[] generate(Class<?> iface) {
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+
+        String ifaceTypeName = Type.getInternalName(iface);
+        String proxyClassName = ifaceTypeName + IMPL_PREFIX;
+        // class definition
+        cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, proxyClassName,
+                desc(Object.class) + desc(ifaceTypeName) + desc(Struct.class),
+                name(Object.class),
+                new String[] { ifaceTypeName, name(Struct.class) });
+
+        cw.visitField(ACC_PUBLIC, PTR_FIELD_NAME, desc(StructPointer.class), desc(StructPointer.class), null);
+        cw.visitEnd();
+
+        // constructor
+        MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>",
+                meth(desc(void.class), desc(StructPointer.class)),
+                meth(desc(void.class), desc(StructPointer.class)), null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitInsn(DUP);
+        mv.visitMethodInsn(INVOKESPECIAL, name(Object.class), "<init>", meth(desc(void.class)), false);
+        mv.visitVarInsn(ALOAD, 1);
+        // Execution of this PUTFIELD instruction causes the bug's ClassNotFoundException.
+        mv.visitFieldInsn(PUTFIELD, proxyClassName, PTR_FIELD_NAME, desc(StructPointer.class));
+        mv.visitInsn(RETURN);
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+
+        // ptr() impl
+        mv = cw.visitMethod(ACC_PUBLIC, PTR_FIELD_NAME, meth(desc(StructPointer.class)),
+                meth(desc(StructPointer.class)), null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitFieldInsn(GETFIELD, proxyClassName, PTR_FIELD_NAME, desc(StructPointer.class));
+        mv.visitInsn(ARETURN);
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+
+        return cw.toByteArray();
+    }
+
+    String name(Class<?> clazz) {
+        if (clazz.isPrimitive()) {
+            throw new IllegalStateException();
+        } else if (clazz.isArray()) {
+            return desc(clazz);
+        } else {
+            return clazz.getName().replaceAll("\\.", "/");
+        }
+    }
+
+    String desc(Class<?> clazz) {
+        String mdesc = MethodType.methodType(clazz).toMethodDescriptorString();
+        return mdesc.substring(mdesc.indexOf(')') + 1);
+    }
+
+    String desc(String clazzName) {
+        return "L" + clazzName + ";";
+    }
+
+    String gen(String clazz, String... typeargs) {
+        return clazz.substring(0, clazz.length() - 1) + Stream.of(typeargs).collect(Collectors.joining("", "<", ">")) + ";";
+    }
+
+    String meth(String restype, String... argtypes) {
+        return Stream.of(argtypes).collect(Collectors.joining("", "(", ")")) + restype;
+    }
+
+    String meth(Method m) {
+        return MethodType.methodType(m.getReturnType(), m.getParameterTypes()).toMethodDescriptorString();
+    }
+}

From 60a2d77f9de1f5366d0ba55f9b274f1a9c8fe67d Mon Sep 17 00:00:00 2001
From: gadams <unknown>
Date: Thu, 5 Apr 2018 11:18:39 -0700
Subject: [PATCH 079/196] 8199782: Fix compilation warnings detected by Solaris
 Developer Studio 12.6 Reviewed-by: sspitsyn, dholmes, ihse

---
 make/hotspot/lib/CompileJvm.gmk                             | 6 ++++++
 src/java.base/solaris/native/libjvm_db/libjvm_db.c          | 3 ++-
 test/fmw/gtest/src/gtest.cc                                 | 3 +++
 .../jtreg/runtime/libadimalloc.solaris.sparc/liboverflow.c  | 5 ++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index 49d24a80700..5274479b552 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -181,6 +181,11 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
   else ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
     JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il
   endif
+  # Exclude warnings in devstudio 12.6
+  ifeq ($(CC_VERSION_NUMBER), 5.15)
+    DISABLED_WARNINGS_solstudio := SEC_ARR_OUTSIDE_BOUND_READ \
+      SEC_ARR_OUTSIDE_BOUND_WRITE
+  endif
 endif
 
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
@@ -223,6 +228,7 @@ $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
     vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
     arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
     DISABLED_WARNINGS_clang := tautological-compare, \
+    DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
     DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \
         1540-1088 1500-010, \
     ASFLAGS := $(JVM_ASFLAGS), \
diff --git a/src/java.base/solaris/native/libjvm_db/libjvm_db.c b/src/java.base/solaris/native/libjvm_db/libjvm_db.c
index 73b26bcb9d5..ca512b8b746 100644
--- a/src/java.base/solaris/native/libjvm_db/libjvm_db.c
+++ b/src/java.base/solaris/native/libjvm_db/libjvm_db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -1393,6 +1393,7 @@ int Jlookup_by_regs(jvm_agent_t* J, const prgregset_t regs, char *name,
     bcp          = (uintptr_t) regs[R_L1];
     methodPtr = (uintptr_t) regs[R_L2];
     sender_sp = regs[R_I5];
+    fp = (uintptr_t) regs[R_FP];
     if (debug > 2) {
         fprintf(stderr, "\nregs[R_I1]=%lx, regs[R_I2]=%lx, regs[R_I5]=%lx, regs[R_L1]=%lx, regs[R_L2]=%lx\n",
                          regs[R_I1], regs[R_I2], regs[R_I5], regs[R_L1], regs[R_L2]);
diff --git a/test/fmw/gtest/src/gtest.cc b/test/fmw/gtest/src/gtest.cc
index 6de53dd0198..4c4ee86fe39 100644
--- a/test/fmw/gtest/src/gtest.cc
+++ b/test/fmw/gtest/src/gtest.cc
@@ -49,6 +49,9 @@
 #include <ostream>  // NOLINT
 #include <sstream>
 #include <vector>
+#if defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5140
+#pragma error_messages(off, SEC_NULL_PTR_DEREF)
+#endif
 
 #if GTEST_OS_LINUX
 
diff --git a/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/liboverflow.c b/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/liboverflow.c
index 36b5dae9fb0..254a3a61b65 100644
--- a/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/liboverflow.c
+++ b/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc/liboverflow.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -26,6 +26,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <jni.h>
+#if defined (__SUNPRO_C) && __SUNPRO_C >= 0x5140
+#pragma error_messages(off, SEC_ARR_OUTSIDE_BOUND_READ)
+#endif
 
 #ifdef __cplusplus
 extern "C" {

From cf329236c439e34d5ad13992217bf8311cb7d878 Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Thu, 5 Apr 2018 21:29:02 +0200
Subject: [PATCH 080/196] 8199608: Clean up LDFLAGS for libfontmanager
 Reviewed-by: erikj

---
 make/lib/Awt2dLibraries.gmk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index 06f1b6c8e84..4085062f862 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -651,10 +651,11 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
     LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
-    LDFLAGS_macosx := -undefined dynamic_lookup, \
     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
     LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
-    LIBS_aix := -lawt_headless,\
+    LIBS_aix := -lawt_headless, \
+    LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \
+        -framework CoreGraphics, \
     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
         $(WIN_AWT_LIB), \
 ))
@@ -665,6 +666,10 @@ ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
 endif
 
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_LWAWT)
+endif
+
 ifeq ($(FREETYPE_TO_USE), bundled)
   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE)
 endif

From 1610b1a15c0a1c053b7bde1020aad0acb49e1d96 Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Thu, 5 Apr 2018 21:33:38 +0200
Subject: [PATCH 081/196] 8200358: Remove mapfiles for JDK executables
 Reviewed-by: erikj

---
 make/autoconf/flags.m4                        |   8 +-
 make/autoconf/spec.gmk.in                     |   6 -
 make/autoconf/toolchain.m4                    |  18 ---
 make/common/NativeCompilation.gmk             | 122 +++++++-----------
 make/launcher/Launcher-jdk.pack.gmk           |  35 ++---
 make/launcher/LauncherCommon.gmk              |  41 +++---
 make/mapfiles/launchers/mapfile-ppc64         |  39 ------
 .../launchers/mapfile-ppc64.anonymous         |  40 ------
 make/mapfiles/launchers/mapfile-sparc         |  47 -------
 make/mapfiles/launchers/mapfile-sparcv9       |  48 -------
 make/mapfiles/launchers/mapfile-x86           |  48 -------
 make/mapfiles/launchers/mapfile-x86.anonymous |  49 -------
 make/mapfiles/launchers/mapfile-x86_64        |  47 -------
 .../launchers/mapfile-x86_64.anonymous        |  40 ------
 .../mapfiles/libunpack/mapfile-vers-unpack200 |  31 -----
 .../mapfile-vers-unpack200-solaris-sparc      |  42 ------
 .../mapfile-vers-unpack200-solaris-x86        |  43 ------
 .../mapfile-vers-unpack200.anonymous          |  34 -----
 src/java.base/share/native/launcher/main.c    |   5 +-
 src/jdk.pack/share/native/unpack200/main.cpp  |   4 +-
 20 files changed, 97 insertions(+), 650 deletions(-)
 delete mode 100644 make/mapfiles/launchers/mapfile-ppc64
 delete mode 100644 make/mapfiles/launchers/mapfile-ppc64.anonymous
 delete mode 100644 make/mapfiles/launchers/mapfile-sparc
 delete mode 100644 make/mapfiles/launchers/mapfile-sparcv9
 delete mode 100644 make/mapfiles/launchers/mapfile-x86
 delete mode 100644 make/mapfiles/launchers/mapfile-x86.anonymous
 delete mode 100644 make/mapfiles/launchers/mapfile-x86_64
 delete mode 100644 make/mapfiles/launchers/mapfile-x86_64.anonymous
 delete mode 100644 make/mapfiles/libunpack/mapfile-vers-unpack200
 delete mode 100644 make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc
 delete mode 100644 make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86
 delete mode 100644 make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous

diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
index 1ac9df39ef2..fef76f8fbba 100644
--- a/make/autoconf/flags.m4
+++ b/make/autoconf/flags.m4
@@ -241,7 +241,7 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
        test "x$OPENJDK_TARGET_CPU" != xmips &&
        test "x$OPENJDK_TARGET_CPU" != xmipsel &&
        test "x$OPENJDK_TARGET_CPU" != xmips64 &&
-       test "x$OPENJDK_TARGET_CPU" != xmips64el; then 
+       test "x$OPENJDK_TARGET_CPU" != xmips64el; then
       MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
     fi
   fi
@@ -325,22 +325,18 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
 
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     CC_OUT_OPTION=-Fo
-    EXE_OUT_OPTION=-out:
     LD_OUT_OPTION=-out:
     AR_OUT_OPTION=-out:
   else
     # The option used to specify the target .o,.a or .so file.
     # When compiling, how to specify the to be created object file.
     CC_OUT_OPTION='-o$(SPACE)'
-    # When linking, how to specify the to be created executable.
-    EXE_OUT_OPTION='-o$(SPACE)'
-    # When linking, how to specify the to be created dynamically linkable library.
+    # When linking, how to specify the output
     LD_OUT_OPTION='-o$(SPACE)'
     # When archiving, how to specify the to be create static archive for object files.
     AR_OUT_OPTION='rcs$(SPACE)'
   fi
   AC_SUBST(CC_OUT_OPTION)
-  AC_SUBST(EXE_OUT_OPTION)
   AC_SUBST(LD_OUT_OPTION)
   AC_SUBST(AR_OUT_OPTION)
 
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index b7a278b7244..d8934e7da18 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -395,7 +395,6 @@ COMPILER_COMMAND_FILE_FLAG:=@COMPILER_COMMAND_FILE_FLAG@
 COMPILER_BINDCMD_FILE_FLAG:=@COMPILER_BINDCMD_FILE_FLAG@
 
 CC_OUT_OPTION:=@CC_OUT_OPTION@
-EXE_OUT_OPTION:=@EXE_OUT_OPTION@
 LD_OUT_OPTION:=@LD_OUT_OPTION@
 AR_OUT_OPTION:=@AR_OUT_OPTION@
 
@@ -460,11 +459,6 @@ LD:=@FIXPATH@ @LD@
 # Xcode SDK path
 SDKROOT:=@SDKROOT@
 
-# The linker on older SuSE distros (e.g. on SLES 10) complains with:
-# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
-# if feeded with a version script which contains named tags.
-USING_BROKEN_SUSE_LD:=@USING_BROKEN_SUSE_LD@
-
 # LDFLAGS used to link the jdk native libraries (C-code)
 LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
 JDKLIB_LIBS:=@JDKLIB_LIBS@
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index a95759f4768..91fabcd4f49 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -1022,24 +1022,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
     # This is later checked when setting flags.
   fi
 
-  # Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed
-  # in executable.'
-  USING_BROKEN_SUSE_LD=no
-  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$TOOLCHAIN_TYPE" = xgcc; then
-    AC_MSG_CHECKING([for broken SuSE 'ld' which only understands anonymous version tags in executables])
-    $ECHO "SUNWprivate_1.1 { local: *; };" > version-script.map
-    $ECHO "int main() { }" > main.c
-    if $CXX -Wl,-version-script=version-script.map main.c 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
-      AC_MSG_RESULT(no)
-      USING_BROKEN_SUSE_LD=no
-    else
-      AC_MSG_RESULT(yes)
-      USING_BROKEN_SUSE_LD=yes
-    fi
-    $RM version-script.map main.c a.out
-  fi
-  AC_SUBST(USING_BROKEN_SUSE_LD)
-
   # Setup hotspot lecagy names for toolchains
   HOTSPOT_TOOLCHAIN_TYPE=$TOOLCHAIN_TYPE
   if test "x$TOOLCHAIN_TYPE" = xclang; then
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 569ee1321b0..da4d24d1c4c 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -860,10 +860,48 @@ define SetupNativeCompilationBody
     endif
   endif
 
-  ifeq ($$($1_TYPE), LIBRARY)
-    # Generating a dynamic library.
-    $1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
+  ifeq ($$($1_TYPE), STATIC_LIBRARY)
+    $1_VARDEPS := $$($1_AR) $$($1_ARFLAGS) $$($1_LIBS) \
+        $$($1_EXTRA_LIBS)
+    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
+        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
+
+    # Generating a static library, ie object file archive.
+    ifeq ($(STATIC_BUILD), true)
+      ifeq ($$($1_USE_MAPFILE_FOR_SYMBOLS), true)
+        STATIC_MAPFILE_DEP := $$($1_MAPFILE)
+      endif
+    endif
+
+    $$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_VARDEPS_FILE) $$(STATIC_MAPFILE_DEP)
+	$$(call LogInfo, Building static library $$($1_BASENAME))
+	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
+	    $$($1_AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_ALL_OBJS) \
+	        $$($1_RES))
+        ifeq ($(STATIC_BUILD), true)
+          ifeq ($$($1_USE_MAPFILE_FOR_SYMBOLS), true)
+	    $(CP) $$($1_MAPFILE) $$(@D)/$$(basename $$(@F)).symbols
+          else
+	    $(GetSymbols)
+          endif
+        endif
+  else
+    # A shared dynamic library or an executable binary has been specified
+    ifeq ($$($1_TYPE), LIBRARY)
+      # Generating a dynamic library.
+      $1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
+
+      # Create loadmap on AIX. Helps in diagnosing some problems.
+      ifneq ($(COMPILER_BINDCMD_FILE_FLAG), )
+        $1_EXTRA_LDFLAGS += $(COMPILER_BINDCMD_FILE_FLAG)$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).loadmap
+      endif
+    endif
+
     ifeq ($(OPENJDK_TARGET_OS), windows)
+      ifeq ($$($1_EMBED_MANIFEST), true)
+        $1_EXTRA_LDFLAGS += -manifest:embed
+      endif
+
       $1_IMPORT_LIBRARY := $$($1_OBJECT_DIR)/$$($1_NAME).lib
       $1_EXTRA_LDFLAGS += "-implib:$$($1_IMPORT_LIBRARY)"
       # To properly trigger downstream dependants of the import library, just as
@@ -882,13 +920,9 @@ define SetupNativeCompilationBody
 		$(TOUCH) $$@
     endif
 
-    # Create loadmap on AIX. Helps in diagnosing some problems.
-    ifneq ($(COMPILER_BINDCMD_FILE_FLAG), )
-      $1_EXTRA_LDFLAGS += $(COMPILER_BINDCMD_FILE_FLAG)$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).loadmap
-    endif
-
     $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
-        $$(GLOBAL_LIBS) $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_CREATE_DEBUGINFO_CMDS) \
+        $$(GLOBAL_LIBS) $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \
+        $$($1_CODESIGN) $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \
         $$($1_STRIP_CMD)
     $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
         $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
@@ -927,8 +961,8 @@ define SetupNativeCompilationBody
       endif
     endif
 
-    $$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_REAL_MAPFILE) \
-        $$($1_VARDEPS_FILE)
+    $$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_MANIFEST) \
+        $$($1_REAL_MAPFILE) $$($1_VARDEPS_FILE)
                 ifneq ($$($1_OBJ_FILE_LIST), )
                   ifeq ($$($1_LINK_OBJS_RELATIVE), true)
 		    $$(eval $$(call ListPathsSafely, $1_ALL_OBJS_RELATIVE, $$($1_OBJ_FILE_LIST)))
@@ -942,74 +976,21 @@ define SetupNativeCompilationBody
                 ifeq ($(OPENJDK_TARGET_OS), windows)
 		  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
 		      $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
-		      $(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$(GLOBAL_LIBS) \
-		      $$($1_LIBS) $$($1_EXTRA_LIBS)) \
+		          $(LD_OUT_OPTION)$$($1_TARGET) $$($1_LD_OBJ_ARG) $$($1_RES) $$(GLOBAL_LIBS) \
+		          $$($1_LIBS) $$($1_EXTRA_LIBS)) \
 		      | $(GREP) -v "^   Creating library .*\.lib and object .*\.exp" || \
-		      test "$$$$?" = "1" ; \
+		          test "$$$$?" = "1" ; \
 		  $$($1_CREATE_DEBUGINFO_CMDS)
 		  $$($1_STRIP_CMD)
                 else
 		  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
 		      $$(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
 		      $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
-		      $(LD_OUT_OPTION)$$@ $$($1_LD_OBJ_ARG) $$($1_RES) $$(GLOBAL_LIBS) \
-		      $$($1_LIBS) $$($1_EXTRA_LIBS)) ; \
+		          $(LD_OUT_OPTION)$$($1_TARGET) $$($1_LD_OBJ_ARG) $$($1_RES) $$(GLOBAL_LIBS) \
+		          $$($1_LIBS) $$($1_EXTRA_LIBS)) ; \
 		  $$($1_CREATE_DEBUGINFO_CMDS)
 		  $$($1_STRIP_CMD)
                 endif
-
-  endif
-
-  ifeq ($$($1_TYPE), STATIC_LIBRARY)
-    $1_VARDEPS := $$($1_AR) $$($1_ARFLAGS) $$($1_LIBS) \
-        $$($1_EXTRA_LIBS)
-    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
-
-    # Generating a static library, ie object file archive.
-    ifeq ($(STATIC_BUILD), true)
-      ifeq ($$($1_USE_MAPFILE_FOR_SYMBOLS), true)
-        STATIC_MAPFILE_DEP := $$($1_MAPFILE)
-      endif
-    endif
-
-    $$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_VARDEPS_FILE) $$(STATIC_MAPFILE_DEP)
-	$$(call LogInfo, Building static library $$($1_BASENAME))
-	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
-	    $$($1_AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_ALL_OBJS) \
-	        $$($1_RES))
-        ifeq ($(STATIC_BUILD), true)
-          ifeq ($$($1_USE_MAPFILE_FOR_SYMBOLS), true)
-	    $(CP) $$($1_MAPFILE) $$(@D)/$$(basename $$(@F)).symbols
-          else
-	    $(GetSymbols)
-          endif
-        endif
-  endif
-
-  ifeq ($$($1_TYPE), EXECUTABLE)
-    # A executable binary has been specified, setup the target for it.
-    $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
-        $$(GLOBAL_LIBS) $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \
-        $$($1_CODESIGN) $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \
-        $$($1_STRIP_CMD)
-    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
-
-    ifeq ($(OPENJDK_TARGET_OS), windows)
-      ifeq ($$($1_EMBED_MANIFEST), true)
-        $1_EXTRA_LDFLAGS += -manifest:embed
-      endif
-    endif
-
-    $$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_MANIFEST) \
-        $$($1_VARDEPS_FILE)
-		$$(call LogInfo, Linking executable $$($1_BASENAME))
-		$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
-		    $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
-		        $(EXE_OUT_OPTION)$$($1_TARGET) \
-		        $$($1_ALL_OBJS) $$($1_RES) \
-		        $$(GLOBAL_LIBS) $$($1_LIBS) $$($1_EXTRA_LIBS))
                 ifeq ($(OPENJDK_TARGET_OS), windows)
                   ifneq ($$($1_MANIFEST), )
 		    $$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1
@@ -1022,9 +1003,6 @@ define SetupNativeCompilationBody
 		    $(CODESIGN) -s openjdk_codesign $$@
                   endif
                 endif
-		$$($1_CREATE_DEBUGINFO_CMDS)
-		$$($1_STRIP_CMD)
-
   endif
 endef
 
diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk
index 51047c5fe6b..1e7debfda32 100644
--- a/make/launcher/Launcher-jdk.pack.gmk
+++ b/make/launcher/Launcher-jdk.pack.gmk
@@ -34,6 +34,25 @@ $(eval $(call SetupBuildLauncher, pack200, \
 # The order of the object files on the link command line affects the size of the resulting
 # binary (at least on linux) which causes the size to differ between old and new build.
 
+# Tell the compiler not to export any functions unless declared so in
+# the source code. On Windows, this is the default and cannot be changed.
+# On Mac, we have always exported all symbols, probably due to oversight
+# and/or misunderstanding. To emulate this, don't hide any symbols
+# by default.
+# Also provide an override for non-conformant libraries.
+ifeq ($(TOOLCHAIN_TYPE), gcc)
+  CXXFLAGS_JDKEXE += -fvisibility=hidden
+  LDFLAGS_JDKEXE += -Wl,--exclude-libs,ALL
+else ifeq ($(TOOLCHAIN_TYPE), clang)
+  ifneq ($(OPENJDK_TARGET_OS), macosx)
+    CXXFLAGS_JDKEXE += -fvisibility=hidden
+  endif
+else ifeq ($(TOOLCHAIN_TYPE), solstudio)
+  CXXFLAGS_JDKEXE += -xldscope=hidden
+else ifeq ($(TOOLCHAIN_TYPE), xlc)
+  CXXFLAGS_JDKEXE += -qvisibility=hidden
+endif
+
 UNPACKEXE_SRC := $(TOPDIR)/src/jdk.pack/share/native/common-unpack \
     $(TOPDIR)/src/jdk.pack/share/native/unpack200
 UNPACKEXE_CFLAGS := -I$(TOPDIR)/src/jdk.pack/share/native/common-unpack \
@@ -58,21 +77,6 @@ else
 
 endif
 
-UNPACK_MAPFILE_DIR := $(TOPDIR)/make/mapfiles/libunpack
-UNPACK_MAPFILE_PLATFORM_FILE := \
-    $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH)
-
-# The linker on older SuSE distros (e.g. on SLES 10) complains with:
-# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
-# if feeded with a version script which contains named tags.
-ifeq ($(USING_BROKEN_SUSE_LD), yes)
-  UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200.anonymous
-else ifneq ($(wildcard $(UNPACK_MAPFILE_PLATFORM_FILE)), )
-  UNPACK_MAPFILE := $(UNPACK_MAPFILE_PLATFORM_FILE)
-else
-  UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200
-endif
-
 $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \
     NAME := unpack200, \
     SRC := $(UNPACKEXE_SRC), \
@@ -84,7 +88,6 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \
     CFLAGS_solaris := -KPIC, \
     CFLAGS_macosx := -fPIC, \
     DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \
-    MAPFILE := $(UNPACK_MAPFILE),\
     LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
         $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk
index 05cf6bc4c89..d7e3fa8cd6c 100644
--- a/make/launcher/LauncherCommon.gmk
+++ b/make/launcher/LauncherCommon.gmk
@@ -26,11 +26,9 @@
 include JdkNativeCompilation.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  DISABLE_MAPFILES := true
   ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
 else
   ifeq ($(OPENJDK_TARGET_OS), windows)
-    DISABLE_MAPFILES := true
   endif
   ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,/../lib/jli)
 
@@ -42,8 +40,27 @@ else
   endif
 endif
 
+# Tell the compiler not to export any functions unless declared so in
+# the source code. On Windows, this is the default and cannot be changed.
+# On Mac, we have always exported all symbols, probably due to oversight
+# and/or misunderstanding. To emulate this, don't hide any symbols
+# by default.
+# Also provide an override for non-conformant libraries.
+ifeq ($(TOOLCHAIN_TYPE), gcc)
+  LAUNCHER_CFLAGS += -fvisibility=hidden
+  LDFLAGS_JDKEXE += -Wl,--exclude-libs,ALL
+else ifeq ($(TOOLCHAIN_TYPE), clang)
+  ifneq ($(OPENJDK_TARGET_OS), macosx)
+    LAUNCHER_CFLAGS += -fvisibility=hidden
+  endif
+else ifeq ($(TOOLCHAIN_TYPE), solstudio)
+  LAUNCHER_CFLAGS += -xldscope=hidden
+else ifeq ($(TOOLCHAIN_TYPE), xlc)
+  LAUNCHER_CFLAGS += -qvisibility=hidden
+endif
+
 LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher
-LAUNCHER_CFLAGS := -I$(TOPDIR)/src/java.base/share/native/launcher \
+LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/launcher \
     -I$(TOPDIR)/src/java.base/share/native/libjli \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
@@ -157,23 +174,6 @@ define SetupBuildLauncherBody
     $1_WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
   endif
 
-  # The linker on older SuSE distros (e.g. on SLES 10) complains with:
-  # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
-  # if feeded with a version script which contains named tags.
-  ifeq ($(USING_BROKEN_SUSE_LD),yes)
-    ifneq ($(wildcard $(TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous), )
-      $1_MAPFILE := $(TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous
-    else
-      $1_MAPFILE :=
-    endif
-  else
-    ifneq ($(wildcard $(TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), )
-      $1_MAPFILE := $(TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
-    else
-      $1_MAPFILE :=
-    endif
-  endif
-
   $$(eval $$(call SetupJdkExecutable, BUILD_LAUNCHER_$1, \
       NAME := $1, \
       EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \
@@ -194,7 +194,6 @@ define SetupBuildLauncherBody
           -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli, \
       LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
           -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli, \
-      MAPFILE := $$($1_MAPFILE), \
       LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \
       LIBS_unix := $$($1_LIBS_unix), \
       LIBS_linux := -lpthread -ljli $(LIBDL), \
diff --git a/make/mapfiles/launchers/mapfile-ppc64 b/make/mapfiles/launchers/mapfile-ppc64
deleted file mode 100644
index fb4ceb5cd3a..00000000000
--- a/make/mapfiles/launchers/mapfile-ppc64
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2004, 2012, 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.
-#
-#
-# Specify what global symbols we export.  Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
-	global:
-		main;		# Provides basic adb symbol offsets
-		environ;	# Public symbols and required by Java run time
-		_environ;
-		__environ_lock;
-
-	local:
-		*;
-};
diff --git a/make/mapfiles/launchers/mapfile-ppc64.anonymous b/make/mapfiles/launchers/mapfile-ppc64.anonymous
deleted file mode 100644
index 4fcde94d1d8..00000000000
--- a/make/mapfiles/launchers/mapfile-ppc64.anonymous
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2004, 2012, 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.
-#
-#
-# Define anonymous library interface (i.e. without a version tag) for broken SuSE ld because
-# the linker on older SuSE distros (e.g. on SLES 10) complains with:
-# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
-# if feeded with a version script which contains named tags.
-
-{
-	global:
-		main;		# Provides basic adb symbol offsets
-		environ;	# Public symbols and required by Java run time
-		_environ;
-		__environ_lock;
-
-	local:
-		*;
-};
diff --git a/make/mapfiles/launchers/mapfile-sparc b/make/mapfiles/launchers/mapfile-sparc
deleted file mode 100644
index b699b6571c6..00000000000
--- a/make/mapfiles/launchers/mapfile-sparc
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2004, 2013, 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.
-#
-# Specify what global symbols we export.  Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
-	global:
-		main;		# Provides basic adb symbol offsets
-		environ;	# Public symbols and required by Java run time
-		_environ;
-		__environ_lock;
-		___Argv;	# The following are private, but as they are
-		_start;		# exported from ctr1/crtn, the clever hacker
-		_init;		# might know about them.  However note, that
-		_fini;		# their use is strictly not supported.
-		_lib_version;
-		__cg92_used;
-		__xargc;
-		__xargv;
-		__fsr_init_value;
-
-	local:
-		*;
-};
diff --git a/make/mapfiles/launchers/mapfile-sparcv9 b/make/mapfiles/launchers/mapfile-sparcv9
deleted file mode 100644
index 59e89b38ed4..00000000000
--- a/make/mapfiles/launchers/mapfile-sparcv9
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2004, 2013, 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.
-#
-
-#
-# Specify what global symbols we export.  Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
-	global:
-		main;		# Provides basic adb symbol offsets
-		environ;	# Public symbols and required by Java run time
-		_environ;
-		__environ_lock;
-		___Argv;	# The following are private, but as they are
-		_start;		# exported from ctr1/crtn, the clever hacker
-		_init;		# might know about them.  However note, that
-		_fini;		# their use is strictly not supported.
-		_lib_version;
-		__xargc;
-		__xargv;
-		__fsr_init_value;
-
-	local:
-		*;
-};
diff --git a/make/mapfiles/launchers/mapfile-x86 b/make/mapfiles/launchers/mapfile-x86
deleted file mode 100644
index dcda7f94957..00000000000
--- a/make/mapfiles/launchers/mapfile-x86
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2004, 2013, 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.
-#
-#
-# Specify what global symbols we export.  Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
-	global:
-		main;		# Provides basic adb symbol offsets
-		environ;	# Public symbols and required by Java run time
-		_environ;
-		__environ_lock;
-		___Argv;	# The following are private, but as they are
-		_start;		# exported from ctr1/crtn, the clever hacker
-		_init;		# might know about them.  However note, that
-		_fini;		# their use is strictly not supported.
-		_lib_version;
-#		_mcount;
-		__fsr;
-		__fsr_init_value;
-		__longdouble_used;
-
-	local:
-		*;
-};
diff --git a/make/mapfiles/launchers/mapfile-x86.anonymous b/make/mapfiles/launchers/mapfile-x86.anonymous
deleted file mode 100644
index 49032cd10df..00000000000
--- a/make/mapfiles/launchers/mapfile-x86.anonymous
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2004, 2012, 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.
-#
-#
-# Define anonymous library interface (i.e. without a version tag) for broken SuSE ld because
-# the linker on older SuSE distros (e.g. on SLES 10) complains with:
-# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
-# if feeded with a version script which contains named tags.
-
-{
-	global:
-		main;		# Provides basic adb symbol offsets
-		environ;	# Public symbols and required by Java run time
-		_environ;
-		__environ_lock;
-		___Argv;	# The following are private, but as they are
-		_start;		# exported from ctr1/crtn, the clever hacker
-		_init;		# might know about them.  However note, that
-		_fini;		# their use is strictly not supported.
-		_lib_version;
-#		_mcount;
-		__fsr;
-		__fsr_init_value;
-		__longdouble_used;
-
-	local:
-		*;
-};
diff --git a/make/mapfiles/launchers/mapfile-x86_64 b/make/mapfiles/launchers/mapfile-x86_64
deleted file mode 100644
index 5700d67f2a0..00000000000
--- a/make/mapfiles/launchers/mapfile-x86_64
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2004, 2013, 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.
-#
-#
-# Specify what global symbols we export.  Note that we're not really
-# interested in declaring a version, simply scoping the file is sufficient.
-#
-
-SUNWprivate_1.1 {
-	global:
-		main;		# Provides basic adb symbol offsets
-		environ;	# Public symbols and required by Java run time
-		_environ;
-		__environ_lock;
-
-		# These are needed by the c runtime in SS12u4
-		___Argv;
-		__xargv;
-		__xargc;
-		_start;
-		__longdouble_used;
-		_lib_version;
-
-	local:
-		*;
-};
diff --git a/make/mapfiles/launchers/mapfile-x86_64.anonymous b/make/mapfiles/launchers/mapfile-x86_64.anonymous
deleted file mode 100644
index 4fcde94d1d8..00000000000
--- a/make/mapfiles/launchers/mapfile-x86_64.anonymous
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2004, 2012, 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.
-#
-#
-# Define anonymous library interface (i.e. without a version tag) for broken SuSE ld because
-# the linker on older SuSE distros (e.g. on SLES 10) complains with:
-# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
-# if feeded with a version script which contains named tags.
-
-{
-	global:
-		main;		# Provides basic adb symbol offsets
-		environ;	# Public symbols and required by Java run time
-		_environ;
-		__environ_lock;
-
-	local:
-		*;
-};
diff --git a/make/mapfiles/libunpack/mapfile-vers-unpack200 b/make/mapfiles/libunpack/mapfile-vers-unpack200
deleted file mode 100644
index 6b082505878..00000000000
--- a/make/mapfiles/libunpack/mapfile-vers-unpack200
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2011, 2013, 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.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
-	local:
-	    *;
-};
diff --git a/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc b/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc
deleted file mode 100644
index d8942de5c25..00000000000
--- a/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-sparc
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2011, 2013, 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.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
-	global:
-		# These are needed by the c runtime in SS12u4
-		environ;
-		_environ;
-		__environ_lock;
-		___Argv;
-		__xargv;
-		__xargc;
-		_start;
-		_lib_version;
-
-	local:
-	    *;
-};
diff --git a/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86 b/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86
deleted file mode 100644
index 4192b939cfd..00000000000
--- a/make/mapfiles/libunpack/mapfile-vers-unpack200-solaris-x86
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2011, 2018, 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.
-#
-
-# Define library interface.
-
-SUNWprivate_1.1 {
-	global:
-		# These are needed by the c runtime in SS12u4
-		environ;
-		_environ;
-		__environ_lock;
-		___Argv;
-		__xargv;
-		__xargc;
-		_start;
-		__longdouble_used;
-		_lib_version;
-
-	local:
-	    *;
-};
diff --git a/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous b/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous
deleted file mode 100644
index 7f3a07934bd..00000000000
--- a/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-# Define anonymous library interface (i.e. without a version tag) for broken SuSE ld because
-# the linker on older SuSE distros (e.g. on SLES 10) complains with:
-# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
-# if feeded with a version script which contains named tags.
-
-{
-	local:
-	    *;
-};
diff --git a/src/java.base/share/native/launcher/main.c b/src/java.base/share/native/launcher/main.c
index 5c743659fd4..58ed4702e12 100644
--- a/src/java.base/share/native/launcher/main.c
+++ b/src/java.base/share/native/launcher/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -32,6 +32,7 @@
 
 #include "defines.h"
 #include "jli_util.h"
+#include "jni.h"
 
 #ifdef _MSC_VER
 #if _MSC_VER > 1400 && _MSC_VER < 1600
@@ -92,7 +93,7 @@ WinMain(HINSTANCE inst, HINSTANCE previnst, LPSTR cmdline, int cmdshow)
     __initenv = _environ;
 
 #else /* JAVAW */
-int
+JNIEXPORT int JNICALL
 main(int argc, char **argv)
 {
     int margc;
diff --git a/src/jdk.pack/share/native/unpack200/main.cpp b/src/jdk.pack/share/native/unpack200/main.cpp
index 286a8732cc8..8ff25d1b476 100644
--- a/src/jdk.pack/share/native/unpack200/main.cpp
+++ b/src/jdk.pack/share/native/unpack200/main.cpp
@@ -45,6 +45,7 @@
 #define THREAD_SELF ((THRTYPE)pthread_self())
 #endif
 
+#include "jni.h"
 #include "defines.h"
 #include "bytes.h"
 #include "utils.h"
@@ -58,7 +59,8 @@
 #include "unpack.h"
 
 
-int main(int argc, char **argv) {
+JNIEXPORT int JNICALL
+main(int argc, char **argv) {
     return unpacker::run(argc, argv);
 }
 

From 7c08642147c32860c1dee85cc9da9a086399f6af Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Thu, 5 Apr 2018 23:46:05 +0200
Subject: [PATCH 082/196] 8199539: Provide a standard way for the build to
 filter un-needed legal .md files Reviewed-by: tbell, ihse

---
 make/CreateJmods.gmk            | 11 ++++++++---
 make/common/Modules.gmk         |  7 +++----
 make/copy/Copy-java.base.gmk    | 18 +++++++++++++++++-
 make/copy/Copy-java.desktop.gmk | 32 ++++++++++++++++++++++++++++++++
 make/copy/CopyCommon.gmk        | 21 +++++++++++++++++++++
 5 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index 0b530bb8b6b..9373499ace7 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -80,10 +80,15 @@ ifneq ($(MAN_DIR), )
   DEPS += $(call CacheFind, $(MAN_DIR))
 endif
 
+# If a specific modules_legal dir exists for this module, only pick up files
+# from there. These files were explicitly filtered or modified in <module>-copy
+# targets. For the rest, just pick up everything from the source legal dirs.
 LEGAL_NOTICES := \
-    $(call uniq, $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
-    $(call FindModuleLegalDirs, $(MODULE))) \
-    #
+    $(SUPPORT_OUTPUTDIR)/modules_legal/common \
+    $(if $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \
+      $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \
+      $(call FindModuleLegalSrcDirs, $(MODULE)) \
+    )
 
 LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
 DEPS += $(call CacheFind, $(LEGAL_NOTICES))
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index ec4ec332542..d9e9352e118 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -394,12 +394,11 @@ ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
 endif
 LEGAL_SUBDIRS += share/legal
 
-# Find all legal dirs for a particular module
+# Find all legal src dirs for a particular module
 # $1 - Module to find legal dirs for
-FindModuleLegalDirs = \
+FindModuleLegalSrcDirs = \
     $(strip $(wildcard \
-        $(addsuffix /$(strip $1), $(SUPPORT_OUTPUTDIR)/modules_legal \
-            $(IMPORT_MODULES_LEGAL)) \
+        $(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \
         $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))) \
     ))
 
diff --git a/make/copy/Copy-java.base.gmk b/make/copy/Copy-java.base.gmk
index 096f6c0e903..6d94bfc16d2 100644
--- a/make/copy/Copy-java.base.gmk
+++ b/make/copy/Copy-java.base.gmk
@@ -24,6 +24,7 @@
 #
 
 include CopyCommon.gmk
+include Modules.gmk
 include TextFileProcessing.gmk
 
 $(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk))
@@ -224,12 +225,27 @@ JDK_ADDITIONAL_LICENSE_INFO  ?= $(wildcard $(TOPDIR)/ADDITIONAL_LICENSE_INFO)
 
 $(eval $(call SetupCopyFiles, COPY_JDK_NOTICES, \
     FILES := $(JDK_LICENSE) $(JDK_NOTICE) $(JDK_ADDITIONAL_LICENSE_INFO), \
-    DEST := $(LEGAL_DST_DIR), \
+    DEST := $(COMMON_LEGAL_DST_DIR), \
     FLATTEN := true, \
 ))
 
 TARGETS += $(COPY_JDK_NOTICES)
 
+################################################################################
+#
+# Copy and filter the legal files depending on what 3rd party components are
+# bundled or linked from the OS.
+#
+ifeq ($(USE_EXTERNAL_LIBZ), true)
+  LEGAL_EXCLUDES += zlib.md
+endif
+
+$(eval $(call SetupCopyLegalFiles, COPY_LEGAL, \
+    EXCLUDES := $(LEGAL_EXCLUDES), \
+))
+
+TARGETS += $(COPY_LEGAL)
+
 ################################################################################
 # Optionally copy libffi.so.? into the the image
 
diff --git a/make/copy/Copy-java.desktop.gmk b/make/copy/Copy-java.desktop.gmk
index b4f28a96a26..a5e1f98302d 100644
--- a/make/copy/Copy-java.desktop.gmk
+++ b/make/copy/Copy-java.desktop.gmk
@@ -24,6 +24,7 @@
 #
 
 include CopyCommon.gmk
+include Modules.gmk
 
 $(eval $(call IncludeCustomExtension, copy/Copy-java.desktop.gmk))
 
@@ -48,3 +49,34 @@ $(LIB_DST_DIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
 TARGETS += $(PSFONTPROPFILE_TARGET_FILES)
 
 ################################################################################
+#
+# Copy and filter the legal files depending on what 3rd party components are
+# bundled or linked from the OS.
+#
+ifeq ($(USE_EXTERNAL_LIBJPEG), true)
+  LEGAL_EXCLUDES += jpeg.md
+endif
+
+ifeq ($(USE_EXTERNAL_LIBGIF), true)
+  LEGAL_EXCLUDES += giflib.md
+endif
+
+ifeq ($(USE_EXTERNAL_LIBPNG), true)
+  LEGAL_EXCLUDES += libpng.md
+endif
+
+ifeq ($(USE_EXTERNAL_LCMS), true)
+  LEGAL_EXCLUDES += lcms.md
+endif
+
+ifeq ($(FREETYPE_TO_USE), system)
+  LEGAL_EXCLUDES += freetype.md
+endif
+
+$(eval $(call SetupCopyLegalFiles, COPY_LEGAL, \
+    EXCLUDES := $(LEGAL_EXCLUDES), \
+))
+
+TARGETS += $(COPY_LEGAL)
+
+################################################################################
diff --git a/make/copy/CopyCommon.gmk b/make/copy/CopyCommon.gmk
index 6d4cdbaf747..60ae6b3b214 100644
--- a/make/copy/CopyCommon.gmk
+++ b/make/copy/CopyCommon.gmk
@@ -26,6 +26,7 @@
 LIB_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
 CONF_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE)
 LEGAL_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)
+COMMON_LEGAL_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_legal/common
 
 ################################################################################
 #
@@ -60,3 +61,23 @@ ifneq ($(wildcard $(INCLUDE_SOURCE_OS_DIR)/*), )
 
   TARGETS += $(COPY_EXPORTED_INCLUDE_OS)
 endif
+
+################################################################################
+# Setup make rules for copying legal files. This is only needed if the files
+# need to be filtered due to optional components being enabled/disabled.
+# Otherwise CreateJmods.gmk will find the legal files in the original src dirs.
+#
+# Parameter 1 is the name of the rule.
+#
+# Remaining parameters are named arguments. These include:
+#   EXCLUDES : List of filenames to exclude from copy
+SetupCopyLegalFiles = $(NamedParamsMacroTemplate)
+define SetupCopyLegalFilesBody
+  $$(eval $$(call SetupCopyFiles, $1, \
+      SRC := $$(CUSTOM_ROOT), \
+      DEST := $$(LEGAL_DST_DIR), \
+      FILES := $$(filter-out $$(addprefix %/, $$($1_EXCLUDES)), \
+          $$(wildcard $$(addsuffix /*, $$(call FindModuleLegalSrcDirs, $$(MODULE))))), \
+      FLATTEN := true, \
+  ))
+endef

From b3db6df64ed793291d46bd4b1ac62f18a0ad81a5 Mon Sep 17 00:00:00 2001
From: anazarov <unknown>
Date: Thu, 5 Apr 2018 17:04:16 -0700
Subject: [PATCH 083/196] 8196750: [Testbug] tools/launcher tests need to
 tolerate unrelated warnings Reviewed-by: ksrini, dholmes

---
 test/jdk/tools/launcher/InfoStreams.java | 30 ++++++++++++++----------
 test/jdk/tools/launcher/ToolsOpts.java   | 22 +++++++++++------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/test/jdk/tools/launcher/InfoStreams.java b/test/jdk/tools/launcher/InfoStreams.java
index dc0e2da00b9..3102d91336b 100644
--- a/test/jdk/tools/launcher/InfoStreams.java
+++ b/test/jdk/tools/launcher/InfoStreams.java
@@ -52,27 +52,33 @@ public static void main(String ... args) throws Exception {
 
         String classPath = System.getProperty("java.class.path");
 
-        run("-help").stderrShouldMatch(USAGE).stdoutShouldNotMatch(".");
-        run("--help").stdoutShouldMatch(USAGE).stderrShouldNotMatch(".");
+        run("-help").stderrShouldMatch(USAGE).stdoutShouldNotMatch(USAGE);
+        run("--help").stdoutShouldMatch(USAGE).stderrShouldNotMatch(USAGE);
 
-        run("-version").stderrShouldMatch(VERSION_ERR).stdoutShouldNotMatch(".");
-        run("--version").stdoutShouldMatch(VERSION_OUT).stderrShouldNotMatch(".");
+        run("-version").stderrShouldMatch(VERSION_ERR)
+                       .stdoutShouldNotMatch(VERSION_ERR)
+                       .stdoutShouldNotMatch(VERSION_OUT);
+        run("--version").stdoutShouldMatch(VERSION_OUT)
+                        .stderrShouldNotMatch(VERSION_OUT)
+                        .stderrShouldNotMatch(VERSION_ERR);
 
         run("-showversion", "--dry-run", "-cp", classPath, "InfoStreams")
             .stderrShouldMatch(VERSION_ERR)
-            .stdoutShouldNotMatch(".");
+            .stdoutShouldNotMatch(VERSION_ERR)
+            .stdoutShouldNotMatch(VERSION_OUT);
         run("--show-version", "--dry-run", "-cp", classPath, "InfoStreams")
             .stdoutShouldMatch(VERSION_OUT)
-            .stderrShouldNotMatch(".");
+            .stderrShouldNotMatch(VERSION_OUT)
+            .stderrShouldNotMatch(VERSION_ERR);
 
         run("-fullversion").stderrShouldMatch(FULLVERSION_ERR)
-            .stdoutShouldNotMatch(".");
+                           .stdoutShouldNotMatch(FULLVERSION_ERR)
+                           .stdoutShouldNotMatch(FULLVERSION_OUT);
         run("--full-version").stdoutShouldMatch(FULLVERSION_OUT)
-            .stderrShouldNotMatch(".");
-
-        run("-X").stderrShouldMatch(NONSTD).stdoutShouldNotMatch(".");
-        run("--help-extra").stdoutShouldMatch(NONSTD).stderrShouldNotMatch(".");
+                             .stderrShouldNotMatch(FULLVERSION_OUT)
+                             .stderrShouldNotMatch(FULLVERSION_ERR);
 
+        run("-X").stderrShouldMatch(NONSTD).stdoutShouldNotMatch(NONSTD);
+        run("--help-extra").stdoutShouldMatch(NONSTD).stderrShouldNotMatch(NONSTD);
     }
-
 }
diff --git a/test/jdk/tools/launcher/ToolsOpts.java b/test/jdk/tools/launcher/ToolsOpts.java
index 1a9ee7a9388..858ba89775b 100644
--- a/test/jdk/tools/launcher/ToolsOpts.java
+++ b/test/jdk/tools/launcher/ToolsOpts.java
@@ -184,7 +184,6 @@ static void runTestOptions() throws IOException {
                     break;
             }
 
-            String[] output = tr.testOutput.toArray(new String[tr.testOutput.size()]);
             //-Joptions should not be passed to tool
             if (jpos > -1) {
                 checkJoptionOutput(tr, arg);
@@ -194,14 +193,23 @@ static void runTestOptions() throws IOException {
                             + "CMD: " + cmdString);
                 }
             } else {
-                //check that each non -J option was passed to tool.
+                // check that each non -J option was passed to tool. It looks for each arg in the output.
+                // Irrelevant lines in the output are skipped. Arguments order is checked as well.
+                int j = 0;
+                List<String> output = tr.testOutput;
                 for (int i = 0; i < arg.length; i++) {
-                    if (output[i].compareTo(arg[i]) != 0) {
+                    boolean found = false;
+                    for (; j < output.size(); j++) {
+                        if (output.get(j).equals(arg[i])) {
+                            pass("check " + output.get(j) + " == " + arg[i]);
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
                         throw new RuntimeException(
-                                "failed! CMD: " + cmdString + "\n   case:" +
-                                output[i] + " != " + arg[i]);
-                    } else {
-                        pass("check " + output[i] + " == " + arg[i]);
+                                "failed! Should have passed non -J option [" + arg[i] + "] to tool.\n"
+                                + "CMD: " + cmdString);
                     }
                 }
             }

From 7010eb80cb9f5cd364a23f31aa59760dbe338507 Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Thu, 5 Apr 2018 17:11:25 -0700
Subject: [PATCH 084/196] 8201221: JDK-8199608 introduced a build race on
 macosx Reviewed-by: darcy

---
 make/lib/Awt2dLibraries.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index 4085062f862..adc6c5826f8 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -667,7 +667,7 @@ ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_LWAWT)
+  $(BUILD_LIBFONTMANAGER): $(call FindLib, java.desktop, awt_lwawt)
 endif
 
 ifeq ($(FREETYPE_TO_USE), bundled)

From 13de403a3c7eb8fa7e4a0ae31850992e066a87f0 Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Fri, 6 Apr 2018 02:52:24 +0200
Subject: [PATCH 085/196] 8201222: JDK-8199539 broke the OpenJDK build
 Reviewed-by: darcy

---
 make/copy/CopyCommon.gmk | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/make/copy/CopyCommon.gmk b/make/copy/CopyCommon.gmk
index 60ae6b3b214..6450cb169f3 100644
--- a/make/copy/CopyCommon.gmk
+++ b/make/copy/CopyCommon.gmk
@@ -73,11 +73,12 @@ endif
 #   EXCLUDES : List of filenames to exclude from copy
 SetupCopyLegalFiles = $(NamedParamsMacroTemplate)
 define SetupCopyLegalFilesBody
-  $$(eval $$(call SetupCopyFiles, $1, \
-      SRC := $$(CUSTOM_ROOT), \
-      DEST := $$(LEGAL_DST_DIR), \
-      FILES := $$(filter-out $$(addprefix %/, $$($1_EXCLUDES)), \
-          $$(wildcard $$(addsuffix /*, $$(call FindModuleLegalSrcDirs, $$(MODULE))))), \
-      FLATTEN := true, \
-  ))
+  $$(foreach f, $$(filter-out $$(addprefix %/, $$($1_EXCLUDES)), \
+      $$(wildcard $$(addsuffix /*, $$(call FindModuleLegalSrcDirs, $$(MODULE))))), \
+    $$(eval $$(call SetupCopyFiles, $1_$$(notdir $$f), \
+        DEST := $$(LEGAL_DST_DIR), \
+        FILES := $$f, \
+    )) \
+    $$(eval $1 += $$($1_$$(notdir $$f))) \
+  )
 endef

From 437ff6f46bdb69ebc96bd46cb5354f3305472168 Mon Sep 17 00:00:00 2001
From: cushon <unknown>
Date: Thu, 5 Apr 2018 14:39:04 -0700
Subject: [PATCH 086/196] 8201194: Handle local variable declarations in lambda
 deduplication Reviewed-by: vromero

---
 .../sun/tools/javac/comp/LambdaToMethod.java  | 22 +-------
 .../com/sun/tools/javac/comp/TreeDiffer.java  | 33 ++++++++----
 .../com/sun/tools/javac/comp/TreeHasher.java  | 25 ++++++---
 .../lambda/deduplication/Deduplication.java   | 51 +++++++++++++-----
 .../deduplication/DeduplicationTest.java      | 53 +++++--------------
 5 files changed, 95 insertions(+), 89 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index cc8e0f924a4..bacd82972fd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -183,15 +183,7 @@ class DedupedLambda {
         public int hashCode() {
             int hashCode = this.hashCode;
             if (hashCode == 0) {
-                this.hashCode = hashCode = TreeHasher.hash(tree, sym -> {
-                    if (sym.owner == symbol) {
-                        int idx = symbol.params().indexOf(sym);
-                        if (idx != -1) {
-                            return idx;
-                        }
-                    }
-                    return null;
-                });
+                this.hashCode = hashCode = TreeHasher.hash(tree, symbol.params());
             }
             return hashCode;
         }
@@ -203,17 +195,7 @@ public boolean equals(Object o) {
             }
             DedupedLambda that = (DedupedLambda) o;
             return types.isSameType(symbol.asType(), that.symbol.asType())
-                    && new TreeDiffer((lhs, rhs) -> {
-                if (lhs.owner == symbol) {
-                    int idx = symbol.params().indexOf(lhs);
-                    if (idx != -1) {
-                        if (Objects.equals(idx, that.symbol.params().indexOf(rhs))) {
-                            return true;
-                        }
-                    }
-                }
-                return null;
-            }).scan(tree, that.tree);
+                    && new TreeDiffer(symbol.params(), that.symbol.params()).scan(tree, that.tree);
         }
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java
index ec48a8e1c17..a0551c8f65a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java
@@ -89,24 +89,34 @@
 import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.List;
-
-import javax.lang.model.element.ElementKind;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Objects;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
 
 /** A visitor that compares two lambda bodies for structural equality. */
 public class TreeDiffer extends TreeScanner {
 
-    private BiFunction<Symbol, Symbol, Boolean> symbolDiffer;
+    public TreeDiffer(
+            Collection<? extends Symbol> symbols, Collection<? extends Symbol> otherSymbols) {
+        this.equiv = equiv(symbols, otherSymbols);
+    }
 
-    public TreeDiffer(BiFunction<Symbol, Symbol, Boolean> symbolDiffer) {
-        this.symbolDiffer = Objects.requireNonNull(symbolDiffer);
+    private static Map<Symbol, Symbol> equiv(
+            Collection<? extends Symbol> symbols, Collection<? extends Symbol> otherSymbols) {
+        Map<Symbol, Symbol> result = new HashMap<>();
+        Iterator<? extends Symbol> it = otherSymbols.iterator();
+        for (Symbol symbol : symbols) {
+            if (!it.hasNext()) break;
+            result.put(symbol, it.next());
+        }
+        return result;
     }
 
     private JCTree parameter;
     private boolean result;
+    private Map<Symbol, Symbol> equiv = new HashMap<>();
 
     public boolean scan(JCTree tree, JCTree parameter) {
         if (tree == null || parameter == null) {
@@ -172,9 +182,8 @@ public void visitIdent(JCIdent tree) {
         Symbol symbol = tree.sym;
         Symbol otherSymbol = that.sym;
         if (symbol != null && otherSymbol != null) {
-            Boolean tmp = symbolDiffer.apply(symbol, otherSymbol);
-            if (tmp != null) {
-                result = tmp;
+            if (Objects.equals(equiv.get(symbol), otherSymbol)) {
+                result = true;
                 return;
             }
         }
@@ -598,6 +607,10 @@ public void visitVarDef(JCVariableDecl tree) {
                         && scan(tree.nameexpr, that.nameexpr)
                         && scan(tree.vartype, that.vartype)
                         && scan(tree.init, that.init);
+        if (!result) {
+            return;
+        }
+        equiv.put(tree.sym, that.sym);
     }
 
     @Override
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeHasher.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeHasher.java
index 916cb2fe056..22ecbc20e13 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeHasher.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeHasher.java
@@ -30,26 +30,31 @@
 import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
 import com.sun.tools.javac.tree.JCTree.JCIdent;
 import com.sun.tools.javac.tree.JCTree.JCLiteral;
+import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
 import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
-import java.util.function.Function;
 
 /** A tree visitor that computes a hash code. */
 public class TreeHasher extends TreeScanner {
 
-    private final Function<Symbol, Integer> symbolHasher;
+    private final Map<Symbol, Integer> symbolHashes;
     private int result = 17;
 
-    public TreeHasher(Function<Symbol, Integer> symbolHasher) {
-        this.symbolHasher = Objects.requireNonNull(symbolHasher);
+    public TreeHasher(Map<Symbol, Integer> symbolHashes) {
+        this.symbolHashes = Objects.requireNonNull(symbolHashes);
     }
 
-    public static int hash(JCTree tree, Function<Symbol, Integer> symbolHasher) {
+    public static int hash(JCTree tree, Collection<? extends Symbol> symbols) {
         if (tree == null) {
             return 0;
         }
-        TreeHasher hasher = new TreeHasher(symbolHasher);
+        Map<Symbol, Integer> symbolHashes = new HashMap<>();
+        symbols.forEach(s -> symbolHashes.put(s, symbolHashes.size()));
+        TreeHasher hasher = new TreeHasher(symbolHashes);
         tree.accept(hasher);
         return hasher.result;
     }
@@ -85,7 +90,7 @@ public void visitLiteral(JCLiteral tree) {
     public void visitIdent(JCIdent tree) {
         Symbol sym = tree.sym;
         if (sym != null) {
-            Integer hash = symbolHasher.apply(sym);
+            Integer hash = symbolHashes.get(sym);
             if (hash != null) {
                 hash(hash);
                 return;
@@ -99,4 +104,10 @@ public void visitSelect(JCFieldAccess tree) {
         hash(tree.sym);
         super.visitSelect(tree);
     }
+
+    @Override
+    public void visitVarDef(JCVariableDecl tree) {
+        symbolHashes.computeIfAbsent(tree.sym, k -> symbolHashes.size());
+        super.visitVarDef(tree);
+    }
 }
diff --git a/test/langtools/tools/javac/lambda/deduplication/Deduplication.java b/test/langtools/tools/javac/lambda/deduplication/Deduplication.java
index 21eaf6512d4..7eb1335b985 100644
--- a/test/langtools/tools/javac/lambda/deduplication/Deduplication.java
+++ b/test/langtools/tools/javac/lambda/deduplication/Deduplication.java
@@ -77,18 +77,45 @@ void test() {
         group((Function<Integer, Integer>) y -> j);
 
         group(
-                (Function<Integer, Integer>) y -> {
-                        while (true) {
-                              break;
-                        }
-                        return 42;
-                },
-                (Function<Integer, Integer>) y -> {
-                        while (true) {
-                              break;
-                        }
-                        return 42;
-                });
+                (Function<Integer, Integer>)
+                        y -> {
+                            while (true) {
+                                break;
+                            }
+                            return 42;
+                        },
+                (Function<Integer, Integer>)
+                        y -> {
+                            while (true) {
+                                break;
+                            }
+                            return 42;
+                        });
+
+        group(
+                (Function<Integer, Integer>)
+                        x -> {
+                            int y = x;
+                            return y;
+                        },
+                (Function<Integer, Integer>)
+                        x -> {
+                            int y = x;
+                            return y;
+                        });
+
+        group(
+                (Function<Integer, Integer>)
+                        x -> {
+                            int y = 0, z = x;
+                            return y;
+                        });
+        group(
+                (Function<Integer, Integer>)
+                        x -> {
+                            int y = 0, z = x;
+                            return z;
+                        });
 
         class Local {
             int i;
diff --git a/test/langtools/tools/javac/lambda/deduplication/DeduplicationTest.java b/test/langtools/tools/javac/lambda/deduplication/DeduplicationTest.java
index 8cfcb0ae375..c7bea0050dd 100644
--- a/test/langtools/tools/javac/lambda/deduplication/DeduplicationTest.java
+++ b/test/langtools/tools/javac/lambda/deduplication/DeduplicationTest.java
@@ -22,7 +22,7 @@
  */
 
 /**
- * @test 8200301
+ * @test 8200301 8201194
  * @summary deduplicate lambda methods with the same body, target type, and captured state
  * @modules jdk.jdeps/com.sun.tools.classfile jdk.compiler/com.sun.tools.javac.api
  *     jdk.compiler/com.sun.tools.javac.code jdk.compiler/com.sun.tools.javac.comp
@@ -32,6 +32,7 @@
  */
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toSet;
 
@@ -57,7 +58,6 @@
 import com.sun.tools.javac.tree.JCTree.JCLambda;
 import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
 import com.sun.tools.javac.tree.JCTree.JCTypeCast;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
 import com.sun.tools.javac.tree.JCTree.Tag;
 import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.Context;
@@ -70,10 +70,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.function.BiFunction;
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileObject;
@@ -160,36 +158,9 @@ public static void main(String[] args) throws Exception {
         }
     }
 
-    /**
-     * Returns a symbol comparator that treats symbols that correspond to the same parameter of each
-     * of the given lambdas as equal.
-     */
-    private static BiFunction<Symbol, Symbol, Boolean> paramsEqual(JCLambda lhs, JCLambda rhs) {
-        return (x, y) -> {
-            Integer idx = paramIndex(lhs, x);
-            if (idx != null && idx != -1) {
-                if (Objects.equals(idx, paramIndex(rhs, y))) {
-                    return true;
-                }
-            }
-            return null;
-        };
-    }
-
-    /**
-     * Returns the index of the given symbol as a parameter of the given lambda, or else {@code -1}
-     * if is not a parameter.
-     */
-    private static Integer paramIndex(JCLambda lambda, Symbol sym) {
-        if (sym != null) {
-            int idx = 0;
-            for (JCVariableDecl param : lambda.params) {
-                if (sym == param.sym) {
-                    return idx;
-                }
-            }
-        }
-        return null;
+    /** Returns the parameter symbols of the given lambda. */
+    private static List<Symbol> paramSymbols(JCLambda lambda) {
+        return lambda.params.stream().map(x -> x.sym).collect(toList());
     }
 
     /** A diagnostic listener that records debug messages related to lambda desugaring. */
@@ -310,13 +281,14 @@ public void visitApply(JCMethodInvocation tree) {
                         dedupedLambdas.put(lhs, first);
                     }
                     for (JCLambda rhs : curr) {
-                        if (!new TreeDiffer(paramsEqual(lhs, rhs)).scan(lhs.body, rhs.body)) {
+                        if (!new TreeDiffer(paramSymbols(lhs), paramSymbols(rhs))
+                                .scan(lhs.body, rhs.body)) {
                             throw new AssertionError(
                                     String.format(
                                             "expected lambdas to be equal\n%s\n%s", lhs, rhs));
                         }
-                        if (TreeHasher.hash(lhs, sym -> paramIndex(lhs, sym))
-                                != TreeHasher.hash(rhs, sym -> paramIndex(rhs, sym))) {
+                        if (TreeHasher.hash(lhs, paramSymbols(lhs))
+                                != TreeHasher.hash(rhs, paramSymbols(rhs))) {
                             throw new AssertionError(
                                     String.format(
                                             "expected lambdas to hash to the same value\n%s\n%s",
@@ -334,14 +306,15 @@ public void visitApply(JCMethodInvocation tree) {
                     }
                     for (JCLambda lhs : curr) {
                         for (JCLambda rhs : lambdaGroups.get(j)) {
-                            if (new TreeDiffer(paramsEqual(lhs, rhs)).scan(lhs.body, rhs.body)) {
+                            if (new TreeDiffer(paramSymbols(lhs), paramSymbols(rhs))
+                                    .scan(lhs.body, rhs.body)) {
                                 throw new AssertionError(
                                         String.format(
                                                 "expected lambdas to not be equal\n%s\n%s",
                                                 lhs, rhs));
                             }
-                            if (TreeHasher.hash(lhs, sym -> paramIndex(lhs, sym))
-                                    == TreeHasher.hash(rhs, sym -> paramIndex(rhs, sym))) {
+                            if (TreeHasher.hash(lhs, paramSymbols(lhs))
+                                    == TreeHasher.hash(rhs, paramSymbols(rhs))) {
                                 throw new AssertionError(
                                         String.format(
                                                 "expected lambdas to hash to different values\n%s\n%s",

From 368fc767f6fad80f9b8e3f56cf81297b2af7acbb Mon Sep 17 00:00:00 2001
From: serb <unknown>
Date: Thu, 5 Apr 2018 19:08:48 -0700
Subject: [PATCH 087/196] 8200149: The "com.sun.awt.AWTUtilities" class can be
 dropped Reviewed-by: prr

---
 .../com/apple/eawt/FullScreenUtilities.java   |   3 +-
 .../apple/eawt/event/GestureUtilities.java    |   3 +-
 .../classes/com/sun/awt/AWTUtilities.java     | 500 ------------------
 3 files changed, 2 insertions(+), 504 deletions(-)
 delete mode 100644 src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java

diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java b/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java
index f70e93b7963..46d0143b220 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java
@@ -37,8 +37,7 @@
  * Utility class perform animated full screen actions to top-level {@link Window}s.
  *
  * This class manages the relationship between {@link Window}s and the {@link FullScreenListener}s
- * attached to them. It's design is similar to the Java SE 6u10 {@code com.sun.awt.AWTUtilities}
- * class which adds additional functionality to AWT Windows, without adding new API to the
+ * attached to them. It adds additional functionality to AWT Windows, without adding new API to the
  * {@link java.awt.Window} class.
  *
  * Full screen operations can only be performed on top-level {@link Window}s that are also {@link RootPaneContainer}s.
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java
index bb8922ee7c9..14561b02c62 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/event/GestureUtilities.java
@@ -33,8 +33,7 @@
  * Registration utility class to add {@link GestureListener}s to Swing components.
  *
  * This class manages the relationship between {@link JComponent}s and the {@link GestureListener}s
- * attached to them. It's design is similar to the Java SE 6u10 {@code com.sun.awt.AWTUtilities}
- * class which adds additional functionality to AWT Windows, without adding new API to the
+ * attached to them. It adds additional functionality to AWT Windows, without adding new API to the
  * {@link java.awt.Window} class.
  *
  * To add a {@link GestureListener} to a top-level Swing window, use the {@link JRootPane} of the
diff --git a/src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java b/src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java
deleted file mode 100644
index 1d16510d267..00000000000
--- a/src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Copyright (c) 2008, 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 com.sun.awt;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Shape;
-import java.awt.Toolkit;
-import java.awt.Window;
-
-import javax.swing.JRootPane;
-
-import sun.awt.AWTAccessor;
-import sun.awt.SunToolkit;
-
-/**
- * A collection of utility methods for AWT.
- *
- * The functionality provided by the static methods of the class includes:
- * <ul>
- * <li>Setting shapes on top-level windows
- * <li>Setting a constant alpha value for each pixel of a top-level window
- * <li>Making a window non-opaque, after that it paints only explicitly
- * painted pixels on the screen, with arbitrary alpha values for every pixel.
- * <li>Setting a 'mixing-cutout' shape for a component.
- * </ul>
- * <p>
- * A "top-level window" is an instance of the {@code Window} class (or its
- * descendant, such as {@code JFrame}).
- * <p>
- * Some of the mentioned features may not be supported by the native platform.
- * To determine whether a particular feature is supported, the user must use
- * the {@code isTranslucencySupported()} method of the class passing a desired
- * translucency kind (a member of the {@code Translucency} enum) as an
- * argument.
- * <p>
- * The per-pixel alpha feature also requires the user to create her/his
- * windows using a translucency-capable graphics configuration.
- * The {@code isTranslucencyCapable()} method must
- * be used to verify whether any given GraphicsConfiguration supports
- * the translucency effects.
- * <p>
- * <b>WARNING</b>: This class is an implementation detail and only meant
- * for limited use outside of the core platform. This API may change
- * drastically between update release, and it may even be
- * removed or be moved in some other package(s)/class(es).
- */
-@Deprecated(forRemoval = true, since = "10")
-public final class AWTUtilities {
-
-    /**
-     * The AWTUtilities class should not be instantiated
-     */
-    private AWTUtilities() {
-    }
-
-    /** Kinds of translucency supported by the underlying system.
-     *  @see #isTranslucencySupported
-     */
-    public static enum Translucency {
-        /**
-         * Represents support in the underlying system for windows each pixel
-         * of which is guaranteed to be either completely opaque, with
-         * an alpha value of 1.0, or completely transparent, with an alpha
-         * value of 0.0.
-         */
-        PERPIXEL_TRANSPARENT,
-
-        /**
-         * Represents support in the underlying system for windows all of
-         * the pixels of which have the same alpha value between or including
-         * 0.0 and 1.0.
-         */
-        TRANSLUCENT,
-
-        /**
-         * Represents support in the underlying system for windows that
-         * contain or might contain pixels with arbitrary alpha values
-         * between and including 0.0 and 1.0.
-         */
-        PERPIXEL_TRANSLUCENT;
-    }
-
-
-    /**
-     * Returns whether the given level of translucency is supported by
-     * the underlying system.
-     *
-     * Note that this method may sometimes return the value
-     * indicating that the particular level is supported, but
-     * the native windowing system may still not support the
-     * given level of translucency (due to the bugs in
-     * the windowing system).
-     *
-     * @param translucencyKind a kind of translucency support
-     *                         (either PERPIXEL_TRANSPARENT,
-     *                         TRANSLUCENT, or PERPIXEL_TRANSLUCENT)
-     * @return whether the given translucency kind is supported
-     * @deprecated use {@link GraphicsDevice#isWindowTranslucencySupported}
-     *             instead
-     */
-    @Deprecated(forRemoval = true, since = "10")
-    public static boolean isTranslucencySupported(Translucency translucencyKind) {
-        switch (translucencyKind) {
-            case PERPIXEL_TRANSPARENT:
-                return isWindowShapingSupported();
-            case TRANSLUCENT:
-                return isWindowOpacitySupported();
-            case PERPIXEL_TRANSLUCENT:
-                return isWindowTranslucencySupported();
-        }
-        return false;
-    }
-
-
-    /**
-     * Returns whether the windowing system supports changing the opacity
-     * value of top-level windows.
-     * Note that this method may sometimes return true, but the native
-     * windowing system may still not support the concept of
-     * translucency (due to the bugs in the windowing system).
-     */
-    private static boolean isWindowOpacitySupported() {
-        Toolkit curToolkit = Toolkit.getDefaultToolkit();
-        if (!(curToolkit instanceof SunToolkit)) {
-            return false;
-        }
-        return ((SunToolkit)curToolkit).isWindowOpacitySupported();
-    }
-
-    /**
-     * Set the opacity of the window. The opacity is at the range [0..1].
-     * Note that setting the opacity level of 0 may or may not disable
-     * the mouse event handling on this window. This is
-     * a platform-dependent behavior.
-     *
-     * In order for this method to enable the translucency effect,
-     * the isTranslucencySupported() method should indicate that the
-     * TRANSLUCENT level of translucency is supported.
-     *
-     * <p>Also note that the window must not be in the full-screen mode
-     * when setting the opacity value &lt; 1.0f. Otherwise
-     * the IllegalArgumentException is thrown.
-     *
-     * @param window the window to set the opacity level to
-     * @param opacity the opacity level to set to the window
-     * @throws NullPointerException if the window argument is null
-     * @throws IllegalArgumentException if the opacity is out of
-     *                                  the range [0..1]
-     * @throws IllegalArgumentException if the window is in full screen mode,
-     *                                  and the opacity is less than 1.0f
-     * @throws UnsupportedOperationException if the TRANSLUCENT translucency
-     *                                       kind is not supported
-     * @deprecated use {@link Window#setOpacity} instead
-     */
-    @Deprecated(forRemoval = true, since = "10")
-    public static void setWindowOpacity(Window window, float opacity) {
-        if (window == null) {
-            throw new NullPointerException(
-                    "The window argument should not be null.");
-        }
-        window.setOpacity(opacity);
-    }
-
-    /**
-     * Get the opacity of the window. If the opacity has not
-     * yet being set, this method returns 1.0.
-     *
-     * @param window the window to get the opacity level from
-     * @throws NullPointerException if the window argument is null
-     * @deprecated use {@link Window#getOpacity} instead
-     */
-    @Deprecated(forRemoval = true, since = "10")
-    public static float getWindowOpacity(Window window) {
-        if (window == null) {
-            throw new NullPointerException(
-                    "The window argument should not be null.");
-        }
-
-        return window.getOpacity();
-    }
-
-    /**
-     * Returns whether the windowing system supports changing the shape
-     * of top-level windows.
-     * Note that this method may sometimes return true, but the native
-     * windowing system may still not support the concept of
-     * shaping (due to the bugs in the windowing system).
-     * @deprecated use {@link GraphicsDevice#isWindowTranslucencySupported}
-     *             instead
-     */
-    @Deprecated(forRemoval = true, since = "10")
-    public static boolean isWindowShapingSupported() {
-        Toolkit curToolkit = Toolkit.getDefaultToolkit();
-        if (!(curToolkit instanceof SunToolkit)) {
-            return false;
-        }
-        return ((SunToolkit)curToolkit).isWindowShapingSupported();
-    }
-
-    /**
-     * Returns an object that implements the Shape interface and represents
-     * the shape previously set with the call to the setWindowShape() method.
-     * If no shape has been set yet, or the shape has been reset to null,
-     * this method returns null.
-     *
-     * @param window the window to get the shape from
-     * @return the current shape of the window
-     * @throws NullPointerException if the window argument is null
-     * @deprecated use {@link Window#getShape} instead
-     */
-    @Deprecated(forRemoval = true, since = "10")
-    public static Shape getWindowShape(Window window) {
-        if (window == null) {
-            throw new NullPointerException(
-                    "The window argument should not be null.");
-        }
-        return window.getShape();
-    }
-
-    /**
-     * Sets a shape for the given window.
-     * If the shape argument is null, this methods restores
-     * the default shape making the window rectangular.
-     * <p>Note that in order to set a shape, the window must be undecorated.
-     * If the window is decorated, this method ignores the {@code shape}
-     * argument and resets the shape to null.
-     * <p>Also note that the window must not be in the full-screen mode
-     * when setting a non-null shape. Otherwise the IllegalArgumentException
-     * is thrown.
-     * <p>Depending on the platform, the method may return without
-     * effecting the shape of the window if the window has a non-null warning
-     * string ({@link Window#getWarningString()}). In this case the passed
-     * shape object is ignored.
-     *
-     * @param window the window to set the shape to
-     * @param shape the shape to set to the window
-     * @throws NullPointerException if the window argument is null
-     * @throws IllegalArgumentException if the window is in full screen mode,
-     *                                  and the shape is not null
-     * @throws UnsupportedOperationException if the PERPIXEL_TRANSPARENT
-     *                                       translucency kind is not supported
-     * @deprecated use {@link Window#setShape} instead
-     */
-    @Deprecated(forRemoval = true, since = "10")
-    public static void setWindowShape(Window window, Shape shape) {
-        if (window == null) {
-            throw new NullPointerException(
-                    "The window argument should not be null.");
-        }
-        window.setShape(shape);
-    }
-
-    private static boolean isWindowTranslucencySupported() {
-        /*
-         * Per-pixel alpha is supported if all the conditions are TRUE:
-         *    1. The toolkit is a sort of SunToolkit
-         *    2. The toolkit supports translucency in general
-         *        (isWindowTranslucencySupported())
-         *    3. There's at least one translucency-capable
-         *        GraphicsConfiguration
-         */
-
-        Toolkit curToolkit = Toolkit.getDefaultToolkit();
-        if (!(curToolkit instanceof SunToolkit)) {
-            return false;
-        }
-
-        if (!((SunToolkit)curToolkit).isWindowTranslucencySupported()) {
-            return false;
-        }
-
-        GraphicsEnvironment env =
-            GraphicsEnvironment.getLocalGraphicsEnvironment();
-
-        // If the default GC supports translucency return true.
-        // It is important to optimize the verification this way,
-        // see CR 6661196 for more details.
-        if (isTranslucencyCapable(env.getDefaultScreenDevice()
-                    .getDefaultConfiguration()))
-        {
-            return true;
-        }
-
-        // ... otherwise iterate through all the GCs.
-        GraphicsDevice[] devices = env.getScreenDevices();
-
-        for (int i = 0; i < devices.length; i++) {
-            GraphicsConfiguration[] configs = devices[i].getConfigurations();
-            for (int j = 0; j < configs.length; j++) {
-                if (isTranslucencyCapable(configs[j])) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Enables the per-pixel alpha support for the given window.
-     * Once the window becomes non-opaque (the isOpaque is set to false),
-     * the drawing sub-system is starting to respect the alpha value of each
-     * separate pixel. If a pixel gets painted with alpha color component
-     * equal to zero, it becomes visually transparent, if the alpha of the
-     * pixel is equal to 255, the pixel is fully opaque. Interim values
-     * of the alpha color component make the pixel semi-transparent (i.e.
-     * translucent).
-     * <p>Note that in order for the window to support the per-pixel alpha
-     * mode, the window must be created using the GraphicsConfiguration
-     * for which the {@link #isTranslucencyCapable}
-     * method returns true.
-     * <p>Also note that some native systems enable the per-pixel translucency
-     * mode for any window created using the translucency-compatible
-     * graphics configuration. However, it is highly recommended to always
-     * invoke the setWindowOpaque() method for these windows, at least for
-     * the sake of cross-platform compatibility reasons.
-     * <p>Also note that the window must not be in the full-screen mode
-     * when making it non-opaque. Otherwise the IllegalArgumentException
-     * is thrown.
-     * <p>If the window is a {@code Frame} or a {@code Dialog}, the window must
-     * be undecorated prior to enabling the per-pixel translucency effect (see
-     * {@link Frame#setUndecorated} and/or {@link Dialog#setUndecorated}).
-     * If the window becomes decorated through a subsequent call to the
-     * corresponding {@code setUndecorated()} method, the per-pixel
-     * translucency effect will be disabled and the opaque property reset to
-     * {@code true}.
-     * <p>Depending on the platform, the method may return without
-     * effecting the opaque property of the window if the window has a non-null
-     * warning string ({@link Window#getWarningString()}). In this case
-     * the passed 'isOpaque' value is ignored.
-     *
-     * @param window the window to set the shape to
-     * @param isOpaque whether the window must be opaque (true),
-     *                 or translucent (false)
-     * @throws NullPointerException if the window argument is null
-     * @throws IllegalArgumentException if the window uses
-     *                                  a GraphicsConfiguration for which the
-     *                                  {@code isTranslucencyCapable()}
-     *                                  method returns false
-     * @throws IllegalArgumentException if the window is in full screen mode,
-     *                                  and the isOpaque is false
-     * @throws IllegalArgumentException if the window is decorated and the
-     * isOpaque argument is {@code false}.
-     * @throws UnsupportedOperationException if the PERPIXEL_TRANSLUCENT
-     *                                       translucency kind is not supported
-     * @deprecated use {@link Window#setBackground} instead
-     */
-    @Deprecated(forRemoval = true, since = "10")
-    public static void setWindowOpaque(Window window, boolean isOpaque) {
-        if (window == null) {
-            throw new NullPointerException(
-                    "The window argument should not be null.");
-        }
-        if (!isOpaque && !isTranslucencySupported(Translucency.PERPIXEL_TRANSLUCENT)) {
-            throw new UnsupportedOperationException(
-                    "The PERPIXEL_TRANSLUCENT translucency kind is not supported");
-        }
-        Color bg = window.getBackground();
-        if (bg == null) {
-            bg = new Color(0, 0, 0, 0);
-        }
-        window.setBackground(new Color(bg.getRed(), bg.getGreen(), bg.getBlue(),
-                                       isOpaque ? 255 : 0));
-    }
-
-    /**
-     * Returns whether the window is opaque or translucent.
-     *
-     * @param window the window to set the shape to
-     * @return whether the window is currently opaque (true)
-     *         or translucent (false)
-     * @throws NullPointerException if the window argument is null
-     * @deprecated use {@link Window#isOpaque} instead
-     */
-    @Deprecated(forRemoval = true, since = "10")
-    public static boolean isWindowOpaque(Window window) {
-        if (window == null) {
-            throw new NullPointerException(
-                    "The window argument should not be null.");
-        }
-
-        return window.isOpaque();
-    }
-
-    /**
-     * Verifies whether a given GraphicsConfiguration supports
-     * the PERPIXEL_TRANSLUCENT kind of translucency.
-     * All windows that are intended to be used with the {@link #setWindowOpaque}
-     * method must be created using a GraphicsConfiguration for which this method
-     * returns true.
-     * <p>Note that some native systems enable the per-pixel translucency
-     * mode for any window created using a translucency-capable
-     * graphics configuration. However, it is highly recommended to always
-     * invoke the setWindowOpaque() method for these windows, at least
-     * for the sake of cross-platform compatibility reasons.
-     *
-     * @param gc GraphicsConfiguration
-     * @throws NullPointerException if the gc argument is null
-     * @return whether the given GraphicsConfiguration supports
-     *         the translucency effects.
-     * @deprecated use {@link GraphicsConfiguration#isTranslucencyCapable}
-     *             instead
-     */
-    @Deprecated(forRemoval = true, since = "10")
-    public static boolean isTranslucencyCapable(GraphicsConfiguration gc) {
-        if (gc == null) {
-            throw new NullPointerException("The gc argument should not be null");
-        }
-        /*
-        return gc.isTranslucencyCapable();
-        */
-        Toolkit curToolkit = Toolkit.getDefaultToolkit();
-        if (!(curToolkit instanceof SunToolkit)) {
-            return false;
-        }
-        return ((SunToolkit)curToolkit).isTranslucencyCapable(gc);
-    }
-
-    /**
-     * Sets a 'mixing-cutout' shape for the given component.
-     *
-     * By default a lightweight component is treated as an opaque rectangle for
-     * the purposes of the Heavyweight/Lightweight Components Mixing feature.
-     * This method enables developers to set an arbitrary shape to be cut out
-     * from heavyweight components positioned underneath the lightweight
-     * component in the z-order.
-     * <p>
-     * The {@code shape} argument may have the following values:
-     * <ul>
-     * <li>{@code null} - reverts the default cutout shape (the rectangle equal
-     * to the component's {@code getBounds()})
-     * <li><i>empty-shape</i> - does not cut out anything from heavyweight
-     * components. This makes the given lightweight component effectively
-     * transparent. Note that descendants of the lightweight component still
-     * affect the shapes of heavyweight components.  An example of an
-     * <i>empty-shape</i> is {@code new Rectangle()}.
-     * <li><i>non-empty-shape</i> - the given shape will be cut out from
-     * heavyweight components.
-     * </ul>
-     * <p>
-     * The most common example when the 'mixing-cutout' shape is needed is a
-     * glass pane component. The {@link JRootPane#setGlassPane} method
-     * automatically sets the <i>empty-shape</i> as the 'mixing-cutout' shape
-     * for the given glass pane component.  If a developer needs some other
-     * 'mixing-cutout' shape for the glass pane (which is rare), this must be
-     * changed manually after installing the glass pane to the root pane.
-     * <p>
-     * Note that the 'mixing-cutout' shape neither affects painting, nor the
-     * mouse events handling for the given component. It is used exclusively
-     * for the purposes of the Heavyweight/Lightweight Components Mixing
-     * feature.
-     *
-     * @param component the component that needs non-default
-     * 'mixing-cutout' shape
-     * @param shape the new 'mixing-cutout' shape
-     * @throws NullPointerException if the component argument is {@code null}
-     * @deprecated use {@link Component#setMixingCutoutShape} instead
-     */
-    @Deprecated(forRemoval = true, since = "9")
-    public static void setComponentMixingCutoutShape(Component component,
-            Shape shape)
-    {
-        if (component == null) {
-            throw new NullPointerException(
-                    "The component argument should not be null.");
-        }
-
-        component.setMixingCutoutShape(shape);
-    }
-}
-

From 8fff77e8abcc1629d9f22d50b58d24ccd3706adf Mon Sep 17 00:00:00 2001
From: asapre <unknown>
Date: Fri, 6 Apr 2018 17:27:24 +0530
Subject: [PATCH 088/196] 8071367: JMX: Remove SNMP support Summary: Drop
 jdk.snmp module. Reviewed-by: alanb, mchung, dfuchs Contributed-by:
 amit.sapre@oracle.com

---
 make/jdk/netbeans/jmx/build.properties        |  5 +-
 .../classes/jdk/internal/agent/Agent.java     | 62 +++++----------
 .../share/conf/management.properties          | 79 -------------------
 .../bootstrap/rmiregistry.properties          | 79 -------------------
 .../bootstrap/rmiregistryssl.properties       | 79 -------------------
 test/jdk/sun/management/windows/README        |  1 -
 .../doclet/testModules/jdk/element-list       |  1 -
 7 files changed, 22 insertions(+), 284 deletions(-)

diff --git a/make/jdk/netbeans/jmx/build.properties b/make/jdk/netbeans/jmx/build.properties
index bd72037301e..38509a59384 100644
--- a/make/jdk/netbeans/jmx/build.properties
+++ b/make/jdk/netbeans/jmx/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -34,8 +34,7 @@ includes=\
     javax/management/ \
     org/omg/stub/javax/management/
 
-excludes=\
-    com/sun/jmx/snmp/
+excludes=
 
 jtreg.tests=\
     com/sun/jmx/ \
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java
index 29c7e87f6c8..b44b3395700 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -58,9 +58,11 @@
 import sun.management.jmxremote.ConnectorBootstrap;
 
 /**
- * This Agent is started by the VM when -Dcom.sun.management.snmp or
- * -Dcom.sun.management.jmxremote is set. This class will be loaded by the
- * system class loader. Also jmx framework could be started by jcmd
+ * This class provides the methods to start the management agent.
+ * 1. {@link #startAgent} method is invoked by the VM if {@code -Dcom.sun.management.*} is set
+ * 2. {@link #startLocalManagementAgent} or {@link #startRemoteManagementAgent}
+ *    is invoked to start the management agent after the VM starts
+ *    via jcmd ManagementAgent.start and start_local command.
  */
 public class Agent {
     /**
@@ -239,8 +241,6 @@ protected void appendConfigPropsFooter() {}
     private static ResourceBundle messageRB;
     private static final String CONFIG_FILE =
             "com.sun.management.config.file";
-    private static final String SNMP_PORT =
-            "com.sun.management.snmp.port";
     private static final String JMXREMOTE =
             "com.sun.management.jmxremote";
     private static final String JMXREMOTE_PORT =
@@ -251,8 +251,6 @@ protected void appendConfigPropsFooter() {}
             "com.sun.management.enableThreadContentionMonitoring";
     private static final String LOCAL_CONNECTOR_ADDRESS_PROP =
             "com.sun.management.jmxremote.localConnectorAddress";
-    private static final String SNMP_AGENT_NAME =
-            "SnmpAgent";
 
     private static final String JDP_DEFAULT_ADDRESS = "224.0.23.178";
     private static final int JDP_DEFAULT_PORT = 7095;
@@ -307,8 +305,11 @@ public static void agentmain(String args) throws Exception {
         startAgent(config_props);
     }
 
-    // jcmd ManagementAgent.start_local entry point
-    // Also called due to command-line via startAgent()
+    /*
+     * Starts the local management agent.
+     * This method is invoked by either startAgent method or
+     * by the VM directly via jcmd ManagementAgent.start_local command.
+     */
     private static synchronized void startLocalManagementAgent() {
         Properties agentProps = VMSupport.getAgentProperties();
 
@@ -330,10 +331,10 @@ private static synchronized void startLocalManagementAgent() {
         }
     }
 
-    // jcmd ManagementAgent.start entry point
-    // This method starts the remote JMX agent and starts neither
-    // the local JMX agent nor the SNMP agent
-    // @see #startLocalManagementAgent and also @see #startAgent.
+    /*
+     * This method is invoked by the VM to start the remote management agent
+     * via jcmd ManagementAgent.start command.
+     */
     private static synchronized void startRemoteManagementAgent(String args) throws Exception {
         if (jmxServer != null) {
             throw new RuntimeException(getText(INVALID_STATE, "Agent already started"));
@@ -418,7 +419,6 @@ private static synchronized String getManagementAgentStatus() throws Exception {
     }
 
     private static void startAgent(Properties props) throws Exception {
-        String snmpPort = props.getProperty(SNMP_PORT);
         String jmxremote = props.getProperty(JMXREMOTE);
         String jmxremotePort = props.getProperty(JMXREMOTE_PORT);
 
@@ -431,9 +431,6 @@ private static void startAgent(Properties props) throws Exception {
         }
 
         try {
-            if (snmpPort != null) {
-                loadSnmpAgent(props);
-            }
 
             /*
              * If the jmxremote.port property is set then we start the
@@ -533,12 +530,10 @@ public static Properties loadManagementProperties() {
     public static synchronized Properties getManagementProperties() {
         if (mgmtProps == null) {
             String configFile = System.getProperty(CONFIG_FILE);
-            String snmpPort = System.getProperty(SNMP_PORT);
             String jmxremote = System.getProperty(JMXREMOTE);
             String jmxremotePort = System.getProperty(JMXREMOTE_PORT);
 
-            if (configFile == null && snmpPort == null
-                    && jmxremote == null && jmxremotePort == null) {
+            if (configFile == null && jmxremote == null && jmxremotePort == null) {
                 // return if out-of-the-management option is not specified
                 return null;
             }
@@ -547,27 +542,6 @@ public static synchronized Properties getManagementProperties() {
         return mgmtProps;
     }
 
-    private static void loadSnmpAgent(Properties props) {
-        /*
-         * Load the jdk.snmp service
-         */
-        AgentProvider provider = AccessController.doPrivileged(
-            (PrivilegedAction<AgentProvider>) () -> {
-                for (AgentProvider aProvider : ServiceLoader.loadInstalled(AgentProvider.class)) {
-                    if (aProvider.getName().equals(SNMP_AGENT_NAME))
-                        return aProvider;
-                }
-                return null;
-            },  null
-        );
-
-        if (provider != null) {
-            provider.startAgent(props);
-         } else { // snmp runtime doesn't exist - initialization fails
-            throw new UnsupportedOperationException("Unsupported management property: " + SNMP_PORT);
-        }
-    }
-
     // read config file and initialize the properties
     private static void readConfiguration(String fname, Properties p) {
         if (fname == null) {
@@ -609,6 +583,10 @@ private static void readConfiguration(String fname, Properties p) {
         }
     }
 
+    /**
+     * This method is invoked by the VM to start the management agent
+     * when -Dcom.sun.management.* is set during startup.
+     */
     public static void startAgent() throws Exception {
         String prop = System.getProperty("com.sun.management.agent.class");
 
diff --git a/src/jdk.management.agent/share/conf/management.properties b/src/jdk.management.agent/share/conf/management.properties
index 1f8d86e1730..0c14bd61f2a 100644
--- a/src/jdk.management.agent/share/conf/management.properties
+++ b/src/jdk.management.agent/share/conf/management.properties
@@ -5,7 +5,6 @@
 # The Management Configuration file (in java.util.Properties format)
 # will be read if one of the following system properties is set:
 #    -Dcom.sun.management.jmxremote.port=<port-number>
-# or -Dcom.sun.management.snmp.port=<port-number>
 # or -Dcom.sun.management.config.file=<this-file>
 #
 # The default Management Configuration file is:
@@ -26,8 +25,6 @@
 # For setting the JMX RMI agent port use the following line
 # com.sun.management.jmxremote.port=<port-number>
 #
-# For setting the SNMP agent port use the following line
-# com.sun.management.snmp.port=<port-number>
 
 #####################################################################
 #                   Optional Instrumentation
@@ -49,82 +46,6 @@
 # To enable thread contention monitoring, uncomment the following line
 # com.sun.management.enableThreadContentionMonitoring
 
-#####################################################################
-#			SNMP Management Properties
-#####################################################################
-#
-# If the system property -Dcom.sun.management.snmp.port=<port-number>
-# is set then
-#	- The SNMP agent (with the Java virtual machine MIB) is started
-#	  that listens on the specified port for incoming SNMP requests.
-#	- the following properties for read for SNMP management.
-#
-# The configuration can be specified only at startup time.
-# Later changes to the above system property (e.g. via setProperty method), this
-# config file, or the ACL file has no effect to the running SNMP agent.
-#
-
-#
-# ##################### SNMP Trap Port #########################
-#
-# com.sun.management.snmp.trap=<trap-destination-port-number>
-#      Specifies the remote port number at which managers are expected
-#      to listen for trap. For each host defined in the ACL file,
-#      the SNMP agent will send traps at <host>:<trap-destination-port-number>
-#      Default for this property is 162.
-#
-
-# To set port for sending traps to a different port use the following line
-# com.sun.management.snmp.trap=<trap-destination-port-number>
-
-#
-# ################ SNMP listen interface #########################
-#
-# com.sun.management.snmp.interface=<InetAddress>
-#      Specifies the local interface on which the SNMP agent will bind.
-#      This is useful when running on machines which have several
-#      interfaces defined. It makes it possible to listen to a specific
-#      subnet accessible through that interface.
-#      Default for this property is "localhost".
-#
-#      The format of the value for that property is any string accepted
-#      by java.net.InetAddress.getByName(String).
-#
-
-# For restricting the port on which SNMP agent listens use the following line
-# com.sun.management.snmp.interface=<InetAddress>
-
-#
-# #################### SNMP ACL file #########################
-#
-# com.sun.management.snmp.acl=true|false
-#      Default for this property is true. (Case for true/false ignored)
-#      If this property is specified as false then the ACL file
-#      is not checked:  all manager hosts are allowed all access.
-#
-
-# For SNMP without checking ACL file uncomment the following line
-# com.sun.management.snmp.acl=false
-
-#
-# com.sun.management.snmp.acl.file=filepath
-#      Specifies location for ACL file
-#      This is optional - default location is
-#      $JRE/conf/management/snmp.acl
-#
-#      If the property "com.sun.management.snmp.acl" is set to false,
-#      then this property and the ACL file are ignored.
-#      Otherwise the ACL file must exist and be in the valid format.
-#      If the ACL file is empty or non existent then no access is allowed.
-#
-#      The SNMP agent will read the ACL file at startup time.
-#      Modification to the ACL file has no effect to any running SNMP
-#      agents which read that ACL file at startup.
-#
-
-# For a non-default acl file location use the following line
-# com.sun.management.snmp.acl.file=filepath
-
 #####################################################################
 #			RMI Management Properties
 #####################################################################
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties
index ef87663d89f..dbe75c4405f 100644
--- a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties
+++ b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties
@@ -5,7 +5,6 @@
 # The Management Configuration file (in java.util.Properties format)
 # will be read if one of the following system properties is set:
 #    -Dcom.sun.management.jmxremote.port=<port-number>
-# or -Dcom.sun.management.snmp.port=<port-number>
 # or -Dcom.sun.management.config.file=<this-file>
 #
 # The default Management Configuration file is:
@@ -26,8 +25,6 @@
 # For setting the JMX RMI agent port use the following line
 com.sun.management.jmxremote.port=${getFreePort}
 #
-# For setting the SNMP agent port use the following line
-# com.sun.management.snmp.port=<port-number>
 
 #####################################################################
 #                   Optional Instrumentation
@@ -49,82 +46,6 @@ com.sun.management.jmxremote.port=${getFreePort}
 # To enable thread contention monitoring, uncomment the following line
 # com.sun.management.enableThreadContentionMonitoring
 
-#####################################################################
-#			SNMP Management Properties
-#####################################################################
-#
-# If the system property -Dcom.sun.management.snmp.port=<port-number>
-# is set then
-#	- The SNMP agent (with the Java virtual machine MIB) is started
-#	  that listens on the specified port for incoming SNMP requests.
-#	- the following properties for read for SNMP management.
-#
-# The configuration can be specified only at startup time.
-# Later changes to the above system property (e.g. via setProperty method), this
-# config file, or the ACL file has no effect to the running SNMP agent.
-#
-
-#
-# ##################### SNMP Trap Port #########################
-#
-# com.sun.management.snmp.trap=<trap-destination-port-number>
-#      Specifies the remote port number at which managers are expected
-#      to listen for trap. For each host defined in the ACL file,
-#      the SNMP agent will send traps at <host>:<trap-destination-port-number>
-#      Default for this property is 162.
-#
-
-# To set port for sending traps to a different port use following line
-# com.sun.management.snmp.trap=<trap-destination-port-number>
-
-#
-# ################ SNMP listen interface #########################
-#
-# com.sun.management.snmp.interface=<InetAddress>
-#      Specifies the local interface on which the SNMP agent will bind.
-#      This is usefull when running on machines which have several
-#      interfaces defined. It makes it possible to listen to a specific
-#      subnet accessible through that interface.
-#      Default for this property is "localhost".
-#
-#      The format of the value for that property is any string accepted
-#      by java.net.InetAddress.getByName(String).
-#
-
-# For restricting the port on which SNMP agent listens use following line
-# com.sun.management.snmp.interface=<InetAddress>
-
-#
-# #################### SNMP ACL file #########################
-#
-# com.sun.management.snmp.acl=true|false
-#      Default for this property is true. (Case for true/false ignored)
-#      If this property is specified as false then the ACL file
-#      is not checked:  all manager hosts are allowed all access.
-#
-
-# For SNMP without checking ACL file uncomment the following line
-# com.sun.management.snmp.acl=false
-
-#
-# com.sun.management.snmp.acl.file=filepath
-#      Specifies location for ACL file
-#      This is optional - default location is
-#      $JRE/conf/management/snmp.acl
-#
-#      If the property "com.sun.management.snmp.acl" is set to false,
-#      then this property and the ACL file are ignored.
-#      Otherwise the ACL file must exist and be in the valid format.
-#      If the ACL file is empty or non existent then no access is allowed.
-#
-#      The SNMP agent will read the ACL file at startup time.
-#      Modification to the ACL file has no effect to any running SNMP
-#      agents which read that ACL file at startup.
-#
-
-# For a non-default acl file location use following line
-# com.sun.management.snmp.acl.file=filepath
-
 #####################################################################
 #			RMI Management Properties
 #####################################################################
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties
index 4796f70aa12..5d01de0977c 100644
--- a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties
+++ b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties
@@ -5,7 +5,6 @@
 # The Management Configuration file (in java.util.Properties format)
 # will be read if one of the following system properties is set:
 #    -Dcom.sun.management.jmxremote.port=<port-number>
-# or -Dcom.sun.management.snmp.port=<port-number>
 # or -Dcom.sun.management.config.file=<this-file>
 #
 # The default Management Configuration file is:
@@ -26,8 +25,6 @@
 # For setting the JMX RMI agent port use the following line
 com.sun.management.jmxremote.port=${getFreePort}
 #
-# For setting the SNMP agent port use the following line
-# com.sun.management.snmp.port=<port-number>
 
 #####################################################################
 #                   Optional Instrumentation
@@ -49,82 +46,6 @@ com.sun.management.jmxremote.port=${getFreePort}
 # To enable thread contention monitoring, uncomment the following line
 # com.sun.management.enableThreadContentionMonitoring
 
-#####################################################################
-#			SNMP Management Properties
-#####################################################################
-#
-# If the system property -Dcom.sun.management.snmp.port=<port-number>
-# is set then
-#	- The SNMP agent (with the Java virtual machine MIB) is started
-#	  that listens on the specified port for incoming SNMP requests.
-#	- the following properties for read for SNMP management.
-#
-# The configuration can be specified only at startup time.
-# Later changes to the above system property (e.g. via setProperty method), this
-# config file, or the ACL file has no effect to the running SNMP agent.
-#
-
-#
-# ##################### SNMP Trap Port #########################
-#
-# com.sun.management.snmp.trap=<trap-destination-port-number>
-#      Specifies the remote port number at which managers are expected
-#      to listen for trap. For each host defined in the ACL file,
-#      the SNMP agent will send traps at <host>:<trap-destination-port-number>
-#      Default for this property is 162.
-#
-
-# To set port for sending traps to a different port use following line
-# com.sun.management.snmp.trap=<trap-destination-port-number>
-
-#
-# ################ SNMP listen interface #########################
-#
-# com.sun.management.snmp.interface=<InetAddress>
-#      Specifies the local interface on which the SNMP agent will bind.
-#      This is usefull when running on machines which have several
-#      interfaces defined. It makes it possible to listen to a specific
-#      subnet accessible through that interface.
-#      Default for this property is "localhost".
-#
-#      The format of the value for that property is any string accepted
-#      by java.net.InetAddress.getByName(String).
-#
-
-# For restricting the port on which SNMP agent listens use following line
-# com.sun.management.snmp.interface=<InetAddress>
-
-#
-# #################### SNMP ACL file #########################
-#
-# com.sun.management.snmp.acl=true|false
-#      Default for this property is true. (Case for true/false ignored)
-#      If this property is specified as false then the ACL file
-#      is not checked:  all manager hosts are allowed all access.
-#
-
-# For SNMP without checking ACL file uncomment the following line
-# com.sun.management.snmp.acl=false
-
-#
-# com.sun.management.snmp.acl.file=filepath
-#      Specifies location for ACL file
-#      This is optional - default location is
-#      $JRE/conf/management/snmp.acl
-#
-#      If the property "com.sun.management.snmp.acl" is set to false,
-#      then this property and the ACL file are ignored.
-#      Otherwise the ACL file must exist and be in the valid format.
-#      If the ACL file is empty or non existent then no access is allowed.
-#
-#      The SNMP agent will read the ACL file at startup time.
-#      Modification to the ACL file has no effect to any running SNMP
-#      agents which read that ACL file at startup.
-#
-
-# For a non-default acl file location use following line
-# com.sun.management.snmp.acl.file=filepath
-
 #####################################################################
 #			RMI Management Properties
 #####################################################################
diff --git a/test/jdk/sun/management/windows/README b/test/jdk/sun/management/windows/README
index c59d214f568..3be62ba73a4 100644
--- a/test/jdk/sun/management/windows/README
+++ b/test/jdk/sun/management/windows/README
@@ -5,7 +5,6 @@ utility to remove all non-owner Access Control Entries from a given file.
 The tool is used by regression tests in the following directories :-
 
 test/sun/management/jmxremote/bootstrap
-test/sun/management/snmp/bootstrap
 
 The tests in these directories create password or ACL files that need to
 be "secured" (meaning that only the owner should have access to the 
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list b/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list
index 23f999eac45..fe6e2c6169b 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list
+++ b/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list
@@ -332,7 +332,6 @@ com.sun.security.auth.login
 com.sun.security.auth.module
 module:jdk.security.jgss
 com.sun.security.jgss
-module:jdk.snmp
 module:jdk.xml.dom
 org.w3c.dom.css
 org.w3c.dom.html

From ed763b7e37eab563dabf84725dd817f7bca22f1c Mon Sep 17 00:00:00 2001
From: vromero <unknown>
Date: Fri, 6 Apr 2018 09:15:09 -0400
Subject: [PATCH 089/196] 8199744: Incorrect compiler message for
 ReceiverParameter in inner class constructor Reviewed-by: mcimadamore

---
 .../sun/tools/javac/parser/JavacParser.java   | 43 +++++++++----------
 .../tools/javac/resources/compiler.properties |  3 +-
 .../IncorrectMsgQualifiedReceiverTest.java    | 11 +++++
 .../IncorrectMsgQualifiedReceiverTest.out     |  3 ++
 .../tools/javac/lambda/8131742/T8131742.out   |  4 +-
 5 files changed, 38 insertions(+), 26 deletions(-)
 create mode 100644 test/langtools/tools/javac/T8199744/IncorrectMsgQualifiedReceiverTest.java
 create mode 100644 test/langtools/tools/javac/T8199744/IncorrectMsgQualifiedReceiverTest.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index dd18927c295..05d81f99356 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -3106,35 +3106,34 @@ JCVariableDecl variableDeclaratorId(JCModifiers mods, JCExpression type, boolean
             name = token.name();
             nextToken();
         } else {
-            if (allowThisIdent && !lambdaParameter) {
+            if (allowThisIdent ||
+                !lambdaParameter ||
+                LAX_IDENTIFIER.accepts(token.kind) ||
+                mods.flags != Flags.PARAMETER ||
+                mods.annotations.nonEmpty()) {
                 JCExpression pn = qualident(false);
                 if (pn.hasTag(Tag.IDENT) && ((JCIdent)pn).name != names._this) {
                     name = ((JCIdent)pn).name;
                 } else {
-                    if ((mods.flags & Flags.VARARGS) != 0) {
-                        log.error(token.pos, Errors.VarargsAndReceiver);
-                    }
-                    if (token.kind == LBRACKET) {
-                        log.error(token.pos, Errors.ArrayAndReceiver);
+                    if (allowThisIdent) {
+                        if ((mods.flags & Flags.VARARGS) != 0) {
+                            log.error(token.pos, Errors.VarargsAndReceiver);
+                        }
+                        if (token.kind == LBRACKET) {
+                            log.error(token.pos, Errors.ArrayAndReceiver);
+                        }
                     }
                     return toP(F.at(pos).ReceiverVarDef(mods, pn, type));
                 }
             } else {
-                if (!lambdaParameter ||
-                        LAX_IDENTIFIER.accepts(token.kind) ||
-                        mods.flags != Flags.PARAMETER ||
-                        mods.annotations.nonEmpty()) {
-                    name = ident();
-                } else {
-                    /** if it is a lambda parameter and the token kind is not an identifier,
-                     *  and there are no modifiers or annotations, then this means that the compiler
-                     *  supposed the lambda to be explicit but it can contain a mix of implicit,
-                     *  var or explicit parameters. So we assign the error name to the parameter name
-                     *  instead of issuing an error and analyze the lambda parameters as a whole at
-                     *  a higher level.
-                     */
-                    name = names.empty;
-                }
+                /** if it is a lambda parameter and the token kind is not an identifier,
+                 *  and there are no modifiers or annotations, then this means that the compiler
+                 *  supposed the lambda to be explicit but it can contain a mix of implicit,
+                 *  var or explicit parameters. So we assign the error name to the parameter name
+                 *  instead of issuing an error and analyze the lambda parameters as a whole at
+                 *  a higher level.
+                 */
+                name = names.empty;
             }
         }
         if ((mods.flags & Flags.VARARGS) != 0 &&
@@ -3905,7 +3904,7 @@ List<JCVariableDecl> formalParameters(boolean lambdaParameters) {
         JCVariableDecl lastParam;
         accept(LPAREN);
         if (token.kind != RPAREN) {
-            this.allowThisIdent = true;
+            this.allowThisIdent = !lambdaParameters;
             lastParam = formalParameter(lambdaParameters);
             if (lastParam.nameexpr != null) {
                 this.receiverParam = lastParam;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 45aee082db4..7d5891b02e6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -2740,7 +2740,8 @@ compiler.err.assert.as.identifier=\
 
 # TODO 308: make a better error message
 compiler.err.this.as.identifier=\
-    as of release 8, ''this'' is allowed as the parameter name for the receiver type only, which has to be the first parameter
+    as of release 8, ''this'' is allowed as the parameter name for the receiver type only\n\
+    which has to be the first parameter, and cannot be a lambda parameter
 
 compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=\
     receiver parameter not applicable for constructor of top-level class
diff --git a/test/langtools/tools/javac/T8199744/IncorrectMsgQualifiedReceiverTest.java b/test/langtools/tools/javac/T8199744/IncorrectMsgQualifiedReceiverTest.java
new file mode 100644
index 00000000000..5ff982a9275
--- /dev/null
+++ b/test/langtools/tools/javac/T8199744/IncorrectMsgQualifiedReceiverTest.java
@@ -0,0 +1,11 @@
+/*
+ * @test  /nodynamiccopyright/
+ * @bug 8199744
+ * @summary Incorrect compiler message for ReceiverParameter in inner class constructor
+ * @compile/fail/ref=IncorrectMsgQualifiedReceiverTest.out -XDrawDiagnostics IncorrectMsgQualifiedReceiverTest.java
+ */
+
+class IncorrectMsgQualifiedReceiverTest {
+    void foo(int any, IncorrectMsgQualifiedReceiverTest IncorrectMsgQualifiedReceiverTest.this) {}
+    void bar(int any, IncorrectMsgQualifiedReceiverTest IncorrectMsgQualifiedReceiverTest.this, int another) {}
+}
diff --git a/test/langtools/tools/javac/T8199744/IncorrectMsgQualifiedReceiverTest.out b/test/langtools/tools/javac/T8199744/IncorrectMsgQualifiedReceiverTest.out
new file mode 100644
index 00000000000..364a5c1b5df
--- /dev/null
+++ b/test/langtools/tools/javac/T8199744/IncorrectMsgQualifiedReceiverTest.out
@@ -0,0 +1,3 @@
+IncorrectMsgQualifiedReceiverTest.java:9:91: compiler.err.this.as.identifier
+IncorrectMsgQualifiedReceiverTest.java:10:91: compiler.err.this.as.identifier
+2 errors
diff --git a/test/langtools/tools/javac/lambda/8131742/T8131742.out b/test/langtools/tools/javac/lambda/8131742/T8131742.out
index b8fd425543e..efc3c1c97fa 100644
--- a/test/langtools/tools/javac/lambda/8131742/T8131742.out
+++ b/test/langtools/tools/javac/lambda/8131742/T8131742.out
@@ -1,4 +1,2 @@
-T8131742.java:8:38: compiler.err.expected3: ',', ')', '['
 T8131742.java:8:39: compiler.err.this.as.identifier
-T8131742.java:8:43: compiler.err.expected: ';'
-3 errors
+1 error

From 27852c6a294571903aa032ce51a7be1ce5e39e23 Mon Sep 17 00:00:00 2001
From: rriggs <unknown>
Date: Fri, 6 Apr 2018 12:49:23 -0400
Subject: [PATCH 090/196] 8200706: Better cleanup for
 open/test/jdk/java/lang/ProcessBuilder/DestroyTest.java Reviewed-by: psandoz,
 lancea

---
 .../java/lang/ProcessBuilder/DestroyTest.java | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/test/jdk/java/lang/ProcessBuilder/DestroyTest.java b/test/jdk/java/lang/ProcessBuilder/DestroyTest.java
index 401bd146c28..f992cba1ab9 100644
--- a/test/jdk/java/lang/ProcessBuilder/DestroyTest.java
+++ b/test/jdk/java/lang/ProcessBuilder/DestroyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -145,18 +145,16 @@ public static ProcessTest getTest() throws Exception {
         String osName = System.getProperty("os.name");
         if (osName.startsWith("Windows")) {
             return new WindowsTest();
-        } else if (osName.startsWith("Linux") == true) {
-            return new UnixTest(
-                File.createTempFile("ProcessTrap-", ".sh",null));
-        } else if (osName.startsWith("Mac OS")) {
-            return new MacTest(
-                File.createTempFile("ProcessTrap-", ".sh",null));
-        } else if (osName.equals("SunOS")) {
-            return new UnixTest(
-                File.createTempFile("ProcessTrap-", ".sh",null));
-        } else if (osName.equals("AIX")) {
-            return new UnixTest(
-                File.createTempFile("ProcessTrap-", ".sh",null));
+        } else {
+            File userDir = new File(System.getProperty("user.dir", "."));
+            File tempFile = File.createTempFile("ProcessTrap-", ".sh", userDir);
+            if (osName.startsWith("Linux") == true
+                    || osName.equals("SunOS")
+                    || osName.equals("AIX")) {
+                return new UnixTest(tempFile);
+            } else if (osName.startsWith("Mac OS")) {
+                return new MacTest(tempFile);
+            }
         }
         return null;
     }

From 339f7a922ea0cf2d34d24e09c9c1566a66420048 Mon Sep 17 00:00:00 2001
From: cushon <unknown>
Date: Fri, 6 Apr 2018 08:58:22 -0700
Subject: [PATCH 091/196] 8201251: The tests for JDK-8187247 should be under
 test/langtools Reviewed-by: darcy

---
 .../ImportCanonicalSameName/ImportCanonicalSameName.java          | 0
 .../ImportCanonicalSameName/ImportCanonicalSameName.out           | 0
 .../tools/javac/importChecks/ImportCanonicalSameName/p1/A.java    | 0
 .../tools/javac/importChecks/ImportCanonicalSameName/p2/A.java    | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename test/{ => langtools}/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java (100%)
 rename test/{ => langtools}/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out (100%)
 rename test/{ => langtools}/tools/javac/importChecks/ImportCanonicalSameName/p1/A.java (100%)
 rename test/{ => langtools}/tools/javac/importChecks/ImportCanonicalSameName/p2/A.java (100%)

diff --git a/test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java b/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java
similarity index 100%
rename from test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java
rename to test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.java
diff --git a/test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out b/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out
similarity index 100%
rename from test/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out
rename to test/langtools/tools/javac/importChecks/ImportCanonicalSameName/ImportCanonicalSameName.out
diff --git a/test/tools/javac/importChecks/ImportCanonicalSameName/p1/A.java b/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/p1/A.java
similarity index 100%
rename from test/tools/javac/importChecks/ImportCanonicalSameName/p1/A.java
rename to test/langtools/tools/javac/importChecks/ImportCanonicalSameName/p1/A.java
diff --git a/test/tools/javac/importChecks/ImportCanonicalSameName/p2/A.java b/test/langtools/tools/javac/importChecks/ImportCanonicalSameName/p2/A.java
similarity index 100%
rename from test/tools/javac/importChecks/ImportCanonicalSameName/p2/A.java
rename to test/langtools/tools/javac/importChecks/ImportCanonicalSameName/p2/A.java

From 05b53611aea4372a5158770e5ee4dc7505c231ba Mon Sep 17 00:00:00 2001
From: Peter Bain <peter_bain@ca.ibm.com>
Date: Fri, 6 Apr 2018 15:18:55 -0400
Subject: [PATCH 092/196] Fix race condition in jdwp

Normally, the event helper thread suspends all threads, then the debug loop in
the listener thread receives a command to resume. The debugger may deadlock if
the debug loop in the listener thread starts processing commands (e.g. resume
threads) before the event helper completes the initialization (and suspends
threads).

This patch adds synchronization to ensure the event helper completes the
initialization sequence before debugger commands are processed.

Signed-off-by: Peter Bain <peter_bain@ca.ibm.com>
---
 .../share/native/libjdwp/debugInit.c          | 37 +++++++++++++++++--
 .../share/native/libjdwp/debugInit.h          |  6 ++-
 .../share/native/libjdwp/debugLoop.c          |  9 +++--
 .../share/native/libjdwp/eventHelper.c        |  7 +++-
 4 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
index 4ed1d5abf71..2568f2fd28e 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.c
@@ -1,5 +1,7 @@
-/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+/*******************************************************************************
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ *
+ * Copyright (c) 1998, 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
@@ -58,6 +60,7 @@
 static jboolean vmInitialized;
 static jrawMonitorID initMonitor;
 static jboolean initComplete;
+static jboolean VMInitComplete;
 static jbyte currentSessionID;
 
 /*
@@ -435,8 +438,9 @@ cbEarlyVMInit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread)
     if ( gdata->vmDead ) {
         EXIT_ERROR(AGENT_ERROR_INTERNAL,"VM dead at VM_INIT time");
     }
-    if (initOnStartup)
+    if (initOnStartup) {
         initialize(env, thread, EI_VM_INIT);
+    }
     vmInitialized = JNI_TRUE;
     LOG_MISC(("END cbEarlyVMInit"));
 }
@@ -617,6 +621,32 @@ debugInit_waitInitComplete(void)
     debugMonitorExit(initMonitor);
 }
 
+void
+signalVMInitComplete(void)
+{
+    /*
+     * VM Initialization is complete
+     */
+    LOG_MISC(("signal VM initialization complete"));
+    debugMonitorEnter(initMonitor);
+    VMInitComplete = JNI_TRUE;
+    debugMonitorNotifyAll(initMonitor);
+    debugMonitorExit(initMonitor);
+}
+
+/*
+ * Wait for VM initialization to complete.
+ */
+void
+debugInit_waitVMInitComplete(void)
+{
+    debugMonitorEnter(initMonitor);
+    while (!VMInitComplete) {
+        debugMonitorWait(initMonitor);
+    }
+    debugMonitorExit(initMonitor);
+}
+
 /* All process exit() calls come from here */
 void
 forceExit(int exit_code)
@@ -672,6 +702,7 @@ initialize(JNIEnv *env, jthread thread, EventIndex triggering_ei)
     LOG_MISC(("Begin initialize()"));
     currentSessionID = 0;
     initComplete = JNI_FALSE;
+    VMInitComplete = JNI_FALSE;
 
     if ( gdata->vmDead ) {
         EXIT_ERROR(AGENT_ERROR_INTERNAL,"VM dead at initialize() time");
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h
index 794e349d895..bef47590398 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/debugInit.h
@@ -1,4 +1,6 @@
-/*
+/*******************************************************************************
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ *
  * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -39,4 +41,6 @@ void debugInit_reset(JNIEnv *env);
 void debugInit_exit(jvmtiError, const char *);
 void forceExit(int);
 
+void debugInit_waitVMInitComplete(void);
+void signalVMInitComplete(void);
 #endif
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c b/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c
index 55d48947c78..1fcba4fd1fd 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c
@@ -1,5 +1,7 @@
-/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+/*******************************************************************************
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ *
+ * Copyright (c) 1998, 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
@@ -98,7 +100,8 @@ debugLoop_run(void)
     standardHandlers_onConnect();
     threadControl_onConnect();
 
-    /* Okay, start reading cmds! */
+    debugInit_waitVMInitComplete();
+	/* Okay, start reading cmds! */
     while (shouldListen) {
         if (!dequeue(&p)) {
             break;
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
index f301cdc63e3..e85dbceaa89 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
@@ -1,5 +1,7 @@
-/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+/*******************************************************************************
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved
+ *
+ * Copyright (c) 1998, 2006, 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
@@ -580,6 +582,7 @@ handleReportVMInitCommand(JNIEnv* env, ReportVMInitCommand *command)
         (void)threadControl_suspendThread(command->thread, JNI_FALSE);
     }
 
+	signalVMInitComplete();
     outStream_initCommand(&out, uniqueID(), 0x0,
                           JDWP_COMMAND_SET(Event),
                           JDWP_COMMAND(Event, Composite));

From 47f03280c0b8976b01238e9141a00f320d77f8e7 Mon Sep 17 00:00:00 2001
From: igerasim <unknown>
Date: Sat, 7 Apr 2018 17:07:13 -0700
Subject: [PATCH 093/196] 8200788: Optimal initial capacity of
 java.lang.VarHandle.AccessMode.methodNameToAccessMode Reviewed-by: redestad

---
 .../classes/java/lang/invoke/VarHandle.java   | 12 ++---
 .../ConstantDirectoryOptimalCapacity.java     |  1 +
 .../VarHandle/AccessMode/OptimalMapSize.java  | 44 +++++++++++++++++++
 3 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java

diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/src/java.base/share/classes/java/lang/invoke/VarHandle.java
index 1b4e1a975ff..d6eca54cc0d 100644
--- a/src/java.base/share/classes/java/lang/invoke/VarHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -1788,10 +1788,12 @@ public enum AccessMode {
 
         static final Map<String, AccessMode> methodNameToAccessMode;
         static {
-            // Initial capacity of # values is sufficient to avoid resizes
-            // for the smallest table size (32)
-            methodNameToAccessMode = new HashMap<>(AccessMode.values().length);
-            for (AccessMode am : AccessMode.values()) {
+            AccessMode[] values = AccessMode.values();
+            // Initial capacity of # values divided by the load factor is sufficient
+            // to avoid resizes for the smallest table size (64)
+            int initialCapacity = (int)(values.length / 0.75f) + 1;
+            methodNameToAccessMode = new HashMap<>(initialCapacity);
+            for (AccessMode am : values) {
                 methodNameToAccessMode.put(am.methodName, am);
             }
         }
diff --git a/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java b/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java
index de9a235b723..a7072046ac7 100644
--- a/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java
+++ b/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java
@@ -27,6 +27,7 @@
  * @summary Initial capacity of Class.enumConstantDirectory is not optimal
  * @library /lib/testlibrary
  * @modules java.base/java.lang:open
+ *          java.base/java.util:open
  * @build jdk.testlibrary.OptimalCapacity
  * @run main ConstantDirectoryOptimalCapacity
  */
diff --git a/test/jdk/java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java b/test/jdk/java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java
new file mode 100644
index 00000000000..dfcfd2cd37b
--- /dev/null
+++ b/test/jdk/java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8200788
+ * @summary Optimal initial capacity of AccessMode.methodNameToAccessMode
+ * @library /lib/testlibrary
+ * @modules java.base/java.lang.invoke:open
+ *          java.base/java.util:open
+ * @build jdk.testlibrary.OptimalCapacity
+ * @run main OptimalMapSize
+ */
+
+import java.lang.invoke.VarHandle.AccessMode;
+import jdk.testlibrary.OptimalCapacity;
+
+public class OptimalMapSize {
+    public static void main(String[] args) throws Throwable {
+        int initialCapacity = (int)(AccessMode.values().length / 0.75f) + 1;
+        OptimalCapacity.ofHashMap(AccessMode.class, "methodNameToAccessMode",
+                initialCapacity);
+    }
+}

From 91acb1c57b504674ae1ca9b59834216123d8482e Mon Sep 17 00:00:00 2001
From: weijun <unknown>
Date: Sun, 8 Apr 2018 11:32:46 +0800
Subject: [PATCH 094/196] 8200792: PKCS12Attribute#hashCode is always constant
 -1 Reviewed-by: xuelei

---
 .../java/security/PKCS12Attribute.java        | 13 +++---
 .../security/PKCS12Attribute/HashCode.java    | 40 +++++++++++++++++++
 2 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 test/jdk/java/security/PKCS12Attribute/HashCode.java

diff --git a/src/java.base/share/classes/java/security/PKCS12Attribute.java b/src/java.base/share/classes/java/security/PKCS12Attribute.java
index a8f1a9db2f2..8b15c13cbb9 100644
--- a/src/java.base/share/classes/java/security/PKCS12Attribute.java
+++ b/src/java.base/share/classes/java/security/PKCS12Attribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -44,7 +44,7 @@ public final class PKCS12Attribute implements KeyStore.Entry.Attribute {
         Pattern.compile("^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2})+$");
     private String name;
     private String value;
-    private byte[] encoded;
+    private final byte[] encoded;
     private int hashValue = -1;
 
     /**
@@ -199,7 +199,7 @@ public boolean equals(Object obj) {
         if (!(obj instanceof PKCS12Attribute)) {
             return false;
         }
-        return Arrays.equals(encoded, ((PKCS12Attribute) obj).getEncoded());
+        return Arrays.equals(encoded, ((PKCS12Attribute) obj).encoded);
     }
 
     /**
@@ -210,10 +210,11 @@ public boolean equals(Object obj) {
      */
     @Override
     public int hashCode() {
-        if (hashValue == -1) {
-            Arrays.hashCode(encoded);
+        int h = hashValue;
+        if (h == -1) {
+            hashValue = h = Arrays.hashCode(encoded);
         }
-        return hashValue;
+        return h;
     }
 
     /**
diff --git a/test/jdk/java/security/PKCS12Attribute/HashCode.java b/test/jdk/java/security/PKCS12Attribute/HashCode.java
new file mode 100644
index 00000000000..21d2fd1f7f2
--- /dev/null
+++ b/test/jdk/java/security/PKCS12Attribute/HashCode.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8200792
+ * @summary PKCS12Attribute#hashCode is always constant -1
+ */
+
+import java.security.PKCS12Attribute;
+
+public class HashCode {
+    public static void main(String[] args) throws Exception {
+        int h1 = new PKCS12Attribute("1.2.3.4", "AA").hashCode();
+        int h2 = new PKCS12Attribute("2.3.4.5", "BB,CC").hashCode();
+        if (h1 == -1 || h2 == -1 || h1 == h2) {
+            throw new Exception("I see " + h1 + " and " + h2);
+        }
+    }
+}

From cdf36ef74bec43f39b10c6bd003aa8b1dad3298e Mon Sep 17 00:00:00 2001
From: weijun <unknown>
Date: Sun, 8 Apr 2018 17:01:20 +0800
Subject: [PATCH 095/196] 8180570: Refactor sun/security/mscapi shell tests to
 plain java tests Reviewed-by: asmotrak

---
 .../mscapi/KeyStoreCompatibilityMode.java     |  13 +-
 .../mscapi/KeyStoreCompatibilityMode.sh       |  66 ---------
 .../security/mscapi/KeytoolChangeAlias.java   |  76 ++++++++++
 .../sun/security/mscapi/KeytoolChangeAlias.sh | 135 ------------------
 .../sun/security/mscapi/PublicKeyInterop.java |  33 ++++-
 .../sun/security/mscapi/PublicKeyInterop.sh   |  87 -----------
 .../security/mscapi/RSAEncryptDecrypt.java    |   9 +-
 .../sun/security/mscapi/RSAEncryptDecrypt.sh  |  83 -----------
 .../sun/security/mscapi/ShortRSAKey1024.sh    | 116 ---------------
 .../security/mscapi/ShortRSAKeyWithinTLS.java |  58 +++++---
 .../security/mscapi/SignUsingSHA2withRSA.java |  36 ++++-
 .../security/mscapi/SignUsingSHA2withRSA.sh   |  84 -----------
 .../nonUniqueAliases/NonUniqueAliases.java    |  93 ++++++++++++
 .../nonUniqueAliases/NonUniqueAliases.sh      | 100 -------------
 test/lib/jdk/test/lib/SecurityTools.java      |   6 +-
 15 files changed, 294 insertions(+), 701 deletions(-)
 delete mode 100644 test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.sh
 create mode 100644 test/jdk/sun/security/mscapi/KeytoolChangeAlias.java
 delete mode 100644 test/jdk/sun/security/mscapi/KeytoolChangeAlias.sh
 delete mode 100644 test/jdk/sun/security/mscapi/PublicKeyInterop.sh
 delete mode 100644 test/jdk/sun/security/mscapi/RSAEncryptDecrypt.sh
 delete mode 100644 test/jdk/sun/security/mscapi/ShortRSAKey1024.sh
 delete mode 100644 test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.sh
 create mode 100644 test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.java
 delete mode 100644 test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh

diff --git a/test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.java b/test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.java
index b18abca674f..573cf9fad0b 100644
--- a/test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.java
+++ b/test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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,8 +22,15 @@
  */
 
 /**
- * @see KeyStoreCompatibilityMode.sh
- */
+ * @test
+ * @bug 6324294 6931562 8180570
+ * @requires os.family == "windows"
+ * @run main KeyStoreCompatibilityMode
+ * @run main/othervm -Dsun.security.mscapi.keyStoreCompatibilityMode=true KeyStoreCompatibilityMode
+ * @run main/othervm -Dsun.security.mscapi.keyStoreCompatibilityMode=false KeyStoreCompatibilityMode -disable
+ * @summary Confirm that a null stream or password is not permitted when
+ *          compatibility mode is enabled (and vice versa).
+*/
 
 import java.io.*;
 import java.security.Provider;
diff --git a/test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.sh b/test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.sh
deleted file mode 100644
index 80a9d565420..00000000000
--- a/test/jdk/sun/security/mscapi/KeyStoreCompatibilityMode.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2005, 2015, 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
-# @bug 6324294 6931562
-# @requires os.family == "windows"
-# @run shell KeyStoreCompatibilityMode.sh
-# @summary Confirm that a null stream or password is not permitted when 
-#          compatibility mode is enabled (and vice versa).
-
-OS=`uname -s`
-case "$OS" in
-    Windows* | CYGWIN* )
-
-    # 'uname -m' does not give us enough information -
-    #  should rely on $PROCESSOR_IDENTIFIER (as is done in Defs-windows.gmk),
-    #  but JTREG does not pass this env variable when executing a shell script.
-    #
-    #  execute test program - rely on it to exit if platform unsupported
-
-	${TESTJAVA}/bin/javac -d . ${TESTSRC}\\KeyStoreCompatibilityMode.java
-
-    # mode implicitly enabled
-	${TESTJAVA}/bin/java ${TESTVMOPTS} KeyStoreCompatibilityMode
-
-    # mode explicitly enabled
-	${TESTJAVA}/bin/java ${TESTVMOPTS} \
-	    -Dsun.security.mscapi.keyStoreCompatibilityMode="true" \
-	    KeyStoreCompatibilityMode
-
-    # mode explicitly disabled
-	${TESTJAVA}/bin/java ${TESTVMOPTS} \
-	    -Dsun.security.mscapi.keyStoreCompatibilityMode="false" \
-	    KeyStoreCompatibilityMode -disable
-
-	exit
-	;;
-
-    * )
-        echo "This test is not intended for '$OS' - passing test"
-        exit 0
-        ;;
-esac
-
diff --git a/test/jdk/sun/security/mscapi/KeytoolChangeAlias.java b/test/jdk/sun/security/mscapi/KeytoolChangeAlias.java
new file mode 100644
index 00000000000..7b48dca9b7a
--- /dev/null
+++ b/test/jdk/sun/security/mscapi/KeytoolChangeAlias.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2018, 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 jdk.test.lib.SecurityTools;
+
+import java.security.KeyStore;
+
+/*
+ * @test
+ * @bug 6415696 6931562 8180570
+ * @requires os.family == "windows"
+ * @library /test/lib
+ * @library /test/jdk/java/security/testlibrary
+ * @summary Test "keytool -changealias" using the Microsoft CryptoAPI provider.
+ */
+public class KeytoolChangeAlias {
+    public static void main(String[] args) throws Exception {
+
+        KeyStore ks = KeyStore.getInstance("Windows-MY");
+        ks.load(null, null);
+
+        try {
+            ks.setCertificateEntry("246810", CertUtils.getCertFromFile("246810.cer"));
+
+            if (ks.containsAlias("13579")) {
+                ks.deleteEntry("13579");
+            }
+
+            int before = ks.size();
+
+            ks.store(null, null); // no-op, but let's do it before a keytool command
+
+            SecurityTools.keytool("-changealias",
+                    "-storetype", "Windows-My",
+                    "-alias", "246810",
+                    "-destalias", "13579").shouldHaveExitValue(0);
+
+            ks.load(null, null);
+
+            if (ks.size() != before) {
+                throw new Exception("error: unexpected number of entries in the "
+                        + "Windows-MY store. Before: " + before
+                        + ". After: " + ks.size());
+            }
+
+            if (!ks.containsAlias("13579")) {
+                throw new Exception("error: cannot find the new alias name"
+                        + " in the Windows-MY store");
+            }
+        } finally {
+            ks.deleteEntry("13579");
+            ks.deleteEntry("246810");
+            ks.store(null, null);
+        }
+    }
+}
diff --git a/test/jdk/sun/security/mscapi/KeytoolChangeAlias.sh b/test/jdk/sun/security/mscapi/KeytoolChangeAlias.sh
deleted file mode 100644
index 1996490109c..00000000000
--- a/test/jdk/sun/security/mscapi/KeytoolChangeAlias.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2006, 2015, 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
-# @bug 6415696 6931562
-# @requires os.family == "windows"
-# @run shell KeytoolChangeAlias.sh
-# @summary Test "keytool -changealias" using the Microsoft CryptoAPI provider.
-
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
-   TESTSRC="."
-fi
-
-if [ "${TESTCLASSES}" = "" ] ; then
-   TESTCLASSES="."
-fi
-
-if [ "${TESTJAVA}" = "" ] ; then
-   echo "TESTJAVA not set.  Test cannot execute."
-   echo "FAILED!!!"
-   exit 1
-fi
-
-OS=`uname -s`
-case "$OS" in
-    Windows* | CYGWIN* )
-
-    # 'uname -m' does not give us enough information -
-    #  should rely on $PROCESSOR_IDENTIFIER (as is done in Defs-windows.gmk),
-    #  but JTREG does not pass this env variable when executing a shell script.
-    #
-    #  execute test program - rely on it to exit if platform unsupported
-
-        echo "Creating the alias '246810' in the Windows-My store..."
-        ${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} \
-	    -import \
-	    -storetype Windows-My \
-	    -file ${TESTSRC}/246810.cer \
-	    -alias 246810 \
-	    -noprompt
-
-	if [ $? -ne 0 ] ; then
-            exit $?
-	fi
-
-	echo "Removing the alias '13579', if it is already present..."
-        ${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} \
-	    -list \
-            -storetype Windows-My \
-	    -alias 13579 > /dev/null 2>&1
-
-	if [ $? ] ; then
-            ${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} \
-		-delete \
-		-storetype Windows-My \
-		-alias 13579 \
-		-noprompt
-	fi
-
-	echo "Counting the entries in the store..."
-	count=`${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} -list -storetype Windows-My | wc -l`
-	before=$count
-
-	echo "Changing the alias name from '246810' to '13579'..."
-
-        ${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} \
-	    -changealias \
-	    -storetype Windows-My \
-	    -alias 246810 \
-	    -destalias 13579
-
-	if [ $? -ne 0 ] ; then
-            exit $?
-	fi
-
-	echo "Re-counting the entries in the store..."
-	count=`${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} -list -storetype Windows-My | wc -l`
-	after=$count
-
-	if [ ! $before = $after ]; then
-	    echo "error: unexpected number of entries in the Windows-MY store"
-	    exit 101
-	fi
-
-	echo "Confirming that the new alias is present..."
-        ${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} \
-	    -list \
-            -storetype Windows-My \
-	    -alias 13579 > /dev/null 2>&1
-
-	if [ $? -ne 0 ] ; then
-	    echo "error: cannot find the new alias name in the Windows-MY store"
-	    exit 102
-	fi
-
-	echo "Removing the new alias '13579'..."
-        ${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} \
-	    -delete \
-            -storetype Windows-My \
-	    -alias 13579 > /dev/null 2>&1
-
-	echo done.
-        exit 0
-        ;;
-
-    * )
-        echo "This test is not intended for '$OS' - passing test"
-        exit 0
-        ;;
-esac
diff --git a/test/jdk/sun/security/mscapi/PublicKeyInterop.java b/test/jdk/sun/security/mscapi/PublicKeyInterop.java
index 6fb05bdaf10..6f0b4bc85c9 100644
--- a/test/jdk/sun/security/mscapi/PublicKeyInterop.java
+++ b/test/jdk/sun/security/mscapi/PublicKeyInterop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,13 +22,19 @@
  */
 
 /**
- * @see PublicKeyInterop.sh
+ * @test
+ * @bug 6888925 8180570
+ * @summary SunMSCAPI's Cipher can't use RSA public keys obtained from other sources.
+ * @requires os.family == "windows"
+ * @library /test/lib
+ * @modules java.base/sun.security.util
  */
 
 import java.security.*;
 import java.util.*;
 import javax.crypto.*;
 
+import jdk.test.lib.SecurityTools;
 import sun.security.util.HexDumpEncoder;
 
 /*
@@ -38,12 +44,31 @@
 public class PublicKeyInterop {
 
     public static void main(String[] arg) throws Exception {
+
+        SecurityTools.keytool("-genkeypair",
+                "-storetype", "Windows-My",
+                "-keyalg", "RSA",
+                "-alias", "6888925",
+                "-dname", "cn=6888925,c=US",
+                "-noprompt").shouldHaveExitValue(0);
+
+        try {
+            run();
+        } finally {
+            KeyStore ks = KeyStore.getInstance("Windows-MY");
+            ks.load(null, null);
+            ks.deleteEntry("6888925");
+            ks.store(null, null);
+        }
+    }
+
+    static void run() throws Exception {
+
         KeyStore ks = KeyStore.getInstance("Windows-MY");
         ks.load(null, null);
         System.out.println("Loaded keystore: Windows-MY");
 
-        PublicKey myPuKey =
-            (PublicKey) ks.getCertificate("6888925").getPublicKey();
+        PublicKey myPuKey = ks.getCertificate("6888925").getPublicKey();
         System.out.println("Public key is a " + myPuKey.getClass().getName());
         PrivateKey myPrKey = (PrivateKey) ks.getKey("6888925", null);
         System.out.println("Private key is a " + myPrKey.getClass().getName());
diff --git a/test/jdk/sun/security/mscapi/PublicKeyInterop.sh b/test/jdk/sun/security/mscapi/PublicKeyInterop.sh
deleted file mode 100644
index aab5ab87844..00000000000
--- a/test/jdk/sun/security/mscapi/PublicKeyInterop.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2011, 2015, 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
-# @bug 6888925
-# @requires os.family == "windows"
-# @run shell PublicKeyInterop.sh
-# @summary SunMSCAPI's Cipher can't use RSA public keys obtained from other
-#          sources.
-#
-
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
-   TESTSRC="."
-fi
-
-if [ "${TESTCLASSES}" = "" ] ; then
-   TESTCLASSES="."
-fi
-
-if [ "${TESTJAVA}" = "" ] ; then
-   echo "TESTJAVA not set.  Test cannot execute."
-   echo "FAILED!!!"
-   exit 1
-fi
-
-OS=`uname -s`
-case "$OS" in
-    Windows* | CYGWIN* )
-
-        echo "Creating a temporary RSA keypair in the Windows-My store..."
-        ${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} \
-	    -genkeypair \
-	    -storetype Windows-My \
-	    -keyalg RSA \
-	    -alias 6888925 \
-	    -dname "cn=6888925,c=US" \
-	    -noprompt
-
-        echo
-        echo "Running the test..."
-        ${TESTJAVA}/bin/javac --add-exports java.base/sun.security.util=ALL-UNNAMED \
-            ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}\\PublicKeyInterop.java
-        ${TESTJAVA}/bin/java --add-exports java.base/sun.security.util=ALL-UNNAMED \
-            ${TESTVMOPTS} PublicKeyInterop
-
-        rc=$?
-
-        echo
-        echo "Removing the temporary RSA keypair from the Windows-My store..."
-        ${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} \
-	    -delete \
-	    -storetype Windows-My \
-	    -alias 6888925
-
-	echo done.
-        exit $rc
-        ;;
-
-    * )
-        echo "This test is not intended for '$OS' - passing test"
-        exit 0
-        ;;
-esac
diff --git a/test/jdk/sun/security/mscapi/RSAEncryptDecrypt.java b/test/jdk/sun/security/mscapi/RSAEncryptDecrypt.java
index 5b23c253c51..18ad012ff9a 100644
--- a/test/jdk/sun/security/mscapi/RSAEncryptDecrypt.java
+++ b/test/jdk/sun/security/mscapi/RSAEncryptDecrypt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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,7 +23,12 @@
 
 
 /**
- * @see RSAEncryptDecrypt.sh
+ * @test
+ * @bug 6457422 6931562 8180570
+ * @summary Confirm that plaintext can be encrypted and then decrypted using the
+ *     RSA cipher in the SunMSCAPI crypto provider. NOTE: The RSA cipher is
+ *     absent from the SunMSCAPI provider in OpenJDK builds.
+ * @requires os.family == "windows"
  */
 
 import javax.crypto.Cipher;
diff --git a/test/jdk/sun/security/mscapi/RSAEncryptDecrypt.sh b/test/jdk/sun/security/mscapi/RSAEncryptDecrypt.sh
deleted file mode 100644
index 9c5efb656b8..00000000000
--- a/test/jdk/sun/security/mscapi/RSAEncryptDecrypt.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2006, 2015, 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
-# @bug 6457422 6931562
-# @requires os.family == "windows"
-# @run shell RSAEncryptDecrypt.sh
-# @summary Confirm that plaintext can be encrypted and then decrypted using the
-#	   RSA cipher in the SunMSCAPI crypto provider. NOTE: The RSA cipher is 
-#	   absent from the SunMSCAPI provider in OpenJDK builds.
-
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
-   TESTSRC="."
-fi
-
-if [ "${TESTCLASSES}" = "" ] ; then
-   TESTCLASSES="."
-fi
-
-if [ "${TESTJAVA}" = "" ] ; then
-   echo "TESTJAVA not set.  Test cannot execute."
-   echo "FAILED!!!"
-   exit 1
-fi
-
-
-OS=`uname -s`
-case "$OS" in
-    Windows* | CYGWIN* )
-
-	#
-	# Workaround for 6449799
-	#
-	if [ "${SystemDrive}" = "" ]; then
-	    SystemRoot="`dosname "${SystemRoot}"`"
-	    export SystemRoot
-	    SystemDrive="`echo ${SystemRoot} | cut -d'/' -f1`"
-	    export SystemDrive
-	fi
-
-	# 'uname -m' does not give us enough information -
-	#  should rely on $PROCESSOR_IDENTIFIER (as is done in
-	#  Defs-windows.gmk), but JTREG does not pass this env variable
-	#  when executing a shell script.
-	#
-	# execute test program - rely on it to exit if platform
-	# unsupported
-
-	${TESTJAVA}/bin/javac -d . ${TESTSRC}\\RSAEncryptDecrypt.java
-	${TESTJAVA}/bin/java ${TESTVMOPTS} RSAEncryptDecrypt
-	exit
-	;;
-
-    * )
-	echo "This test is not intended for '$OS' - passing test"
-	exit 0
-	;;
-esac
-
diff --git a/test/jdk/sun/security/mscapi/ShortRSAKey1024.sh b/test/jdk/sun/security/mscapi/ShortRSAKey1024.sh
deleted file mode 100644
index 67f5ecba390..00000000000
--- a/test/jdk/sun/security/mscapi/ShortRSAKey1024.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2012, 2018, 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
-# @bug 7106773
-# @summary 512 bits RSA key cannot work with SHA384 and SHA512
-# @requires os.family == "windows"
-# @run shell ShortRSAKey1024.sh 1024
-# @run shell ShortRSAKey1024.sh 768
-# @run shell ShortRSAKey1024.sh 512
-
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
-   TESTSRC="."
-fi
-
-if [ "${TESTCLASSES}" = "" ] ; then
-   TESTCLASSES="."
-fi
-
-if [ "${TESTJAVA}" = "" ] ; then
-   echo "TESTJAVA not set.  Test cannot execute."
-   echo "FAILED!!!"
-   exit 1
-fi
-
-OS=`uname -s`
-case "$OS" in
-  AIX | CYGWIN* | Darwin | Linux | SunOS )
-    FS="/"
-    ;;
-  Windows_* )
-    FS="\\"
-    ;;
-esac
-
-BITS=$1
-
-case "$OS" in
-    Windows* | CYGWIN* )
-
-        echo "Removing the keypair if it already exists (for unknown reason)..."
-        ${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} \
-            -delete \
-            -storetype Windows-My \
-            -debug \
-            -alias 7106773.$BITS
-
-        echo "Creating a temporary RSA keypair in the Windows-My store..."
-        ${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} \
-            -genkeypair \
-            -storetype Windows-My \
-            -keyalg RSA \
-            -alias 7106773.$BITS \
-            -keysize $BITS \
-            -dname "cn=localhost,c=US" \
-            -debug \
-            -noprompt
-
-        if [ "$?" -ne "0" ]; then
-            echo "Unable to generate key pair in Windows-My keystore"
-            exit 1
-        fi
-
-        echo
-        echo "Running the test..."
-        ${TESTJAVA}${FS}bin${FS}javac --add-exports java.base/sun.security.util=ALL-UNNAMED \
-            ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . \
-            ${TESTSRC}${FS}ShortRSAKeyWithinTLS.java
-        ${TESTJAVA}${FS}bin${FS}java --add-exports java.base/sun.security.util=ALL-UNNAMED \
-            ${TESTVMOPTS} ShortRSAKeyWithinTLS 7106773.$BITS $BITS \
-            TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA
-
-        rc=$?
-
-        echo
-        echo "Removing the temporary RSA keypair from the Windows-My store..."
-        ${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} \
-            -delete \
-            -storetype Windows-My \
-            -debug \
-            -alias 7106773.$BITS
-
-        echo "Done".
-        exit $rc
-        ;;
-
-    * )
-        echo "This test is not intended for '$OS' - passing test"
-        exit 0
-        ;;
-esac
diff --git a/test/jdk/sun/security/mscapi/ShortRSAKeyWithinTLS.java b/test/jdk/sun/security/mscapi/ShortRSAKeyWithinTLS.java
index 4a66abb290d..7b063a00471 100644
--- a/test/jdk/sun/security/mscapi/ShortRSAKeyWithinTLS.java
+++ b/test/jdk/sun/security/mscapi/ShortRSAKeyWithinTLS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -21,15 +21,30 @@
  * questions.
  */
 
+/*
+ * @test
+ * @bug 7106773 8180570
+ * @summary 512 bits RSA key cannot work with SHA384 and SHA512
+ * @requires os.family == "windows"
+ * @modules java.base/sun.security.util
+ *          java.base/sun.security.tools.keytool
+ *          java.base/sun.security.x509
+ * @run main ShortRSAKeyWithinTLS 1024
+ * @run main ShortRSAKeyWithinTLS 768
+ * @run main ShortRSAKeyWithinTLS 512
+ */
 import java.io.*;
 import java.net.*;
+import java.security.cert.Certificate;
 import java.util.*;
 import java.security.*;
 import java.security.cert.*;
 import javax.net.*;
 import javax.net.ssl.*;
 
+import sun.security.tools.keytool.CertAndKeyGen;
 import sun.security.util.KeyUtil;
+import sun.security.x509.X500Name;
 
 public class ShortRSAKeyWithinTLS {
 
@@ -217,28 +232,37 @@ private void checkKeySize(KeyStore ks) throws Exception {
     private static String clientProtocol = null;
     private static String clientCiperSuite = null;
 
-    private static void parseArguments(String[] args) {
-        keyAlias = args[0];
-        keySize = Integer.parseInt(args[1]);
-
-        if (args.length > 2) {
-            clientProtocol = args[2];
-        }
-
-        if (args.length > 3) {
-            clientCiperSuite = args[3];
-        }
-    }
-
     public static void main(String[] args) throws Exception {
         if (debug) {
             System.setProperty("javax.net.debug", "all");
         }
 
-        // Get the customized arguments.
-        parseArguments(args);
+        keyAlias = "7106773." + args[0];
+        keySize = Integer.parseInt(args[0]);
 
-        new ShortRSAKeyWithinTLS();
+        KeyStore ks = KeyStore.getInstance("Windows-MY");
+        ks.load(null, null);
+        if (ks.containsAlias(keyAlias)) {
+            ks.deleteEntry(keyAlias);
+        }
+
+        CertAndKeyGen gen = new CertAndKeyGen("RSA", "SHA256withRSA");
+        gen.generate(keySize);
+
+        ks.setKeyEntry(keyAlias, gen.getPrivateKey(), null,
+                new Certificate[] {
+                    gen.getSelfCertificate(new X500Name("cn=localhost,c=US"), 100)
+                });
+
+        clientProtocol = "TLSv1.2";
+        clientCiperSuite = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA";
+
+        try {
+            new ShortRSAKeyWithinTLS();
+        } finally {
+            ks.deleteEntry(keyAlias);
+            ks.store(null, null);
+        }
     }
 
     Thread clientThread = null;
diff --git a/test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.java b/test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.java
index 90973ecce4d..3a2c7472cb7 100644
--- a/test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.java
+++ b/test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,10 +22,19 @@
  */
 
 /**
- * @see SignUsingSHA2withRSA.sh
+ * @test
+ * @bug 6753664 8180570
+ * @summary Support SHA256 (and higher) in SunMSCAPI
+ * @requires os.family == "windows"
+ * @modules java.base/sun.security.tools.keytool
+ *          java.base/sun.security.x509
  */
 
+import sun.security.tools.keytool.CertAndKeyGen;
+import sun.security.x509.X500Name;
+
 import java.security.*;
+import java.security.cert.Certificate;
 import java.util.*;
 
 public class SignUsingSHA2withRSA {
@@ -37,6 +46,29 @@ public class SignUsingSHA2withRSA {
     private static List<byte[]> generatedSignatures = new ArrayList<>();
 
     public static void main(String[] args) throws Exception {
+        KeyStore ks = KeyStore.getInstance("Windows-MY");
+        ks.load(null, null);
+        if (ks.containsAlias("6753664")) {
+            ks.deleteEntry("6753664");
+        }
+
+        CertAndKeyGen gen = new CertAndKeyGen("RSA", "SHA256withRSA");
+        gen.generate(2048);
+
+        ks.setKeyEntry("6753664", gen.getPrivateKey(), null,
+                new Certificate[] {
+                        gen.getSelfCertificate(new X500Name("cn=localhost,c=US"), 100)
+                });
+
+        try {
+            run();
+        } finally {
+            ks.deleteEntry("6753664");
+            ks.store(null, null);
+        }
+    }
+
+    static void run() throws Exception {
 
         Provider[] providers = Security.getProviders("Signature.SHA256withRSA");
         if (providers == null) {
diff --git a/test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.sh b/test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.sh
deleted file mode 100644
index 26a0ad2e7a5..00000000000
--- a/test/jdk/sun/security/mscapi/SignUsingSHA2withRSA.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2011, 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.
-#
-# 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
-# @bug 6753664
-# @requires os.family == "windows"
-# @run shell SignUsingSHA2withRSA.sh
-# @summary Support SHA256 (and higher) in SunMSCAPI
-
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
-   TESTSRC="."
-fi
-
-if [ "${TESTCLASSES}" = "" ] ; then
-   TESTCLASSES="."
-fi
-
-if [ "${TESTJAVA}" = "" ] ; then
-   echo "TESTJAVA not set.  Test cannot execute."
-   echo "FAILED!!!"
-   exit 1
-fi
-
-OS=`uname -s`
-case "$OS" in
-    Windows* | CYGWIN* )
-
-        echo "Creating a temporary RSA keypair in the Windows-My store..."
-        ${TESTJAVA}/bin/keytool \
-	    -genkeypair \
-	    -storetype Windows-My \
-	    -keyalg RSA \
-	    -alias 6753664 \
-	    -dname "cn=6753664,c=US" \
-	    -noprompt
-
-        echo
-	echo "Running the test..."
-        ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingSHA2withRSA.java
-        ${TESTJAVA}/bin/java ${TESTVMOPTS} SignUsingSHA2withRSA
-
-        rc=$?
-
-        echo
-        echo "Removing the temporary RSA keypair from the Windows-My store..."
-        ${TESTJAVA}/bin/keytool \
-	    -delete \
-	    -storetype Windows-My \
-	    -alias 6753664
-
-	echo done.
-        exit $rc
-        ;;
-
-    * )
-        echo "This test is not intended for '$OS' - passing test"
-        exit 0
-        ;;
-esac
diff --git a/test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.java b/test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.java
new file mode 100644
index 00000000000..637adf51d99
--- /dev/null
+++ b/test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2018, 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
+ * @ignore Uses certutil.exe that isn't guaranteed to be installed
+ * @bug 6483657 8154113
+ * @requires os.family == "windows"
+ * @library /test/lib
+ * @summary Test "keytool -list" displays correctly same named certificates
+ */
+
+import jdk.test.lib.process.ProcessTools;
+
+import java.security.KeyStore;
+import java.util.Collections;
+
+public class NonUniqueAliases {
+    public static void main(String[] args) throws Throwable {
+
+        try {
+            String testSrc = System.getProperty("test.src", ".");
+
+            // removing the alias NonUniqueName if it already exists
+            ProcessTools.executeCommand("certutil", "-user", "-delstore", "MY",
+                    "NonUniqueName");
+
+            // Importing 1st certificate into MY keystore using certutil tool
+            ProcessTools.executeCommand("certutil", "-user", "-addstore", "MY",
+                    testSrc + "/nonUniq1.pem");
+
+            // Importing 2nd certificate into MY keystore using certutil tool
+            ProcessTools.executeCommand("certutil", "-user", "-addstore", "MY",
+                    testSrc + "/nonUniq2.pem");
+
+            // Now we have 2
+            checkCount(1, 1);
+
+            ProcessTools.executeCommand("certutil", "-user", "-delstore", "MY",
+                    "NonUniqueName");
+
+            // Now we have 2
+            checkCount(0, 0);
+        } finally {
+            ProcessTools.executeCommand("certutil", "-user", "-delstore", "MY",
+                    "NonUniqueName");
+        }
+    }
+
+    static void checkCount(int c0, int c1) throws Exception {
+
+        KeyStore ks = KeyStore.getInstance("Windows-MY");
+        ks.load(null, null);
+
+        int count0 = 0, count1 = 0;
+        for (String alias : Collections.list(ks.aliases())) {
+            if (alias.equals("NonUniqueName")) {
+                count0++;
+            }
+            if (alias.equals("NonUniqueName (1)")) {
+                count1++;
+            }
+        }
+        if (count0 != c0) {
+            throw new Exception("error: unexpected number of entries ("
+                    + count0 + ") in the Windows-MY store");
+        }
+        if (count1 != c1) {
+            throw new Exception("error: unexpected number of entries ("
+                    + count1 + ") in the Windows-MY store");
+        }
+    }
+}
diff --git a/test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh b/test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh
deleted file mode 100644
index b6e264cbafa..00000000000
--- a/test/jdk/sun/security/mscapi/nonUniqueAliases/NonUniqueAliases.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 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.
-#
-# 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
-# @ignore Uses certutil.exe that isn't guaranteed to be installed
-# @bug 6483657
-# @requires os.family == "windows"
-# @run shell NonUniqueAliases.sh
-# @summary Test "keytool -list" displays correcly same named certificates
-
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
-   TESTSRC="."
-fi
-
-if [ "${TESTCLASSES}" = "" ] ; then
-   TESTCLASSES="."
-fi
-
-if [ "${TESTJAVA}" = "" ] ; then
-   echo "TESTJAVA not set.  Test cannot execute."
-   echo "FAILED!!!"
-   exit 1
-fi
-
-OS=`uname -s`
-case "$OS" in
-    Windows* | CYGWIN* )
-
-        # 'uname -m' does not give us enough information -
-        #  should rely on $PROCESSOR_IDENTIFIER (as is done in Defs-windows.gmk),
-        #  but JTREG does not pass this env variable when executing a shell script.
-        #
-        #  execute test program - rely on it to exit if platform unsupported
-
-        echo "removing the alias NonUniqueName if it already exists"
-        certutil -user -delstore MY NonUniqueName
-
-        echo "Importing 1st certificate into MY keystore using certutil tool"
-        certutil -user -addstore MY ${TESTSRC}/nonUniq1.pem
-
-        echo "Importing 2nd certificate into MY keystore using certutil tool"
-        certutil -user -addstore MY ${TESTSRC}/nonUniq2.pem
-
-        echo "Listing certificates with keytool"
-        ${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} -list -storetype Windows-My
-
-        echo "Counting expected entries"
-        count0=`${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} -list -storetype Windows-My | grep 'NonUniqueName,' | wc -l`
-
-        if [ ! $count0 = 1 ]; then
-            echo "error: unexpected number of entries ($count0) in the Windows-MY store"
-            certutil -user -delstore MY NonUniqueName
-            exit 115
-        fi
-
-        echo "Counting expected entries"
-        count1=`${TESTJAVA}/bin/keytool ${TESTTOOLVMOPTS} -list -storetype Windows-My | grep 'NonUniqueName (1),' | wc -l`
-
-        if [ ! $count1 = 1 ]; then
-            echo "error: unexpected number of entries ($count1) in the Windows-MY store"
-            certutil -user -delstore MY NonUniqueName
-            exit 116
-        fi
-
-        echo "Cleaning up"
-        certutil -user -delstore MY NonUniqueName
-
-        exit 0
-        ;;
-
-    * )
-        echo "This test is not intended for '$OS' - passing test"
-        exit 0
-        ;;
-esac
diff --git a/test/lib/jdk/test/lib/SecurityTools.java b/test/lib/jdk/test/lib/SecurityTools.java
index eb5f5018fdd..240801fb87f 100644
--- a/test/lib/jdk/test/lib/SecurityTools.java
+++ b/test/lib/jdk/test/lib/SecurityTools.java
@@ -43,8 +43,10 @@ public class SecurityTools {
     private static ProcessBuilder getProcessBuilder(String tool, List<String> args) {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(tool)
                 .addVMArg("-Duser.language=en")
-                .addVMArg("-Duser.country=US")
-                .addVMArg("-Djava.security.egd=file:/dev/./urandom");
+                .addVMArg("-Duser.country=US");
+        if (!Platform.isWindows()) {
+            launcher.addVMArg("-Djava.security.egd=file:/dev/./urandom");
+        }
         for (String arg : args) {
             if (arg.startsWith("-J")) {
                 launcher.addVMArg(arg.substring(2));

From 0f7fd82bd00724680e0d0c904af141b1964c6892 Mon Sep 17 00:00:00 2001
From: rwestberg <unknown>
Date: Mon, 9 Apr 2018 10:09:38 +0200
Subject: [PATCH 096/196] 8199736: Define WIN32_LEAN_AND_MEAN before including
 windows.h Reviewed-by: erikj, ihse, kbarrett, dholmes

---
 make/autoconf/flags-cflags.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index b8e1f5214c7..ac70ffd7813 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -453,7 +453,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE \
         -D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
-    ALWAYS_DEFINES_JVM="-DNOMINMAX"
+    ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN"
   fi
 
   ###############################################################################

From 6e6fec1c15d3f5c3e337ed281cf006d521fad9f8 Mon Sep 17 00:00:00 2001
From: sgehwolf <unknown>
Date: Mon, 9 Apr 2018 13:28:47 +0200
Subject: [PATCH 097/196] 8196516: libfontmanager must be built with LDFLAGS
 allowing unresolved symbols Summary: Fixes build failures on some sustems
 with custom LDFLAGS settings. Reviewed-by: erikj, ihse, serb

---
 make/lib/Awt2dLibraries.gmk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index f3205c1fcd8..6392c49f349 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -623,6 +623,10 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
   BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
 endif
 
+# LDFLAGS clarification:
+#   Filter relevant linker flags disallowing unresolved symbols as we cannot
+#   build-time decide to which library to link against (libawt_headless or
+#   libawt_xawt). See JDK-8196516 for details.
 $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
     NAME := fontmanager, \
     SRC := $(LIBFONTMANAGER_SRC), \
@@ -648,7 +652,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
         truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
         hidevf w_novirtualdescr arrowrtn2, \
     DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
-    LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
+    LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \
+        $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \

From eab8e664e2f33b8f1cb1dbf3df28181c951d5957 Mon Sep 17 00:00:00 2001
From: redestad <unknown>
Date: Mon, 9 Apr 2018 13:35:19 +0200
Subject: [PATCH 098/196] 8201178: Remove sun.nio.cs.FastCharsetProvider
 Reviewed-by: alanb

---
 .../sun/nio/cs/FastCharsetProvider.java       | 161 ------------------
 1 file changed, 161 deletions(-)
 delete mode 100644 src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java

diff --git a/src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java b/src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java
deleted file mode 100644
index d0eae762e71..00000000000
--- a/src/java.base/share/classes/sun/nio/cs/FastCharsetProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2004, 2011, 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 sun.nio.cs;
-
-import java.nio.charset.Charset;
-import java.nio.charset.spi.CharsetProvider;
-import java.util.Iterator;
-import java.util.Map;
-
-
-/**
- * Abstract base class for fast charset providers.
- *
- * @author Mark Reinhold
- */
-
-public class FastCharsetProvider
-    extends CharsetProvider
-{
-
-    // Maps canonical names to class names
-    private Map<String,String> classMap;
-
-    // Maps alias names to canonical names
-    private Map<String,String> aliasMap;
-
-    // Maps canonical names to cached instances
-    private Map<String,Charset> cache;
-
-    private String packagePrefix;
-
-    protected FastCharsetProvider(String pp,
-                                  Map<String,String> am,
-                                  Map<String,String> cm,
-                                  Map<String,Charset> c)
-    {
-        packagePrefix = pp;
-        aliasMap = am;
-        classMap = cm;
-        cache = c;
-    }
-
-    private String canonicalize(String csn) {
-        String acn = aliasMap.get(csn);
-        return (acn != null) ? acn : csn;
-    }
-
-    // Private ASCII-only version, optimized for interpretation during startup
-    //
-    private static String toLower(String s) {
-        int n = s.length();
-        boolean allLower = true;
-        for (int i = 0; i < n; i++) {
-            int c = s.charAt(i);
-            if (((c - 'A') | ('Z' - c)) >= 0) {
-                allLower = false;
-                break;
-            }
-        }
-        if (allLower)
-            return s;
-        char[] ca = new char[n];
-        for (int i = 0; i < n; i++) {
-            int c = s.charAt(i);
-            if (((c - 'A') | ('Z' - c)) >= 0)
-                ca[i] = (char)(c + 0x20);
-            else
-                ca[i] = (char)c;
-        }
-        return new String(ca);
-    }
-
-    private Charset lookup(String charsetName) {
-
-        String csn = canonicalize(toLower(charsetName));
-
-        // Check cache first
-        Charset cs = cache.get(csn);
-        if (cs != null)
-            return cs;
-
-        // Do we even support this charset?
-        String cln = classMap.get(csn);
-        if (cln == null)
-            return null;
-
-        if (cln.equals("US_ASCII")) {
-            cs = new US_ASCII();
-            cache.put(csn, cs);
-            return cs;
-        }
-
-        // Instantiate the charset and cache it
-        try {
-            @SuppressWarnings("deprecation")
-            Object o= Class.forName(packagePrefix + "." + cln,
-                                    true,
-                                    this.getClass().getClassLoader()).newInstance();
-            cs = (Charset)o;
-            cache.put(csn, cs);
-            return cs;
-        } catch (ClassNotFoundException |
-                 IllegalAccessException |
-                 InstantiationException x) {
-            return null;
-        }
-    }
-
-    public final Charset charsetForName(String charsetName) {
-        synchronized (this) {
-            return lookup(canonicalize(charsetName));
-        }
-    }
-
-    public final Iterator<Charset> charsets() {
-
-        return new Iterator<Charset>() {
-
-                Iterator<String> i = classMap.keySet().iterator();
-
-                public boolean hasNext() {
-                    return i.hasNext();
-                }
-
-                public Charset next() {
-                    String csn = i.next();
-                    return lookup(csn);
-                }
-
-                public void remove() {
-                    throw new UnsupportedOperationException();
-                }
-
-            };
-
-    }
-
-}

From 6f9f071ac09355b464bf457a54c778cbf6d6e540 Mon Sep 17 00:00:00 2001
From: rpatil <unknown>
Date: Mon, 9 Apr 2018 04:43:03 -0700
Subject: [PATCH 099/196] 8200359: (tz) Upgrade time-zone data to tzdata2018d
 Reviewed-by: naoto

---
 make/data/tzdata/VERSION                      |   2 +-
 make/data/tzdata/africa                       |  57 ++-
 make/data/tzdata/antarctica                   |   3 +-
 make/data/tzdata/asia                         | 177 +++----
 make/data/tzdata/australasia                  | 114 +++--
 make/data/tzdata/europe                       |  84 ++--
 make/data/tzdata/northamerica                 |  27 +-
 make/data/tzdata/southamerica                 | 430 ++++++++++++------
 make/data/tzdata/zone.tab                     |   2 +-
 .../sun/util/resources/TimeZoneNames.java     |   2 +-
 .../util/resources/ext/TimeZoneNames_de.java  |   2 +-
 .../util/resources/ext/TimeZoneNames_es.java  |   2 +-
 .../util/resources/ext/TimeZoneNames_fr.java  |   2 +-
 .../util/resources/ext/TimeZoneNames_it.java  |   2 +-
 .../util/resources/ext/TimeZoneNames_ja.java  |   2 +-
 .../util/resources/ext/TimeZoneNames_ko.java  |   2 +-
 .../resources/ext/TimeZoneNames_pt_BR.java    |   2 +-
 .../util/resources/ext/TimeZoneNames_sv.java  |   2 +-
 .../resources/ext/TimeZoneNames_zh_CN.java    |   2 +-
 .../resources/ext/TimeZoneNames_zh_TW.java    |   2 +-
 test/jdk/sun/util/calendar/zi/tzdata/VERSION  |   2 +-
 test/jdk/sun/util/calendar/zi/tzdata/africa   |  57 ++-
 .../sun/util/calendar/zi/tzdata/antarctica    |   3 +-
 test/jdk/sun/util/calendar/zi/tzdata/asia     | 177 +++----
 .../sun/util/calendar/zi/tzdata/australasia   | 114 +++--
 test/jdk/sun/util/calendar/zi/tzdata/europe   |  84 ++--
 .../sun/util/calendar/zi/tzdata/northamerica  |  27 +-
 .../sun/util/calendar/zi/tzdata/southamerica  | 430 ++++++++++++------
 test/jdk/sun/util/calendar/zi/tzdata/zone.tab |   2 +-
 29 files changed, 1091 insertions(+), 723 deletions(-)

diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION
index 561bd27bce5..f72d1acab47 100644
--- a/make/data/tzdata/VERSION
+++ b/make/data/tzdata/VERSION
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2018c
+tzdata2018d
diff --git a/make/data/tzdata/africa b/make/data/tzdata/africa
index 92c0b43ecf0..1e96df349d0 100644
--- a/make/data/tzdata/africa
+++ b/make/data/tzdata/africa
@@ -138,13 +138,13 @@ Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15  0:01
 
 # Cape Verde / Cabo Verde
 #
+# From Paul Eggert (2018-02-16):
 # Shanks gives 1907 for the transition to +02.
-# Perhaps the 1911-05-26 Portuguese decree
-# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# merely made it official?
+# For now, ignore that and follow the 1911-05-26 Portuguese decree
+# (see Europe/Lisbon).
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907        # Praia
+Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1912 Jan 01  2:00u # Praia
 			-2:00	-	-02	1942 Sep
 			-2:00	1:00	-01	1945 Oct 15
 			-2:00	-	-02	1975 Nov 25  2:00
@@ -393,15 +393,34 @@ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 # See Africa/Abidjan.
 
 # Ghana
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+
+# From Paul Eggert (2018-01-30):
 # Whitman says DST was observed from 1931 to "the present";
-# Shanks & Pottenger say 1936 to 1942;
-# and September 1 to January 1 is given by:
-# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
-# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
-# For lack of better info, assume DST was observed from 1920 to 1942.
-Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
+# Shanks & Pottenger say 1936 to 1942 with 20 minutes of DST,
+# with transitions on 09-01 and 12-31 at 00:00.
+# Page 33 of Parish GCB, Colonial Reports - Annual. No. 1066. Gold
+# Coast. Report for 1919. (March 1921), OCLC 784024077
+# http://libsysdigi.library.illinois.edu/ilharvest/africana/books2011-05/5530214/5530214_1919/5530214_1919_opt.pdf
+# lists the Determination of the Time Ordinance, 1919, No. 18,
+# "to advance the time observed locally by the space of twenty minutes
+# during the last four months of each year; the object in view being
+# to extend during those months the period of daylight-time available
+# for evening recreation after office hours."
+# Vanessa Ogle, The Global Transformation of Time, 1870-1950 (2015), p 33,
+# writes "In 1919, the Gold Coast (Ghana as of 1957) made Greenwich
+# time its legal time and simultaneously legalized a summer time of
+# UTC - 00:20 minutes from March to October."; a footnote lists
+# the ordinance as being dated 1919-11-24.
+# The Crown Colonist, Volume 12 (1942), p 176, says "the Government
+# intend advancing Gold Coast time half an hour ahead of G.M.T.
+# The actual date of the alteration has not yet been announced."
+# These sources are incomplete and contradictory.  Possibly what is
+# now Ghana observed different DST regimes in different years.  For
+# lack of better info, use Shanks except treat the minus sign as a
+# typo, and assume DST started in 1920 not 1936.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	-
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	GMT/+0020
@@ -411,13 +430,13 @@ Zone	Africa/Accra	-0:00:52 -	LMT	1918
 
 # Guinea-Bissau
 #
+# From Paul Eggert (2018-02-16):
 # Shanks gives 1911-05-26 for the transition to WAT,
 # evidently confusing the date of the Portuguese decree
-# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# with the date that it took effect, namely 1912-01-01.
+# (see Europe/Lisbon) with the date that it took effect.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bissau	-1:02:20 -	LMT	1912 Jan  1
+Zone	Africa/Bissau	-1:02:20 -	LMT	1912 Jan  1  1:00u
 			-1:00	-	-01	1975
 			 0:00	-	GMT
 
@@ -613,9 +632,9 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 # at 2am (or 02:00) local time..."
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	S
+Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	-
 Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
-Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	S
+Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	-
 Rule Mauritius	2009	only	-	Mar	lastSun	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
@@ -1060,6 +1079,8 @@ Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
 
 # São Tomé and Príncipe
 
+# See Europe/Lisbon for info about the 1912 transition.
+
 # From Steffen Thorsen (2018-01-08):
 # Multiple sources tell that São Tomé changed from UTC to UTC+1 as
 # they entered the year 2018.
@@ -1068,7 +1089,7 @@ Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
 # http://www.mnec.gov.st/index.php/publicacoes/documentos/file/90-decreto-lei-n-25-2017
 
 Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:45 -	LMT	1912 # Lisbon Mean Time
+			-0:36:45 -	LMT	1912 Jan  1 00:00u # Lisbon MT
 			 0:00	-	GMT	2018 Jan  1 01:00
 			 1:00	-	WAT
 
diff --git a/make/data/tzdata/antarctica b/make/data/tzdata/antarctica
index c78ef7ed503..74ce2dcef51 100644
--- a/make/data/tzdata/antarctica
+++ b/make/data/tzdata/antarctica
@@ -98,7 +98,8 @@ Zone Antarctica/Casey	0	-	-00	1969
 			8:00	-	+08	2011 Oct 28  2:00
 			11:00	-	+11	2012 Feb 21 17:00u
 			8:00	-	+08	2016 Oct 22
-			11:00	-	+11
+			11:00	-	+11	2018 Mar 11  4:00
+			8:00	-	+08
 Zone Antarctica/Davis	0	-	-00	1957 Jan 13
 			7:00	-	+07	1964 Nov
 			0	-	-00	1969 Feb
diff --git a/make/data/tzdata/asia b/make/data/tzdata/asia
index c281ece84de..d03b8ef0b49 100644
--- a/make/data/tzdata/asia
+++ b/make/data/tzdata/asia
@@ -92,13 +92,13 @@
 Rule	EUAsia	1981	max	-	Mar	lastSun	 1:00u	1:00	S
 Rule	EUAsia	1979	1995	-	Sep	lastSun	 1:00u	0	-
 Rule	EUAsia	1996	max	-	Oct	lastSun	 1:00u	0	-
-Rule E-EurAsia	1981	max	-	Mar	lastSun	 0:00	1:00	S
+Rule E-EurAsia	1981	max	-	Mar	lastSun	 0:00	1:00	-
 Rule E-EurAsia	1979	1995	-	Sep	lastSun	 0:00	0	-
 Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
-Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
+Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	-
 Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
 Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
-Rule RussiaAsia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
+Rule RussiaAsia	1985	2010	-	Mar	lastSun	 2:00s	1:00	-
 Rule RussiaAsia	1996	2010	-	Oct	lastSun	 2:00s	0	-
 
 # Afghanistan
@@ -133,7 +133,7 @@ Zone	Asia/Kabul	4:36:48 -	LMT	1890
 # (brief)
 # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule Armenia	2011	only	-	Mar	lastSun	 2:00s	1:00	S
+Rule Armenia	2011	only	-	Mar	lastSun	 2:00s	1:00	-
 Rule Armenia	2011	only	-	Oct	lastSun	 2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
@@ -159,7 +159,7 @@ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
 # http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
+Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	-
 Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
@@ -246,7 +246,7 @@ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
 # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Dhaka	2009	only	-	Jun	19	23:00	1:00	S
+Rule	Dhaka	2009	only	-	Jun	19	23:00	1:00	-
 Rule	Dhaka	2009	only	-	Dec	31	24:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -787,8 +787,9 @@ Rule	Macau	1974	1977	-	Oct	Sun>=15	3:30	0	S
 Rule	Macau	1975	1977	-	Apr	Sun>=15	3:30	1:00	D
 Rule	Macau	1978	1980	-	Apr	Sun>=15	0:00	1:00	D
 Rule	Macau	1978	1980	-	Oct	Sun>=15	0:00	0	S
+# See Europe/Lisbon for info about the 1912 transition.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Macau	7:34:20 -	LMT	1912 Jan  1
+Zone	Asia/Macau	7:34:20 -	LMT	1911 Dec 31 16:00u
 			8:00	Macau	C%sT
 
 
@@ -1129,61 +1130,61 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 # thirtieth day of Shahrivar.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
-Rule	Iran	1978	only	-	Oct	21	0:00	0	S
-Rule	Iran	1979	only	-	Sep	19	0:00	0	S
-Rule	Iran	1980	only	-	Sep	23	0:00	0	S
-Rule	Iran	1991	only	-	May	 3	0:00	1:00	D
-Rule	Iran	1992	1995	-	Mar	22	0:00	1:00	D
-Rule	Iran	1991	1995	-	Sep	22	0:00	0	S
-Rule	Iran	1996	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	1996	only	-	Sep	21	0:00	0	S
-Rule	Iran	1997	1999	-	Mar	22	0:00	1:00	D
-Rule	Iran	1997	1999	-	Sep	22	0:00	0	S
-Rule	Iran	2000	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2000	only	-	Sep	21	0:00	0	S
-Rule	Iran	2001	2003	-	Mar	22	0:00	1:00	D
-Rule	Iran	2001	2003	-	Sep	22	0:00	0	S
-Rule	Iran	2004	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2004	only	-	Sep	21	0:00	0	S
-Rule	Iran	2005	only	-	Mar	22	0:00	1:00	D
-Rule	Iran	2005	only	-	Sep	22	0:00	0	S
-Rule	Iran	2008	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2008	only	-	Sep	21	0:00	0	S
-Rule	Iran	2009	2011	-	Mar	22	0:00	1:00	D
-Rule	Iran	2009	2011	-	Sep	22	0:00	0	S
-Rule	Iran	2012	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2012	only	-	Sep	21	0:00	0	S
-Rule	Iran	2013	2015	-	Mar	22	0:00	1:00	D
-Rule	Iran	2013	2015	-	Sep	22	0:00	0	S
-Rule	Iran	2016	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2016	only	-	Sep	21	0:00	0	S
-Rule	Iran	2017	2019	-	Mar	22	0:00	1:00	D
-Rule	Iran	2017	2019	-	Sep	22	0:00	0	S
-Rule	Iran	2020	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2020	only	-	Sep	21	0:00	0	S
-Rule	Iran	2021	2023	-	Mar	22	0:00	1:00	D
-Rule	Iran	2021	2023	-	Sep	22	0:00	0	S
-Rule	Iran	2024	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2024	only	-	Sep	21	0:00	0	S
-Rule	Iran	2025	2027	-	Mar	22	0:00	1:00	D
-Rule	Iran	2025	2027	-	Sep	22	0:00	0	S
-Rule	Iran	2028	2029	-	Mar	21	0:00	1:00	D
-Rule	Iran	2028	2029	-	Sep	21	0:00	0	S
-Rule	Iran	2030	2031	-	Mar	22	0:00	1:00	D
-Rule	Iran	2030	2031	-	Sep	22	0:00	0	S
-Rule	Iran	2032	2033	-	Mar	21	0:00	1:00	D
-Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
-Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
-Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
+Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	-
+Rule	Iran	1978	only	-	Oct	21	0:00	0	-
+Rule	Iran	1979	only	-	Sep	19	0:00	0	-
+Rule	Iran	1980	only	-	Sep	23	0:00	0	-
+Rule	Iran	1991	only	-	May	 3	0:00	1:00	-
+Rule	Iran	1992	1995	-	Mar	22	0:00	1:00	-
+Rule	Iran	1991	1995	-	Sep	22	0:00	0	-
+Rule	Iran	1996	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	1996	only	-	Sep	21	0:00	0	-
+Rule	Iran	1997	1999	-	Mar	22	0:00	1:00	-
+Rule	Iran	1997	1999	-	Sep	22	0:00	0	-
+Rule	Iran	2000	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2000	only	-	Sep	21	0:00	0	-
+Rule	Iran	2001	2003	-	Mar	22	0:00	1:00	-
+Rule	Iran	2001	2003	-	Sep	22	0:00	0	-
+Rule	Iran	2004	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2004	only	-	Sep	21	0:00	0	-
+Rule	Iran	2005	only	-	Mar	22	0:00	1:00	-
+Rule	Iran	2005	only	-	Sep	22	0:00	0	-
+Rule	Iran	2008	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2008	only	-	Sep	21	0:00	0	-
+Rule	Iran	2009	2011	-	Mar	22	0:00	1:00	-
+Rule	Iran	2009	2011	-	Sep	22	0:00	0	-
+Rule	Iran	2012	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2012	only	-	Sep	21	0:00	0	-
+Rule	Iran	2013	2015	-	Mar	22	0:00	1:00	-
+Rule	Iran	2013	2015	-	Sep	22	0:00	0	-
+Rule	Iran	2016	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2016	only	-	Sep	21	0:00	0	-
+Rule	Iran	2017	2019	-	Mar	22	0:00	1:00	-
+Rule	Iran	2017	2019	-	Sep	22	0:00	0	-
+Rule	Iran	2020	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2020	only	-	Sep	21	0:00	0	-
+Rule	Iran	2021	2023	-	Mar	22	0:00	1:00	-
+Rule	Iran	2021	2023	-	Sep	22	0:00	0	-
+Rule	Iran	2024	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2024	only	-	Sep	21	0:00	0	-
+Rule	Iran	2025	2027	-	Mar	22	0:00	1:00	-
+Rule	Iran	2025	2027	-	Sep	22	0:00	0	-
+Rule	Iran	2028	2029	-	Mar	21	0:00	1:00	-
+Rule	Iran	2028	2029	-	Sep	21	0:00	0	-
+Rule	Iran	2030	2031	-	Mar	22	0:00	1:00	-
+Rule	Iran	2030	2031	-	Sep	22	0:00	0	-
+Rule	Iran	2032	2033	-	Mar	21	0:00	1:00	-
+Rule	Iran	2032	2033	-	Sep	21	0:00	0	-
+Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	-
+Rule	Iran	2034	2035	-	Sep	22	0:00	0	-
 #
 # The following rules are approximations starting in the year 2038.
 # These are the best post-2037 approximations available, given the
 # restrictions of a single rule using a Gregorian-based data format.
 # At some point this table will need to be extended, though quite
 # possibly Iran will change the rules first.
-Rule	Iran	2036	max	-	Mar	21	0:00	1:00	D
-Rule	Iran	2036	max	-	Sep	21	0:00	0	S
+Rule	Iran	2036	max	-	Mar	21	0:00	1:00	-
+Rule	Iran	2036	max	-	Sep	21	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
@@ -1219,17 +1220,17 @@ Zone	Asia/Tehran	3:25:44	-	LMT	1916
 # https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iraq	1982	only	-	May	1	0:00	1:00	D
-Rule	Iraq	1982	1984	-	Oct	1	0:00	0	S
-Rule	Iraq	1983	only	-	Mar	31	0:00	1:00	D
-Rule	Iraq	1984	1985	-	Apr	1	0:00	1:00	D
-Rule	Iraq	1985	1990	-	Sep	lastSun	1:00s	0	S
-Rule	Iraq	1986	1990	-	Mar	lastSun	1:00s	1:00	D
+Rule	Iraq	1982	only	-	May	1	0:00	1:00	-
+Rule	Iraq	1982	1984	-	Oct	1	0:00	0	-
+Rule	Iraq	1983	only	-	Mar	31	0:00	1:00	-
+Rule	Iraq	1984	1985	-	Apr	1	0:00	1:00	-
+Rule	Iraq	1985	1990	-	Sep	lastSun	1:00s	0	-
+Rule	Iraq	1986	1990	-	Mar	lastSun	1:00s	1:00	-
 # IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the ':01' is a typo.
 # Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
 #
-Rule	Iraq	1991	2007	-	Apr	 1	3:00s	1:00	D
-Rule	Iraq	1991	2007	-	Oct	 1	3:00s	0	S
+Rule	Iraq	1991	2007	-	Apr	 1	3:00s	1:00	-
+Rule	Iraq	1991	2007	-	Oct	 1	3:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baghdad	2:57:40	-	LMT	1890
 			2:57:36	-	BMT	1918     # Baghdad Mean Time?
@@ -1501,8 +1502,7 @@ Rule	Japan	1950	1951	-	May	Sat>=1	24:00	1:00	D
 
 # From Hideyuki Suzuki (1998-11-09):
 # 'Tokyo' usually stands for the former location of Tokyo Astronomical
-# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s),
-# 35 degrees 39' 16.0" N.
+# Observatory: 139° 44' 40.90" E (9h 18m 58.727s), 35° 39' 16.0" N.
 # This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
 # edited by National Astronomical Observatory of Japan....
 # JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
@@ -1510,10 +1510,10 @@ Rule	Japan	1950	1951	-	May	Sat>=1	24:00	1:00	D
 
 # From Hideyuki Suzuki (1998-11-16):
 # The ordinance No. 51 (1886) established "standard time" in Japan,
-# which stands for the time on 135 degrees E.
+# which stands for the time on 135° E.
 # In the ordinance No. 167 (1895), "standard time" was renamed to "central
 # standard time".  And the same ordinance also established "western standard
-# time", which stands for the time on 120 degrees E....  But "western standard
+# time", which stands for the time on 120° E....  But "western standard
 # time" was abolished in the ordinance No. 529 (1937).  In the ordinance No.
 # 167, there is no mention regarding for what place western standard time is
 # standard....
@@ -1926,9 +1926,9 @@ Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
 # From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Kyrgyz	1992	1996	-	Apr	Sun>=7	0:00s	1:00	S
+Rule	Kyrgyz	1992	1996	-	Apr	Sun>=7	0:00s	1:00	-
 Rule	Kyrgyz	1992	1996	-	Sep	lastSun	0:00	0	-
-Rule	Kyrgyz	1997	2005	-	Mar	lastSun	2:30	1:00	S
+Rule	Kyrgyz	1997	2005	-	Mar	lastSun	2:30	1:00	-
 Rule	Kyrgyz	1997	2004	-	Oct	lastSun	2:30	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
@@ -2060,7 +2060,7 @@ Zone	Asia/Beirut	2:22:00 -	LMT	1880
 
 # Malaysia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NBorneo	1935	1941	-	Sep	14	0:00	0:20	TS # one-Third Summer
+Rule	NBorneo	1935	1941	-	Sep	14	0:00	0:20	-
 Rule	NBorneo	1935	1941	-	Dec	14	0:00	0	-
 #
 # peninsular Malaysia
@@ -2205,7 +2205,7 @@ Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Malé
 # http://zasag.mn/news/view/8969
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	S
+Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	-
 Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
 # Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
 # but McDow says the 2001 switches occurred at 02:00.  Also, IATA SSIM
@@ -2222,13 +2222,13 @@ Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
 # Mongolian Government meeting has concluded today to cancel daylight
 # saving time adoption in Mongolia.  Source: http://zasag.mn/news/view/16192
 
-Rule	Mongol	1985	1998	-	Mar	lastSun	0:00	1:00	S
+Rule	Mongol	1985	1998	-	Mar	lastSun	0:00	1:00	-
 Rule	Mongol	1984	1998	-	Sep	lastSun	0:00	0	-
 # IATA SSIM (1999-09) says Mongolia no longer observes DST.
-Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	S
+Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	-
 Rule	Mongol	2001	2006	-	Sep	lastSat	2:00	0	-
-Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	S
-Rule	Mongol	2015	2016	-	Mar	lastSat	2:00	1:00	S
+Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	-
+Rule	Mongol	2015	2016	-	Mar	lastSat	2:00	1:00	-
 Rule	Mongol	2015	2016	-	Sep	lastSat	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -2662,9 +2662,6 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # [Google translation]: "The Council also decided to start daylight
 # saving in Palestine as of one o'clock on Saturday morning,
 # 2016-03-26, to provide the clock 60 minutes ahead."
-#
-# From Paul Eggert (2016-03-12):
-# Predict spring transitions on March's last Saturday at 01:00 from now on.
 
 # From Sharef Mustafa (2016-10-19):
 # [T]he Palestinian cabinet decision (Mar 8th 2016) published on
@@ -2681,6 +2678,16 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # https://www.timeanddate.com/time/change/gaza-strip/gaza
 # https://www.timeanddate.com/time/change/west-bank/hebron
 
+# From Sharef Mustafa (2018-03-16):
+# Palestine summer time will start on Mar 24th 2018 by advancing the
+# clock by 60 minutes as per Palestinian cabinet decision published on
+# the offical website, though the decree did not specify the exact
+# time of the time shift.
+# http://www.palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e7a42ab7-ee23-435a-b9c8-a4f7e81f3817
+#
+# From Paul Eggert (2018-03-16):
+# For 2016 on, predict spring transitions on March's fourth Saturday at 01:00.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
 Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
@@ -2710,7 +2717,7 @@ Rule Palestine	2012	only	-	Sep	21	1:00	0	-
 Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
 Rule Palestine	2014	2015	-	Oct	Fri>=21	0:00	0	-
 Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
-Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
+Rule Palestine	2016	max	-	Mar	Sat>=22	1:00	1:00	S
 Rule Palestine	2016	max	-	Oct	lastSat	1:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -2760,11 +2767,11 @@ Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
 # http://www.philstar.com/headlines/2014/08/05/1354152/pnoy-urged-declare-use-daylight-saving-time
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Phil	1936	only	-	Nov	1	0:00	1:00	S
+Rule	Phil	1936	only	-	Nov	1	0:00	1:00	-
 Rule	Phil	1937	only	-	Feb	1	0:00	0	-
-Rule	Phil	1954	only	-	Apr	12	0:00	1:00	S
+Rule	Phil	1954	only	-	Apr	12	0:00	1:00	-
 Rule	Phil	1954	only	-	Jul	1	0:00	0	-
-Rule	Phil	1978	only	-	Mar	22	0:00	1:00	S
+Rule	Phil	1978	only	-	Mar	22	0:00	1:00	-
 Rule	Phil	1978	only	-	Sep	21	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Manila	-15:56:00 -	LMT	1844 Dec 31
@@ -3120,9 +3127,9 @@ Zone	Asia/Tashkent	4:37:11 -	LMT	1924 May  2
 # and is the basis for the information below.
 #
 # The 1906 transition was effective July 1 and standardized Indochina to
-# Phù Liễn Observatory, legally 104 deg. 17'17" east of Paris.
+# Phù Liễn Observatory, legally 104° 17' 17" east of Paris.
 # It's unclear whether this meant legal Paris Mean Time (00:09:21) or
-# the Paris Meridian (2 deg. 20'14.03" E); the former yields 07:06:30.1333...
+# the Paris Meridian (2° 20' 14.03" E); the former yields 07:06:30.1333...
 # and the latter 07:06:29.333... so either way it rounds to 07:06:30,
 # which is used below even though the modern-day Phù Liễn Observatory
 # is closer to 07:06:31.  Abbreviate Phù Liễn Mean Time as PLMT.
diff --git a/make/data/tzdata/australasia b/make/data/tzdata/australasia
index f97957d3b0a..d12619907fb 100644
--- a/make/data/tzdata/australasia
+++ b/make/data/tzdata/australasia
@@ -219,20 +219,20 @@ Zone Australia/Broken_Hill 9:25:48 -	LMT	1895 Feb
 
 # Lord Howe Island
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	LH	1981	1984	-	Oct	lastSun	2:00	1:00	D
-Rule	LH	1982	1985	-	Mar	Sun>=1	2:00	0	S
-Rule	LH	1985	only	-	Oct	lastSun	2:00	0:30	D
-Rule	LH	1986	1989	-	Mar	Sun>=15	2:00	0	S
-Rule	LH	1986	only	-	Oct	19	2:00	0:30	D
-Rule	LH	1987	1999	-	Oct	lastSun	2:00	0:30	D
-Rule	LH	1990	1995	-	Mar	Sun>=1	2:00	0	S
-Rule	LH	1996	2005	-	Mar	lastSun	2:00	0	S
-Rule	LH	2000	only	-	Aug	lastSun	2:00	0:30	D
-Rule	LH	2001	2007	-	Oct	lastSun	2:00	0:30	D
-Rule	LH	2006	only	-	Apr	Sun>=1	2:00	0	S
-Rule	LH	2007	only	-	Mar	lastSun	2:00	0	S
-Rule	LH	2008	max	-	Apr	Sun>=1	2:00	0	S
-Rule	LH	2008	max	-	Oct	Sun>=1	2:00	0:30	D
+Rule	LH	1981	1984	-	Oct	lastSun	2:00	1:00	-
+Rule	LH	1982	1985	-	Mar	Sun>=1	2:00	0	-
+Rule	LH	1985	only	-	Oct	lastSun	2:00	0:30	-
+Rule	LH	1986	1989	-	Mar	Sun>=15	2:00	0	-
+Rule	LH	1986	only	-	Oct	19	2:00	0:30	-
+Rule	LH	1987	1999	-	Oct	lastSun	2:00	0:30	-
+Rule	LH	1990	1995	-	Mar	Sun>=1	2:00	0	-
+Rule	LH	1996	2005	-	Mar	lastSun	2:00	0	-
+Rule	LH	2000	only	-	Aug	lastSun	2:00	0:30	-
+Rule	LH	2001	2007	-	Oct	lastSun	2:00	0:30	-
+Rule	LH	2006	only	-	Apr	Sun>=1	2:00	0	-
+Rule	LH	2007	only	-	Mar	lastSun	2:00	0	-
+Rule	LH	2008	max	-	Apr	Sun>=1	2:00	0	-
+Rule	LH	2008	max	-	Oct	Sun>=1	2:00	0:30	-
 Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
 			10:00	-	AEST	1981 Mar
 			10:30	LH	+1030/+1130 1985 Jul
@@ -390,15 +390,15 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # practice than guessing no DST.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	-
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
-Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
+Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	-
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	2013	-	Oct	Sun>=21	2:00	1:00	S
+Rule	Fiji	2010	2013	-	Oct	Sun>=21	2:00	1:00	-
 Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
 Rule	Fiji	2012	2013	-	Jan	Sun>=18	3:00	0	-
 Rule	Fiji	2014	only	-	Jan	Sun>=18	2:00	0	-
-Rule	Fiji	2014	max	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Fiji	2014	max	-	Nov	Sun>=1	2:00	1:00	-
 Rule	Fiji	2015	max	-	Jan	Sun>=14	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
@@ -429,11 +429,11 @@ Zone Pacific/Tarawa	 11:32:04 -	LMT	1901 # Bairiki
 			 12:00	-	+12
 Zone Pacific/Enderbury	-11:24:20 -	LMT	1901
 			-12:00	-	-12	1979 Oct
-			-11:00	-	-11	1995
+			-11:00	-	-11	1994 Dec 31
 			 13:00	-	+13
 Zone Pacific/Kiritimati	-10:29:20 -	LMT	1901
 			-10:40	-	-1040	1979 Oct
-			-10:00	-	-10	1995
+			-10:00	-	-10	1994 Dec 31
 			 14:00	-	+14
 
 # N Mariana Is
@@ -470,9 +470,9 @@ Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15 # Uaobe
 
 # New Caledonia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NC	1977	1978	-	Dec	Sun>=1	0:00	1:00	S
+Rule	NC	1977	1978	-	Dec	Sun>=1	0:00	1:00	-
 Rule	NC	1978	1979	-	Feb	27	0:00	0	-
-Rule	NC	1996	only	-	Dec	 1	2:00s	1:00	S
+Rule	NC	1996	only	-	Dec	 1	2:00s	1:00	-
 # Shanks & Pottenger say the following was at 2:00; go with IATA.
 Rule	NC	1997	only	-	Mar	 2	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -492,27 +492,28 @@ Rule	NZ	1929	1933	-	Mar	Sun>=15	2:00	0	M
 Rule	NZ	1934	1940	-	Apr	lastSun	2:00	0	M
 Rule	NZ	1934	1940	-	Sep	lastSun	2:00	0:30	S
 Rule	NZ	1946	only	-	Jan	 1	0:00	0	S
-# Since 1957 Chatham has been 45 minutes ahead of NZ, but there's no
-# convenient single notation for the date and time of this transition
-# so we must duplicate the Rule lines.
+# Since 1957 Chatham has been 45 minutes ahead of NZ, but until 2018a
+# there was no documented single notation for the date and time of this
+# transition.  Duplicate the Rule lines for now, to give the 2018a change
+# time to percolate out.
 Rule	NZ	1974	only	-	Nov	Sun>=1	2:00s	1:00	D
-Rule	Chatham	1974	only	-	Nov	Sun>=1	2:45s	1:00	D
+Rule	Chatham	1974	only	-	Nov	Sun>=1	2:45s	1:00	-
 Rule	NZ	1975	only	-	Feb	lastSun	2:00s	0	S
-Rule	Chatham	1975	only	-	Feb	lastSun	2:45s	0	S
+Rule	Chatham	1975	only	-	Feb	lastSun	2:45s	0	-
 Rule	NZ	1975	1988	-	Oct	lastSun	2:00s	1:00	D
-Rule	Chatham	1975	1988	-	Oct	lastSun	2:45s	1:00	D
+Rule	Chatham	1975	1988	-	Oct	lastSun	2:45s	1:00	-
 Rule	NZ	1976	1989	-	Mar	Sun>=1	2:00s	0	S
-Rule	Chatham	1976	1989	-	Mar	Sun>=1	2:45s	0	S
+Rule	Chatham	1976	1989	-	Mar	Sun>=1	2:45s	0	-
 Rule	NZ	1989	only	-	Oct	Sun>=8	2:00s	1:00	D
-Rule	Chatham	1989	only	-	Oct	Sun>=8	2:45s	1:00	D
+Rule	Chatham	1989	only	-	Oct	Sun>=8	2:45s	1:00	-
 Rule	NZ	1990	2006	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	Chatham	1990	2006	-	Oct	Sun>=1	2:45s	1:00	D
+Rule	Chatham	1990	2006	-	Oct	Sun>=1	2:45s	1:00	-
 Rule	NZ	1990	2007	-	Mar	Sun>=15	2:00s	0	S
-Rule	Chatham	1990	2007	-	Mar	Sun>=15	2:45s	0	S
+Rule	Chatham	1990	2007	-	Mar	Sun>=15	2:45s	0	-
 Rule	NZ	2007	max	-	Sep	lastSun	2:00s	1:00	D
-Rule	Chatham	2007	max	-	Sep	lastSun	2:45s	1:00	D
+Rule	Chatham	2007	max	-	Sep	lastSun	2:45s	1:00	-
 Rule	NZ	2008	max	-	Apr	Sun>=1	2:00s	0	S
-Rule	Chatham	2008	max	-	Apr	Sun>=1	2:45s	0	S
+Rule	Chatham	2008	max	-	Apr	Sun>=1	2:45s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Auckland	11:39:04 -	LMT	1868 Nov  2
 			11:30	NZ	NZ%sT	1946 Jan  1
@@ -536,9 +537,9 @@ Link Pacific/Auckland Antarctica/McMurdo
 # Cook Is
 # From Shanks & Pottenger:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HS
+Rule	Cook	1978	only	-	Nov	12	0:00	0:30	-
 Rule	Cook	1979	1991	-	Mar	Sun>=1	0:00	0	-
-Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	HS
+Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901        # Avarua
 			-10:30	-	-1030	1978 Nov 12
@@ -679,11 +680,11 @@ Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
 # Assume the pattern instituted in 2012 will continue indefinitely.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	WS	2010	only	-	Sep	lastSun	0:00	1	D
-Rule	WS	2011	only	-	Apr	Sat>=1	4:00	0	S
-Rule	WS	2011	only	-	Sep	lastSat	3:00	1	D
-Rule	WS	2012	max	-	Apr	Sun>=1	4:00	0	S
-Rule	WS	2012	max	-	Sep	lastSun	3:00	1	D
+Rule	WS	2010	only	-	Sep	lastSun	0:00	1	-
+Rule	WS	2011	only	-	Apr	Sat>=1	4:00	0	-
+Rule	WS	2011	only	-	Sep	lastSat	3:00	1	-
+Rule	WS	2012	max	-	Apr	Sun>=1	4:00	0	-
+Rule	WS	2012	max	-	Sep	lastSun	3:00	1	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Apia	 12:33:04 -	LMT	1892 Jul  5
 			-11:26:56 -	LMT	1911
@@ -723,11 +724,11 @@ Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
 
 # Tonga
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Tonga	1999	only	-	Oct	 7	2:00s	1:00	S
+Rule	Tonga	1999	only	-	Oct	 7	2:00s	1:00	-
 Rule	Tonga	2000	only	-	Mar	19	2:00s	0	-
-Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	-
 Rule	Tonga	2001	2002	-	Jan	lastSun	2:00	0	-
-Rule	Tonga	2016	only	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Tonga	2016	only	-	Nov	Sun>=1	2:00	1:00	-
 Rule	Tonga	2017	only	-	Jan	Sun>=15	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
@@ -804,12 +805,12 @@ Zone	Pacific/Wake	11:06:28 -	LMT	1901
 
 # Vanuatu
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Vanuatu	1983	only	-	Sep	25	0:00	1:00	S
+Rule	Vanuatu	1983	only	-	Sep	25	0:00	1:00	-
 Rule	Vanuatu	1984	1991	-	Mar	Sun>=23	0:00	0	-
-Rule	Vanuatu	1984	only	-	Oct	23	0:00	1:00	S
-Rule	Vanuatu	1985	1991	-	Sep	Sun>=23	0:00	1:00	S
+Rule	Vanuatu	1984	only	-	Oct	23	0:00	1:00	-
+Rule	Vanuatu	1985	1991	-	Sep	Sun>=23	0:00	1:00	-
 Rule	Vanuatu	1992	1993	-	Jan	Sun>=23	0:00	0	-
-Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	S
+Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
 			11:00	Vanuatu	+11/+12
@@ -1108,6 +1109,13 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # South Australian time even though it's located in Western Australia.
 
 # Queensland
+
+# From Paul Eggert (2018-02-26):
+# I lack access to the following source for Queensland DST:
+# Pearce C. History of daylight saving time in Queensland.
+# Queensland Hist J. 2017 Aug;23(6):389-403
+# https://search.informit.com.au/documentSummary;dn=994682348436426;res=IELHSS
+
 # From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # #   The state of QUEENSLAND.. [ Courtesy Qld. Dept Premier Econ&Trade Devel ]
 # #						[ Dec 1990 ]
@@ -1534,6 +1542,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # "declared it the same day [throughout] the country as of Jan. 1, 1995"
 # as part of the competition to be first into the 21st century.
 
+# From Kerry Shetline (2018-02-03):
+# December 31 was the day that was skipped, so that the transition
+# would be from Friday December 30, 1994 to Sunday January 1, 1995.
+# From Paul Eggert (2018-02-04):
+# One source for this is page 202 of: Bartky IR. One Time Fits All:
+# The Campaigns for Global Uniformity (2007).
 
 # Kwajalein
 
@@ -1626,7 +1640,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # From Howie Phelps (1999-11-10), who talked to a Pitcairner via shortwave:
 # Betty Christian told me yesterday that their local time is the same as
-# Pacific Standard Time. They used to be 1/2 hour different from us here in
+# Pacific Standard Time. They used to be ½ hour different from us here in
 # Sacramento but it was changed a couple of years ago.
 
 
@@ -1665,7 +1679,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # 12 hours and 20 minutes ahead of GMT.  When New Zealand adjusted its
 # standard time in 1940s, Tonga had the choice of subtracting from its
 # local time to come on the same standard time as New Zealand or of
-# advancing its time to maintain the differential of 13 degrees
+# advancing its time to maintain the differential of 13°
 # (approximately 50 minutes ahead of New Zealand time).
 #
 # Because His Majesty King T�ufaʻ�hau Tupou IV, then Crown Prince
diff --git a/make/data/tzdata/europe b/make/data/tzdata/europe
index 1565814a3e3..176a9f81671 100644
--- a/make/data/tzdata/europe
+++ b/make/data/tzdata/europe
@@ -140,8 +140,8 @@
 # along the towpath within a few yards of it.'
 #
 # I have a one inch to one mile map of London and my estimate of the stone's
-# position is 51 degrees 28' 30" N, 0 degrees 18' 45" W. The longitude should
-# be within about +-2". The Ordnance Survey grid reference is TQ172761.
+# position is 51° 28' 30" N, 0° 18' 45" W. The longitude should
+# be within about ±2". The Ordnance Survey grid reference is TQ172761.
 #
 # [This yields GMTOFF = -0:01:15 for London LMT in the 18th century.]
 
@@ -181,7 +181,7 @@
 # after-hours daylight in which to pursue his research.
 # In 1895 he presented a paper to the Wellington Philosophical Society
 # that proposed a two-hour daylight-saving shift.  See:
-# Hudson GV. On seasonal time-adjustment in countries south of lat. 30 deg.
+# Hudson GV. On seasonal time-adjustment in countries south of lat. 30°.
 # Transactions and Proceedings of the New Zealand Institute. 1895;28:734
 # http://rsnz.natlib.govt.nz/volume/rsnz_28/rsnz_28_00_006110.html
 # Although some interest was expressed in New Zealand, his proposal
@@ -531,11 +531,25 @@ Link	Europe/London	Europe/Jersey
 Link	Europe/London	Europe/Guernsey
 Link	Europe/London	Europe/Isle_of_Man
 
-# From Paul Eggert (2018-01-19):
+# From Paul Eggert (2018-02-15):
+# In January 2018 we discovered that the negative SAVE values in the
+# Eire rules cause problems with tests for ICU:
+# https://mm.icann.org/pipermail/tz/2018-January/025825.html
+# and with tests for OpenJDK:
+# https://mm.icann.org/pipermail/tz/2018-January/025822.html
+#
+# To work around this problem, the build procedure can translate the
+# following data into two forms, one with negative SAVE values and the
+# other form with a traditional approximation for Irish time stamps
+# after 1971-10-31 02:00 UTC; although this approximation has tm_isdst
+# flags that are reversed, its UTC offsets are correct and this often
+# suffices.  This source file currently uses only nonnegative SAVE
+# values, but this is intended to change and downstream code should
+# not rely on it.
+#
 # The following is like GB-Eire and EU, except with standard time in
-# summer and negative daylight saving time in winter.
-# Although currently commented out, this will need to become uncommented
-# once the ICU/OpenJDK workaround is removed; see below.
+# summer and negative daylight saving time in winter.  It is for when
+# negative SAVE values are used.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 #Rule	Eire	1971	only	-	Oct	31	 2:00u	-1:00	GMT
 #Rule	Eire	1972	1980	-	Mar	Sun>=16	 2:00u	0	IST
@@ -556,24 +570,12 @@ Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
 			 0:00	1:00	IST	1947 Nov  2  2:00s
 			 0:00	-	GMT	1948 Apr 18  2:00s
 			 0:00	GB-Eire	GMT/IST	1968 Oct 27
-# From Paul Eggert (2018-01-18):
-# The next line should look like this:
+# The next line is for when negative SAVE values are used.
 #			 1:00	Eire	IST/GMT
-# However, in January 2018 we discovered that the Eire rules cause
-# problems with tests for ICU:
-# https://mm.icann.org/pipermail/tz/2018-January/025825.html
-# and with tests for OpenJDK:
-# https://mm.icann.org/pipermail/tz/2018-January/025822.html
-# To work around this problem, use a traditional approximation for
-# time stamps after 1971-10-31 02:00 UTC, to give ICU and OpenJDK
-# developers breathing room to fix bugs.  This approximation has
-# correct UTC offsets, but results in tm_isdst flags are the reverse
-# of what they should be.  This workaround is temporary and should be
-# removed reasonably soon.
+# These three lines are for when SAVE values are always nonnegative.
 			 1:00	-	IST	1971 Oct 31  2:00u
 			 0:00	GB-Eire	GMT/IST	1996
 			 0:00	EU	GMT/IST
-# End of workaround for ICU and OpenJDK bugs.
 
 
 ###############################################################################
@@ -1557,21 +1559,21 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 # http://www.almanak.hi.is/klukkan.html
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iceland	1917	1919	-	Feb	19	23:00	1:00	S
+Rule	Iceland	1917	1919	-	Feb	19	23:00	1:00	-
 Rule	Iceland	1917	only	-	Oct	21	 1:00	0	-
 Rule	Iceland	1918	1919	-	Nov	16	 1:00	0	-
-Rule	Iceland	1921	only	-	Mar	19	23:00	1:00	S
+Rule	Iceland	1921	only	-	Mar	19	23:00	1:00	-
 Rule	Iceland	1921	only	-	Jun	23	 1:00	0	-
-Rule	Iceland	1939	only	-	Apr	29	23:00	1:00	S
+Rule	Iceland	1939	only	-	Apr	29	23:00	1:00	-
 Rule	Iceland	1939	only	-	Oct	29	 2:00	0	-
-Rule	Iceland	1940	only	-	Feb	25	 2:00	1:00	S
+Rule	Iceland	1940	only	-	Feb	25	 2:00	1:00	-
 Rule	Iceland	1940	1941	-	Nov	Sun>=2	 1:00s	0	-
-Rule	Iceland	1941	1942	-	Mar	Sun>=2	 1:00s	1:00	S
+Rule	Iceland	1941	1942	-	Mar	Sun>=2	 1:00s	1:00	-
 # 1943-1946 - first Sunday in March until first Sunday in winter
-Rule	Iceland	1943	1946	-	Mar	Sun>=1	 1:00s	1:00	S
+Rule	Iceland	1943	1946	-	Mar	Sun>=1	 1:00s	1:00	-
 Rule	Iceland	1942	1948	-	Oct	Sun>=22	 1:00s	0	-
 # 1947-1967 - first Sunday in April until first Sunday in winter
-Rule	Iceland	1947	1967	-	Apr	Sun>=1	 1:00s	1:00	S
+Rule	Iceland	1947	1967	-	Apr	Sun>=1	 1:00s	1:00	-
 # 1949 and 1967 Oct transitions delayed by 1 week
 Rule	Iceland	1949	only	-	Oct	30	 1:00s	0	-
 Rule	Iceland	1950	1966	-	Oct	Sun>=22	 1:00s	0	-
@@ -2161,15 +2163,19 @@ Zone	Europe/Warsaw	1:24:00 -	LMT	1880
 			1:00	EU	CE%sT
 
 # Portugal
-#
+
 # From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
 # According to a Portuguese decree (1911-05-26)
 # https://dre.pt/application/dir/pdf1sdip/1911/05/12500/23132313.pdf
 # Lisbon was at -0:36:44.68, but switched to GMT on 1912-01-01 at 00:00.
-# Round the old offset to -0:36:45.  This agrees with Willett but disagrees
-# with Shanks, who says the transition occurred on 1911-05-24 at 00:00 for
-# Europe/Lisbon, Atlantic/Azores, and Atlantic/Madeira.
+# Round the old offset to -0:36:45.  This agrees with Willett....
 #
+# From Michael Deckers (2018-02-15):
+# article 5 [of the 1911 decree; Deckers's translation] ...:
+# These dispositions shall enter into force at the instant at which,
+# according to the 2nd article, the civil day January 1, 1912 begins,
+# all clocks therefore having to be advanced or set back correspondingly ...
+
 # From Rui Pedro Salgueiro (1992-11-12):
 # Portugal has recently (September, 27) changed timezone
 # (from WET to MET or CET) to harmonize with EEC.
@@ -2252,7 +2258,7 @@ Rule	Port	1983	only	-	Mar	lastSun	 2:00s	1:00	S
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Lisbon	-0:36:45 -	LMT	1884
-			-0:36:45 -	LMT	1912 Jan  1 # Lisbon Mean Time
+			-0:36:45 -	LMT	1912 Jan  1  0:00u # Lisbon MT
 			 0:00	Port	WE%sT	1966 Apr  3  2:00
 			 1:00	-	CET	1976 Sep 26  1:00
 			 0:00	Port	WE%sT	1983 Sep 25  1:00s
@@ -2261,7 +2267,7 @@ Zone	Europe/Lisbon	-0:36:45 -	LMT	1884
 			 0:00	EU	WE%sT
 # This Zone can be simplified once we assume zic %z.
 Zone Atlantic/Azores	-1:42:40 -	LMT	1884        # Ponta Delgada
-			-1:54:32 -	HMT	1912 Jan  1 # Horta Mean Time
+			-1:54:32 -	HMT	1912 Jan  1  2:00u # Horta MT
 			-2:00	Port	-02/-01	1942 Apr 25 22:00s
 			-2:00	Port	+00	1942 Aug 15 22:00s
 			-2:00	Port	-02/-01	1943 Apr 17 22:00s
@@ -2277,7 +2283,7 @@ Zone Atlantic/Azores	-1:42:40 -	LMT	1884        # Ponta Delgada
 			-1:00	EU	-01/+00
 # This Zone can be simplified once we assume zic %z.
 Zone Atlantic/Madeira	-1:07:36 -	LMT	1884        # Funchal
-			-1:07:36 -	FMT	1912 Jan  1 # Funchal Mean Time
+			-1:07:36 -	FMT	1912 Jan  1  1:00u # Funchal MT
 			-1:00	Port	-01/+00	1942 Apr 25 22:00s
 			-1:00	Port	+01	1942 Aug 15 22:00s
 			-1:00	Port	-01/+00	1943 Apr 17 22:00s
@@ -2615,13 +2621,13 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 
 # From Vladimir Karpinsky (2014-07-08):
 # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
-# Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
+# Observatory (coordinates: 55° 45' 29.70", 37° 34' 05.30")....
 # LMT in Moscow since Jul 3, 1916 is 2:31:01 as a result of new standard.
 # (The info is from the book by Byalokoz ... p. 18.)
 # The time in St. Petersburg as capital of Russia was defined by
 # Pulkov observatory, near St. Petersburg.  In 1916 LMT Moscow
 # was synchronized with LMT St. Petersburg (+30 minutes), (Pulkov observatory
-# coordinates: 59 deg. 46'18.70", 30 deg. 19'40.70") so 30 deg. 19'40.70" >
+# coordinates: 59° 46' 18.70", 30° 19' 40.70") so 30° 19' 40.70" >
 # 2h01m18.7s = 2:01:19.  LMT Moscow = LMT St.Petersburg + 30m 2:01:19 + 0:30 =
 # 2:31:19 ...
 #
@@ -3450,7 +3456,7 @@ Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
 # three degrees, or twelve minutes of time, to the west of the
 # meridian of the Observatory of Stockholm".  The law is dated 1878-05-31.
 #
-# The observatory at that time had the meridian 18 degrees 03' 30"
+# The observatory at that time had the meridian 18° 03' 30"
 # eastern longitude = 01:12:14 in time.  Less 12 minutes gives the
 # national standard time as 01:00:14 ahead of GMT....
 #
@@ -3554,7 +3560,7 @@ Zone Europe/Stockholm	1:12:12 -	LMT	1879 Jan  1
 # From Alois Treindl (2013-09-11):
 # The Federal regulations say
 # https://www.admin.ch/opc/de/classified-compilation/20071096/index.html
-# ... the meridian for Bern mean time ... is 7 degrees 26' 22.50".
+# ... the meridian for Bern mean time ... is 7° 26' 22.50".
 # Expressed in time, it is 0h29m45.5s.
 
 # From Pierre-Yves Berger (2013-09-11):
diff --git a/make/data/tzdata/northamerica b/make/data/tzdata/northamerica
index 2aa184bc6bf..bcfb662154f 100644
--- a/make/data/tzdata/northamerica
+++ b/make/data/tzdata/northamerica
@@ -48,7 +48,7 @@
 # in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
 # but in 1872-05 he moved the proposed origin to Greenwich.
 
-# From Paul Eggert (2016-09-21):
+# From Paul Eggert (2018-03-20):
 # Dowd's proposal left many details unresolved, such as where to draw
 # lines between time zones.  The key individual who made time zones
 # work in the US was William Frederick Allen - railway engineer,
@@ -59,10 +59,9 @@
 # to the General Time Convention on 1883-04-11, saying that his plan
 # meant "local time would be practically abolished" - a plus for
 # railway scheduling.  By the next convention on 1883-10-11 nearly all
-# railroads had agreed and it took effect on 1883-11-18 at 12:00.
-# That Sunday was called the "day of two noons", as the eastern parts
-# of the new zones observed noon twice.  Allen witnessed the
-# transition in New York City, writing:
+# railroads had agreed and it took effect on 1883-11-18.  That Sunday
+# was called the "day of two noons", as some locations observed noon
+# twice.  Allen witnessed the transition in New York City, writing:
 #
 #   I heard the bells of St. Paul's strike on the old time.  Four
 #   minutes later, obedient to the electrical signal from the Naval
@@ -447,8 +446,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
 # ...according to the Census Bureau, the largest city is Beulah (although
 # it's commonly referred to as Beulah-Hazen, with Hazen being the next
 # largest city in Mercer County).  Google Maps places Beulah's city hall
-# at 47 degrees 15' 51" N, 101 degrees 46' 40" W, which yields an offset
-# of 6h47'07".
+# at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07".
 
 Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
 			-7:00	US	M%sT	2010 Nov  7  2:00
@@ -481,7 +479,7 @@ Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00:04
 # California, northern Idaho (Benewah, Bonner, Boundary, Clearwater,
 # Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties, Idaho county
 # north of the Salmon River, and the towns of Burgdorf and Warren),
-# Nevada (except West Wendover), Oregon (except the northern 3/4 of
+# Nevada (except West Wendover), Oregon (except the northern ¾ of
 # Malheur county), and Washington
 
 # From Paul Eggert (2016-08-20):
@@ -979,6 +977,13 @@ Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
 			-5:00	-	EST	2006
 			-5:00	US	E%sT
 
+# From Paul Eggert (2018-03-20):
+# The Louisville & Nashville Railroad's 1883-11-18 change occurred at
+# 10:00 old local time; train were supposed to come to a standstill
+# for precisely 18 minutes.  See Bartky Fig. 1 (page 50).  It is not
+# clear how this matched civil time in Louisville, so for now continue
+# to assume Louisville switched at noon new local time, like New York.
+#
 # Part of Kentucky left its clocks alone in 1974.
 # This also includes Clark, Floyd, and Harrison counties in Indiana.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
@@ -3287,8 +3292,8 @@ Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
 # http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Jamaica	-5:07:11 -	LMT	1890        # Kingston
-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+Zone	America/Jamaica	-5:07:10 -	LMT	1890        # Kingston
+			-5:07:10 -	KMT	1912 Feb    # Kingston Mean Time
 			-5:00	-	EST	1974
 			-5:00	US	E%sT	1984
 			-5:00	-	EST
@@ -3438,7 +3443,7 @@ Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Grand_Turk	-4:44:32 -	LMT	1890
-			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
+			-5:07:10 -	KMT	1912 Feb # Kingston Mean Time
 			-5:00	-	EST	1979
 			-5:00	US	E%sT	2015 Nov Sun>=1 2:00
 			-4:00	-	AST	2018 Mar 11 3:00
diff --git a/make/data/tzdata/southamerica b/make/data/tzdata/southamerica
index 38dd275398f..65d3c9fcef2 100644
--- a/make/data/tzdata/southamerica
+++ b/make/data/tzdata/southamerica
@@ -70,28 +70,28 @@
 # AR was chosen because they are the ISO letters that represent Argentina.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Arg	1930	only	-	Dec	 1	0:00	1:00	S
+Rule	Arg	1930	only	-	Dec	 1	0:00	1:00	-
 Rule	Arg	1931	only	-	Apr	 1	0:00	0	-
-Rule	Arg	1931	only	-	Oct	15	0:00	1:00	S
+Rule	Arg	1931	only	-	Oct	15	0:00	1:00	-
 Rule	Arg	1932	1940	-	Mar	 1	0:00	0	-
-Rule	Arg	1932	1939	-	Nov	 1	0:00	1:00	S
-Rule	Arg	1940	only	-	Jul	 1	0:00	1:00	S
+Rule	Arg	1932	1939	-	Nov	 1	0:00	1:00	-
+Rule	Arg	1940	only	-	Jul	 1	0:00	1:00	-
 Rule	Arg	1941	only	-	Jun	15	0:00	0	-
-Rule	Arg	1941	only	-	Oct	15	0:00	1:00	S
+Rule	Arg	1941	only	-	Oct	15	0:00	1:00	-
 Rule	Arg	1943	only	-	Aug	 1	0:00	0	-
-Rule	Arg	1943	only	-	Oct	15	0:00	1:00	S
+Rule	Arg	1943	only	-	Oct	15	0:00	1:00	-
 Rule	Arg	1946	only	-	Mar	 1	0:00	0	-
-Rule	Arg	1946	only	-	Oct	 1	0:00	1:00	S
+Rule	Arg	1946	only	-	Oct	 1	0:00	1:00	-
 Rule	Arg	1963	only	-	Oct	 1	0:00	0	-
-Rule	Arg	1963	only	-	Dec	15	0:00	1:00	S
+Rule	Arg	1963	only	-	Dec	15	0:00	1:00	-
 Rule	Arg	1964	1966	-	Mar	 1	0:00	0	-
-Rule	Arg	1964	1966	-	Oct	15	0:00	1:00	S
+Rule	Arg	1964	1966	-	Oct	15	0:00	1:00	-
 Rule	Arg	1967	only	-	Apr	 2	0:00	0	-
-Rule	Arg	1967	1968	-	Oct	Sun>=1	0:00	1:00	S
+Rule	Arg	1967	1968	-	Oct	Sun>=1	0:00	1:00	-
 Rule	Arg	1968	1969	-	Apr	Sun>=1	0:00	0	-
-Rule	Arg	1974	only	-	Jan	23	0:00	1:00	S
+Rule	Arg	1974	only	-	Jan	23	0:00	1:00	-
 Rule	Arg	1974	only	-	May	 1	0:00	0	-
-Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
+Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	-
 #
 # From Hernan G. Otero (1995-06-26):
 # These corrections were contributed by InterSoft Argentina S.A.,
@@ -99,7 +99,7 @@ Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
 # Talleres de Hidrografía Naval Argentina
 # (Argentine Naval Hydrography Institute)
 Rule	Arg	1989	1993	-	Mar	Sun>=1	0:00	0	-
-Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	-
 #
 # From Hernan G. Otero (1995-06-26):
 # From this moment on, the law that mandated the daylight saving
@@ -110,7 +110,7 @@ Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	S
 # On October 3, 1999, 0:00 local, Argentina implemented daylight savings time,
 # which did not result in the switch of a time zone, as they stayed 9 hours
 # from the International Date Line.
-Rule	Arg	1999	only	-	Oct	Sun>=1	0:00	1:00	S
+Rule	Arg	1999	only	-	Oct	Sun>=1	0:00	1:00	-
 # From Paul Eggert (2007-12-28):
 # DST was set to expire on March 5, not March 3, but since it was converted
 # to standard time on March 3 it's more convenient for us to pretend that
@@ -213,9 +213,9 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 # la modificación del huso horario, ya que 2009 nos encuentra con
 # crecimiento en la producción y distribución energética."
 
-Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
+Rule	Arg	2007	only	-	Dec	30	0:00	1:00	-
 Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
-Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	-
 
 # From Mariano Absatz (2004-05-21):
 # Today it was officially published that the Province of Mendoza is changing
@@ -225,12 +225,14 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # It's Law No. 7,210.  This change is due to a public power emergency, so for
 # now we'll assume it's for this year only.
 #
-# From Paul Eggert (2014-08-09):
+# From Paul Eggert (2018-01-31):
 # Hora de verano para la República Argentina
 # http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html
 # says that standard time in Argentina from 1894-10-31
 # to 1920-05-01 was -4:16:48.25.  Go with this more-precise value
-# over Shanks & Pottenger.
+# over Shanks & Pottenger.  It is upward compatible with Milne, who
+# says Córdoba time was -4:16:48.2.
+
 #
 # From Mariano Absatz (2004-06-05):
 # These media articles from a major newspaper mostly cover the current state:
@@ -404,9 +406,9 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # rules...San Luis is still using "Western ARgentina Time" and it got
 # stuck on Summer daylight savings time even though the summer is over.
 
-# From Paul Eggert (2013-09-05):
+# From Paul Eggert (2018-01-23):
 # Perhaps San Luis operates on the legal fiction that it is at -04
-# with perpetual summer time, but ordinary usage typically seems to
+# with perpetual daylight saving time, but ordinary usage typically seems to
 # just say it's at -03; see, for example,
 # https://es.wikipedia.org/wiki/Hora_oficial_argentina
 # We've documented similar situations as being plain changes to
@@ -415,9 +417,6 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # plus is that this silences a zic complaint that there's no POSIX TZ
 # setting for time stamps past 2038.
 
-# From Paul Eggert (2013-02-21):
-# Milne says Córdoba time was -4:16:48.2.  Round to the nearest second.
-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Buenos Aires (BA), Capital Federal (CF),
@@ -552,7 +551,7 @@ Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
 # San Luis (SL)
 
 Rule	SanLuis	2008	2009	-	Mar	Sun>=8	0:00	0	-
-Rule	SanLuis	2007	2008	-	Oct	Sun>=8	0:00	1:00	S
+Rule	SanLuis	2007	2008	-	Oct	Sun>=8	0:00	1:00	-
 
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
@@ -794,14 +793,14 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
 # Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
-Rule	Brazil	1931	only	-	Oct	 3	11:00	1:00	S
+Rule	Brazil	1931	only	-	Oct	 3	11:00	1:00	-
 Rule	Brazil	1932	1933	-	Apr	 1	 0:00	0	-
-Rule	Brazil	1932	only	-	Oct	 3	 0:00	1:00	S
+Rule	Brazil	1932	only	-	Oct	 3	 0:00	1:00	-
 # Decree 23,195 <http://pcdsh01.on.br/HV23195.htm> (1933-10-10)
 # revoked DST.
 # Decree 27,496 <http://pcdsh01.on.br/HV27496.htm> (1949-11-24)
 # Decree 27,998 <http://pcdsh01.on.br/HV27998.htm> (1950-04-13)
-Rule	Brazil	1949	1952	-	Dec	 1	 0:00	1:00	S
+Rule	Brazil	1949	1952	-	Dec	 1	 0:00	1:00	-
 Rule	Brazil	1950	only	-	Apr	16	 1:00	0	-
 Rule	Brazil	1951	1952	-	Apr	 1	 0:00	0	-
 # Decree 32,308 <http://pcdsh01.on.br/HV32308.htm> (1953-02-24)
@@ -813,51 +812,51 @@ Rule	Brazil	1953	only	-	Mar	 1	 0:00	0	-
 # in SP, RJ, GB, MG, ES, due to the prolongation of the drought.
 # Decree 53,071 <http://pcdsh01.on.br/HV53071.htm> (1963-12-03)
 # extended the above decree to all of the national territory on 12-09.
-Rule	Brazil	1963	only	-	Dec	 9	 0:00	1:00	S
+Rule	Brazil	1963	only	-	Dec	 9	 0:00	1:00	-
 # Decree 53,604 <http://pcdsh01.on.br/HV53604.htm> (1964-02-25)
 # extended summer time by one day to 1964-03-01 00:00 (start of school).
 Rule	Brazil	1964	only	-	Mar	 1	 0:00	0	-
 # Decree 55,639 <http://pcdsh01.on.br/HV55639.htm> (1965-01-27)
-Rule	Brazil	1965	only	-	Jan	31	 0:00	1:00	S
+Rule	Brazil	1965	only	-	Jan	31	 0:00	1:00	-
 Rule	Brazil	1965	only	-	Mar	31	 0:00	0	-
 # Decree 57,303 <http://pcdsh01.on.br/HV57303.htm> (1965-11-22)
-Rule	Brazil	1965	only	-	Dec	 1	 0:00	1:00	S
+Rule	Brazil	1965	only	-	Dec	 1	 0:00	1:00	-
 # Decree 57,843 <http://pcdsh01.on.br/HV57843.htm> (1966-02-18)
 Rule	Brazil	1966	1968	-	Mar	 1	 0:00	0	-
-Rule	Brazil	1966	1967	-	Nov	 1	 0:00	1:00	S
+Rule	Brazil	1966	1967	-	Nov	 1	 0:00	1:00	-
 # Decree 63,429 <http://pcdsh01.on.br/HV63429.htm> (1968-10-15)
 # revoked DST.
 # Decree 91,698 <http://pcdsh01.on.br/HV91698.htm> (1985-09-27)
-Rule	Brazil	1985	only	-	Nov	 2	 0:00	1:00	S
+Rule	Brazil	1985	only	-	Nov	 2	 0:00	1:00	-
 # Decree 92,310 (1986-01-21)
 # Decree 92,463 (1986-03-13)
 Rule	Brazil	1986	only	-	Mar	15	 0:00	0	-
 # Decree 93,316 (1986-10-01)
-Rule	Brazil	1986	only	-	Oct	25	 0:00	1:00	S
+Rule	Brazil	1986	only	-	Oct	25	 0:00	1:00	-
 Rule	Brazil	1987	only	-	Feb	14	 0:00	0	-
 # Decree 94,922 <http://pcdsh01.on.br/HV94922.htm> (1987-09-22)
-Rule	Brazil	1987	only	-	Oct	25	 0:00	1:00	S
+Rule	Brazil	1987	only	-	Oct	25	 0:00	1:00	-
 Rule	Brazil	1988	only	-	Feb	 7	 0:00	0	-
 # Decree 96,676 <http://pcdsh01.on.br/HV96676.htm> (1988-09-12)
 # except for the states of AC, AM, PA, RR, RO, and AP (then a territory)
-Rule	Brazil	1988	only	-	Oct	16	 0:00	1:00	S
+Rule	Brazil	1988	only	-	Oct	16	 0:00	1:00	-
 Rule	Brazil	1989	only	-	Jan	29	 0:00	0	-
 # Decree 98,077 <http://pcdsh01.on.br/HV98077.htm> (1989-08-21)
 # with the same exceptions
-Rule	Brazil	1989	only	-	Oct	15	 0:00	1:00	S
+Rule	Brazil	1989	only	-	Oct	15	 0:00	1:00	-
 Rule	Brazil	1990	only	-	Feb	11	 0:00	0	-
 # Decree 99,530 <http://pcdsh01.on.br/HV99530.htm> (1990-09-17)
 # adopted by RS, SC, PR, SP, RJ, ES, MG, GO, MS, DF.
 # Decree 99,629 (1990-10-19) adds BA, MT.
-Rule	Brazil	1990	only	-	Oct	21	 0:00	1:00	S
+Rule	Brazil	1990	only	-	Oct	21	 0:00	1:00	-
 Rule	Brazil	1991	only	-	Feb	17	 0:00	0	-
 # Unnumbered decree <http://pcdsh01.on.br/HV1991.htm> (1991-09-25)
 # adopted by RS, SC, PR, SP, RJ, ES, MG, BA, GO, MT, MS, DF.
-Rule	Brazil	1991	only	-	Oct	20	 0:00	1:00	S
+Rule	Brazil	1991	only	-	Oct	20	 0:00	1:00	-
 Rule	Brazil	1992	only	-	Feb	 9	 0:00	0	-
 # Unnumbered decree <http://pcdsh01.on.br/HV1992.htm> (1992-10-16)
 # adopted by same states.
-Rule	Brazil	1992	only	-	Oct	25	 0:00	1:00	S
+Rule	Brazil	1992	only	-	Oct	25	 0:00	1:00	-
 Rule	Brazil	1993	only	-	Jan	31	 0:00	0	-
 # Decree 942 <http://pcdsh01.on.br/HV942.htm> (1993-09-28)
 # adopted by same states, plus AM.
@@ -867,12 +866,12 @@ Rule	Brazil	1993	only	-	Jan	31	 0:00	0	-
 # adopted by same states, plus MT and TO.
 # Decree 1,674 <http://pcdsh01.on.br/HV1674.htm> (1995-10-13)
 # adds AL, SE.
-Rule	Brazil	1993	1995	-	Oct	Sun>=11	 0:00	1:00	S
+Rule	Brazil	1993	1995	-	Oct	Sun>=11	 0:00	1:00	-
 Rule	Brazil	1994	1995	-	Feb	Sun>=15	 0:00	0	-
 Rule	Brazil	1996	only	-	Feb	11	 0:00	0	-
 # Decree 2,000 <http://pcdsh01.on.br/HV2000.htm> (1996-09-04)
 # adopted by same states, minus AL, SE.
-Rule	Brazil	1996	only	-	Oct	 6	 0:00	1:00	S
+Rule	Brazil	1996	only	-	Oct	 6	 0:00	1:00	-
 Rule	Brazil	1997	only	-	Feb	16	 0:00	0	-
 # From Daniel C. Sobral (1998-02-12):
 # In 1997, the DS began on October 6. The stated reason was that
@@ -882,19 +881,19 @@ Rule	Brazil	1997	only	-	Feb	16	 0:00	0	-
 # to help dealing with the shortages of electric power.
 #
 # Decree 2,317 (1997-09-04), adopted by same states.
-Rule	Brazil	1997	only	-	Oct	 6	 0:00	1:00	S
+Rule	Brazil	1997	only	-	Oct	 6	 0:00	1:00	-
 # Decree 2,495 <http://pcdsh01.on.br/figuras/HV2495.JPG>
 # (1998-02-10)
 Rule	Brazil	1998	only	-	Mar	 1	 0:00	0	-
 # Decree 2,780 <http://pcdsh01.on.br/figuras/Hv98.jpg> (1998-09-11)
 # adopted by the same states as before.
-Rule	Brazil	1998	only	-	Oct	11	 0:00	1:00	S
+Rule	Brazil	1998	only	-	Oct	11	 0:00	1:00	-
 Rule	Brazil	1999	only	-	Feb	21	 0:00	0	-
 # Decree 3,150 <http://pcdsh01.on.br/figuras/HV3150.gif>
 # (1999-08-23) adopted by same states.
 # Decree 3,188 <http://pcdsh01.on.br/DecHV99.gif> (1999-09-30)
 # adds SE, AL, PB, PE, RN, CE, PI, MA and RR.
-Rule	Brazil	1999	only	-	Oct	 3	 0:00	1:00	S
+Rule	Brazil	1999	only	-	Oct	 3	 0:00	1:00	-
 Rule	Brazil	2000	only	-	Feb	27	 0:00	0	-
 # Decree 3,592 <http://pcdsh01.on.br/DEC3592.htm> (2000-09-06)
 # adopted by the same states as before.
@@ -904,34 +903,34 @@ Rule	Brazil	2000	only	-	Feb	27	 0:00	0	-
 # repeals DST in SE, AL, PB, RN, CE, PI and MA, effective 2000-10-22 00:00.
 # Decree 3,916 <http://pcdsh01.on.br/figuras/HV3916.gif>
 # (2001-09-13) reestablishes DST in AL, CE, MA, PB, PE, PI, RN, SE.
-Rule	Brazil	2000	2001	-	Oct	Sun>=8	 0:00	1:00	S
+Rule	Brazil	2000	2001	-	Oct	Sun>=8	 0:00	1:00	-
 Rule	Brazil	2001	2006	-	Feb	Sun>=15	 0:00	0	-
 # Decree 4,399 (2002-10-01) repeals DST in AL, CE, MA, PB, PE, PI, RN, SE.
 # 4,399 <http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm>
-Rule	Brazil	2002	only	-	Nov	 3	 0:00	1:00	S
+Rule	Brazil	2002	only	-	Nov	 3	 0:00	1:00	-
 # Decree 4,844 (2003-09-24; corrected 2003-09-26) repeals DST in BA, MT, TO.
 # 4,844 <http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm>
-Rule	Brazil	2003	only	-	Oct	19	 0:00	1:00	S
+Rule	Brazil	2003	only	-	Oct	19	 0:00	1:00	-
 # Decree 5,223 (2004-10-01) reestablishes DST in MT.
 # 5,223 <http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm>
-Rule	Brazil	2004	only	-	Nov	 2	 0:00	1:00	S
+Rule	Brazil	2004	only	-	Nov	 2	 0:00	1:00	-
 # Decree 5,539 <http://pcdsh01.on.br/DecHV5539.gif> (2005-09-19),
 # adopted by the same states as before.
-Rule	Brazil	2005	only	-	Oct	16	 0:00	1:00	S
+Rule	Brazil	2005	only	-	Oct	16	 0:00	1:00	-
 # Decree 5,920 <http://pcdsh01.on.br/DecHV5920.gif> (2006-10-03),
 # adopted by the same states as before.
-Rule	Brazil	2006	only	-	Nov	 5	 0:00	1:00	S
+Rule	Brazil	2006	only	-	Nov	 5	 0:00	1:00	-
 Rule	Brazil	2007	only	-	Feb	25	 0:00	0	-
 # Decree 6,212 <http://pcdsh01.on.br/DecHV6212.gif> (2007-09-26),
 # adopted by the same states as before.
-Rule	Brazil	2007	only	-	Oct	Sun>=8	 0:00	1:00	S
+Rule	Brazil	2007	only	-	Oct	Sun>=8	 0:00	1:00	-
 # From Frederico A. C. Neves (2008-09-10):
 # According to this decree
 # http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
 # [t]he DST period in Brazil now on will be from the 3rd Oct Sunday to the
 # 3rd Feb Sunday. There is an exception on the return date when this is
 # the Carnival Sunday then the return date will be the next Sunday...
-Rule	Brazil	2008	2017	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Brazil	2008	2017	-	Oct	Sun>=15	0:00	1:00	-
 Rule	Brazil	2008	2011	-	Feb	Sun>=15	0:00	0	-
 # Decree 7,584 <http://pcdsh01.on.br/HVdecreto7584_20111013.jpg> (2011-10-13)
 # added Bahia.
@@ -949,7 +948,7 @@ Rule	Brazil	2016	2022	-	Feb	Sun>=15	0:00	0	-
 # ... https://www.timeanddate.com/news/time/brazil-delays-dst-2018.html
 # From Steffen Thorsen (2017-12-20):
 # http://www.planalto.gov.br/ccivil_03/_ato2015-2018/2017/decreto/D9242.htm
-Rule	Brazil	2018	max	-	Nov	Sun>=1	0:00	1:00	S
+Rule	Brazil	2018	max	-	Nov	Sun>=1	0:00	1:00	-
 Rule	Brazil	2023	only	-	Feb	Sun>=22	0:00	0	-
 Rule	Brazil	2024	2025	-	Feb	Sun>=15	0:00	0	-
 Rule	Brazil	2026	only	-	Feb	Sun>=22	0:00	0	-
@@ -1256,28 +1255,28 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # For now, assume that they will not revert.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
+Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	-
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	S
+Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	-
 Rule	Chile	1969	only	-	Mar	30	3:00u	0	-
-Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	S
+Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	-
 Rule	Chile	1970	only	-	Mar	29	3:00u	0	-
 Rule	Chile	1971	only	-	Mar	14	3:00u	0	-
-Rule	Chile	1970	1972	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1970	1972	-	Oct	Sun>=9	4:00u	1:00	-
 Rule	Chile	1972	1986	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	S
-Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	-
+Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	-
 Rule	Chile	1987	only	-	Apr	12	3:00u	0	-
 Rule	Chile	1988	1990	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1988	1989	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	S
+Rule	Chile	1988	1989	-	Oct	Sun>=9	4:00u	1:00	-
+Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	-
 Rule	Chile	1991	1996	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	-
 Rule	Chile	1997	only	-	Mar	30	3:00u	0	-
 Rule	Chile	1998	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
+Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	-
 Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
-Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	-
 Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
 # N.B.: the end of March 29 in Chile is March 30 in Universal time,
 # which is used below in specifying the transition.
@@ -1285,11 +1284,11 @@ Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
 Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
 Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
-Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	-
 Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
-Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
+Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	-
 Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
-Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
+Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	-
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1354,7 +1353,7 @@ Zone Antarctica/Palmer	0	-	-00	1965
 # "A variation of fifteen minutes in the public clocks of Bogota is not rare."
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	CO	1992	only	-	May	 3	0:00	1:00	S
+Rule	CO	1992	only	-	May	 3	0:00	1:00	-
 Rule	CO	1993	only	-	Apr	 4	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Bogota	-4:56:16 -	LMT	1884 Mar 13
@@ -1414,7 +1413,7 @@ Link	America/Curacao	America/Kralendijk	# Caribbean Netherlands
 # repeated.  For now, assume transitions were at 00:00 local time country-wide.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Ecuador	1992	only	-	Nov	28	0:00	1:00	S
+Rule	Ecuador	1992	only	-	Nov	28	0:00	1:00	-
 Rule	Ecuador	1993	only	-	Feb	 5	0:00	0	-
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1504,22 +1503,22 @@ Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
 #   the maintainers of the database to inform them we're adopting
 #   the same policy this year and suggest recommendations for future years.
 #
-# For now we will assume permanent summer time for the Falklands
+# For now we will assume permanent -03 for the Falklands
 # until advised differently (to apply for 2012 and beyond, after the 2011
 # experiment was apparently successful.)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Falk	1937	1938	-	Sep	lastSun	0:00	1:00	S
+Rule	Falk	1937	1938	-	Sep	lastSun	0:00	1:00	-
 Rule	Falk	1938	1942	-	Mar	Sun>=19	0:00	0	-
-Rule	Falk	1939	only	-	Oct	1	0:00	1:00	S
-Rule	Falk	1940	1942	-	Sep	lastSun	0:00	1:00	S
+Rule	Falk	1939	only	-	Oct	1	0:00	1:00	-
+Rule	Falk	1940	1942	-	Sep	lastSun	0:00	1:00	-
 Rule	Falk	1943	only	-	Jan	1	0:00	0	-
-Rule	Falk	1983	only	-	Sep	lastSun	0:00	1:00	S
+Rule	Falk	1983	only	-	Sep	lastSun	0:00	1:00	-
 Rule	Falk	1984	1985	-	Apr	lastSun	0:00	0	-
-Rule	Falk	1984	only	-	Sep	16	0:00	1:00	S
-Rule	Falk	1985	2000	-	Sep	Sun>=9	0:00	1:00	S
+Rule	Falk	1984	only	-	Sep	16	0:00	1:00	-
+Rule	Falk	1985	2000	-	Sep	Sun>=9	0:00	1:00	-
 Rule	Falk	1986	2000	-	Apr	Sun>=16	0:00	0	-
 Rule	Falk	2001	2010	-	Apr	Sun>=15	2:00	0	-
-Rule	Falk	2001	2010	-	Sep	Sun>=1	2:00	1:00	S
+Rule	Falk	2001	2010	-	Sep	Sun>=1	2:00	1:00	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
 			-3:51:24 -	SMT	1912 Mar 12 # Stanley Mean Time
@@ -1554,16 +1553,16 @@ Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar    # Georgetown
 # adjust their clocks at 0 hour of the given dates.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Para	1975	1988	-	Oct	 1	0:00	1:00	S
+Rule	Para	1975	1988	-	Oct	 1	0:00	1:00	-
 Rule	Para	1975	1978	-	Mar	 1	0:00	0	-
 Rule	Para	1979	1991	-	Apr	 1	0:00	0	-
-Rule	Para	1989	only	-	Oct	22	0:00	1:00	S
-Rule	Para	1990	only	-	Oct	 1	0:00	1:00	S
-Rule	Para	1991	only	-	Oct	 6	0:00	1:00	S
+Rule	Para	1989	only	-	Oct	22	0:00	1:00	-
+Rule	Para	1990	only	-	Oct	 1	0:00	1:00	-
+Rule	Para	1991	only	-	Oct	 6	0:00	1:00	-
 Rule	Para	1992	only	-	Mar	 1	0:00	0	-
-Rule	Para	1992	only	-	Oct	 5	0:00	1:00	S
+Rule	Para	1992	only	-	Oct	 5	0:00	1:00	-
 Rule	Para	1993	only	-	Mar	31	0:00	0	-
-Rule	Para	1993	1995	-	Oct	 1	0:00	1:00	S
+Rule	Para	1993	1995	-	Oct	 1	0:00	1:00	-
 Rule	Para	1994	1995	-	Feb	lastSun	0:00	0	-
 Rule	Para	1996	only	-	Mar	 1	0:00	0	-
 # IATA SSIM (2000-02) says 1999-10-10; ignore this for now.
@@ -1581,7 +1580,7 @@ Rule	Para	1996	only	-	Mar	 1	0:00	0	-
 # year, the time will change on the first Sunday of October; likewise, the
 # clock will be set back on the first Sunday of March.
 #
-Rule	Para	1996	2001	-	Oct	Sun>=1	0:00	1:00	S
+Rule	Para	1996	2001	-	Oct	Sun>=1	0:00	1:00	-
 # IATA SSIM (1997-09) says Mar 1; go with Shanks & Pottenger.
 Rule	Para	1997	only	-	Feb	lastSun	0:00	0	-
 # Shanks & Pottenger say 1999-02-28; IATA SSIM (1999-02) says 1999-02-27, but
@@ -1592,7 +1591,7 @@ Rule	Para	1998	2001	-	Mar	Sun>=1	0:00	0	-
 # dst method to be from the first Sunday in September to the first Sunday in
 # April.
 Rule	Para	2002	2004	-	Apr	Sun>=1	0:00	0	-
-Rule	Para	2002	2003	-	Sep	Sun>=1	0:00	1:00	S
+Rule	Para	2002	2003	-	Sep	Sun>=1	0:00	1:00	-
 #
 # From Jesper Nørgaard Welen (2005-01-02):
 # There are several sources that claim that Paraguay made
@@ -1601,7 +1600,7 @@ Rule	Para	2002	2003	-	Sep	Sun>=1	0:00	1:00	S
 # Decree 1,867 (2004-03-05)
 # From Carlos Raúl Perasso via Jesper Nørgaard Welen (2006-10-13)
 # http://www.presidencia.gov.py/decretos/D1867.pdf
-Rule	Para	2004	2009	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Para	2004	2009	-	Oct	Sun>=15	0:00	1:00	-
 Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	-
 # From Carlos Raúl Perasso (2010-02-18):
 # By decree number 3958 issued yesterday
@@ -1614,7 +1613,7 @@ Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	-
 # and that on the first Sunday of the month of October, it is to be set
 # forward 60 minutes, in all the territory of the Paraguayan Republic.
 # ...
-Rule	Para	2010	max	-	Oct	Sun>=1	0:00	1:00	S
+Rule	Para	2010	max	-	Oct	Sun>=1	0:00	1:00	-
 Rule	Para	2010	2012	-	Apr	Sun>=8	0:00	0	-
 #
 # From Steffen Thorsen (2013-03-07):
@@ -1647,16 +1646,16 @@ Zone America/Asuncion	-3:50:40 -	LMT	1890
 # Shanks & Pottenger don't have this transition.  Assume 1986 was like 1987.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Peru	1938	only	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1938	only	-	Jan	 1	0:00	1:00	-
 Rule	Peru	1938	only	-	Apr	 1	0:00	0	-
-Rule	Peru	1938	1939	-	Sep	lastSun	0:00	1:00	S
+Rule	Peru	1938	1939	-	Sep	lastSun	0:00	1:00	-
 Rule	Peru	1939	1940	-	Mar	Sun>=24	0:00	0	-
-Rule	Peru	1986	1987	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1986	1987	-	Jan	 1	0:00	1:00	-
 Rule	Peru	1986	1987	-	Apr	 1	0:00	0	-
-Rule	Peru	1990	only	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1990	only	-	Jan	 1	0:00	1:00	-
 Rule	Peru	1990	only	-	Apr	 1	0:00	0	-
 # IATA is ambiguous for 1993/1995; go with Shanks & Pottenger.
-Rule	Peru	1994	only	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1994	only	-	Jan	 1	0:00	1:00	-
 Rule	Peru	1994	only	-	Apr	 1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Lima	-5:08:12 -	LMT	1890
@@ -1702,72 +1701,201 @@ Link America/Port_of_Spain America/Tortola	# Virgin Islands (UK)
 # Uruguay
 # From Paul Eggert (1993-11-18):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
-# From Shanks & Pottenger:
+#
+# From Tim Parenti (2018-02-20), per Jeremie Bonjour (2018-01-31) and Michael
+# Deckers (2018-02-20):
+# ... At least they kept good records...
+#
+# http://www.armada.mil.uy/ContenidosPDFs/sohma/web/almanaque/almanaque_2018.pdf#page=36
+# Page 36 of Almanaque 2018, published by the Oceanography, Hydrography, and
+# Meteorology Service of the Uruguayan Navy, seems to give many transitions
+# with greater clarity than we've had before.  It directly references many laws
+# and decrees which are, in turn, referenced below.  They can be viewed in the
+# public archives of the Diario Oficial (in Spanish) at
+# http://www.impo.com.uy/diariooficial/
+#
+# Ley No. 3920 of 1908-06-10 placed the determination of legal time under the
+# auspices of the National Institute for the Prediction of Time.  It is unclear
+# exactly what offset was used during this period, though Ley No. 7200 of
+# 1920-04-23 used the Observatory of the National Meteorological Institute in
+# Montevideo (34° 54' 33" S, 56° 12' 45" W) as its reference meridian,
+# retarding legal time by 15 minutes 9 seconds from 1920-04-30 24:00,
+# resulting in UT-04.  Assume the corresponding LMT of UT-03:44:51 (given on
+# page 725 of the Proceedings of the Second Pan-American Scientific Congress,
+# 1915-1916) was in use, and merely became official from 1908-06-10.
+# https://www.impo.com.uy/diariooficial/1908/06/18/12
+# https://www.impo.com.uy/diariooficial/1920/04/27/9
+#
+# Ley No. 7594 of 1923-06-28 specified legal time as Observatory time advanced
+# by 44 minutes 51 seconds (UT-03) "from 30 September to 31 March", and by 14
+# minutes 51 seconds (UT-03:30) "the rest of the year"; a message from the
+# National Council of Administration the same day, published directly below the
+# law in the Diario Oficial, specified the first transition to be 1923-09-30
+# 24:00.  This effectively established standard time at UT-03:30 with 30
+# minutes DST.  Assume transitions at 24:00 on the specified days until Ley No.
+# 7919 of 1926-03-05 ended this arrangement, repealing all "laws and other
+# provisions which oppose" it, resulting in year-round UT-03:30; a Resolución
+# of 1926-03-11 puts the final transition at 1926-03-31 24:00, the same as it
+# would have been under the previous law.
+# https://www.impo.com.uy/diariooficial/1923/07/02/2
+# https://www.impo.com.uy/diariooficial/1926/03/10/2
+# https://www.impo.com.uy/diariooficial/1926/03/18/2
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives 1923 Oct 1; go with Shanks & Pottenger.
-Rule	Uruguay	1923	only	-	Oct	 2	 0:00	0:30	HS
+Rule	Uruguay	1923	1925	-	Oct	 1	 0:00	0:30	-
 Rule	Uruguay	1924	1926	-	Apr	 1	 0:00	0	-
-Rule	Uruguay	1924	1925	-	Oct	 1	 0:00	0:30	HS
-Rule	Uruguay	1933	1935	-	Oct	lastSun	 0:00	0:30	HS
-# Shanks & Pottenger give 1935 Apr 1 0:00 & 1936 Mar 30 0:00; go with Whitman.
-Rule	Uruguay	1934	1936	-	Mar	Sat>=25	23:30s	0	-
-Rule	Uruguay	1936	only	-	Nov	 1	 0:00	0:30	HS
-Rule	Uruguay	1937	1941	-	Mar	lastSun	 0:00	0	-
-# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
-Rule	Uruguay	1937	1940	-	Oct	lastSun	 0:00	0:30	HS
-# Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
-# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
-Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0:30	HS
-Rule	Uruguay	1942	only	-	Jan	 1	 0:00	0	-
-Rule	Uruguay	1942	only	-	Dec	14	 0:00	1:00	S
+# From Tim Parenti (2018-02-15):
+# http://www.impo.com.uy/diariooficial/1933/10/27/6
+#
+# It appears Ley No. 9122 of 1933 was never published as such in the Diario
+# Oficial, but instead appeared as Document 26 in the Diario on Friday
+# 1933-10-27 as a decree made Monday 1933-10-23 and filed under the Ministry of
+# National Defense.  It reinstituted a DST of 30 minutes (to UT-03) "from the
+# last Sunday of October...until the last Saturday of March."  In accordance
+# with this provision, the first transition was explicitly specified in Article
+# 2 of the decree as Saturday 1933-10-28 at 24:00; that is, Sunday 1933-10-29
+# at 00:00.  Assume transitions at 00:00 Sunday throughout.
+#
+# Departing from the matter-of-fact nature of previous timekeeping laws, the
+# 1933 decree "consider[s] the advantages of...the advance of legal time":
+#
+#   "Whereas: The measure adopted by almost all nations at the time of the last
+#    World War still persists in North America and Europe, precisely because of
+#    the economic, hygienic, and social advantages derived from such an
+#    emergency measure...
+#
+#    Whereas: The advance of the legal time during the summer seasons, by
+#    displacing social activity near sunrise, favors the citizen populations
+#    and especially the society that creates and works..."
+#
+# It further specified that "necessary measures" be taken to ensure that
+# "public spectacles finish, in general, before [01:00]."
+Rule	Uruguay	1933	1938	-	Oct	lastSun	 0:00	0:30	-
+Rule	Uruguay	1934	1941	-	Mar	lastSat	24:00	0	-
+# From Tim Parenti (2018-02-15):
+# Most of the Rules below, and their contemporaneous Zone lines, have been
+# updated simply to match the Almanaque 2018.  Although the document does not
+# list exact transition times, midnight transitions were already present in our
+# data here for all transitions through 2004-09, and this is both consistent
+# with prior transitions and verified in several decrees marked below between
+# 1939-09 and 2004-09, wherein the relevant text was typically of the form:
+#
+#   "From 0 hours on [date], the legal time of the entire Republic will be...
+#
+#    In accordance with [the preceding], on [previous date] at 24 hours, all
+#    clocks throughout the Republic will be [advanced/retarded] by..."
+#
+# It is possible that there is greater specificity to be found for the Rules
+# below, but it is buried in no fewer than 40 different decrees individually
+# referenced by the Almanaque for the period from 1939-09 to 2014-09.
+# Four-fifths of these were promulgated less than two weeks before taking
+# effect; more than half within a week and none more than 5 weeks.  Only the
+# handful with comments below have been checked with any thoroughness.
+Rule	Uruguay	1939	only	-	Oct	 1	 0:00	0:30	-
+Rule	Uruguay	1940	only	-	Oct	27	 0:00	0:30	-
+# From Tim Parenti (2018-02-15):
+# Decreto 1145 of the Ministry of National Defense, dated 1941-07-26, specified
+# UT-03 from Friday 1941-08-01 00:00, citing an "urgent...need to save fuel".
+# http://www.impo.com.uy/diariooficial/1941/08/04/1
+Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0:30	-
+# From Tim Parenti (2018-02-15):
+# Decreto 1866 of the Ministry of National Defense, dated 1942-12-09, specified
+# further advancement (to UT-02:30) from Sunday 1942-12-13 24:00.  Since clocks
+# never went back to UT-03:30 thereafter, this is modeled as advancing standard
+# time by 30 minutes to UT-03, while retaining 30 minutes of DST.
+# http://www.impo.com.uy/diariooficial/1942/12/16/3
+Rule	Uruguay	1942	only	-	Dec	14	 0:00	0:30	-
 Rule	Uruguay	1943	only	-	Mar	14	 0:00	0	-
-Rule	Uruguay	1959	only	-	May	24	 0:00	1:00	S
+Rule	Uruguay	1959	only	-	May	24	 0:00	0:30	-
 Rule	Uruguay	1959	only	-	Nov	15	 0:00	0	-
-Rule	Uruguay	1960	only	-	Jan	17	 0:00	1:00	S
+Rule	Uruguay	1960	only	-	Jan	17	 0:00	1:00	-
 Rule	Uruguay	1960	only	-	Mar	 6	 0:00	0	-
-Rule	Uruguay	1965	1967	-	Apr	Sun>=1	 0:00	1:00	S
+Rule	Uruguay	1965	only	-	Apr	 4	 0:00	1:00	-
 Rule	Uruguay	1965	only	-	Sep	26	 0:00	0	-
-Rule	Uruguay	1966	1967	-	Oct	31	 0:00	0	-
-Rule	Uruguay	1968	1970	-	May	27	 0:00	0:30	HS
-Rule	Uruguay	1968	1970	-	Dec	 2	 0:00	0	-
-Rule	Uruguay	1972	only	-	Apr	24	 0:00	1:00	S
-Rule	Uruguay	1972	only	-	Aug	15	 0:00	0	-
-Rule	Uruguay	1974	only	-	Mar	10	 0:00	0:30	HS
-Rule	Uruguay	1974	only	-	Dec	22	 0:00	1:00	S
-Rule	Uruguay	1976	only	-	Oct	 1	 0:00	0	-
-Rule	Uruguay	1977	only	-	Dec	 4	 0:00	1:00	S
-Rule	Uruguay	1978	only	-	Apr	 1	 0:00	0	-
-Rule	Uruguay	1979	only	-	Oct	 1	 0:00	1:00	S
-Rule	Uruguay	1980	only	-	May	 1	 0:00	0	-
-Rule	Uruguay	1987	only	-	Dec	14	 0:00	1:00	S
-Rule	Uruguay	1988	only	-	Mar	14	 0:00	0	-
-Rule	Uruguay	1988	only	-	Dec	11	 0:00	1:00	S
-Rule	Uruguay	1989	only	-	Mar	12	 0:00	0	-
-Rule	Uruguay	1989	only	-	Oct	29	 0:00	1:00	S
-# Shanks & Pottenger say no DST was observed in 1990/1 and 1991/2,
-# and that 1992/3's DST was from 10-25 to 03-01.  Go with IATA.
-Rule	Uruguay	1990	1992	-	Mar	Sun>=1	 0:00	0	-
-Rule	Uruguay	1990	1991	-	Oct	Sun>=21	 0:00	1:00	S
-Rule	Uruguay	1992	only	-	Oct	18	 0:00	1:00	S
+# From Tim Parenti (2018-02-15):
+# Decreto 321/968 of 1968-05-25, citing emergency drought measures decreed the
+# day before, brought clocks forward 30 minutes from Monday 1968-05-27 00:00.
+# http://www.impo.com.uy/diariooficial/1968/05/30/5
+Rule	Uruguay	1968	only	-	May	27	 0:00	0:30	-
+Rule	Uruguay	1968	only	-	Dec	 1	 0:00	0	-
+# From Tim Parenti (2018-02-15):
+# Decreto 188/970 of 1970-04-23 instituted restrictions on electricity
+# consumption "as a consequence of the current rainfall regime in the country".
+# Articles 13 and 14 advanced clocks by an hour from Saturday 1970-04-25 00:00.
+# http://www.impo.com.uy/diariooficial/1970/04/29/4
+Rule	Uruguay	1970	only	-	Apr	25	 0:00	1:00	-
+Rule	Uruguay	1970	only	-	Jun	14	 0:00	0	-
+Rule	Uruguay	1972	only	-	Apr	23	 0:00	1:00	-
+Rule	Uruguay	1972	only	-	Jul	16	 0:00	0	-
+# From Tim Parenti (2018-02-15):
+# Decreto 29/974 of 1974-01-11, citing "the international rise in the price of
+# oil", advanced clocks by 90 minutes (to UT-01:30).  Decreto 163/974 of
+# 1974-03-04 returned 60 of those minutes (to UT-02:30), and the remaining 30
+# minutes followed in Decreto 679/974 of 1974-08-29.
+# http://www.impo.com.uy/diariooficial/1974/01/22/11
+# http://www.impo.com.uy/diariooficial/1974/03/14/3
+# http://www.impo.com.uy/diariooficial/1974/09/04/6
+Rule	Uruguay	1974	only	-	Jan	13	 0:00	1:30	-
+Rule	Uruguay	1974	only	-	Mar	10	 0:00	0:30	-
+Rule	Uruguay	1974	only	-	Sep	 1	 0:00	0	-
+Rule	Uruguay	1974	only	-	Dec	22	 0:00	1:00	-
+Rule	Uruguay	1975	only	-	Mar	30	 0:00	0	-
+Rule	Uruguay	1976	only	-	Dec	19	 0:00	1:00	-
+Rule	Uruguay	1977	only	-	Mar	 6	 0:00	0	-
+Rule	Uruguay	1977	only	-	Dec	 4	 0:00	1:00	-
+Rule	Uruguay	1978	1979	-	Mar	Sun>=1	 0:00	0	-
+Rule	Uruguay	1978	only	-	Dec	17	 0:00	1:00	-
+Rule	Uruguay	1979	only	-	Apr	29	 0:00	1:00	-
+Rule	Uruguay	1980	only	-	Mar	16	 0:00	0	-
+# From Tim Parenti (2018-02-15):
+# Decreto 725/987 of 1987-12-04 cited "better use of national tourist
+# attractions" to advance clocks one hour from Monday 1987-12-14 00:00.
+# http://www.impo.com.uy/diariooficial/1988/01/25/1
+Rule	Uruguay	1987	only	-	Dec	14	 0:00	1:00	-
+Rule	Uruguay	1988	only	-	Feb	28	 0:00	0	-
+Rule	Uruguay	1988	only	-	Dec	11	 0:00	1:00	-
+Rule	Uruguay	1989	only	-	Mar	 5	 0:00	0	-
+Rule	Uruguay	1989	only	-	Oct	29	 0:00	1:00	-
+Rule	Uruguay	1990	only	-	Feb	25	 0:00	0	-
+# From Tim Parenti (2018-02-15), per Paul Eggert (1999-11-04):
+# IATA agrees as below for 1990-10 through 1993-02.  Per Almanaque 2018, the
+# 1992/1993 season appears to be the first in over half a century where DST
+# both began and ended pursuant to the same decree.
+Rule	Uruguay	1990	1991	-	Oct	Sun>=21	 0:00	1:00	-
+Rule	Uruguay	1991	1992	-	Mar	Sun>=1	 0:00	0	-
+Rule	Uruguay	1992	only	-	Oct	18	 0:00	1:00	-
 Rule	Uruguay	1993	only	-	Feb	28	 0:00	0	-
 # From Eduardo Cota (2004-09-20):
 # The Uruguayan government has decreed a change in the local time....
-# http://www.presidencia.gub.uy/decretos/2004091502.htm
-Rule	Uruguay	2004	only	-	Sep	19	 0:00	1:00	S
+# From Tim Parenti (2018-02-15):
+# Decreto 328/004 of 2004-09-15.
+# http://www.impo.com.uy/diariooficial/2004/09/23/documentos.pdf#page=1
+Rule	Uruguay	2004	only	-	Sep	19	 0:00	1:00	-
 # From Steffen Thorsen (2005-03-11):
 # Uruguay's DST was scheduled to end on Sunday, 2005-03-13, but in order to
 # save energy ... it was postponed two weeks....
-# http://www.presidencia.gub.uy/_Web/noticias/2005/03/2005031005.htm
+# From Tim Parenti (2018-02-15):
+# This 2005 postponement is not in Almanaque 2018.  Go with the contemporaneous
+# reporting, which is confirmed by Decreto 107/005 of 2005-03-10 amending
+# Decreto 328/004:
+# http://www.impo.com.uy/diariooficial/2005/03/15/documentos.pdf#page=1
+# The original decree specified a transition of 2005-03-12 24:00, but the new
+# one specified 2005-03-27 02:00.
 Rule	Uruguay	2005	only	-	Mar	27	 2:00	0	-
 # From Eduardo Cota (2005-09-27):
-# http://www.presidencia.gub.uy/_Web/decretos/2005/09/CM%20119_09%2009%202005_00001.PDF
-# This means that from 2005-10-09 at 02:00 local time, until 2006-03-12 at
-# 02:00 local time, official time in Uruguay will be at GMT -2.
-Rule	Uruguay	2005	only	-	Oct	 9	 2:00	1:00	S
-Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
-# From Jesper Nørgaard Welen (2006-09-06):
-# http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
-#
+# ...from 2005-10-09 at 02:00 local time, until 2006-03-12 at 02:00 local time,
+# official time in Uruguay will be at GMT -2.
+# From Tim Parenti (2018-02-15):
+# Decreto 318/005 of 2005-09-19.
+# http://www.impo.com.uy/diariooficial/2005/09/23/documentos.pdf#page=1
+Rule	Uruguay	2005	only	-	Oct	 9	 2:00	1:00	-
+Rule	Uruguay	2006	2015	-	Mar	Sun>=8	 2:00	0	-
+# From Tim Parenti (2018-02-15), per Jesper Nørgaard Welen (2006-09-06):
+# Decreto 311/006 of 2006-09-04 established regular DST from the first Sunday
+# of October at 02:00 through the second Sunday of March at 02:00.  Almanaque
+# 2018 appears to have a few typoed dates through this period; ignore them.
+# http://www.impo.com.uy/diariooficial/2006/09/08/documentos.pdf#page=1
+Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	-
 # From Steffen Thorsen (2015-06-30):
 # ... it looks like they will not be using DST the coming summer:
 # http://www.elobservador.com.uy/gobierno-resolvio-que-no-habra-cambio-horario-verano-n656787
@@ -1777,17 +1905,19 @@ Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
 # instead of out to dinner.
 # From Pablo Camargo (2015-07-13):
 # http://archivo.presidencia.gub.uy/sci/decretos/2015/06/cons_min_201.pdf
-# [dated 2015-06-29; repeals Decree 311/006 dated 2006-09-04]
-Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	S
-Rule	Uruguay	2007	2015	-	Mar	Sun>=8	 2:00	0	-
+# From Tim Parenti (2018-02-15):
+# Decreto 178/015 of 2015-06-29; repeals Decreto 311/006.
 
 # This Zone can be simplified once we assume zic %z.
-Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
-			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
+Zone America/Montevideo	-3:44:51 -	LMT	1908 Jun 10
+			-3:44:51 -	MMT	1920 May  1 # Montevideo MT
+			-4:00	-	-04	1923 Oct  1
 			-3:30	Uruguay	-0330/-03 1942 Dec 14
+			-3:00	Uruguay	-03/-0230 1960
 			-3:00	Uruguay	-03/-02	1968
-			-3:00	Uruguay	-03/-0230 1971
+			-3:00	Uruguay	-03/-0230 1970
 			-3:00	Uruguay	-03/-02	1974
+			-3:00	Uruguay	-03/-0130 1974 Mar 10
 			-3:00	Uruguay	-03/-0230 1974 Dec 22
 			-3:00	Uruguay	-03/-02
 
diff --git a/make/data/tzdata/zone.tab b/make/data/tzdata/zone.tab
index f6d9c667734..873737e06b8 100644
--- a/make/data/tzdata/zone.tab
+++ b/make/data/tzdata/zone.tab
@@ -452,7 +452,7 @@ US	+593249-1394338	America/Yakutat	Alaska - Yakutat
 US	+643004-1652423	America/Nome	Alaska (west)
 US	+515248-1763929	America/Adak	Aleutian Islands
 US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-3453-05611	America/Montevideo
+UY	-345433-0561245	America/Montevideo
 UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
 UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
 VA	+415408+0122711	Europe/Vatican
diff --git a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
index d95927dd494..3e4a0dab75a 100644
--- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
+++ b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
@@ -445,7 +445,7 @@ protected final Object[][] getContents() {
                                               "Western Greenland Summer Time", "WGST",
                                               "Western Greenland Time", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
index 9c33f32624a..e73e37d363e 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "Westgr\u00f6nl\u00e4ndische Sommerzeit", "WGST",
                                               "Westgr\u00F6nl\u00E4ndische Zeit", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
index f29fc7c7525..2f9b16c91c6 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "Hora de verano de Groenlandia Occidental", "WGST",
                                               "Hora de Groenlandia Occidental", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
index 5401504b8d5..f9a59c73513 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "Heure d'\u00e9t\u00e9 du Groenland de l'Ouest", "WGST",
                                               "Heure du Groenland de l'Ouest", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
index 15ab8b4d52f..ca223137aa9 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "Ora estiva della Groenlandia occidentale", "WGST",
                                               "Ora della Groenlandia occidentale", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
index 5fa26431c0a..591c3b2b57d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "\u897f\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "WGST",
                                               "\u897F\u90E8\u30B0\u30EA\u30FC\u30F3\u30E9\u30F3\u30C9\u6642\u9593", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
index 350f167c9d7..3ace60dccf0 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "\uc11c\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WGST",
                                               "\uC11C\uBD80 \uADF8\uB9B0\uB780\uB4DC \uD45C\uC900\uC2DC", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
index e281083fba6..11ec3f9cf03 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Ocidental", "WGST",
                                               "Hor\u00E1rio da Groenl\u00E2ndia Ocidental", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
index 8c130a7dadd..cd93be37c1b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "V\u00e4stra Gr\u00f6nland, sommartid", "WGST",
                                               "V\u00E4stgr\u00F6nl\u00E4ndsk tid", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
index 511587d8dd6..36f5db8f067 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "\u897f\u683c\u6797\u5170\u5c9b\u590f\u4ee4\u65f6", "WGST",
                                               "\u897F\u683C\u6797\u5170\u5C9B\u65F6\u95F4", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
index 5f8db1732b6..adf456d3c48 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
@@ -446,7 +446,7 @@ protected final Object[][] getContents() {
                                               "\u897f\u683c\u6797\u862d\u5cf6\u590f\u4ee4\u6642\u9593", "WGST",
                                               "\u897F\u683C\u9675\u862D\u6642\u9593", "WGT"}},
             {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", AST},
+            {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
diff --git a/test/jdk/sun/util/calendar/zi/tzdata/VERSION b/test/jdk/sun/util/calendar/zi/tzdata/VERSION
index 561bd27bce5..f72d1acab47 100644
--- a/test/jdk/sun/util/calendar/zi/tzdata/VERSION
+++ b/test/jdk/sun/util/calendar/zi/tzdata/VERSION
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2018c
+tzdata2018d
diff --git a/test/jdk/sun/util/calendar/zi/tzdata/africa b/test/jdk/sun/util/calendar/zi/tzdata/africa
index 92c0b43ecf0..1e96df349d0 100644
--- a/test/jdk/sun/util/calendar/zi/tzdata/africa
+++ b/test/jdk/sun/util/calendar/zi/tzdata/africa
@@ -138,13 +138,13 @@ Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15  0:01
 
 # Cape Verde / Cabo Verde
 #
+# From Paul Eggert (2018-02-16):
 # Shanks gives 1907 for the transition to +02.
-# Perhaps the 1911-05-26 Portuguese decree
-# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# merely made it official?
+# For now, ignore that and follow the 1911-05-26 Portuguese decree
+# (see Europe/Lisbon).
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907        # Praia
+Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1912 Jan 01  2:00u # Praia
 			-2:00	-	-02	1942 Sep
 			-2:00	1:00	-01	1945 Oct 15
 			-2:00	-	-02	1975 Nov 25  2:00
@@ -393,15 +393,34 @@ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 # See Africa/Abidjan.
 
 # Ghana
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+
+# From Paul Eggert (2018-01-30):
 # Whitman says DST was observed from 1931 to "the present";
-# Shanks & Pottenger say 1936 to 1942;
-# and September 1 to January 1 is given by:
-# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
-# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
-# For lack of better info, assume DST was observed from 1920 to 1942.
-Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
+# Shanks & Pottenger say 1936 to 1942 with 20 minutes of DST,
+# with transitions on 09-01 and 12-31 at 00:00.
+# Page 33 of Parish GCB, Colonial Reports - Annual. No. 1066. Gold
+# Coast. Report for 1919. (March 1921), OCLC 784024077
+# http://libsysdigi.library.illinois.edu/ilharvest/africana/books2011-05/5530214/5530214_1919/5530214_1919_opt.pdf
+# lists the Determination of the Time Ordinance, 1919, No. 18,
+# "to advance the time observed locally by the space of twenty minutes
+# during the last four months of each year; the object in view being
+# to extend during those months the period of daylight-time available
+# for evening recreation after office hours."
+# Vanessa Ogle, The Global Transformation of Time, 1870-1950 (2015), p 33,
+# writes "In 1919, the Gold Coast (Ghana as of 1957) made Greenwich
+# time its legal time and simultaneously legalized a summer time of
+# UTC - 00:20 minutes from March to October."; a footnote lists
+# the ordinance as being dated 1919-11-24.
+# The Crown Colonist, Volume 12 (1942), p 176, says "the Government
+# intend advancing Gold Coast time half an hour ahead of G.M.T.
+# The actual date of the alteration has not yet been announced."
+# These sources are incomplete and contradictory.  Possibly what is
+# now Ghana observed different DST regimes in different years.  For
+# lack of better info, use Shanks except treat the minus sign as a
+# typo, and assume DST started in 1920 not 1936.
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	-
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	GMT/+0020
@@ -411,13 +430,13 @@ Zone	Africa/Accra	-0:00:52 -	LMT	1918
 
 # Guinea-Bissau
 #
+# From Paul Eggert (2018-02-16):
 # Shanks gives 1911-05-26 for the transition to WAT,
 # evidently confusing the date of the Portuguese decree
-# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# with the date that it took effect, namely 1912-01-01.
+# (see Europe/Lisbon) with the date that it took effect.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bissau	-1:02:20 -	LMT	1912 Jan  1
+Zone	Africa/Bissau	-1:02:20 -	LMT	1912 Jan  1  1:00u
 			-1:00	-	-01	1975
 			 0:00	-	GMT
 
@@ -613,9 +632,9 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 # at 2am (or 02:00) local time..."
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	S
+Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	-
 Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
-Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	S
+Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	-
 Rule Mauritius	2009	only	-	Mar	lastSun	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
@@ -1060,6 +1079,8 @@ Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
 
 # São Tomé and Príncipe
 
+# See Europe/Lisbon for info about the 1912 transition.
+
 # From Steffen Thorsen (2018-01-08):
 # Multiple sources tell that São Tomé changed from UTC to UTC+1 as
 # they entered the year 2018.
@@ -1068,7 +1089,7 @@ Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
 # http://www.mnec.gov.st/index.php/publicacoes/documentos/file/90-decreto-lei-n-25-2017
 
 Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:45 -	LMT	1912 # Lisbon Mean Time
+			-0:36:45 -	LMT	1912 Jan  1 00:00u # Lisbon MT
 			 0:00	-	GMT	2018 Jan  1 01:00
 			 1:00	-	WAT
 
diff --git a/test/jdk/sun/util/calendar/zi/tzdata/antarctica b/test/jdk/sun/util/calendar/zi/tzdata/antarctica
index c78ef7ed503..74ce2dcef51 100644
--- a/test/jdk/sun/util/calendar/zi/tzdata/antarctica
+++ b/test/jdk/sun/util/calendar/zi/tzdata/antarctica
@@ -98,7 +98,8 @@ Zone Antarctica/Casey	0	-	-00	1969
 			8:00	-	+08	2011 Oct 28  2:00
 			11:00	-	+11	2012 Feb 21 17:00u
 			8:00	-	+08	2016 Oct 22
-			11:00	-	+11
+			11:00	-	+11	2018 Mar 11  4:00
+			8:00	-	+08
 Zone Antarctica/Davis	0	-	-00	1957 Jan 13
 			7:00	-	+07	1964 Nov
 			0	-	-00	1969 Feb
diff --git a/test/jdk/sun/util/calendar/zi/tzdata/asia b/test/jdk/sun/util/calendar/zi/tzdata/asia
index c281ece84de..d03b8ef0b49 100644
--- a/test/jdk/sun/util/calendar/zi/tzdata/asia
+++ b/test/jdk/sun/util/calendar/zi/tzdata/asia
@@ -92,13 +92,13 @@
 Rule	EUAsia	1981	max	-	Mar	lastSun	 1:00u	1:00	S
 Rule	EUAsia	1979	1995	-	Sep	lastSun	 1:00u	0	-
 Rule	EUAsia	1996	max	-	Oct	lastSun	 1:00u	0	-
-Rule E-EurAsia	1981	max	-	Mar	lastSun	 0:00	1:00	S
+Rule E-EurAsia	1981	max	-	Mar	lastSun	 0:00	1:00	-
 Rule E-EurAsia	1979	1995	-	Sep	lastSun	 0:00	0	-
 Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
-Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
+Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	-
 Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
 Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
-Rule RussiaAsia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
+Rule RussiaAsia	1985	2010	-	Mar	lastSun	 2:00s	1:00	-
 Rule RussiaAsia	1996	2010	-	Oct	lastSun	 2:00s	0	-
 
 # Afghanistan
@@ -133,7 +133,7 @@ Zone	Asia/Kabul	4:36:48 -	LMT	1890
 # (brief)
 # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule Armenia	2011	only	-	Mar	lastSun	 2:00s	1:00	S
+Rule Armenia	2011	only	-	Mar	lastSun	 2:00s	1:00	-
 Rule Armenia	2011	only	-	Oct	lastSun	 2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
@@ -159,7 +159,7 @@ Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
 # http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
+Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	-
 Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
@@ -246,7 +246,7 @@ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
 # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Dhaka	2009	only	-	Jun	19	23:00	1:00	S
+Rule	Dhaka	2009	only	-	Jun	19	23:00	1:00	-
 Rule	Dhaka	2009	only	-	Dec	31	24:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -787,8 +787,9 @@ Rule	Macau	1974	1977	-	Oct	Sun>=15	3:30	0	S
 Rule	Macau	1975	1977	-	Apr	Sun>=15	3:30	1:00	D
 Rule	Macau	1978	1980	-	Apr	Sun>=15	0:00	1:00	D
 Rule	Macau	1978	1980	-	Oct	Sun>=15	0:00	0	S
+# See Europe/Lisbon for info about the 1912 transition.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Macau	7:34:20 -	LMT	1912 Jan  1
+Zone	Asia/Macau	7:34:20 -	LMT	1911 Dec 31 16:00u
 			8:00	Macau	C%sT
 
 
@@ -1129,61 +1130,61 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 # thirtieth day of Shahrivar.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
-Rule	Iran	1978	only	-	Oct	21	0:00	0	S
-Rule	Iran	1979	only	-	Sep	19	0:00	0	S
-Rule	Iran	1980	only	-	Sep	23	0:00	0	S
-Rule	Iran	1991	only	-	May	 3	0:00	1:00	D
-Rule	Iran	1992	1995	-	Mar	22	0:00	1:00	D
-Rule	Iran	1991	1995	-	Sep	22	0:00	0	S
-Rule	Iran	1996	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	1996	only	-	Sep	21	0:00	0	S
-Rule	Iran	1997	1999	-	Mar	22	0:00	1:00	D
-Rule	Iran	1997	1999	-	Sep	22	0:00	0	S
-Rule	Iran	2000	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2000	only	-	Sep	21	0:00	0	S
-Rule	Iran	2001	2003	-	Mar	22	0:00	1:00	D
-Rule	Iran	2001	2003	-	Sep	22	0:00	0	S
-Rule	Iran	2004	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2004	only	-	Sep	21	0:00	0	S
-Rule	Iran	2005	only	-	Mar	22	0:00	1:00	D
-Rule	Iran	2005	only	-	Sep	22	0:00	0	S
-Rule	Iran	2008	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2008	only	-	Sep	21	0:00	0	S
-Rule	Iran	2009	2011	-	Mar	22	0:00	1:00	D
-Rule	Iran	2009	2011	-	Sep	22	0:00	0	S
-Rule	Iran	2012	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2012	only	-	Sep	21	0:00	0	S
-Rule	Iran	2013	2015	-	Mar	22	0:00	1:00	D
-Rule	Iran	2013	2015	-	Sep	22	0:00	0	S
-Rule	Iran	2016	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2016	only	-	Sep	21	0:00	0	S
-Rule	Iran	2017	2019	-	Mar	22	0:00	1:00	D
-Rule	Iran	2017	2019	-	Sep	22	0:00	0	S
-Rule	Iran	2020	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2020	only	-	Sep	21	0:00	0	S
-Rule	Iran	2021	2023	-	Mar	22	0:00	1:00	D
-Rule	Iran	2021	2023	-	Sep	22	0:00	0	S
-Rule	Iran	2024	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2024	only	-	Sep	21	0:00	0	S
-Rule	Iran	2025	2027	-	Mar	22	0:00	1:00	D
-Rule	Iran	2025	2027	-	Sep	22	0:00	0	S
-Rule	Iran	2028	2029	-	Mar	21	0:00	1:00	D
-Rule	Iran	2028	2029	-	Sep	21	0:00	0	S
-Rule	Iran	2030	2031	-	Mar	22	0:00	1:00	D
-Rule	Iran	2030	2031	-	Sep	22	0:00	0	S
-Rule	Iran	2032	2033	-	Mar	21	0:00	1:00	D
-Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
-Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
-Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
+Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	-
+Rule	Iran	1978	only	-	Oct	21	0:00	0	-
+Rule	Iran	1979	only	-	Sep	19	0:00	0	-
+Rule	Iran	1980	only	-	Sep	23	0:00	0	-
+Rule	Iran	1991	only	-	May	 3	0:00	1:00	-
+Rule	Iran	1992	1995	-	Mar	22	0:00	1:00	-
+Rule	Iran	1991	1995	-	Sep	22	0:00	0	-
+Rule	Iran	1996	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	1996	only	-	Sep	21	0:00	0	-
+Rule	Iran	1997	1999	-	Mar	22	0:00	1:00	-
+Rule	Iran	1997	1999	-	Sep	22	0:00	0	-
+Rule	Iran	2000	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2000	only	-	Sep	21	0:00	0	-
+Rule	Iran	2001	2003	-	Mar	22	0:00	1:00	-
+Rule	Iran	2001	2003	-	Sep	22	0:00	0	-
+Rule	Iran	2004	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2004	only	-	Sep	21	0:00	0	-
+Rule	Iran	2005	only	-	Mar	22	0:00	1:00	-
+Rule	Iran	2005	only	-	Sep	22	0:00	0	-
+Rule	Iran	2008	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2008	only	-	Sep	21	0:00	0	-
+Rule	Iran	2009	2011	-	Mar	22	0:00	1:00	-
+Rule	Iran	2009	2011	-	Sep	22	0:00	0	-
+Rule	Iran	2012	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2012	only	-	Sep	21	0:00	0	-
+Rule	Iran	2013	2015	-	Mar	22	0:00	1:00	-
+Rule	Iran	2013	2015	-	Sep	22	0:00	0	-
+Rule	Iran	2016	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2016	only	-	Sep	21	0:00	0	-
+Rule	Iran	2017	2019	-	Mar	22	0:00	1:00	-
+Rule	Iran	2017	2019	-	Sep	22	0:00	0	-
+Rule	Iran	2020	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2020	only	-	Sep	21	0:00	0	-
+Rule	Iran	2021	2023	-	Mar	22	0:00	1:00	-
+Rule	Iran	2021	2023	-	Sep	22	0:00	0	-
+Rule	Iran	2024	only	-	Mar	21	0:00	1:00	-
+Rule	Iran	2024	only	-	Sep	21	0:00	0	-
+Rule	Iran	2025	2027	-	Mar	22	0:00	1:00	-
+Rule	Iran	2025	2027	-	Sep	22	0:00	0	-
+Rule	Iran	2028	2029	-	Mar	21	0:00	1:00	-
+Rule	Iran	2028	2029	-	Sep	21	0:00	0	-
+Rule	Iran	2030	2031	-	Mar	22	0:00	1:00	-
+Rule	Iran	2030	2031	-	Sep	22	0:00	0	-
+Rule	Iran	2032	2033	-	Mar	21	0:00	1:00	-
+Rule	Iran	2032	2033	-	Sep	21	0:00	0	-
+Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	-
+Rule	Iran	2034	2035	-	Sep	22	0:00	0	-
 #
 # The following rules are approximations starting in the year 2038.
 # These are the best post-2037 approximations available, given the
 # restrictions of a single rule using a Gregorian-based data format.
 # At some point this table will need to be extended, though quite
 # possibly Iran will change the rules first.
-Rule	Iran	2036	max	-	Mar	21	0:00	1:00	D
-Rule	Iran	2036	max	-	Sep	21	0:00	0	S
+Rule	Iran	2036	max	-	Mar	21	0:00	1:00	-
+Rule	Iran	2036	max	-	Sep	21	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
@@ -1219,17 +1220,17 @@ Zone	Asia/Tehran	3:25:44	-	LMT	1916
 # https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iraq	1982	only	-	May	1	0:00	1:00	D
-Rule	Iraq	1982	1984	-	Oct	1	0:00	0	S
-Rule	Iraq	1983	only	-	Mar	31	0:00	1:00	D
-Rule	Iraq	1984	1985	-	Apr	1	0:00	1:00	D
-Rule	Iraq	1985	1990	-	Sep	lastSun	1:00s	0	S
-Rule	Iraq	1986	1990	-	Mar	lastSun	1:00s	1:00	D
+Rule	Iraq	1982	only	-	May	1	0:00	1:00	-
+Rule	Iraq	1982	1984	-	Oct	1	0:00	0	-
+Rule	Iraq	1983	only	-	Mar	31	0:00	1:00	-
+Rule	Iraq	1984	1985	-	Apr	1	0:00	1:00	-
+Rule	Iraq	1985	1990	-	Sep	lastSun	1:00s	0	-
+Rule	Iraq	1986	1990	-	Mar	lastSun	1:00s	1:00	-
 # IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the ':01' is a typo.
 # Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
 #
-Rule	Iraq	1991	2007	-	Apr	 1	3:00s	1:00	D
-Rule	Iraq	1991	2007	-	Oct	 1	3:00s	0	S
+Rule	Iraq	1991	2007	-	Apr	 1	3:00s	1:00	-
+Rule	Iraq	1991	2007	-	Oct	 1	3:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baghdad	2:57:40	-	LMT	1890
 			2:57:36	-	BMT	1918     # Baghdad Mean Time?
@@ -1501,8 +1502,7 @@ Rule	Japan	1950	1951	-	May	Sat>=1	24:00	1:00	D
 
 # From Hideyuki Suzuki (1998-11-09):
 # 'Tokyo' usually stands for the former location of Tokyo Astronomical
-# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s),
-# 35 degrees 39' 16.0" N.
+# Observatory: 139° 44' 40.90" E (9h 18m 58.727s), 35° 39' 16.0" N.
 # This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
 # edited by National Astronomical Observatory of Japan....
 # JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
@@ -1510,10 +1510,10 @@ Rule	Japan	1950	1951	-	May	Sat>=1	24:00	1:00	D
 
 # From Hideyuki Suzuki (1998-11-16):
 # The ordinance No. 51 (1886) established "standard time" in Japan,
-# which stands for the time on 135 degrees E.
+# which stands for the time on 135° E.
 # In the ordinance No. 167 (1895), "standard time" was renamed to "central
 # standard time".  And the same ordinance also established "western standard
-# time", which stands for the time on 120 degrees E....  But "western standard
+# time", which stands for the time on 120° E....  But "western standard
 # time" was abolished in the ordinance No. 529 (1937).  In the ordinance No.
 # 167, there is no mention regarding for what place western standard time is
 # standard....
@@ -1926,9 +1926,9 @@ Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
 # From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Kyrgyz	1992	1996	-	Apr	Sun>=7	0:00s	1:00	S
+Rule	Kyrgyz	1992	1996	-	Apr	Sun>=7	0:00s	1:00	-
 Rule	Kyrgyz	1992	1996	-	Sep	lastSun	0:00	0	-
-Rule	Kyrgyz	1997	2005	-	Mar	lastSun	2:30	1:00	S
+Rule	Kyrgyz	1997	2005	-	Mar	lastSun	2:30	1:00	-
 Rule	Kyrgyz	1997	2004	-	Oct	lastSun	2:30	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
@@ -2060,7 +2060,7 @@ Zone	Asia/Beirut	2:22:00 -	LMT	1880
 
 # Malaysia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NBorneo	1935	1941	-	Sep	14	0:00	0:20	TS # one-Third Summer
+Rule	NBorneo	1935	1941	-	Sep	14	0:00	0:20	-
 Rule	NBorneo	1935	1941	-	Dec	14	0:00	0	-
 #
 # peninsular Malaysia
@@ -2205,7 +2205,7 @@ Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Malé
 # http://zasag.mn/news/view/8969
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	S
+Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	-
 Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
 # Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
 # but McDow says the 2001 switches occurred at 02:00.  Also, IATA SSIM
@@ -2222,13 +2222,13 @@ Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
 # Mongolian Government meeting has concluded today to cancel daylight
 # saving time adoption in Mongolia.  Source: http://zasag.mn/news/view/16192
 
-Rule	Mongol	1985	1998	-	Mar	lastSun	0:00	1:00	S
+Rule	Mongol	1985	1998	-	Mar	lastSun	0:00	1:00	-
 Rule	Mongol	1984	1998	-	Sep	lastSun	0:00	0	-
 # IATA SSIM (1999-09) says Mongolia no longer observes DST.
-Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	S
+Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	-
 Rule	Mongol	2001	2006	-	Sep	lastSat	2:00	0	-
-Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	S
-Rule	Mongol	2015	2016	-	Mar	lastSat	2:00	1:00	S
+Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	-
+Rule	Mongol	2015	2016	-	Mar	lastSat	2:00	1:00	-
 Rule	Mongol	2015	2016	-	Sep	lastSat	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -2662,9 +2662,6 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # [Google translation]: "The Council also decided to start daylight
 # saving in Palestine as of one o'clock on Saturday morning,
 # 2016-03-26, to provide the clock 60 minutes ahead."
-#
-# From Paul Eggert (2016-03-12):
-# Predict spring transitions on March's last Saturday at 01:00 from now on.
 
 # From Sharef Mustafa (2016-10-19):
 # [T]he Palestinian cabinet decision (Mar 8th 2016) published on
@@ -2681,6 +2678,16 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # https://www.timeanddate.com/time/change/gaza-strip/gaza
 # https://www.timeanddate.com/time/change/west-bank/hebron
 
+# From Sharef Mustafa (2018-03-16):
+# Palestine summer time will start on Mar 24th 2018 by advancing the
+# clock by 60 minutes as per Palestinian cabinet decision published on
+# the offical website, though the decree did not specify the exact
+# time of the time shift.
+# http://www.palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e7a42ab7-ee23-435a-b9c8-a4f7e81f3817
+#
+# From Paul Eggert (2018-03-16):
+# For 2016 on, predict spring transitions on March's fourth Saturday at 01:00.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
 Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
@@ -2710,7 +2717,7 @@ Rule Palestine	2012	only	-	Sep	21	1:00	0	-
 Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
 Rule Palestine	2014	2015	-	Oct	Fri>=21	0:00	0	-
 Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
-Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
+Rule Palestine	2016	max	-	Mar	Sat>=22	1:00	1:00	S
 Rule Palestine	2016	max	-	Oct	lastSat	1:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -2760,11 +2767,11 @@ Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
 # http://www.philstar.com/headlines/2014/08/05/1354152/pnoy-urged-declare-use-daylight-saving-time
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Phil	1936	only	-	Nov	1	0:00	1:00	S
+Rule	Phil	1936	only	-	Nov	1	0:00	1:00	-
 Rule	Phil	1937	only	-	Feb	1	0:00	0	-
-Rule	Phil	1954	only	-	Apr	12	0:00	1:00	S
+Rule	Phil	1954	only	-	Apr	12	0:00	1:00	-
 Rule	Phil	1954	only	-	Jul	1	0:00	0	-
-Rule	Phil	1978	only	-	Mar	22	0:00	1:00	S
+Rule	Phil	1978	only	-	Mar	22	0:00	1:00	-
 Rule	Phil	1978	only	-	Sep	21	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Manila	-15:56:00 -	LMT	1844 Dec 31
@@ -3120,9 +3127,9 @@ Zone	Asia/Tashkent	4:37:11 -	LMT	1924 May  2
 # and is the basis for the information below.
 #
 # The 1906 transition was effective July 1 and standardized Indochina to
-# Phù Liễn Observatory, legally 104 deg. 17'17" east of Paris.
+# Phù Liễn Observatory, legally 104° 17' 17" east of Paris.
 # It's unclear whether this meant legal Paris Mean Time (00:09:21) or
-# the Paris Meridian (2 deg. 20'14.03" E); the former yields 07:06:30.1333...
+# the Paris Meridian (2° 20' 14.03" E); the former yields 07:06:30.1333...
 # and the latter 07:06:29.333... so either way it rounds to 07:06:30,
 # which is used below even though the modern-day Phù Liễn Observatory
 # is closer to 07:06:31.  Abbreviate Phù Liễn Mean Time as PLMT.
diff --git a/test/jdk/sun/util/calendar/zi/tzdata/australasia b/test/jdk/sun/util/calendar/zi/tzdata/australasia
index f97957d3b0a..d12619907fb 100644
--- a/test/jdk/sun/util/calendar/zi/tzdata/australasia
+++ b/test/jdk/sun/util/calendar/zi/tzdata/australasia
@@ -219,20 +219,20 @@ Zone Australia/Broken_Hill 9:25:48 -	LMT	1895 Feb
 
 # Lord Howe Island
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	LH	1981	1984	-	Oct	lastSun	2:00	1:00	D
-Rule	LH	1982	1985	-	Mar	Sun>=1	2:00	0	S
-Rule	LH	1985	only	-	Oct	lastSun	2:00	0:30	D
-Rule	LH	1986	1989	-	Mar	Sun>=15	2:00	0	S
-Rule	LH	1986	only	-	Oct	19	2:00	0:30	D
-Rule	LH	1987	1999	-	Oct	lastSun	2:00	0:30	D
-Rule	LH	1990	1995	-	Mar	Sun>=1	2:00	0	S
-Rule	LH	1996	2005	-	Mar	lastSun	2:00	0	S
-Rule	LH	2000	only	-	Aug	lastSun	2:00	0:30	D
-Rule	LH	2001	2007	-	Oct	lastSun	2:00	0:30	D
-Rule	LH	2006	only	-	Apr	Sun>=1	2:00	0	S
-Rule	LH	2007	only	-	Mar	lastSun	2:00	0	S
-Rule	LH	2008	max	-	Apr	Sun>=1	2:00	0	S
-Rule	LH	2008	max	-	Oct	Sun>=1	2:00	0:30	D
+Rule	LH	1981	1984	-	Oct	lastSun	2:00	1:00	-
+Rule	LH	1982	1985	-	Mar	Sun>=1	2:00	0	-
+Rule	LH	1985	only	-	Oct	lastSun	2:00	0:30	-
+Rule	LH	1986	1989	-	Mar	Sun>=15	2:00	0	-
+Rule	LH	1986	only	-	Oct	19	2:00	0:30	-
+Rule	LH	1987	1999	-	Oct	lastSun	2:00	0:30	-
+Rule	LH	1990	1995	-	Mar	Sun>=1	2:00	0	-
+Rule	LH	1996	2005	-	Mar	lastSun	2:00	0	-
+Rule	LH	2000	only	-	Aug	lastSun	2:00	0:30	-
+Rule	LH	2001	2007	-	Oct	lastSun	2:00	0:30	-
+Rule	LH	2006	only	-	Apr	Sun>=1	2:00	0	-
+Rule	LH	2007	only	-	Mar	lastSun	2:00	0	-
+Rule	LH	2008	max	-	Apr	Sun>=1	2:00	0	-
+Rule	LH	2008	max	-	Oct	Sun>=1	2:00	0:30	-
 Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
 			10:00	-	AEST	1981 Mar
 			10:30	LH	+1030/+1130 1985 Jul
@@ -390,15 +390,15 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # practice than guessing no DST.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	-
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
-Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
+Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	-
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	2013	-	Oct	Sun>=21	2:00	1:00	S
+Rule	Fiji	2010	2013	-	Oct	Sun>=21	2:00	1:00	-
 Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
 Rule	Fiji	2012	2013	-	Jan	Sun>=18	3:00	0	-
 Rule	Fiji	2014	only	-	Jan	Sun>=18	2:00	0	-
-Rule	Fiji	2014	max	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Fiji	2014	max	-	Nov	Sun>=1	2:00	1:00	-
 Rule	Fiji	2015	max	-	Jan	Sun>=14	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
@@ -429,11 +429,11 @@ Zone Pacific/Tarawa	 11:32:04 -	LMT	1901 # Bairiki
 			 12:00	-	+12
 Zone Pacific/Enderbury	-11:24:20 -	LMT	1901
 			-12:00	-	-12	1979 Oct
-			-11:00	-	-11	1995
+			-11:00	-	-11	1994 Dec 31
 			 13:00	-	+13
 Zone Pacific/Kiritimati	-10:29:20 -	LMT	1901
 			-10:40	-	-1040	1979 Oct
-			-10:00	-	-10	1995
+			-10:00	-	-10	1994 Dec 31
 			 14:00	-	+14
 
 # N Mariana Is
@@ -470,9 +470,9 @@ Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15 # Uaobe
 
 # New Caledonia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NC	1977	1978	-	Dec	Sun>=1	0:00	1:00	S
+Rule	NC	1977	1978	-	Dec	Sun>=1	0:00	1:00	-
 Rule	NC	1978	1979	-	Feb	27	0:00	0	-
-Rule	NC	1996	only	-	Dec	 1	2:00s	1:00	S
+Rule	NC	1996	only	-	Dec	 1	2:00s	1:00	-
 # Shanks & Pottenger say the following was at 2:00; go with IATA.
 Rule	NC	1997	only	-	Mar	 2	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -492,27 +492,28 @@ Rule	NZ	1929	1933	-	Mar	Sun>=15	2:00	0	M
 Rule	NZ	1934	1940	-	Apr	lastSun	2:00	0	M
 Rule	NZ	1934	1940	-	Sep	lastSun	2:00	0:30	S
 Rule	NZ	1946	only	-	Jan	 1	0:00	0	S
-# Since 1957 Chatham has been 45 minutes ahead of NZ, but there's no
-# convenient single notation for the date and time of this transition
-# so we must duplicate the Rule lines.
+# Since 1957 Chatham has been 45 minutes ahead of NZ, but until 2018a
+# there was no documented single notation for the date and time of this
+# transition.  Duplicate the Rule lines for now, to give the 2018a change
+# time to percolate out.
 Rule	NZ	1974	only	-	Nov	Sun>=1	2:00s	1:00	D
-Rule	Chatham	1974	only	-	Nov	Sun>=1	2:45s	1:00	D
+Rule	Chatham	1974	only	-	Nov	Sun>=1	2:45s	1:00	-
 Rule	NZ	1975	only	-	Feb	lastSun	2:00s	0	S
-Rule	Chatham	1975	only	-	Feb	lastSun	2:45s	0	S
+Rule	Chatham	1975	only	-	Feb	lastSun	2:45s	0	-
 Rule	NZ	1975	1988	-	Oct	lastSun	2:00s	1:00	D
-Rule	Chatham	1975	1988	-	Oct	lastSun	2:45s	1:00	D
+Rule	Chatham	1975	1988	-	Oct	lastSun	2:45s	1:00	-
 Rule	NZ	1976	1989	-	Mar	Sun>=1	2:00s	0	S
-Rule	Chatham	1976	1989	-	Mar	Sun>=1	2:45s	0	S
+Rule	Chatham	1976	1989	-	Mar	Sun>=1	2:45s	0	-
 Rule	NZ	1989	only	-	Oct	Sun>=8	2:00s	1:00	D
-Rule	Chatham	1989	only	-	Oct	Sun>=8	2:45s	1:00	D
+Rule	Chatham	1989	only	-	Oct	Sun>=8	2:45s	1:00	-
 Rule	NZ	1990	2006	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	Chatham	1990	2006	-	Oct	Sun>=1	2:45s	1:00	D
+Rule	Chatham	1990	2006	-	Oct	Sun>=1	2:45s	1:00	-
 Rule	NZ	1990	2007	-	Mar	Sun>=15	2:00s	0	S
-Rule	Chatham	1990	2007	-	Mar	Sun>=15	2:45s	0	S
+Rule	Chatham	1990	2007	-	Mar	Sun>=15	2:45s	0	-
 Rule	NZ	2007	max	-	Sep	lastSun	2:00s	1:00	D
-Rule	Chatham	2007	max	-	Sep	lastSun	2:45s	1:00	D
+Rule	Chatham	2007	max	-	Sep	lastSun	2:45s	1:00	-
 Rule	NZ	2008	max	-	Apr	Sun>=1	2:00s	0	S
-Rule	Chatham	2008	max	-	Apr	Sun>=1	2:45s	0	S
+Rule	Chatham	2008	max	-	Apr	Sun>=1	2:45s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Auckland	11:39:04 -	LMT	1868 Nov  2
 			11:30	NZ	NZ%sT	1946 Jan  1
@@ -536,9 +537,9 @@ Link Pacific/Auckland Antarctica/McMurdo
 # Cook Is
 # From Shanks & Pottenger:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HS
+Rule	Cook	1978	only	-	Nov	12	0:00	0:30	-
 Rule	Cook	1979	1991	-	Mar	Sun>=1	0:00	0	-
-Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	HS
+Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901        # Avarua
 			-10:30	-	-1030	1978 Nov 12
@@ -679,11 +680,11 @@ Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
 # Assume the pattern instituted in 2012 will continue indefinitely.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	WS	2010	only	-	Sep	lastSun	0:00	1	D
-Rule	WS	2011	only	-	Apr	Sat>=1	4:00	0	S
-Rule	WS	2011	only	-	Sep	lastSat	3:00	1	D
-Rule	WS	2012	max	-	Apr	Sun>=1	4:00	0	S
-Rule	WS	2012	max	-	Sep	lastSun	3:00	1	D
+Rule	WS	2010	only	-	Sep	lastSun	0:00	1	-
+Rule	WS	2011	only	-	Apr	Sat>=1	4:00	0	-
+Rule	WS	2011	only	-	Sep	lastSat	3:00	1	-
+Rule	WS	2012	max	-	Apr	Sun>=1	4:00	0	-
+Rule	WS	2012	max	-	Sep	lastSun	3:00	1	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Apia	 12:33:04 -	LMT	1892 Jul  5
 			-11:26:56 -	LMT	1911
@@ -723,11 +724,11 @@ Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
 
 # Tonga
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Tonga	1999	only	-	Oct	 7	2:00s	1:00	S
+Rule	Tonga	1999	only	-	Oct	 7	2:00s	1:00	-
 Rule	Tonga	2000	only	-	Mar	19	2:00s	0	-
-Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	-
 Rule	Tonga	2001	2002	-	Jan	lastSun	2:00	0	-
-Rule	Tonga	2016	only	-	Nov	Sun>=1	2:00	1:00	S
+Rule	Tonga	2016	only	-	Nov	Sun>=1	2:00	1:00	-
 Rule	Tonga	2017	only	-	Jan	Sun>=15	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
@@ -804,12 +805,12 @@ Zone	Pacific/Wake	11:06:28 -	LMT	1901
 
 # Vanuatu
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Vanuatu	1983	only	-	Sep	25	0:00	1:00	S
+Rule	Vanuatu	1983	only	-	Sep	25	0:00	1:00	-
 Rule	Vanuatu	1984	1991	-	Mar	Sun>=23	0:00	0	-
-Rule	Vanuatu	1984	only	-	Oct	23	0:00	1:00	S
-Rule	Vanuatu	1985	1991	-	Sep	Sun>=23	0:00	1:00	S
+Rule	Vanuatu	1984	only	-	Oct	23	0:00	1:00	-
+Rule	Vanuatu	1985	1991	-	Sep	Sun>=23	0:00	1:00	-
 Rule	Vanuatu	1992	1993	-	Jan	Sun>=23	0:00	0	-
-Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	S
+Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
 			11:00	Vanuatu	+11/+12
@@ -1108,6 +1109,13 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # South Australian time even though it's located in Western Australia.
 
 # Queensland
+
+# From Paul Eggert (2018-02-26):
+# I lack access to the following source for Queensland DST:
+# Pearce C. History of daylight saving time in Queensland.
+# Queensland Hist J. 2017 Aug;23(6):389-403
+# https://search.informit.com.au/documentSummary;dn=994682348436426;res=IELHSS
+
 # From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # #   The state of QUEENSLAND.. [ Courtesy Qld. Dept Premier Econ&Trade Devel ]
 # #						[ Dec 1990 ]
@@ -1534,6 +1542,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # "declared it the same day [throughout] the country as of Jan. 1, 1995"
 # as part of the competition to be first into the 21st century.
 
+# From Kerry Shetline (2018-02-03):
+# December 31 was the day that was skipped, so that the transition
+# would be from Friday December 30, 1994 to Sunday January 1, 1995.
+# From Paul Eggert (2018-02-04):
+# One source for this is page 202 of: Bartky IR. One Time Fits All:
+# The Campaigns for Global Uniformity (2007).
 
 # Kwajalein
 
@@ -1626,7 +1640,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # From Howie Phelps (1999-11-10), who talked to a Pitcairner via shortwave:
 # Betty Christian told me yesterday that their local time is the same as
-# Pacific Standard Time. They used to be 1/2 hour different from us here in
+# Pacific Standard Time. They used to be ½ hour different from us here in
 # Sacramento but it was changed a couple of years ago.
 
 
@@ -1665,7 +1679,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # 12 hours and 20 minutes ahead of GMT.  When New Zealand adjusted its
 # standard time in 1940s, Tonga had the choice of subtracting from its
 # local time to come on the same standard time as New Zealand or of
-# advancing its time to maintain the differential of 13 degrees
+# advancing its time to maintain the differential of 13°
 # (approximately 50 minutes ahead of New Zealand time).
 #
 # Because His Majesty King T�ufaʻ�hau Tupou IV, then Crown Prince
diff --git a/test/jdk/sun/util/calendar/zi/tzdata/europe b/test/jdk/sun/util/calendar/zi/tzdata/europe
index 1565814a3e3..176a9f81671 100644
--- a/test/jdk/sun/util/calendar/zi/tzdata/europe
+++ b/test/jdk/sun/util/calendar/zi/tzdata/europe
@@ -140,8 +140,8 @@
 # along the towpath within a few yards of it.'
 #
 # I have a one inch to one mile map of London and my estimate of the stone's
-# position is 51 degrees 28' 30" N, 0 degrees 18' 45" W. The longitude should
-# be within about +-2". The Ordnance Survey grid reference is TQ172761.
+# position is 51° 28' 30" N, 0° 18' 45" W. The longitude should
+# be within about ±2". The Ordnance Survey grid reference is TQ172761.
 #
 # [This yields GMTOFF = -0:01:15 for London LMT in the 18th century.]
 
@@ -181,7 +181,7 @@
 # after-hours daylight in which to pursue his research.
 # In 1895 he presented a paper to the Wellington Philosophical Society
 # that proposed a two-hour daylight-saving shift.  See:
-# Hudson GV. On seasonal time-adjustment in countries south of lat. 30 deg.
+# Hudson GV. On seasonal time-adjustment in countries south of lat. 30°.
 # Transactions and Proceedings of the New Zealand Institute. 1895;28:734
 # http://rsnz.natlib.govt.nz/volume/rsnz_28/rsnz_28_00_006110.html
 # Although some interest was expressed in New Zealand, his proposal
@@ -531,11 +531,25 @@ Link	Europe/London	Europe/Jersey
 Link	Europe/London	Europe/Guernsey
 Link	Europe/London	Europe/Isle_of_Man
 
-# From Paul Eggert (2018-01-19):
+# From Paul Eggert (2018-02-15):
+# In January 2018 we discovered that the negative SAVE values in the
+# Eire rules cause problems with tests for ICU:
+# https://mm.icann.org/pipermail/tz/2018-January/025825.html
+# and with tests for OpenJDK:
+# https://mm.icann.org/pipermail/tz/2018-January/025822.html
+#
+# To work around this problem, the build procedure can translate the
+# following data into two forms, one with negative SAVE values and the
+# other form with a traditional approximation for Irish time stamps
+# after 1971-10-31 02:00 UTC; although this approximation has tm_isdst
+# flags that are reversed, its UTC offsets are correct and this often
+# suffices.  This source file currently uses only nonnegative SAVE
+# values, but this is intended to change and downstream code should
+# not rely on it.
+#
 # The following is like GB-Eire and EU, except with standard time in
-# summer and negative daylight saving time in winter.
-# Although currently commented out, this will need to become uncommented
-# once the ICU/OpenJDK workaround is removed; see below.
+# summer and negative daylight saving time in winter.  It is for when
+# negative SAVE values are used.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 #Rule	Eire	1971	only	-	Oct	31	 2:00u	-1:00	GMT
 #Rule	Eire	1972	1980	-	Mar	Sun>=16	 2:00u	0	IST
@@ -556,24 +570,12 @@ Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
 			 0:00	1:00	IST	1947 Nov  2  2:00s
 			 0:00	-	GMT	1948 Apr 18  2:00s
 			 0:00	GB-Eire	GMT/IST	1968 Oct 27
-# From Paul Eggert (2018-01-18):
-# The next line should look like this:
+# The next line is for when negative SAVE values are used.
 #			 1:00	Eire	IST/GMT
-# However, in January 2018 we discovered that the Eire rules cause
-# problems with tests for ICU:
-# https://mm.icann.org/pipermail/tz/2018-January/025825.html
-# and with tests for OpenJDK:
-# https://mm.icann.org/pipermail/tz/2018-January/025822.html
-# To work around this problem, use a traditional approximation for
-# time stamps after 1971-10-31 02:00 UTC, to give ICU and OpenJDK
-# developers breathing room to fix bugs.  This approximation has
-# correct UTC offsets, but results in tm_isdst flags are the reverse
-# of what they should be.  This workaround is temporary and should be
-# removed reasonably soon.
+# These three lines are for when SAVE values are always nonnegative.
 			 1:00	-	IST	1971 Oct 31  2:00u
 			 0:00	GB-Eire	GMT/IST	1996
 			 0:00	EU	GMT/IST
-# End of workaround for ICU and OpenJDK bugs.
 
 
 ###############################################################################
@@ -1557,21 +1559,21 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 # http://www.almanak.hi.is/klukkan.html
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iceland	1917	1919	-	Feb	19	23:00	1:00	S
+Rule	Iceland	1917	1919	-	Feb	19	23:00	1:00	-
 Rule	Iceland	1917	only	-	Oct	21	 1:00	0	-
 Rule	Iceland	1918	1919	-	Nov	16	 1:00	0	-
-Rule	Iceland	1921	only	-	Mar	19	23:00	1:00	S
+Rule	Iceland	1921	only	-	Mar	19	23:00	1:00	-
 Rule	Iceland	1921	only	-	Jun	23	 1:00	0	-
-Rule	Iceland	1939	only	-	Apr	29	23:00	1:00	S
+Rule	Iceland	1939	only	-	Apr	29	23:00	1:00	-
 Rule	Iceland	1939	only	-	Oct	29	 2:00	0	-
-Rule	Iceland	1940	only	-	Feb	25	 2:00	1:00	S
+Rule	Iceland	1940	only	-	Feb	25	 2:00	1:00	-
 Rule	Iceland	1940	1941	-	Nov	Sun>=2	 1:00s	0	-
-Rule	Iceland	1941	1942	-	Mar	Sun>=2	 1:00s	1:00	S
+Rule	Iceland	1941	1942	-	Mar	Sun>=2	 1:00s	1:00	-
 # 1943-1946 - first Sunday in March until first Sunday in winter
-Rule	Iceland	1943	1946	-	Mar	Sun>=1	 1:00s	1:00	S
+Rule	Iceland	1943	1946	-	Mar	Sun>=1	 1:00s	1:00	-
 Rule	Iceland	1942	1948	-	Oct	Sun>=22	 1:00s	0	-
 # 1947-1967 - first Sunday in April until first Sunday in winter
-Rule	Iceland	1947	1967	-	Apr	Sun>=1	 1:00s	1:00	S
+Rule	Iceland	1947	1967	-	Apr	Sun>=1	 1:00s	1:00	-
 # 1949 and 1967 Oct transitions delayed by 1 week
 Rule	Iceland	1949	only	-	Oct	30	 1:00s	0	-
 Rule	Iceland	1950	1966	-	Oct	Sun>=22	 1:00s	0	-
@@ -2161,15 +2163,19 @@ Zone	Europe/Warsaw	1:24:00 -	LMT	1880
 			1:00	EU	CE%sT
 
 # Portugal
-#
+
 # From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
 # According to a Portuguese decree (1911-05-26)
 # https://dre.pt/application/dir/pdf1sdip/1911/05/12500/23132313.pdf
 # Lisbon was at -0:36:44.68, but switched to GMT on 1912-01-01 at 00:00.
-# Round the old offset to -0:36:45.  This agrees with Willett but disagrees
-# with Shanks, who says the transition occurred on 1911-05-24 at 00:00 for
-# Europe/Lisbon, Atlantic/Azores, and Atlantic/Madeira.
+# Round the old offset to -0:36:45.  This agrees with Willett....
 #
+# From Michael Deckers (2018-02-15):
+# article 5 [of the 1911 decree; Deckers's translation] ...:
+# These dispositions shall enter into force at the instant at which,
+# according to the 2nd article, the civil day January 1, 1912 begins,
+# all clocks therefore having to be advanced or set back correspondingly ...
+
 # From Rui Pedro Salgueiro (1992-11-12):
 # Portugal has recently (September, 27) changed timezone
 # (from WET to MET or CET) to harmonize with EEC.
@@ -2252,7 +2258,7 @@ Rule	Port	1983	only	-	Mar	lastSun	 2:00s	1:00	S
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Lisbon	-0:36:45 -	LMT	1884
-			-0:36:45 -	LMT	1912 Jan  1 # Lisbon Mean Time
+			-0:36:45 -	LMT	1912 Jan  1  0:00u # Lisbon MT
 			 0:00	Port	WE%sT	1966 Apr  3  2:00
 			 1:00	-	CET	1976 Sep 26  1:00
 			 0:00	Port	WE%sT	1983 Sep 25  1:00s
@@ -2261,7 +2267,7 @@ Zone	Europe/Lisbon	-0:36:45 -	LMT	1884
 			 0:00	EU	WE%sT
 # This Zone can be simplified once we assume zic %z.
 Zone Atlantic/Azores	-1:42:40 -	LMT	1884        # Ponta Delgada
-			-1:54:32 -	HMT	1912 Jan  1 # Horta Mean Time
+			-1:54:32 -	HMT	1912 Jan  1  2:00u # Horta MT
 			-2:00	Port	-02/-01	1942 Apr 25 22:00s
 			-2:00	Port	+00	1942 Aug 15 22:00s
 			-2:00	Port	-02/-01	1943 Apr 17 22:00s
@@ -2277,7 +2283,7 @@ Zone Atlantic/Azores	-1:42:40 -	LMT	1884        # Ponta Delgada
 			-1:00	EU	-01/+00
 # This Zone can be simplified once we assume zic %z.
 Zone Atlantic/Madeira	-1:07:36 -	LMT	1884        # Funchal
-			-1:07:36 -	FMT	1912 Jan  1 # Funchal Mean Time
+			-1:07:36 -	FMT	1912 Jan  1  1:00u # Funchal MT
 			-1:00	Port	-01/+00	1942 Apr 25 22:00s
 			-1:00	Port	+01	1942 Aug 15 22:00s
 			-1:00	Port	-01/+00	1943 Apr 17 22:00s
@@ -2615,13 +2621,13 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 
 # From Vladimir Karpinsky (2014-07-08):
 # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
-# Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
+# Observatory (coordinates: 55° 45' 29.70", 37° 34' 05.30")....
 # LMT in Moscow since Jul 3, 1916 is 2:31:01 as a result of new standard.
 # (The info is from the book by Byalokoz ... p. 18.)
 # The time in St. Petersburg as capital of Russia was defined by
 # Pulkov observatory, near St. Petersburg.  In 1916 LMT Moscow
 # was synchronized with LMT St. Petersburg (+30 minutes), (Pulkov observatory
-# coordinates: 59 deg. 46'18.70", 30 deg. 19'40.70") so 30 deg. 19'40.70" >
+# coordinates: 59° 46' 18.70", 30° 19' 40.70") so 30° 19' 40.70" >
 # 2h01m18.7s = 2:01:19.  LMT Moscow = LMT St.Petersburg + 30m 2:01:19 + 0:30 =
 # 2:31:19 ...
 #
@@ -3450,7 +3456,7 @@ Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
 # three degrees, or twelve minutes of time, to the west of the
 # meridian of the Observatory of Stockholm".  The law is dated 1878-05-31.
 #
-# The observatory at that time had the meridian 18 degrees 03' 30"
+# The observatory at that time had the meridian 18° 03' 30"
 # eastern longitude = 01:12:14 in time.  Less 12 minutes gives the
 # national standard time as 01:00:14 ahead of GMT....
 #
@@ -3554,7 +3560,7 @@ Zone Europe/Stockholm	1:12:12 -	LMT	1879 Jan  1
 # From Alois Treindl (2013-09-11):
 # The Federal regulations say
 # https://www.admin.ch/opc/de/classified-compilation/20071096/index.html
-# ... the meridian for Bern mean time ... is 7 degrees 26' 22.50".
+# ... the meridian for Bern mean time ... is 7° 26' 22.50".
 # Expressed in time, it is 0h29m45.5s.
 
 # From Pierre-Yves Berger (2013-09-11):
diff --git a/test/jdk/sun/util/calendar/zi/tzdata/northamerica b/test/jdk/sun/util/calendar/zi/tzdata/northamerica
index 2aa184bc6bf..bcfb662154f 100644
--- a/test/jdk/sun/util/calendar/zi/tzdata/northamerica
+++ b/test/jdk/sun/util/calendar/zi/tzdata/northamerica
@@ -48,7 +48,7 @@
 # in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
 # but in 1872-05 he moved the proposed origin to Greenwich.
 
-# From Paul Eggert (2016-09-21):
+# From Paul Eggert (2018-03-20):
 # Dowd's proposal left many details unresolved, such as where to draw
 # lines between time zones.  The key individual who made time zones
 # work in the US was William Frederick Allen - railway engineer,
@@ -59,10 +59,9 @@
 # to the General Time Convention on 1883-04-11, saying that his plan
 # meant "local time would be practically abolished" - a plus for
 # railway scheduling.  By the next convention on 1883-10-11 nearly all
-# railroads had agreed and it took effect on 1883-11-18 at 12:00.
-# That Sunday was called the "day of two noons", as the eastern parts
-# of the new zones observed noon twice.  Allen witnessed the
-# transition in New York City, writing:
+# railroads had agreed and it took effect on 1883-11-18.  That Sunday
+# was called the "day of two noons", as some locations observed noon
+# twice.  Allen witnessed the transition in New York City, writing:
 #
 #   I heard the bells of St. Paul's strike on the old time.  Four
 #   minutes later, obedient to the electrical signal from the Naval
@@ -447,8 +446,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
 # ...according to the Census Bureau, the largest city is Beulah (although
 # it's commonly referred to as Beulah-Hazen, with Hazen being the next
 # largest city in Mercer County).  Google Maps places Beulah's city hall
-# at 47 degrees 15' 51" N, 101 degrees 46' 40" W, which yields an offset
-# of 6h47'07".
+# at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07".
 
 Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
 			-7:00	US	M%sT	2010 Nov  7  2:00
@@ -481,7 +479,7 @@ Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00:04
 # California, northern Idaho (Benewah, Bonner, Boundary, Clearwater,
 # Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties, Idaho county
 # north of the Salmon River, and the towns of Burgdorf and Warren),
-# Nevada (except West Wendover), Oregon (except the northern 3/4 of
+# Nevada (except West Wendover), Oregon (except the northern ¾ of
 # Malheur county), and Washington
 
 # From Paul Eggert (2016-08-20):
@@ -979,6 +977,13 @@ Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
 			-5:00	-	EST	2006
 			-5:00	US	E%sT
 
+# From Paul Eggert (2018-03-20):
+# The Louisville & Nashville Railroad's 1883-11-18 change occurred at
+# 10:00 old local time; train were supposed to come to a standstill
+# for precisely 18 minutes.  See Bartky Fig. 1 (page 50).  It is not
+# clear how this matched civil time in Louisville, so for now continue
+# to assume Louisville switched at noon new local time, like New York.
+#
 # Part of Kentucky left its clocks alone in 1974.
 # This also includes Clark, Floyd, and Harrison counties in Indiana.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
@@ -3287,8 +3292,8 @@ Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
 # http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Jamaica	-5:07:11 -	LMT	1890        # Kingston
-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
+Zone	America/Jamaica	-5:07:10 -	LMT	1890        # Kingston
+			-5:07:10 -	KMT	1912 Feb    # Kingston Mean Time
 			-5:00	-	EST	1974
 			-5:00	US	E%sT	1984
 			-5:00	-	EST
@@ -3438,7 +3443,7 @@ Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Grand_Turk	-4:44:32 -	LMT	1890
-			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
+			-5:07:10 -	KMT	1912 Feb # Kingston Mean Time
 			-5:00	-	EST	1979
 			-5:00	US	E%sT	2015 Nov Sun>=1 2:00
 			-4:00	-	AST	2018 Mar 11 3:00
diff --git a/test/jdk/sun/util/calendar/zi/tzdata/southamerica b/test/jdk/sun/util/calendar/zi/tzdata/southamerica
index 38dd275398f..65d3c9fcef2 100644
--- a/test/jdk/sun/util/calendar/zi/tzdata/southamerica
+++ b/test/jdk/sun/util/calendar/zi/tzdata/southamerica
@@ -70,28 +70,28 @@
 # AR was chosen because they are the ISO letters that represent Argentina.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Arg	1930	only	-	Dec	 1	0:00	1:00	S
+Rule	Arg	1930	only	-	Dec	 1	0:00	1:00	-
 Rule	Arg	1931	only	-	Apr	 1	0:00	0	-
-Rule	Arg	1931	only	-	Oct	15	0:00	1:00	S
+Rule	Arg	1931	only	-	Oct	15	0:00	1:00	-
 Rule	Arg	1932	1940	-	Mar	 1	0:00	0	-
-Rule	Arg	1932	1939	-	Nov	 1	0:00	1:00	S
-Rule	Arg	1940	only	-	Jul	 1	0:00	1:00	S
+Rule	Arg	1932	1939	-	Nov	 1	0:00	1:00	-
+Rule	Arg	1940	only	-	Jul	 1	0:00	1:00	-
 Rule	Arg	1941	only	-	Jun	15	0:00	0	-
-Rule	Arg	1941	only	-	Oct	15	0:00	1:00	S
+Rule	Arg	1941	only	-	Oct	15	0:00	1:00	-
 Rule	Arg	1943	only	-	Aug	 1	0:00	0	-
-Rule	Arg	1943	only	-	Oct	15	0:00	1:00	S
+Rule	Arg	1943	only	-	Oct	15	0:00	1:00	-
 Rule	Arg	1946	only	-	Mar	 1	0:00	0	-
-Rule	Arg	1946	only	-	Oct	 1	0:00	1:00	S
+Rule	Arg	1946	only	-	Oct	 1	0:00	1:00	-
 Rule	Arg	1963	only	-	Oct	 1	0:00	0	-
-Rule	Arg	1963	only	-	Dec	15	0:00	1:00	S
+Rule	Arg	1963	only	-	Dec	15	0:00	1:00	-
 Rule	Arg	1964	1966	-	Mar	 1	0:00	0	-
-Rule	Arg	1964	1966	-	Oct	15	0:00	1:00	S
+Rule	Arg	1964	1966	-	Oct	15	0:00	1:00	-
 Rule	Arg	1967	only	-	Apr	 2	0:00	0	-
-Rule	Arg	1967	1968	-	Oct	Sun>=1	0:00	1:00	S
+Rule	Arg	1967	1968	-	Oct	Sun>=1	0:00	1:00	-
 Rule	Arg	1968	1969	-	Apr	Sun>=1	0:00	0	-
-Rule	Arg	1974	only	-	Jan	23	0:00	1:00	S
+Rule	Arg	1974	only	-	Jan	23	0:00	1:00	-
 Rule	Arg	1974	only	-	May	 1	0:00	0	-
-Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
+Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	-
 #
 # From Hernan G. Otero (1995-06-26):
 # These corrections were contributed by InterSoft Argentina S.A.,
@@ -99,7 +99,7 @@ Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
 # Talleres de Hidrografía Naval Argentina
 # (Argentine Naval Hydrography Institute)
 Rule	Arg	1989	1993	-	Mar	Sun>=1	0:00	0	-
-Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	-
 #
 # From Hernan G. Otero (1995-06-26):
 # From this moment on, the law that mandated the daylight saving
@@ -110,7 +110,7 @@ Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	S
 # On October 3, 1999, 0:00 local, Argentina implemented daylight savings time,
 # which did not result in the switch of a time zone, as they stayed 9 hours
 # from the International Date Line.
-Rule	Arg	1999	only	-	Oct	Sun>=1	0:00	1:00	S
+Rule	Arg	1999	only	-	Oct	Sun>=1	0:00	1:00	-
 # From Paul Eggert (2007-12-28):
 # DST was set to expire on March 5, not March 3, but since it was converted
 # to standard time on March 3 it's more convenient for us to pretend that
@@ -213,9 +213,9 @@ Rule	Arg	2000	only	-	Mar	3	0:00	0	-
 # la modificación del huso horario, ya que 2009 nos encuentra con
 # crecimiento en la producción y distribución energética."
 
-Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
+Rule	Arg	2007	only	-	Dec	30	0:00	1:00	-
 Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
-Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	-
 
 # From Mariano Absatz (2004-05-21):
 # Today it was officially published that the Province of Mendoza is changing
@@ -225,12 +225,14 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # It's Law No. 7,210.  This change is due to a public power emergency, so for
 # now we'll assume it's for this year only.
 #
-# From Paul Eggert (2014-08-09):
+# From Paul Eggert (2018-01-31):
 # Hora de verano para la República Argentina
 # http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html
 # says that standard time in Argentina from 1894-10-31
 # to 1920-05-01 was -4:16:48.25.  Go with this more-precise value
-# over Shanks & Pottenger.
+# over Shanks & Pottenger.  It is upward compatible with Milne, who
+# says Córdoba time was -4:16:48.2.
+
 #
 # From Mariano Absatz (2004-06-05):
 # These media articles from a major newspaper mostly cover the current state:
@@ -404,9 +406,9 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # rules...San Luis is still using "Western ARgentina Time" and it got
 # stuck on Summer daylight savings time even though the summer is over.
 
-# From Paul Eggert (2013-09-05):
+# From Paul Eggert (2018-01-23):
 # Perhaps San Luis operates on the legal fiction that it is at -04
-# with perpetual summer time, but ordinary usage typically seems to
+# with perpetual daylight saving time, but ordinary usage typically seems to
 # just say it's at -03; see, for example,
 # https://es.wikipedia.org/wiki/Hora_oficial_argentina
 # We've documented similar situations as being plain changes to
@@ -415,9 +417,6 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # plus is that this silences a zic complaint that there's no POSIX TZ
 # setting for time stamps past 2038.
 
-# From Paul Eggert (2013-02-21):
-# Milne says Córdoba time was -4:16:48.2.  Round to the nearest second.
-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Buenos Aires (BA), Capital Federal (CF),
@@ -552,7 +551,7 @@ Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
 # San Luis (SL)
 
 Rule	SanLuis	2008	2009	-	Mar	Sun>=8	0:00	0	-
-Rule	SanLuis	2007	2008	-	Oct	Sun>=8	0:00	1:00	S
+Rule	SanLuis	2007	2008	-	Oct	Sun>=8	0:00	1:00	-
 
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
@@ -794,14 +793,14 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
 # Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
-Rule	Brazil	1931	only	-	Oct	 3	11:00	1:00	S
+Rule	Brazil	1931	only	-	Oct	 3	11:00	1:00	-
 Rule	Brazil	1932	1933	-	Apr	 1	 0:00	0	-
-Rule	Brazil	1932	only	-	Oct	 3	 0:00	1:00	S
+Rule	Brazil	1932	only	-	Oct	 3	 0:00	1:00	-
 # Decree 23,195 <http://pcdsh01.on.br/HV23195.htm> (1933-10-10)
 # revoked DST.
 # Decree 27,496 <http://pcdsh01.on.br/HV27496.htm> (1949-11-24)
 # Decree 27,998 <http://pcdsh01.on.br/HV27998.htm> (1950-04-13)
-Rule	Brazil	1949	1952	-	Dec	 1	 0:00	1:00	S
+Rule	Brazil	1949	1952	-	Dec	 1	 0:00	1:00	-
 Rule	Brazil	1950	only	-	Apr	16	 1:00	0	-
 Rule	Brazil	1951	1952	-	Apr	 1	 0:00	0	-
 # Decree 32,308 <http://pcdsh01.on.br/HV32308.htm> (1953-02-24)
@@ -813,51 +812,51 @@ Rule	Brazil	1953	only	-	Mar	 1	 0:00	0	-
 # in SP, RJ, GB, MG, ES, due to the prolongation of the drought.
 # Decree 53,071 <http://pcdsh01.on.br/HV53071.htm> (1963-12-03)
 # extended the above decree to all of the national territory on 12-09.
-Rule	Brazil	1963	only	-	Dec	 9	 0:00	1:00	S
+Rule	Brazil	1963	only	-	Dec	 9	 0:00	1:00	-
 # Decree 53,604 <http://pcdsh01.on.br/HV53604.htm> (1964-02-25)
 # extended summer time by one day to 1964-03-01 00:00 (start of school).
 Rule	Brazil	1964	only	-	Mar	 1	 0:00	0	-
 # Decree 55,639 <http://pcdsh01.on.br/HV55639.htm> (1965-01-27)
-Rule	Brazil	1965	only	-	Jan	31	 0:00	1:00	S
+Rule	Brazil	1965	only	-	Jan	31	 0:00	1:00	-
 Rule	Brazil	1965	only	-	Mar	31	 0:00	0	-
 # Decree 57,303 <http://pcdsh01.on.br/HV57303.htm> (1965-11-22)
-Rule	Brazil	1965	only	-	Dec	 1	 0:00	1:00	S
+Rule	Brazil	1965	only	-	Dec	 1	 0:00	1:00	-
 # Decree 57,843 <http://pcdsh01.on.br/HV57843.htm> (1966-02-18)
 Rule	Brazil	1966	1968	-	Mar	 1	 0:00	0	-
-Rule	Brazil	1966	1967	-	Nov	 1	 0:00	1:00	S
+Rule	Brazil	1966	1967	-	Nov	 1	 0:00	1:00	-
 # Decree 63,429 <http://pcdsh01.on.br/HV63429.htm> (1968-10-15)
 # revoked DST.
 # Decree 91,698 <http://pcdsh01.on.br/HV91698.htm> (1985-09-27)
-Rule	Brazil	1985	only	-	Nov	 2	 0:00	1:00	S
+Rule	Brazil	1985	only	-	Nov	 2	 0:00	1:00	-
 # Decree 92,310 (1986-01-21)
 # Decree 92,463 (1986-03-13)
 Rule	Brazil	1986	only	-	Mar	15	 0:00	0	-
 # Decree 93,316 (1986-10-01)
-Rule	Brazil	1986	only	-	Oct	25	 0:00	1:00	S
+Rule	Brazil	1986	only	-	Oct	25	 0:00	1:00	-
 Rule	Brazil	1987	only	-	Feb	14	 0:00	0	-
 # Decree 94,922 <http://pcdsh01.on.br/HV94922.htm> (1987-09-22)
-Rule	Brazil	1987	only	-	Oct	25	 0:00	1:00	S
+Rule	Brazil	1987	only	-	Oct	25	 0:00	1:00	-
 Rule	Brazil	1988	only	-	Feb	 7	 0:00	0	-
 # Decree 96,676 <http://pcdsh01.on.br/HV96676.htm> (1988-09-12)
 # except for the states of AC, AM, PA, RR, RO, and AP (then a territory)
-Rule	Brazil	1988	only	-	Oct	16	 0:00	1:00	S
+Rule	Brazil	1988	only	-	Oct	16	 0:00	1:00	-
 Rule	Brazil	1989	only	-	Jan	29	 0:00	0	-
 # Decree 98,077 <http://pcdsh01.on.br/HV98077.htm> (1989-08-21)
 # with the same exceptions
-Rule	Brazil	1989	only	-	Oct	15	 0:00	1:00	S
+Rule	Brazil	1989	only	-	Oct	15	 0:00	1:00	-
 Rule	Brazil	1990	only	-	Feb	11	 0:00	0	-
 # Decree 99,530 <http://pcdsh01.on.br/HV99530.htm> (1990-09-17)
 # adopted by RS, SC, PR, SP, RJ, ES, MG, GO, MS, DF.
 # Decree 99,629 (1990-10-19) adds BA, MT.
-Rule	Brazil	1990	only	-	Oct	21	 0:00	1:00	S
+Rule	Brazil	1990	only	-	Oct	21	 0:00	1:00	-
 Rule	Brazil	1991	only	-	Feb	17	 0:00	0	-
 # Unnumbered decree <http://pcdsh01.on.br/HV1991.htm> (1991-09-25)
 # adopted by RS, SC, PR, SP, RJ, ES, MG, BA, GO, MT, MS, DF.
-Rule	Brazil	1991	only	-	Oct	20	 0:00	1:00	S
+Rule	Brazil	1991	only	-	Oct	20	 0:00	1:00	-
 Rule	Brazil	1992	only	-	Feb	 9	 0:00	0	-
 # Unnumbered decree <http://pcdsh01.on.br/HV1992.htm> (1992-10-16)
 # adopted by same states.
-Rule	Brazil	1992	only	-	Oct	25	 0:00	1:00	S
+Rule	Brazil	1992	only	-	Oct	25	 0:00	1:00	-
 Rule	Brazil	1993	only	-	Jan	31	 0:00	0	-
 # Decree 942 <http://pcdsh01.on.br/HV942.htm> (1993-09-28)
 # adopted by same states, plus AM.
@@ -867,12 +866,12 @@ Rule	Brazil	1993	only	-	Jan	31	 0:00	0	-
 # adopted by same states, plus MT and TO.
 # Decree 1,674 <http://pcdsh01.on.br/HV1674.htm> (1995-10-13)
 # adds AL, SE.
-Rule	Brazil	1993	1995	-	Oct	Sun>=11	 0:00	1:00	S
+Rule	Brazil	1993	1995	-	Oct	Sun>=11	 0:00	1:00	-
 Rule	Brazil	1994	1995	-	Feb	Sun>=15	 0:00	0	-
 Rule	Brazil	1996	only	-	Feb	11	 0:00	0	-
 # Decree 2,000 <http://pcdsh01.on.br/HV2000.htm> (1996-09-04)
 # adopted by same states, minus AL, SE.
-Rule	Brazil	1996	only	-	Oct	 6	 0:00	1:00	S
+Rule	Brazil	1996	only	-	Oct	 6	 0:00	1:00	-
 Rule	Brazil	1997	only	-	Feb	16	 0:00	0	-
 # From Daniel C. Sobral (1998-02-12):
 # In 1997, the DS began on October 6. The stated reason was that
@@ -882,19 +881,19 @@ Rule	Brazil	1997	only	-	Feb	16	 0:00	0	-
 # to help dealing with the shortages of electric power.
 #
 # Decree 2,317 (1997-09-04), adopted by same states.
-Rule	Brazil	1997	only	-	Oct	 6	 0:00	1:00	S
+Rule	Brazil	1997	only	-	Oct	 6	 0:00	1:00	-
 # Decree 2,495 <http://pcdsh01.on.br/figuras/HV2495.JPG>
 # (1998-02-10)
 Rule	Brazil	1998	only	-	Mar	 1	 0:00	0	-
 # Decree 2,780 <http://pcdsh01.on.br/figuras/Hv98.jpg> (1998-09-11)
 # adopted by the same states as before.
-Rule	Brazil	1998	only	-	Oct	11	 0:00	1:00	S
+Rule	Brazil	1998	only	-	Oct	11	 0:00	1:00	-
 Rule	Brazil	1999	only	-	Feb	21	 0:00	0	-
 # Decree 3,150 <http://pcdsh01.on.br/figuras/HV3150.gif>
 # (1999-08-23) adopted by same states.
 # Decree 3,188 <http://pcdsh01.on.br/DecHV99.gif> (1999-09-30)
 # adds SE, AL, PB, PE, RN, CE, PI, MA and RR.
-Rule	Brazil	1999	only	-	Oct	 3	 0:00	1:00	S
+Rule	Brazil	1999	only	-	Oct	 3	 0:00	1:00	-
 Rule	Brazil	2000	only	-	Feb	27	 0:00	0	-
 # Decree 3,592 <http://pcdsh01.on.br/DEC3592.htm> (2000-09-06)
 # adopted by the same states as before.
@@ -904,34 +903,34 @@ Rule	Brazil	2000	only	-	Feb	27	 0:00	0	-
 # repeals DST in SE, AL, PB, RN, CE, PI and MA, effective 2000-10-22 00:00.
 # Decree 3,916 <http://pcdsh01.on.br/figuras/HV3916.gif>
 # (2001-09-13) reestablishes DST in AL, CE, MA, PB, PE, PI, RN, SE.
-Rule	Brazil	2000	2001	-	Oct	Sun>=8	 0:00	1:00	S
+Rule	Brazil	2000	2001	-	Oct	Sun>=8	 0:00	1:00	-
 Rule	Brazil	2001	2006	-	Feb	Sun>=15	 0:00	0	-
 # Decree 4,399 (2002-10-01) repeals DST in AL, CE, MA, PB, PE, PI, RN, SE.
 # 4,399 <http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm>
-Rule	Brazil	2002	only	-	Nov	 3	 0:00	1:00	S
+Rule	Brazil	2002	only	-	Nov	 3	 0:00	1:00	-
 # Decree 4,844 (2003-09-24; corrected 2003-09-26) repeals DST in BA, MT, TO.
 # 4,844 <http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm>
-Rule	Brazil	2003	only	-	Oct	19	 0:00	1:00	S
+Rule	Brazil	2003	only	-	Oct	19	 0:00	1:00	-
 # Decree 5,223 (2004-10-01) reestablishes DST in MT.
 # 5,223 <http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm>
-Rule	Brazil	2004	only	-	Nov	 2	 0:00	1:00	S
+Rule	Brazil	2004	only	-	Nov	 2	 0:00	1:00	-
 # Decree 5,539 <http://pcdsh01.on.br/DecHV5539.gif> (2005-09-19),
 # adopted by the same states as before.
-Rule	Brazil	2005	only	-	Oct	16	 0:00	1:00	S
+Rule	Brazil	2005	only	-	Oct	16	 0:00	1:00	-
 # Decree 5,920 <http://pcdsh01.on.br/DecHV5920.gif> (2006-10-03),
 # adopted by the same states as before.
-Rule	Brazil	2006	only	-	Nov	 5	 0:00	1:00	S
+Rule	Brazil	2006	only	-	Nov	 5	 0:00	1:00	-
 Rule	Brazil	2007	only	-	Feb	25	 0:00	0	-
 # Decree 6,212 <http://pcdsh01.on.br/DecHV6212.gif> (2007-09-26),
 # adopted by the same states as before.
-Rule	Brazil	2007	only	-	Oct	Sun>=8	 0:00	1:00	S
+Rule	Brazil	2007	only	-	Oct	Sun>=8	 0:00	1:00	-
 # From Frederico A. C. Neves (2008-09-10):
 # According to this decree
 # http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
 # [t]he DST period in Brazil now on will be from the 3rd Oct Sunday to the
 # 3rd Feb Sunday. There is an exception on the return date when this is
 # the Carnival Sunday then the return date will be the next Sunday...
-Rule	Brazil	2008	2017	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Brazil	2008	2017	-	Oct	Sun>=15	0:00	1:00	-
 Rule	Brazil	2008	2011	-	Feb	Sun>=15	0:00	0	-
 # Decree 7,584 <http://pcdsh01.on.br/HVdecreto7584_20111013.jpg> (2011-10-13)
 # added Bahia.
@@ -949,7 +948,7 @@ Rule	Brazil	2016	2022	-	Feb	Sun>=15	0:00	0	-
 # ... https://www.timeanddate.com/news/time/brazil-delays-dst-2018.html
 # From Steffen Thorsen (2017-12-20):
 # http://www.planalto.gov.br/ccivil_03/_ato2015-2018/2017/decreto/D9242.htm
-Rule	Brazil	2018	max	-	Nov	Sun>=1	0:00	1:00	S
+Rule	Brazil	2018	max	-	Nov	Sun>=1	0:00	1:00	-
 Rule	Brazil	2023	only	-	Feb	Sun>=22	0:00	0	-
 Rule	Brazil	2024	2025	-	Feb	Sun>=15	0:00	0	-
 Rule	Brazil	2026	only	-	Feb	Sun>=22	0:00	0	-
@@ -1256,28 +1255,28 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # For now, assume that they will not revert.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
+Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	-
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	S
+Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	-
 Rule	Chile	1969	only	-	Mar	30	3:00u	0	-
-Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	S
+Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	-
 Rule	Chile	1970	only	-	Mar	29	3:00u	0	-
 Rule	Chile	1971	only	-	Mar	14	3:00u	0	-
-Rule	Chile	1970	1972	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1970	1972	-	Oct	Sun>=9	4:00u	1:00	-
 Rule	Chile	1972	1986	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	S
-Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	-
+Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	-
 Rule	Chile	1987	only	-	Apr	12	3:00u	0	-
 Rule	Chile	1988	1990	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1988	1989	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	S
+Rule	Chile	1988	1989	-	Oct	Sun>=9	4:00u	1:00	-
+Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	-
 Rule	Chile	1991	1996	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	-
 Rule	Chile	1997	only	-	Mar	30	3:00u	0	-
 Rule	Chile	1998	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
+Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	-
 Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
-Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	-
 Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
 # N.B.: the end of March 29 in Chile is March 30 in Universal time,
 # which is used below in specifying the transition.
@@ -1285,11 +1284,11 @@ Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
 Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
 Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
 Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
-Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
+Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	-
 Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
-Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
+Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	-
 Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
-Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
+Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	-
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1354,7 +1353,7 @@ Zone Antarctica/Palmer	0	-	-00	1965
 # "A variation of fifteen minutes in the public clocks of Bogota is not rare."
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	CO	1992	only	-	May	 3	0:00	1:00	S
+Rule	CO	1992	only	-	May	 3	0:00	1:00	-
 Rule	CO	1993	only	-	Apr	 4	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Bogota	-4:56:16 -	LMT	1884 Mar 13
@@ -1414,7 +1413,7 @@ Link	America/Curacao	America/Kralendijk	# Caribbean Netherlands
 # repeated.  For now, assume transitions were at 00:00 local time country-wide.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Ecuador	1992	only	-	Nov	28	0:00	1:00	S
+Rule	Ecuador	1992	only	-	Nov	28	0:00	1:00	-
 Rule	Ecuador	1993	only	-	Feb	 5	0:00	0	-
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1504,22 +1503,22 @@ Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
 #   the maintainers of the database to inform them we're adopting
 #   the same policy this year and suggest recommendations for future years.
 #
-# For now we will assume permanent summer time for the Falklands
+# For now we will assume permanent -03 for the Falklands
 # until advised differently (to apply for 2012 and beyond, after the 2011
 # experiment was apparently successful.)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Falk	1937	1938	-	Sep	lastSun	0:00	1:00	S
+Rule	Falk	1937	1938	-	Sep	lastSun	0:00	1:00	-
 Rule	Falk	1938	1942	-	Mar	Sun>=19	0:00	0	-
-Rule	Falk	1939	only	-	Oct	1	0:00	1:00	S
-Rule	Falk	1940	1942	-	Sep	lastSun	0:00	1:00	S
+Rule	Falk	1939	only	-	Oct	1	0:00	1:00	-
+Rule	Falk	1940	1942	-	Sep	lastSun	0:00	1:00	-
 Rule	Falk	1943	only	-	Jan	1	0:00	0	-
-Rule	Falk	1983	only	-	Sep	lastSun	0:00	1:00	S
+Rule	Falk	1983	only	-	Sep	lastSun	0:00	1:00	-
 Rule	Falk	1984	1985	-	Apr	lastSun	0:00	0	-
-Rule	Falk	1984	only	-	Sep	16	0:00	1:00	S
-Rule	Falk	1985	2000	-	Sep	Sun>=9	0:00	1:00	S
+Rule	Falk	1984	only	-	Sep	16	0:00	1:00	-
+Rule	Falk	1985	2000	-	Sep	Sun>=9	0:00	1:00	-
 Rule	Falk	1986	2000	-	Apr	Sun>=16	0:00	0	-
 Rule	Falk	2001	2010	-	Apr	Sun>=15	2:00	0	-
-Rule	Falk	2001	2010	-	Sep	Sun>=1	2:00	1:00	S
+Rule	Falk	2001	2010	-	Sep	Sun>=1	2:00	1:00	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
 			-3:51:24 -	SMT	1912 Mar 12 # Stanley Mean Time
@@ -1554,16 +1553,16 @@ Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar    # Georgetown
 # adjust their clocks at 0 hour of the given dates.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Para	1975	1988	-	Oct	 1	0:00	1:00	S
+Rule	Para	1975	1988	-	Oct	 1	0:00	1:00	-
 Rule	Para	1975	1978	-	Mar	 1	0:00	0	-
 Rule	Para	1979	1991	-	Apr	 1	0:00	0	-
-Rule	Para	1989	only	-	Oct	22	0:00	1:00	S
-Rule	Para	1990	only	-	Oct	 1	0:00	1:00	S
-Rule	Para	1991	only	-	Oct	 6	0:00	1:00	S
+Rule	Para	1989	only	-	Oct	22	0:00	1:00	-
+Rule	Para	1990	only	-	Oct	 1	0:00	1:00	-
+Rule	Para	1991	only	-	Oct	 6	0:00	1:00	-
 Rule	Para	1992	only	-	Mar	 1	0:00	0	-
-Rule	Para	1992	only	-	Oct	 5	0:00	1:00	S
+Rule	Para	1992	only	-	Oct	 5	0:00	1:00	-
 Rule	Para	1993	only	-	Mar	31	0:00	0	-
-Rule	Para	1993	1995	-	Oct	 1	0:00	1:00	S
+Rule	Para	1993	1995	-	Oct	 1	0:00	1:00	-
 Rule	Para	1994	1995	-	Feb	lastSun	0:00	0	-
 Rule	Para	1996	only	-	Mar	 1	0:00	0	-
 # IATA SSIM (2000-02) says 1999-10-10; ignore this for now.
@@ -1581,7 +1580,7 @@ Rule	Para	1996	only	-	Mar	 1	0:00	0	-
 # year, the time will change on the first Sunday of October; likewise, the
 # clock will be set back on the first Sunday of March.
 #
-Rule	Para	1996	2001	-	Oct	Sun>=1	0:00	1:00	S
+Rule	Para	1996	2001	-	Oct	Sun>=1	0:00	1:00	-
 # IATA SSIM (1997-09) says Mar 1; go with Shanks & Pottenger.
 Rule	Para	1997	only	-	Feb	lastSun	0:00	0	-
 # Shanks & Pottenger say 1999-02-28; IATA SSIM (1999-02) says 1999-02-27, but
@@ -1592,7 +1591,7 @@ Rule	Para	1998	2001	-	Mar	Sun>=1	0:00	0	-
 # dst method to be from the first Sunday in September to the first Sunday in
 # April.
 Rule	Para	2002	2004	-	Apr	Sun>=1	0:00	0	-
-Rule	Para	2002	2003	-	Sep	Sun>=1	0:00	1:00	S
+Rule	Para	2002	2003	-	Sep	Sun>=1	0:00	1:00	-
 #
 # From Jesper Nørgaard Welen (2005-01-02):
 # There are several sources that claim that Paraguay made
@@ -1601,7 +1600,7 @@ Rule	Para	2002	2003	-	Sep	Sun>=1	0:00	1:00	S
 # Decree 1,867 (2004-03-05)
 # From Carlos Raúl Perasso via Jesper Nørgaard Welen (2006-10-13)
 # http://www.presidencia.gov.py/decretos/D1867.pdf
-Rule	Para	2004	2009	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Para	2004	2009	-	Oct	Sun>=15	0:00	1:00	-
 Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	-
 # From Carlos Raúl Perasso (2010-02-18):
 # By decree number 3958 issued yesterday
@@ -1614,7 +1613,7 @@ Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	-
 # and that on the first Sunday of the month of October, it is to be set
 # forward 60 minutes, in all the territory of the Paraguayan Republic.
 # ...
-Rule	Para	2010	max	-	Oct	Sun>=1	0:00	1:00	S
+Rule	Para	2010	max	-	Oct	Sun>=1	0:00	1:00	-
 Rule	Para	2010	2012	-	Apr	Sun>=8	0:00	0	-
 #
 # From Steffen Thorsen (2013-03-07):
@@ -1647,16 +1646,16 @@ Zone America/Asuncion	-3:50:40 -	LMT	1890
 # Shanks & Pottenger don't have this transition.  Assume 1986 was like 1987.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Peru	1938	only	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1938	only	-	Jan	 1	0:00	1:00	-
 Rule	Peru	1938	only	-	Apr	 1	0:00	0	-
-Rule	Peru	1938	1939	-	Sep	lastSun	0:00	1:00	S
+Rule	Peru	1938	1939	-	Sep	lastSun	0:00	1:00	-
 Rule	Peru	1939	1940	-	Mar	Sun>=24	0:00	0	-
-Rule	Peru	1986	1987	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1986	1987	-	Jan	 1	0:00	1:00	-
 Rule	Peru	1986	1987	-	Apr	 1	0:00	0	-
-Rule	Peru	1990	only	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1990	only	-	Jan	 1	0:00	1:00	-
 Rule	Peru	1990	only	-	Apr	 1	0:00	0	-
 # IATA is ambiguous for 1993/1995; go with Shanks & Pottenger.
-Rule	Peru	1994	only	-	Jan	 1	0:00	1:00	S
+Rule	Peru	1994	only	-	Jan	 1	0:00	1:00	-
 Rule	Peru	1994	only	-	Apr	 1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Lima	-5:08:12 -	LMT	1890
@@ -1702,72 +1701,201 @@ Link America/Port_of_Spain America/Tortola	# Virgin Islands (UK)
 # Uruguay
 # From Paul Eggert (1993-11-18):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
-# From Shanks & Pottenger:
+#
+# From Tim Parenti (2018-02-20), per Jeremie Bonjour (2018-01-31) and Michael
+# Deckers (2018-02-20):
+# ... At least they kept good records...
+#
+# http://www.armada.mil.uy/ContenidosPDFs/sohma/web/almanaque/almanaque_2018.pdf#page=36
+# Page 36 of Almanaque 2018, published by the Oceanography, Hydrography, and
+# Meteorology Service of the Uruguayan Navy, seems to give many transitions
+# with greater clarity than we've had before.  It directly references many laws
+# and decrees which are, in turn, referenced below.  They can be viewed in the
+# public archives of the Diario Oficial (in Spanish) at
+# http://www.impo.com.uy/diariooficial/
+#
+# Ley No. 3920 of 1908-06-10 placed the determination of legal time under the
+# auspices of the National Institute for the Prediction of Time.  It is unclear
+# exactly what offset was used during this period, though Ley No. 7200 of
+# 1920-04-23 used the Observatory of the National Meteorological Institute in
+# Montevideo (34° 54' 33" S, 56° 12' 45" W) as its reference meridian,
+# retarding legal time by 15 minutes 9 seconds from 1920-04-30 24:00,
+# resulting in UT-04.  Assume the corresponding LMT of UT-03:44:51 (given on
+# page 725 of the Proceedings of the Second Pan-American Scientific Congress,
+# 1915-1916) was in use, and merely became official from 1908-06-10.
+# https://www.impo.com.uy/diariooficial/1908/06/18/12
+# https://www.impo.com.uy/diariooficial/1920/04/27/9
+#
+# Ley No. 7594 of 1923-06-28 specified legal time as Observatory time advanced
+# by 44 minutes 51 seconds (UT-03) "from 30 September to 31 March", and by 14
+# minutes 51 seconds (UT-03:30) "the rest of the year"; a message from the
+# National Council of Administration the same day, published directly below the
+# law in the Diario Oficial, specified the first transition to be 1923-09-30
+# 24:00.  This effectively established standard time at UT-03:30 with 30
+# minutes DST.  Assume transitions at 24:00 on the specified days until Ley No.
+# 7919 of 1926-03-05 ended this arrangement, repealing all "laws and other
+# provisions which oppose" it, resulting in year-round UT-03:30; a Resolución
+# of 1926-03-11 puts the final transition at 1926-03-31 24:00, the same as it
+# would have been under the previous law.
+# https://www.impo.com.uy/diariooficial/1923/07/02/2
+# https://www.impo.com.uy/diariooficial/1926/03/10/2
+# https://www.impo.com.uy/diariooficial/1926/03/18/2
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives 1923 Oct 1; go with Shanks & Pottenger.
-Rule	Uruguay	1923	only	-	Oct	 2	 0:00	0:30	HS
+Rule	Uruguay	1923	1925	-	Oct	 1	 0:00	0:30	-
 Rule	Uruguay	1924	1926	-	Apr	 1	 0:00	0	-
-Rule	Uruguay	1924	1925	-	Oct	 1	 0:00	0:30	HS
-Rule	Uruguay	1933	1935	-	Oct	lastSun	 0:00	0:30	HS
-# Shanks & Pottenger give 1935 Apr 1 0:00 & 1936 Mar 30 0:00; go with Whitman.
-Rule	Uruguay	1934	1936	-	Mar	Sat>=25	23:30s	0	-
-Rule	Uruguay	1936	only	-	Nov	 1	 0:00	0:30	HS
-Rule	Uruguay	1937	1941	-	Mar	lastSun	 0:00	0	-
-# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
-Rule	Uruguay	1937	1940	-	Oct	lastSun	 0:00	0:30	HS
-# Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
-# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
-Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0:30	HS
-Rule	Uruguay	1942	only	-	Jan	 1	 0:00	0	-
-Rule	Uruguay	1942	only	-	Dec	14	 0:00	1:00	S
+# From Tim Parenti (2018-02-15):
+# http://www.impo.com.uy/diariooficial/1933/10/27/6
+#
+# It appears Ley No. 9122 of 1933 was never published as such in the Diario
+# Oficial, but instead appeared as Document 26 in the Diario on Friday
+# 1933-10-27 as a decree made Monday 1933-10-23 and filed under the Ministry of
+# National Defense.  It reinstituted a DST of 30 minutes (to UT-03) "from the
+# last Sunday of October...until the last Saturday of March."  In accordance
+# with this provision, the first transition was explicitly specified in Article
+# 2 of the decree as Saturday 1933-10-28 at 24:00; that is, Sunday 1933-10-29
+# at 00:00.  Assume transitions at 00:00 Sunday throughout.
+#
+# Departing from the matter-of-fact nature of previous timekeeping laws, the
+# 1933 decree "consider[s] the advantages of...the advance of legal time":
+#
+#   "Whereas: The measure adopted by almost all nations at the time of the last
+#    World War still persists in North America and Europe, precisely because of
+#    the economic, hygienic, and social advantages derived from such an
+#    emergency measure...
+#
+#    Whereas: The advance of the legal time during the summer seasons, by
+#    displacing social activity near sunrise, favors the citizen populations
+#    and especially the society that creates and works..."
+#
+# It further specified that "necessary measures" be taken to ensure that
+# "public spectacles finish, in general, before [01:00]."
+Rule	Uruguay	1933	1938	-	Oct	lastSun	 0:00	0:30	-
+Rule	Uruguay	1934	1941	-	Mar	lastSat	24:00	0	-
+# From Tim Parenti (2018-02-15):
+# Most of the Rules below, and their contemporaneous Zone lines, have been
+# updated simply to match the Almanaque 2018.  Although the document does not
+# list exact transition times, midnight transitions were already present in our
+# data here for all transitions through 2004-09, and this is both consistent
+# with prior transitions and verified in several decrees marked below between
+# 1939-09 and 2004-09, wherein the relevant text was typically of the form:
+#
+#   "From 0 hours on [date], the legal time of the entire Republic will be...
+#
+#    In accordance with [the preceding], on [previous date] at 24 hours, all
+#    clocks throughout the Republic will be [advanced/retarded] by..."
+#
+# It is possible that there is greater specificity to be found for the Rules
+# below, but it is buried in no fewer than 40 different decrees individually
+# referenced by the Almanaque for the period from 1939-09 to 2014-09.
+# Four-fifths of these were promulgated less than two weeks before taking
+# effect; more than half within a week and none more than 5 weeks.  Only the
+# handful with comments below have been checked with any thoroughness.
+Rule	Uruguay	1939	only	-	Oct	 1	 0:00	0:30	-
+Rule	Uruguay	1940	only	-	Oct	27	 0:00	0:30	-
+# From Tim Parenti (2018-02-15):
+# Decreto 1145 of the Ministry of National Defense, dated 1941-07-26, specified
+# UT-03 from Friday 1941-08-01 00:00, citing an "urgent...need to save fuel".
+# http://www.impo.com.uy/diariooficial/1941/08/04/1
+Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0:30	-
+# From Tim Parenti (2018-02-15):
+# Decreto 1866 of the Ministry of National Defense, dated 1942-12-09, specified
+# further advancement (to UT-02:30) from Sunday 1942-12-13 24:00.  Since clocks
+# never went back to UT-03:30 thereafter, this is modeled as advancing standard
+# time by 30 minutes to UT-03, while retaining 30 minutes of DST.
+# http://www.impo.com.uy/diariooficial/1942/12/16/3
+Rule	Uruguay	1942	only	-	Dec	14	 0:00	0:30	-
 Rule	Uruguay	1943	only	-	Mar	14	 0:00	0	-
-Rule	Uruguay	1959	only	-	May	24	 0:00	1:00	S
+Rule	Uruguay	1959	only	-	May	24	 0:00	0:30	-
 Rule	Uruguay	1959	only	-	Nov	15	 0:00	0	-
-Rule	Uruguay	1960	only	-	Jan	17	 0:00	1:00	S
+Rule	Uruguay	1960	only	-	Jan	17	 0:00	1:00	-
 Rule	Uruguay	1960	only	-	Mar	 6	 0:00	0	-
-Rule	Uruguay	1965	1967	-	Apr	Sun>=1	 0:00	1:00	S
+Rule	Uruguay	1965	only	-	Apr	 4	 0:00	1:00	-
 Rule	Uruguay	1965	only	-	Sep	26	 0:00	0	-
-Rule	Uruguay	1966	1967	-	Oct	31	 0:00	0	-
-Rule	Uruguay	1968	1970	-	May	27	 0:00	0:30	HS
-Rule	Uruguay	1968	1970	-	Dec	 2	 0:00	0	-
-Rule	Uruguay	1972	only	-	Apr	24	 0:00	1:00	S
-Rule	Uruguay	1972	only	-	Aug	15	 0:00	0	-
-Rule	Uruguay	1974	only	-	Mar	10	 0:00	0:30	HS
-Rule	Uruguay	1974	only	-	Dec	22	 0:00	1:00	S
-Rule	Uruguay	1976	only	-	Oct	 1	 0:00	0	-
-Rule	Uruguay	1977	only	-	Dec	 4	 0:00	1:00	S
-Rule	Uruguay	1978	only	-	Apr	 1	 0:00	0	-
-Rule	Uruguay	1979	only	-	Oct	 1	 0:00	1:00	S
-Rule	Uruguay	1980	only	-	May	 1	 0:00	0	-
-Rule	Uruguay	1987	only	-	Dec	14	 0:00	1:00	S
-Rule	Uruguay	1988	only	-	Mar	14	 0:00	0	-
-Rule	Uruguay	1988	only	-	Dec	11	 0:00	1:00	S
-Rule	Uruguay	1989	only	-	Mar	12	 0:00	0	-
-Rule	Uruguay	1989	only	-	Oct	29	 0:00	1:00	S
-# Shanks & Pottenger say no DST was observed in 1990/1 and 1991/2,
-# and that 1992/3's DST was from 10-25 to 03-01.  Go with IATA.
-Rule	Uruguay	1990	1992	-	Mar	Sun>=1	 0:00	0	-
-Rule	Uruguay	1990	1991	-	Oct	Sun>=21	 0:00	1:00	S
-Rule	Uruguay	1992	only	-	Oct	18	 0:00	1:00	S
+# From Tim Parenti (2018-02-15):
+# Decreto 321/968 of 1968-05-25, citing emergency drought measures decreed the
+# day before, brought clocks forward 30 minutes from Monday 1968-05-27 00:00.
+# http://www.impo.com.uy/diariooficial/1968/05/30/5
+Rule	Uruguay	1968	only	-	May	27	 0:00	0:30	-
+Rule	Uruguay	1968	only	-	Dec	 1	 0:00	0	-
+# From Tim Parenti (2018-02-15):
+# Decreto 188/970 of 1970-04-23 instituted restrictions on electricity
+# consumption "as a consequence of the current rainfall regime in the country".
+# Articles 13 and 14 advanced clocks by an hour from Saturday 1970-04-25 00:00.
+# http://www.impo.com.uy/diariooficial/1970/04/29/4
+Rule	Uruguay	1970	only	-	Apr	25	 0:00	1:00	-
+Rule	Uruguay	1970	only	-	Jun	14	 0:00	0	-
+Rule	Uruguay	1972	only	-	Apr	23	 0:00	1:00	-
+Rule	Uruguay	1972	only	-	Jul	16	 0:00	0	-
+# From Tim Parenti (2018-02-15):
+# Decreto 29/974 of 1974-01-11, citing "the international rise in the price of
+# oil", advanced clocks by 90 minutes (to UT-01:30).  Decreto 163/974 of
+# 1974-03-04 returned 60 of those minutes (to UT-02:30), and the remaining 30
+# minutes followed in Decreto 679/974 of 1974-08-29.
+# http://www.impo.com.uy/diariooficial/1974/01/22/11
+# http://www.impo.com.uy/diariooficial/1974/03/14/3
+# http://www.impo.com.uy/diariooficial/1974/09/04/6
+Rule	Uruguay	1974	only	-	Jan	13	 0:00	1:30	-
+Rule	Uruguay	1974	only	-	Mar	10	 0:00	0:30	-
+Rule	Uruguay	1974	only	-	Sep	 1	 0:00	0	-
+Rule	Uruguay	1974	only	-	Dec	22	 0:00	1:00	-
+Rule	Uruguay	1975	only	-	Mar	30	 0:00	0	-
+Rule	Uruguay	1976	only	-	Dec	19	 0:00	1:00	-
+Rule	Uruguay	1977	only	-	Mar	 6	 0:00	0	-
+Rule	Uruguay	1977	only	-	Dec	 4	 0:00	1:00	-
+Rule	Uruguay	1978	1979	-	Mar	Sun>=1	 0:00	0	-
+Rule	Uruguay	1978	only	-	Dec	17	 0:00	1:00	-
+Rule	Uruguay	1979	only	-	Apr	29	 0:00	1:00	-
+Rule	Uruguay	1980	only	-	Mar	16	 0:00	0	-
+# From Tim Parenti (2018-02-15):
+# Decreto 725/987 of 1987-12-04 cited "better use of national tourist
+# attractions" to advance clocks one hour from Monday 1987-12-14 00:00.
+# http://www.impo.com.uy/diariooficial/1988/01/25/1
+Rule	Uruguay	1987	only	-	Dec	14	 0:00	1:00	-
+Rule	Uruguay	1988	only	-	Feb	28	 0:00	0	-
+Rule	Uruguay	1988	only	-	Dec	11	 0:00	1:00	-
+Rule	Uruguay	1989	only	-	Mar	 5	 0:00	0	-
+Rule	Uruguay	1989	only	-	Oct	29	 0:00	1:00	-
+Rule	Uruguay	1990	only	-	Feb	25	 0:00	0	-
+# From Tim Parenti (2018-02-15), per Paul Eggert (1999-11-04):
+# IATA agrees as below for 1990-10 through 1993-02.  Per Almanaque 2018, the
+# 1992/1993 season appears to be the first in over half a century where DST
+# both began and ended pursuant to the same decree.
+Rule	Uruguay	1990	1991	-	Oct	Sun>=21	 0:00	1:00	-
+Rule	Uruguay	1991	1992	-	Mar	Sun>=1	 0:00	0	-
+Rule	Uruguay	1992	only	-	Oct	18	 0:00	1:00	-
 Rule	Uruguay	1993	only	-	Feb	28	 0:00	0	-
 # From Eduardo Cota (2004-09-20):
 # The Uruguayan government has decreed a change in the local time....
-# http://www.presidencia.gub.uy/decretos/2004091502.htm
-Rule	Uruguay	2004	only	-	Sep	19	 0:00	1:00	S
+# From Tim Parenti (2018-02-15):
+# Decreto 328/004 of 2004-09-15.
+# http://www.impo.com.uy/diariooficial/2004/09/23/documentos.pdf#page=1
+Rule	Uruguay	2004	only	-	Sep	19	 0:00	1:00	-
 # From Steffen Thorsen (2005-03-11):
 # Uruguay's DST was scheduled to end on Sunday, 2005-03-13, but in order to
 # save energy ... it was postponed two weeks....
-# http://www.presidencia.gub.uy/_Web/noticias/2005/03/2005031005.htm
+# From Tim Parenti (2018-02-15):
+# This 2005 postponement is not in Almanaque 2018.  Go with the contemporaneous
+# reporting, which is confirmed by Decreto 107/005 of 2005-03-10 amending
+# Decreto 328/004:
+# http://www.impo.com.uy/diariooficial/2005/03/15/documentos.pdf#page=1
+# The original decree specified a transition of 2005-03-12 24:00, but the new
+# one specified 2005-03-27 02:00.
 Rule	Uruguay	2005	only	-	Mar	27	 2:00	0	-
 # From Eduardo Cota (2005-09-27):
-# http://www.presidencia.gub.uy/_Web/decretos/2005/09/CM%20119_09%2009%202005_00001.PDF
-# This means that from 2005-10-09 at 02:00 local time, until 2006-03-12 at
-# 02:00 local time, official time in Uruguay will be at GMT -2.
-Rule	Uruguay	2005	only	-	Oct	 9	 2:00	1:00	S
-Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
-# From Jesper Nørgaard Welen (2006-09-06):
-# http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
-#
+# ...from 2005-10-09 at 02:00 local time, until 2006-03-12 at 02:00 local time,
+# official time in Uruguay will be at GMT -2.
+# From Tim Parenti (2018-02-15):
+# Decreto 318/005 of 2005-09-19.
+# http://www.impo.com.uy/diariooficial/2005/09/23/documentos.pdf#page=1
+Rule	Uruguay	2005	only	-	Oct	 9	 2:00	1:00	-
+Rule	Uruguay	2006	2015	-	Mar	Sun>=8	 2:00	0	-
+# From Tim Parenti (2018-02-15), per Jesper Nørgaard Welen (2006-09-06):
+# Decreto 311/006 of 2006-09-04 established regular DST from the first Sunday
+# of October at 02:00 through the second Sunday of March at 02:00.  Almanaque
+# 2018 appears to have a few typoed dates through this period; ignore them.
+# http://www.impo.com.uy/diariooficial/2006/09/08/documentos.pdf#page=1
+Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	-
 # From Steffen Thorsen (2015-06-30):
 # ... it looks like they will not be using DST the coming summer:
 # http://www.elobservador.com.uy/gobierno-resolvio-que-no-habra-cambio-horario-verano-n656787
@@ -1777,17 +1905,19 @@ Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
 # instead of out to dinner.
 # From Pablo Camargo (2015-07-13):
 # http://archivo.presidencia.gub.uy/sci/decretos/2015/06/cons_min_201.pdf
-# [dated 2015-06-29; repeals Decree 311/006 dated 2006-09-04]
-Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	S
-Rule	Uruguay	2007	2015	-	Mar	Sun>=8	 2:00	0	-
+# From Tim Parenti (2018-02-15):
+# Decreto 178/015 of 2015-06-29; repeals Decreto 311/006.
 
 # This Zone can be simplified once we assume zic %z.
-Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
-			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
+Zone America/Montevideo	-3:44:51 -	LMT	1908 Jun 10
+			-3:44:51 -	MMT	1920 May  1 # Montevideo MT
+			-4:00	-	-04	1923 Oct  1
 			-3:30	Uruguay	-0330/-03 1942 Dec 14
+			-3:00	Uruguay	-03/-0230 1960
 			-3:00	Uruguay	-03/-02	1968
-			-3:00	Uruguay	-03/-0230 1971
+			-3:00	Uruguay	-03/-0230 1970
 			-3:00	Uruguay	-03/-02	1974
+			-3:00	Uruguay	-03/-0130 1974 Mar 10
 			-3:00	Uruguay	-03/-0230 1974 Dec 22
 			-3:00	Uruguay	-03/-02
 
diff --git a/test/jdk/sun/util/calendar/zi/tzdata/zone.tab b/test/jdk/sun/util/calendar/zi/tzdata/zone.tab
index f6d9c667734..873737e06b8 100644
--- a/test/jdk/sun/util/calendar/zi/tzdata/zone.tab
+++ b/test/jdk/sun/util/calendar/zi/tzdata/zone.tab
@@ -452,7 +452,7 @@ US	+593249-1394338	America/Yakutat	Alaska - Yakutat
 US	+643004-1652423	America/Nome	Alaska (west)
 US	+515248-1763929	America/Adak	Aleutian Islands
 US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-3453-05611	America/Montevideo
+UY	-345433-0561245	America/Montevideo
 UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
 UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
 VA	+415408+0122711	Europe/Vatican

From 94b6ebd4301c7d06bb888f3ea64f88edd919b17a Mon Sep 17 00:00:00 2001
From: Andrew Leonard <andrew_m_leonard@uk.ibm.com>
Date: Mon, 9 Apr 2018 16:59:57 +0100
Subject: [PATCH 100/196] Make autoconf OPENJDK-TAG logic handle merged OpenJDK
 tags

Signed-off-by: Andrew Leonard <andrew_m_leonard@uk.ibm.com>
---
 closed/autoconf/custom-hook.m4 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4
index e5b12aaddbb..cf77e3bd0d2 100644
--- a/closed/autoconf/custom-hook.m4
+++ b/closed/autoconf/custom-hook.m4
@@ -192,7 +192,12 @@ AC_DEFUN_ONCE([OPENJ9_PLATFORM_SETUP],
 AC_DEFUN_ONCE([OPENJDK_VERSION_DETAILS],
 [
   OPENJDK_SHA=`git -C $TOPDIR rev-parse --short HEAD`
-  OPENJDK_TAG=`git -C $TOPDIR describe --abbrev=0 --tags --match "jdk-11*" "${OPENJDK_SHA}"`
+  LAST_TAGGED_SHA=`git -C $TOPDIR rev-list --tags="jdk-11*" --max-count=1 2>/dev/null`
+  if test "x$LAST_TAGGED_SHA" != x; then
+    OPENJDK_TAG=`git -C $TOPDIR describe --abbrev=0 --tags "$LAST_TAGGED_SHA"`
+  else
+    OPENJDK_TAG=
+  fi
   AC_SUBST(OPENJDK_SHA)
   AC_SUBST(OPENJDK_TAG)
 

From 43d11d7e37f23c1c7b73aea5d6f0c149525b86b6 Mon Sep 17 00:00:00 2001
From: bpatel <unknown>
Date: Mon, 9 Apr 2018 09:45:51 -0700
Subject: [PATCH 101/196] 8196200: Implement a navigation builder in javadoc
 Reviewed-by: jjg, ksrini

---
 .../formats/html/AbstractIndexWriter.java     |   16 +-
 .../formats/html/AbstractMemberWriter.java    |   53 +-
 .../html/AbstractModuleIndexWriter.java       |   17 +-
 .../html/AbstractPackageIndexWriter.java      |   17 +-
 .../formats/html/AbstractTreeWriter.java      |   10 -
 .../html/AnnotationTypeFieldWriterImpl.java   |   27 +-
 ...nnotationTypeOptionalMemberWriterImpl.java |   16 +-
 ...nnotationTypeRequiredMemberWriterImpl.java |   28 +-
 .../html/AnnotationTypeWriterImpl.java        |  184 +--
 .../doclets/formats/html/ClassUseWriter.java  |   79 +-
 .../doclets/formats/html/ClassWriterImpl.java |  160 +--
 .../html/ConstantsSummaryWriterImpl.java      |   12 +-
 .../formats/html/ConstructorWriterImpl.java   |   29 +-
 .../formats/html/DeprecatedListWriter.java    |   22 +-
 .../formats/html/DocFilesHandlerImpl.java     |   47 +-
 .../formats/html/EnumConstantWriterImpl.java  |   35 +-
 .../doclets/formats/html/FieldWriterImpl.java |   36 +-
 .../doclets/formats/html/HelpWriter.java      |   22 +-
 .../formats/html/HtmlConfiguration.java       |    4 +-
 .../formats/html/HtmlDocletWriter.java        |  342 +-----
 .../formats/html/MethodWriterImpl.java        |   35 +-
 .../formats/html/ModuleIndexWriter.java       |    6 +-
 .../formats/html/ModuleWriterImpl.java        |   69 +-
 .../formats/html/NestedClassWriterImpl.java   |   29 +-
 .../formats/html/PackageIndexWriter.java      |    6 +-
 .../formats/html/PackageTreeWriter.java       |   40 +-
 .../formats/html/PackageUseWriter.java        |   64 +-
 .../formats/html/PackageWriterImpl.java       |   66 +-
 .../formats/html/PropertyWriterImpl.java      |   36 +-
 .../html/SerializedFormWriterImpl.java        |   11 +-
 .../formats/html/SingleIndexWriter.java       |    6 +-
 .../formats/html/SplitIndexWriter.java        |    6 +-
 .../doclets/formats/html/TreeWriter.java      |   12 +-
 .../formats/html/markup/Navigation.java       | 1089 +++++++++++++++++
 .../testModules/TestModuleServicesLink.java   |   25 +-
 .../doclet/testModules/TestModules.java       |   40 +-
 .../doclet/testNavigation/TestNavigation.java |  113 +-
 37 files changed, 1428 insertions(+), 1381 deletions(-)
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java
index 13fefbca04b..b7055ee8303 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java
@@ -42,6 +42,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
@@ -72,6 +74,8 @@ public class AbstractIndexWriter extends HtmlDocletWriter {
      */
     protected IndexBuilder indexbuilder;
 
+    protected Navigation navBar;
+
     /**
      * This constructor will be used by {@link SplitIndexWriter}. Initializes
      * path to this file and relative path from this file.
@@ -85,17 +89,7 @@ protected AbstractIndexWriter(HtmlConfiguration configuration,
                                   IndexBuilder indexbuilder) {
         super(configuration, path);
         this.indexbuilder = indexbuilder;
-    }
-
-    /**
-     * Get the index label for navigation bar.
-     *
-     * @return a content tree for the tree label
-     */
-    @Override
-    protected Content getNavLinkIndex() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.indexLabel);
-        return li;
+        this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.INDEX, path);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
index da875608670..1809daa9c10 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
@@ -45,6 +45,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
@@ -214,23 +215,6 @@ protected abstract void addInheritedSummaryLink(TypeElement typeElement,
      */
     protected abstract Content getDeprecatedLink(Element member);
 
-    /**
-     * Get the navigation summary link.
-     *
-     * @param typeElement the TypeElement to be documented
-     * @param link true if its a link else the label to be printed
-     * @return a content tree for the navigation summary link.
-     */
-    protected abstract Content getNavSummaryLink(TypeElement typeElement, boolean link);
-
-    /**
-     * Add the navigation detail link.
-     *
-     * @param link true if its a link else the label to be printed
-     * @param liNav the content tree to which the navigation detail link will be added
-     */
-    protected abstract void addNavDetailLink(boolean link, Content liNav);
-
     /**
      * Add the member name to the content tree.
      *
@@ -474,41 +458,6 @@ protected void addUseInfo(List<? extends Element> mems,
         }
     }
 
-    /**
-     * Add the navigation detail link.
-     *
-     * @param members the members to be linked
-     * @param liNav the content tree to which the navigation detail link will be added
-     */
-    protected void addNavDetailLink(SortedSet<Element> members, Content liNav) {
-        addNavDetailLink(!members.isEmpty(), liNav);
-    }
-
-    /**
-     * Add the navigation summary link.
-     *
-     * @param members members to be linked
-     * @param visibleMemberMap the visible inherited members map
-     * @param liNav the content tree to which the navigation summary link will be added
-     */
-    protected void addNavSummaryLink(SortedSet<? extends Element> members,
-            VisibleMemberMap visibleMemberMap, Content liNav) {
-        if (!members.isEmpty()) {
-            liNav.addContent(getNavSummaryLink(null, true));
-            return;
-        }
-
-        TypeElement superClass = utils.getSuperClass(typeElement);
-        while (superClass != null) {
-            if (visibleMemberMap.hasMembers(superClass)) {
-                liNav.addContent(getNavSummaryLink(superClass, true));
-                return;
-            }
-            superClass = utils.getSuperClass(superClass);
-        }
-        liNav.addContent(getNavSummaryLink(null, false));
-    }
-
     protected void serialWarning(Element e, String key, String a1, String a2) {
         if (configuration.serialwarn) {
             configuration.messages.warning(e, key, a1, a2);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java
index 5e9aa4b2374..6afec556b13 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java
@@ -37,6 +37,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
@@ -61,6 +63,8 @@ public abstract class AbstractModuleIndexWriter extends HtmlDocletWriter {
      */
     protected SortedMap<ModuleElement, Set<PackageElement>> modules;
 
+    protected Navigation navBar;
+
     /**
      * Constructor. Also initializes the modules variable.
      *
@@ -71,6 +75,7 @@ public AbstractModuleIndexWriter(HtmlConfiguration configuration,
                                       DocPath filename) {
         super(configuration, filename);
         modules = configuration.modulePackages;
+        this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.OVERVIEW, path);
     }
 
     /**
@@ -251,18 +256,6 @@ protected void addConfigurationTitle(Content body) {
         }
     }
 
-    /**
-     * Returns highlighted "Overview", in the navigation bar as this is the
-     * overview page.
-     *
-     * @return a Content object to be added to the documentation tree
-     */
-    @Override
-    protected Content getNavLinkContents() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.overviewLabel);
-        return li;
-    }
-
     /**
      * Do nothing. This will be overridden in ModuleIndexFrameWriter.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java
index f84e8cab357..09f21b60301 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java
@@ -33,6 +33,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
@@ -58,6 +60,8 @@ public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter {
      */
     protected SortedSet<PackageElement> packages;
 
+    protected Navigation navBar;
+
     /**
      * Constructor. Also initializes the packages variable.
      *
@@ -68,6 +72,7 @@ public AbstractPackageIndexWriter(HtmlConfiguration configuration,
                                       DocPath filename) {
         super(configuration, filename);
         packages = configuration.packages;
+        this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.OVERVIEW, path);
     }
 
     /**
@@ -173,18 +178,6 @@ protected void addConfigurationTitle(Content body) {
         }
     }
 
-    /**
-     * Returns highlighted "Overview", in the navigation bar as this is the
-     * overview page.
-     *
-     * @return a Content object to be added to the documentation tree
-     */
-    @Override
-    protected Content getNavLinkContents() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.overviewLabel);
-        return li;
-    }
-
     /**
      * Do nothing. This will be overridden.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
index a9122d9cf16..81ee8ceeaf3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
@@ -184,14 +184,4 @@ protected void addExtendsImplements(TypeElement parent, TypeElement typeElement,
     protected void addPartialInfo(TypeElement typeElement, Content contentTree) {
         addPreQualifiedStrongClassLink(LinkInfoImpl.Kind.TREE, typeElement, contentTree);
     }
-
-    /**
-     * Get the tree label for the navigation bar.
-     *
-     * @return a content tree for the tree label
-     */
-    protected Content getNavLinkTree() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.treeLabel);
-        return li;
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
index 8279929b382..7de6932ef9c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
@@ -37,7 +37,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeFieldWriter;
 import jdk.javadoc.internal.doclets.toolkit.Content;
@@ -285,31 +285,6 @@ protected Content getDeprecatedLink(Element member) {
                 member, utils.getFullyQualifiedName(member));
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
-        if (link) {
-            return links.createLink(
-                    SectionName.ANNOTATION_TYPE_FIELD_SUMMARY,
-                    contents.navField);
-        } else {
-            return contents.navField;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(links.createLink(
-                    SectionName.ANNOTATION_TYPE_FIELD_DETAIL,
-                    contents.navField));
-        } else {
-            liNav.addContent(contents.navField);
-        }
-    }
     private TypeMirror getType(Element member) {
         if (utils.isConstructor(member))
             return null;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
index 34b085b4e83..5ad100d0df6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
@@ -35,7 +35,7 @@
 
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeOptionalMemberWriter;
 import jdk.javadoc.internal.doclets.toolkit.Content;
@@ -152,18 +152,4 @@ public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
         memberTree.addContent(links.createAnchor(
                 SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY));
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
-        if (link) {
-            return links.createLink(
-                    SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY,
-                    contents.navAnnotationTypeOptionalMember);
-        } else {
-            return contents.navAnnotationTypeOptionalMember;
-        }
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
index 2b6ecdd4130..c29711027a2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
@@ -37,7 +37,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeRequiredMemberWriter;
 import jdk.javadoc.internal.doclets.toolkit.Content;
@@ -300,32 +300,6 @@ protected Content getDeprecatedLink(Element member) {
         return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, member, name);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
-        if (link) {
-            return links.createLink(
-                    SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY,
-                    contents.navAnnotationTypeRequiredMember);
-        } else {
-            return contents.navAnnotationTypeRequiredMember;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(links.createLink(
-                    SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL,
-                    contents.navAnnotationTypeMember));
-        } else {
-            liNav.addContent(contents.navAnnotationTypeMember);
-        }
-    }
-
     private TypeMirror getType(Element member) {
         return utils.isExecutableElement(member)
                 ? utils.getReturnType((ExecutableElement) member)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java
index 0f63f1eb372..6f8309c76ac 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java
@@ -30,21 +30,20 @@
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.TypeMirror;
 
 import com.sun.source.doctree.DocTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeWriter;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.builders.MemberSummaryBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
 
 /**
@@ -69,6 +68,8 @@ public class AnnotationTypeWriterImpl extends SubWriterHolderWriter
 
     protected TypeElement annotationType;
 
+    private final Navigation navBar;
+
     /**
      * @param configuration the configuration
      * @param annotationType the annotation type being documented.
@@ -78,55 +79,7 @@ public AnnotationTypeWriterImpl(HtmlConfiguration configuration,
         super(configuration, configuration.docPaths.forClass(annotationType));
         this.annotationType = annotationType;
         configuration.currentTypeElement = annotationType;
-    }
-
-    /**
-     * Get the module link.
-     *
-     * @return a content tree for the module link
-     */
-    @Override
-    protected Content getNavLinkModule() {
-        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(annotationType),
-                contents.moduleLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    @Override
-    protected Content getNavLinkPackage() {
-        Content linkContent = links.createLink(DocPaths.PACKAGE_SUMMARY,
-                contents.packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the class link.
-     *
-     * @return a content tree for the class link
-     */
-    @Override
-    protected Content getNavLinkClass() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.classLabel);
-        return li;
-    }
-
-    /**
-     * Get the class use link.
-     *
-     * @return a content tree for the class use link
-     */
-    @Override
-    protected Content getNavLinkClassUse() {
-        Content linkContent = links.createLink(DocPaths.CLASS_USE.resolve(filename), contents.useLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
+        this.navBar = new Navigation(annotationType, configuration, fixedNavDiv, PageMode.CLASS, path);
     }
 
     /**
@@ -139,7 +92,12 @@ public Content getHeader(String header) {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(annotationType),
+                contents.moduleLabel);
+        navBar.setNavLinkModule(linkContent);
+        navBar.setMemberSummaryBuilder(configuration.getBuilderFactory().getMemberSummaryBuilder(this));
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
@@ -195,7 +153,8 @@ public void addFooter(Content contentTree) {
         Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : contentTree;
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             contentTree.addContent(htmlTree);
@@ -295,123 +254,6 @@ public void addAnnotationTypeDeprecationInfo(Content annotationInfoTree) {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Content getNavLinkTree() {
-        Content treeLinkContent = links.createLink(DocPaths.PACKAGE_TREE,
-                contents.treeLabel, "", "");
-        Content li = HtmlTree.LI(treeLinkContent);
-        return li;
-    }
-
-    /**
-     * Add summary details to the navigation bar.
-     *
-     * @param subDiv the content tree to which the summary detail links will be added
-     */
-    @Override
-    protected void addSummaryDetailLinks(Content subDiv) {
-        Content div = HtmlTree.DIV(getNavSummaryLinks());
-        div.addContent(getNavDetailLinks());
-        subDiv.addContent(div);
-    }
-
-    /**
-     * Get summary links for navigation bar.
-     *
-     * @return the content tree for the navigation summary links
-     */
-    protected Content getNavSummaryLinks() {
-        Content li = HtmlTree.LI(contents.summaryLabel);
-        li.addContent(Contents.SPACE);
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder =
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        Content liNavField = new HtmlTree(HtmlTag.LI);
-        addNavSummaryLink(memberSummaryBuilder,
-                "doclet.navField",
-                VisibleMemberMap.Kind.ANNOTATION_TYPE_FIELDS, liNavField);
-        addNavGap(liNavField);
-        ulNav.addContent(liNavField);
-        Content liNavReq = new HtmlTree(HtmlTag.LI);
-        addNavSummaryLink(memberSummaryBuilder,
-                "doclet.navAnnotationTypeRequiredMember",
-                VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_REQUIRED, liNavReq);
-        addNavGap(liNavReq);
-        ulNav.addContent(liNavReq);
-        Content liNavOpt = new HtmlTree(HtmlTag.LI);
-        addNavSummaryLink(memberSummaryBuilder,
-                "doclet.navAnnotationTypeOptionalMember",
-                VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_OPTIONAL, liNavOpt);
-        ulNav.addContent(liNavOpt);
-        return ulNav;
-    }
-
-    /**
-     * Add the navigation summary link.
-     *
-     * @param builder builder for the member to be documented
-     * @param label the label for the navigation
-     * @param type type to be documented
-     * @param liNav the content tree to which the navigation summary link will be added
-     */
-    protected void addNavSummaryLink(MemberSummaryBuilder builder,
-            String label, VisibleMemberMap.Kind type, Content liNav) {
-        AbstractMemberWriter writer = ((AbstractMemberWriter) builder.
-                getMemberSummaryWriter(type));
-        if (writer == null) {
-            liNav.addContent(contents.getContent(label));
-        } else {
-            liNav.addContent(writer.getNavSummaryLink(null,
-                    ! builder.getVisibleMemberMap(type).noVisibleMembers()));
-        }
-    }
-
-    /**
-     * Get detail links for the navigation bar.
-     *
-     * @return the content tree for the detail links
-     */
-    protected Content getNavDetailLinks() {
-        Content li = HtmlTree.LI(contents.detailLabel);
-        li.addContent(Contents.SPACE);
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder =
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        AbstractMemberWriter writerField =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(VisibleMemberMap.Kind.ANNOTATION_TYPE_FIELDS));
-        AbstractMemberWriter writerOptional =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_OPTIONAL));
-        AbstractMemberWriter writerRequired =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_REQUIRED));
-        Content liNavField = new HtmlTree(HtmlTag.LI);
-        if (writerField != null) {
-            writerField.addNavDetailLink(!utils.getAnnotationFields(annotationType).isEmpty(), liNavField);
-        } else {
-            liNavField.addContent(contents.navField);
-        }
-        addNavGap(liNavField);
-        ulNav.addContent(liNavField);
-        if (writerOptional != null){
-            Content liNavOpt = new HtmlTree(HtmlTag.LI);
-            writerOptional.addNavDetailLink(!annotationType.getAnnotationMirrors().isEmpty(), liNavOpt);
-            ulNav.addContent(liNavOpt);
-        } else if (writerRequired != null){
-            Content liNavReq = new HtmlTree(HtmlTag.LI);
-            writerRequired.addNavDetailLink(!annotationType.getAnnotationMirrors().isEmpty(), liNavReq);
-            ulNav.addContent(liNavReq);
-        } else {
-            Content liNav = HtmlTree.LI(contents.navAnnotationTypeMember);
-            ulNav.addContent(liNav);
-        }
-        return ulNav;
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
index 490711c8935..9b44e521be2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
@@ -47,7 +47,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
@@ -106,6 +107,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
     final String methodUseTableSummary;
     final String constructorUseTableSummary;
     final String packageUseTableSummary;
+    private final Navigation navBar;
 
     /**
      * The HTML tree for main tag.
@@ -178,6 +180,7 @@ public ClassUseWriter(HtmlConfiguration configuration,
                 resources.getText("doclet.constructors"));
         packageUseTableSummary = MessageFormat.format(useTableSummary,
                 resources.getText("doclet.packages"));
+        this.navBar = new Navigation(typeElement, configuration, fixedNavDiv, PageMode.USE, path);
     }
 
     /**
@@ -264,7 +267,8 @@ protected void generateClassUseFile() throws DocFileIOException {
         HtmlTree htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : body;
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(htmlTree);
@@ -476,7 +480,15 @@ protected HtmlTree getClassUseHeader() {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        Content mdleLinkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement),
+                contents.moduleLabel);
+        navBar.setNavLinkModule(mdleLinkContent);
+        Content classLinkContent = getLink(new LinkInfoImpl(
+                configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement)
+                .label(configuration.getText("doclet.Class")));
+        navBar.setNavLinkClass(classLinkContent);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
@@ -494,65 +506,4 @@ protected HtmlTree getClassUseHeader() {
         }
         return bodyTree;
     }
-
-    /**
-     * Get the module link.
-     *
-     * @return a content tree for the module link
-     */
-    @Override
-    protected Content getNavLinkModule() {
-        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement),
-                contents.moduleLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content linkContent =
-                links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY), contents.packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get class page link.
-     *
-     * @return a content tree for the class page link
-     */
-    protected Content getNavLinkClass() {
-        Content linkContent = getLink(new LinkInfoImpl(
-                configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, typeElement)
-                .label(configuration.getText("doclet.Class")));
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the use link.
-     *
-     * @return a content tree for the use link
-     */
-    protected Content getNavLinkClassUse() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.useLabel);
-        return li;
-    }
-
-    /**
-     * Get the tree link.
-     *
-     * @return a content tree for the tree link
-     */
-    protected Content getNavLinkTree() {
-        Content linkContent = utils.isEnclosingPackageIncluded(typeElement)
-                ? links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_TREE), contents.treeLabel)
-                : links.createLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), contents.treeLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
index 1b9bae9f057..7b88d5c1f79 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
@@ -40,6 +40,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.ClassWriter;
 import jdk.javadoc.internal.doclets.toolkit.Content;
@@ -48,11 +50,9 @@
 import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
-import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap.Kind;
 
 /**
  * Generate the Class Information Page.
@@ -78,6 +78,8 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
 
     protected final ClassTree classtree;
 
+    private final Navigation navBar;
+
     /**
      * @param configuration the configuration data for the doclet
      * @param typeElement the class being documented.
@@ -89,55 +91,7 @@ public ClassWriterImpl(HtmlConfiguration configuration, TypeElement typeElement,
         this.typeElement = typeElement;
         configuration.currentTypeElement = typeElement;
         this.classtree = classTree;
-    }
-
-    /**
-     * Get the module link.
-     *
-     * @return a content tree for the module link
-     */
-    @Override
-    protected Content getNavLinkModule() {
-        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement),
-                contents.moduleLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    @Override
-    protected Content getNavLinkPackage() {
-        Content linkContent = links.createLink(DocPaths.PACKAGE_SUMMARY,
-                contents.packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the class link.
-     *
-     * @return a content tree for the class link
-     */
-    @Override
-    protected Content getNavLinkClass() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.classLabel);
-        return li;
-    }
-
-    /**
-     * Get the class use link.
-     *
-     * @return a content tree for the class use link
-     */
-    @Override
-    protected Content getNavLinkClassUse() {
-        Content linkContent = links.createLink(DocPaths.CLASS_USE.resolve(filename), contents.useLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
+        this.navBar = new Navigation(typeElement, configuration, fixedNavDiv, PageMode.CLASS, path);
     }
 
     /**
@@ -150,7 +104,12 @@ public Content getHeader(String header) {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(typeElement),
+                contents.moduleLabel);
+        navBar.setNavLinkModule(linkContent);
+        navBar.setMemberSummaryBuilder(configuration.getBuilderFactory().getMemberSummaryBuilder(this));
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
@@ -210,7 +169,8 @@ public void addFooter(Content contentTree) {
         Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : contentTree;
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             contentTree.addContent(htmlTree);
@@ -608,100 +568,6 @@ private Content getClassLinks(LinkInfoImpl.Kind context, Collection<?> list) {
         return dd;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Content getNavLinkTree() {
-        Content treeLinkContent = links.createLink(DocPaths.PACKAGE_TREE,
-                contents.treeLabel, "", "");
-        Content li = HtmlTree.LI(treeLinkContent);
-        return li;
-    }
-
-    /**
-     * Add summary details to the navigation bar.
-     *
-     * @param subDiv the content tree to which the summary detail links will be added
-     */
-    @Override
-    protected void addSummaryDetailLinks(Content subDiv) {
-        Content div = HtmlTree.DIV(getNavSummaryLinks());
-        div.addContent(getNavDetailLinks());
-        subDiv.addContent(div);
-    }
-
-    /**
-     * Get summary links for navigation bar.
-     *
-     * @return the content tree for the navigation summary links
-     */
-    protected Content getNavSummaryLinks() {
-        Content li = HtmlTree.LI(contents.summaryLabel);
-        li.addContent(Contents.SPACE);
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder =
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        for (VisibleMemberMap.Kind kind : VisibleMemberMap.Kind.summarySet) {
-            Content liNav = new HtmlTree(HtmlTag.LI);
-            if (kind == VisibleMemberMap.Kind.ENUM_CONSTANTS && !utils.isEnum(typeElement)) {
-                continue;
-            }
-            if (kind == VisibleMemberMap.Kind.CONSTRUCTORS && utils.isEnum(typeElement)) {
-                continue;
-            }
-            AbstractMemberWriter writer =
-                ((AbstractMemberWriter) memberSummaryBuilder.getMemberSummaryWriter(kind));
-            if (writer == null) {
-                liNav.addContent(contents.getContent(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
-            } else {
-                writer.addNavSummaryLink(
-                        memberSummaryBuilder.members(kind),
-                        memberSummaryBuilder.getVisibleMemberMap(kind), liNav);
-            }
-            if (kind != Kind.METHODS) {
-                addNavGap(liNav);
-            }
-            ulNav.addContent(liNav);
-        }
-        return ulNav;
-    }
-
-    /**
-     * Get detail links for the navigation bar.
-     *
-     * @return the content tree for the detail links
-     */
-    protected Content getNavDetailLinks() {
-        Content li = HtmlTree.LI(contents.detailLabel);
-        li.addContent(Contents.SPACE);
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder =
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        for (VisibleMemberMap.Kind kind : VisibleMemberMap.Kind.detailSet) {
-            Content liNav = new HtmlTree(HtmlTag.LI);
-            AbstractMemberWriter writer =
-                    ((AbstractMemberWriter) memberSummaryBuilder.
-                    getMemberSummaryWriter(kind));
-            if (kind == VisibleMemberMap.Kind.ENUM_CONSTANTS && !utils.isEnum(typeElement)) {
-                continue;
-            }
-            if (kind == VisibleMemberMap.Kind.CONSTRUCTORS && utils.isEnum(typeElement)) {
-                continue;
-            }
-            if (writer == null) {
-                liNav.addContent(contents.getContent(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
-            } else {
-                writer.addNavDetailLink(memberSummaryBuilder.members(kind), liNav);
-            }
-            if (kind != Kind.METHODS) {
-                addNavGap(liNav);
-            }
-            ulNav.addContent(liNav);
-        }
-        return ulNav;
-    }
-
     /**
      * Return the TypeElement being documented.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
index b4ca115646d..edfec7138a5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
@@ -40,7 +40,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.ConstantsSummaryWriter;
 import jdk.javadoc.internal.doclets.toolkit.Content;
@@ -86,6 +87,8 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
      */
     private HtmlTree summaryTree;
 
+    private final Navigation navBar;
+
     /**
      * Construct a ConstantsSummaryWriter.
      * @param configuration the configuration used in this run
@@ -98,6 +101,7 @@ public ConstantsSummaryWriterImpl(HtmlConfiguration configuration) {
                 configuration.getText("doclet.Constants_Summary"));
         constantsTableHeader = new TableHeader(
                 contents.modifierAndTypeLabel, contents.constantFieldLabel, contents.valueLabel);
+        this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.CONSTANTVALUES, path);
     }
 
     /**
@@ -111,7 +115,8 @@ public Content getHeader() {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
@@ -341,7 +346,8 @@ public void addFooter(Content contentTree) {
         Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : contentTree;
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             contentTree.addContent(htmlTree);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
index 8ba665fc126..b0a9bc4e9be 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java
@@ -38,7 +38,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.ConstructorWriter;
 import jdk.javadoc.internal.doclets.toolkit.Content;
@@ -294,33 +294,6 @@ public void addInheritedSummaryAnchor(TypeElement typeElement, Content inherited
     public void addInheritedSummaryLabel(TypeElement typeElement, Content inheritedTree) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
-        if (link) {
-            return links.createLink(SectionName.CONSTRUCTOR_SUMMARY,
-                    contents.navConstructor);
-        } else {
-            return contents.navConstructor;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(links.createLink(
-                    SectionName.CONSTRUCTOR_DETAIL,
-                    contents.navConstructor));
-        } else {
-            liNav.addContent(contents.navConstructor);
-        }
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
index b646aed1769..5c06a7ab5b1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
@@ -42,6 +42,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder;
@@ -209,6 +211,8 @@ private String getHeaderKey(DeprElementKind kind) {
 
     private HtmlConfiguration configuration;
 
+    private final Navigation navBar;
+
     /**
      * Constructor.
      *
@@ -219,6 +223,7 @@ private String getHeaderKey(DeprElementKind kind) {
     public DeprecatedListWriter(HtmlConfiguration configuration, DocPath filename) {
         super(configuration, filename);
         this.configuration = configuration;
+        this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.DEPRECATED, path);
         NestedClassWriterImpl classW = new NestedClassWriterImpl(this);
         writerMap = new EnumMap<>(DeprElementKind.class);
         for (DeprElementKind kind : DeprElementKind.values()) {
@@ -307,7 +312,8 @@ protected void generateDeprecatedListFile(DeprecatedAPIListBuilder deprapi)
         htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : body;
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(htmlTree);
@@ -378,24 +384,14 @@ public HtmlTree getHeader() {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
         return bodyTree;
     }
 
-    /**
-     * Get the deprecated label.
-     *
-     * @return a content tree for the deprecated label
-     */
-    @Override
-    protected Content getNavLinkDeprecated() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.deprecatedLabel);
-        return li;
-    }
-
     /**
      * Add deprecated information to the documentation tree
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java
index cc73ec5ebe3..e6df1f6059a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java
@@ -27,16 +27,15 @@
 
 import com.sun.source.doctree.AttributeTree;
 import com.sun.source.doctree.AttributeTree.ValueKind;
-import com.sun.source.doctree.DocRootTree;
 import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.EndElementTree;
-import com.sun.source.doctree.LinkTree;
 import com.sun.source.doctree.StartElementTree;
 import com.sun.source.doctree.TextTree;
 import com.sun.source.util.SimpleDocTreeVisitor;
 import com.sun.tools.doclint.HtmlTag;
 import com.sun.tools.doclint.HtmlTag.Attr;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.DocFilesHandler;
@@ -51,15 +50,19 @@
 import javax.lang.model.element.PackageElement;
 import javax.tools.FileObject;
 import javax.tools.JavaFileManager.Location;
+
 import java.util.Collections;
 import java.util.List;
 
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
+
 public class DocFilesHandlerImpl implements DocFilesHandler {
 
     public final Element element;
     public final Location location;
     public final DocPath  source;
     public final HtmlConfiguration configuration;
+    private Navigation navBar;
 
     /**
      * Constructor to construct the DocFilesWriter object.
@@ -171,14 +174,24 @@ private boolean handleHtmlFile(DocFile srcfile, DocPath dstPath) throws DocFileI
         String title = getWindowTitle(docletWriter, dfElement).trim();
         HtmlTree htmlContent = docletWriter.getBody(true, title);
         docletWriter.addTop(htmlContent);
-        docletWriter.addNavLinks(true, htmlContent);
+        PackageElement pkg = (PackageElement) element;
+        this.navBar = new Navigation(pkg, configuration, docletWriter.fixedNavDiv,
+                PageMode.DOCFILE, docletWriter.path);
+        Content mdleLinkContent = docletWriter.getModuleLink(utils.elementUtils.getModuleOf(pkg),
+                docletWriter.contents.moduleLabel);
+        navBar.setNavLinkModule(mdleLinkContent);
+        Content pkgLinkContent = docletWriter.getPackageLink(pkg, docletWriter.contents.packageLabel);
+        navBar.setNavLinkPackage(pkgLinkContent);
+        navBar.setUserHeader(docletWriter.getUserHeaderFooter(true));
+        htmlContent.addContent(navBar.getContent(true));
         List<? extends DocTree> fullBody = utils.getFullBody(dfElement);
         Content bodyContent = docletWriter.commentTagsToContent(null, dfElement, fullBody, false);
 
         docletWriter.addTagsInfo(dfElement, bodyContent);
         htmlContent.addContent(bodyContent);
 
-        docletWriter.addNavLinks(false, htmlContent);
+        navBar.setUserFooter(docletWriter.getUserHeaderFooter(false));
+        htmlContent.addContent(navBar.getContent(false));
         docletWriter.addBottom(htmlContent);
         docletWriter.printHtmlDocument(Collections.emptyList(), false, htmlContent);
         return true;
@@ -301,31 +314,5 @@ public DocFileWriter(HtmlConfiguration configuration, DocPath path, Element e) {
                     throw new AssertionError("unsupported element: " + e.getKind());
             }
         }
-
-        /**
-         * Get the module link.
-         *
-         * @return a content tree for the module link
-         */
-        @Override
-        protected Content getNavLinkModule() {
-            Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(pkg),
-                    contents.moduleLabel);
-            Content li = HtmlTree.LI(linkContent);
-            return li;
-        }
-
-        /**
-         * Get this package link.
-         *
-         * @return a content tree for the package link
-         */
-        @Override
-        protected Content getNavLinkPackage() {
-            Content linkContent = getPackageLink(pkg,
-                    contents.packageLabel);
-            Content li = HtmlTree.LI(linkContent);
-            return li;
-        }
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
index 7b7e3eb8022..514b313cbe7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java
@@ -37,7 +37,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.EnumConstantWriter;
@@ -273,37 +273,4 @@ protected Content getDeprecatedLink(Element member) {
         String name = utils.getFullyQualifiedName(member) + "." + member.getSimpleName();
         return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, member, name);
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
-        if (link) {
-            if (typeElement == null) {
-                return links.createLink(SectionName.ENUM_CONSTANT_SUMMARY,
-                        contents.navEnum);
-            } else {
-                return links.createLink(
-                        SectionName.ENUM_CONSTANTS_INHERITANCE,
-                        configuration.getClassName(typeElement), contents.navEnum);
-            }
-        } else {
-            return contents.navEnum;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(links.createLink(
-                    SectionName.ENUM_CONSTANT_DETAIL,
-                    contents.navEnum));
-        } else {
-            liNav.addContent(contents.navEnum);
-        }
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
index c823107f5bc..4b551737460 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java
@@ -39,7 +39,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.FieldWriter;
@@ -302,38 +302,4 @@ protected Content getDeprecatedLink(Element member) {
         String name = utils.getFullyQualifiedName(member) + "." + member.getSimpleName();
         return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, member, name);
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
-        if (link) {
-            if (typeElement == null) {
-                return links.createLink(
-                        SectionName.FIELD_SUMMARY,
-                        contents.navField);
-            } else {
-                return links.createLink(
-                        SectionName.FIELDS_INHERITANCE,
-                        configuration.getClassName(typeElement), contents.navField);
-            }
-        } else {
-            return contents.navField;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(links.createLink(
-                    SectionName.FIELD_DETAIL,
-                    contents.navField));
-        } else {
-            liNav.addContent(contents.navField);
-        }
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
index 5c7b16f1398..3c033c03a99 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
@@ -29,6 +29,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
@@ -51,6 +53,8 @@ public class HelpWriter extends HtmlDocletWriter {
 
     HtmlTree mainTree = HtmlTree.MAIN();
 
+    private final Navigation navBar;
+
     /**
      * Constructor to construct HelpWriter object.
      * @param configuration the configuration
@@ -59,6 +63,7 @@ public class HelpWriter extends HtmlDocletWriter {
     public HelpWriter(HtmlConfiguration configuration,
                       DocPath filename) {
         super(configuration, filename);
+        this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.HELP, path);
     }
 
     /**
@@ -88,7 +93,8 @@ protected void generateHelpFile() throws DocFileIOException {
                 ? HtmlTree.HEADER()
                 : body;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             body.addContent(htmlTree);
         }
@@ -96,7 +102,8 @@ protected void generateHelpFile() throws DocFileIOException {
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             htmlTree = HtmlTree.FOOTER();
         }
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(htmlTree);
@@ -428,15 +435,4 @@ protected void addHelpFileContents(Content contentTree) {
             contentTree.addContent(divContent);
         }
     }
-
-    /**
-     * Get the help label.
-     *
-     * @return a content tree for the help label
-     */
-    @Override
-    protected Content getNavLinkHelp() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.helpLabel);
-        return li;
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
index f3d7896d8e3..a5424781658 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
@@ -247,11 +247,11 @@ public class HtmlConfiguration extends BaseConfiguration {
 
     protected Set<Character> tagSearchIndexKeys;
 
-    protected final Contents contents;
+    public final Contents contents;
 
     protected final Messages messages;
 
-    protected DocPaths docPaths;
+    public DocPaths docPaths;
 
     /**
      * Creates an object to hold the configuration for a doclet.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 833d3aab0e9..6cc62a8f258 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -69,13 +69,13 @@
 
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.DocType;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
 import jdk.javadoc.internal.doclets.formats.html.markup.Script;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
@@ -490,261 +490,6 @@ public void addBottom(Content htmlTree) {
         htmlTree.addContent(p);
     }
 
-    /**
-     * Adds the navigation bar for the Html page at the top and and the bottom.
-     *
-     * @param header If true print navigation bar at the top of the page else
-     * @param htmlTree the HtmlTree to which the nav links will be added
-     */
-    protected void addNavLinks(boolean header, Content htmlTree) {
-        if (!configuration.nonavbar) {
-            Content tree = (configuration.allowTag(HtmlTag.NAV))
-                    ? HtmlTree.NAV()
-                    : htmlTree;
-            String allClassesId = "allclasses_";
-            HtmlTree navDiv = new HtmlTree(HtmlTag.DIV);
-            fixedNavDiv.setStyle(HtmlStyle.fixedNav);
-            Content skipNavLinks = configuration.getContent("doclet.Skip_navigation_links");
-            if (header) {
-                fixedNavDiv.addContent(HtmlConstants.START_OF_TOP_NAVBAR);
-                navDiv.setStyle(HtmlStyle.topNav);
-                allClassesId += "navbar_top";
-                Content a = links.createAnchor(SectionName.NAVBAR_TOP);
-                //WCAG - Hyperlinks should contain text or an image with alt text - for AT tools
-                navDiv.addContent(a);
-                Content skipLinkContent = HtmlTree.DIV(HtmlStyle.skipNav,
-                        links.createLink(SectionName.SKIP_NAVBAR_TOP, skipNavLinks,
-                        skipNavLinks.toString(), ""));
-                navDiv.addContent(skipLinkContent);
-            } else {
-                tree.addContent(HtmlConstants.START_OF_BOTTOM_NAVBAR);
-                navDiv.setStyle(HtmlStyle.bottomNav);
-                allClassesId += "navbar_bottom";
-                Content a = links.createAnchor(SectionName.NAVBAR_BOTTOM);
-                navDiv.addContent(a);
-                Content skipLinkContent = HtmlTree.DIV(HtmlStyle.skipNav,
-                        links.createLink(SectionName.SKIP_NAVBAR_BOTTOM, skipNavLinks,
-                        skipNavLinks.toString(), ""));
-                navDiv.addContent(skipLinkContent);
-            }
-            if (header) {
-                navDiv.addContent(links.createAnchor(SectionName.NAVBAR_TOP_FIRSTROW));
-            } else {
-                navDiv.addContent(links.createAnchor(SectionName.NAVBAR_BOTTOM_FIRSTROW));
-            }
-            HtmlTree navList = new HtmlTree(HtmlTag.UL);
-            navList.setStyle(HtmlStyle.navList);
-            navList.addAttr(HtmlAttr.TITLE,
-                            configuration.getText("doclet.Navigation"));
-            if (configuration.createoverview) {
-                navList.addContent(getNavLinkContents());
-            }
-            if (configuration.showModules) {
-                if (configuration.modules.size() == 1) {
-                    navList.addContent(getNavLinkModule(configuration.modules.first()));
-                } else if (!configuration.modules.isEmpty()) {
-                    navList.addContent(getNavLinkModule());
-                }
-            }
-            if (configuration.packages.size() == 1) {
-                navList.addContent(getNavLinkPackage(configuration.packages.first()));
-            } else if (!configuration.packages.isEmpty()) {
-                navList.addContent(getNavLinkPackage());
-            }
-            navList.addContent(getNavLinkClass());
-            if(configuration.classuse) {
-                navList.addContent(getNavLinkClassUse());
-            }
-            if(configuration.createtree) {
-                navList.addContent(getNavLinkTree());
-            }
-            if(!(configuration.nodeprecated ||
-                     configuration.nodeprecatedlist)) {
-                navList.addContent(getNavLinkDeprecated());
-            }
-            if(configuration.createindex) {
-                navList.addContent(getNavLinkIndex());
-            }
-            if (!configuration.nohelp) {
-                navList.addContent(getNavLinkHelp());
-            }
-            navDiv.addContent(navList);
-            Content aboutDiv = HtmlTree.DIV(HtmlStyle.aboutLanguage, getUserHeaderFooter(header));
-            navDiv.addContent(aboutDiv);
-            if (header) {
-                fixedNavDiv.addContent(navDiv);
-            } else {
-                tree.addContent(navDiv);
-            }
-            HtmlTree subDiv = new HtmlTree(HtmlTag.DIV);
-            subDiv.setStyle(HtmlStyle.subNav);
-            if (configuration.frames) {
-                Content ulFrames = HtmlTree.UL(HtmlStyle.navList,
-                    getNavShowLists(), getNavHideLists(filename));
-                subDiv.addContent(ulFrames);
-            }
-            HtmlTree ulAllClasses = HtmlTree.UL(HtmlStyle.navList, getNavLinkClassIndex());
-            ulAllClasses.addAttr(HtmlAttr.ID, allClassesId);
-            subDiv.addContent(ulAllClasses);
-            if (header && configuration.createindex) {
-                String searchValueId = "search";
-                String reset = "reset";
-                HtmlTree inputText = HtmlTree.INPUT("text", searchValueId, searchValueId);
-                HtmlTree inputReset = HtmlTree.INPUT(reset, reset, reset);
-                Content searchTxt = configuration.getContent("doclet.search");
-                HtmlTree liInput = HtmlTree.LI(HtmlTree.LABEL(searchValueId, searchTxt));
-                liInput.addContent(inputText);
-                liInput.addContent(inputReset);
-                HtmlTree ulSearch = HtmlTree.UL(HtmlStyle.navListSearch, liInput);
-                subDiv.addContent(ulSearch);
-            }
-            subDiv.addContent(getAllClassesLinkScript(allClassesId));
-            addSummaryDetailLinks(subDiv);
-            if (header) {
-                subDiv.addContent(links.createAnchor(SectionName.SKIP_NAVBAR_TOP));
-                fixedNavDiv.addContent(subDiv);
-                fixedNavDiv.addContent(HtmlConstants.END_OF_TOP_NAVBAR);
-                tree.addContent(fixedNavDiv);
-                HtmlTree paddingDiv = HtmlTree.DIV(HtmlStyle.navPadding, Contents.SPACE);
-                tree.addContent(paddingDiv);
-                Script script = new Script(
-                        "<!--\n"
-                        + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
-                        + "//-->\n");
-                tree.addContent(script.asContent());
-            } else {
-                subDiv.addContent(links.createAnchor(SectionName.SKIP_NAVBAR_BOTTOM));
-                tree.addContent(subDiv);
-                tree.addContent(HtmlConstants.END_OF_BOTTOM_NAVBAR);
-            }
-            if (configuration.allowTag(HtmlTag.NAV)) {
-                htmlTree.addContent(tree);
-            }
-        }
-    }
-
-    /**
-     * Do nothing. This is the default method.
-     */
-    protected void addSummaryDetailLinks(Content navDiv) {
-    }
-
-    /**
-     * Get link to the "overview-summary.html" page.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkContents() {
-        Content linkContent = links.createLink(pathToRoot.resolve(DocPaths.overviewSummary(configuration.frames)),
-                contents.overviewLabel, "", "");
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get link to the module summary page for the module passed.
-     *
-     * @param mdle Module to which link will be generated
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkModule(ModuleElement mdle) {
-        Content linkContent = getModuleLink(mdle, contents.moduleLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the word "Module", to indicate that link is not available here.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkModule() {
-        Content li = HtmlTree.LI(contents.moduleLabel);
-        return li;
-    }
-
-    /**
-     * Get link to the "package-summary.html" page for the package passed.
-     *
-     * @param pkg Package to which link will be generated
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkPackage(PackageElement pkg) {
-        Content linkContent = getPackageLink(pkg, contents.packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the word "Package" , to indicate that link is not available here.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkPackage() {
-        Content li = HtmlTree.LI(contents.packageLabel);
-        return li;
-    }
-
-    /**
-     * Get the word "Use", to indicate that link is not available.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkClassUse() {
-        Content li = HtmlTree.LI(contents.useLabel);
-        return li;
-    }
-
-    /**
-     * Get "FRAMES" link, to switch to the frame version of the output.
-     *
-     * @param link File to be linked, "index.html"
-     * @return a content tree for the link
-     */
-    protected Content getNavShowLists(DocPath link) {
-        DocLink dl = new DocLink(link, path.getPath(), null);
-        Content framesContent = links.createLink(dl, contents.framesLabel, "", "_top");
-        Content li = HtmlTree.LI(framesContent);
-        return li;
-    }
-
-    /**
-     * Get "FRAMES" link, to switch to the frame version of the output.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavShowLists() {
-        return getNavShowLists(pathToRoot.resolve(DocPaths.INDEX));
-    }
-
-    /**
-     * Get "NO FRAMES" link, to switch to the non-frame version of the output.
-     *
-     * @param link File to be linked
-     * @return a content tree for the link
-     */
-    protected Content getNavHideLists(DocPath link) {
-        Content noFramesContent = links.createLink(link, contents.noFramesLabel, "", "_top");
-        Content li = HtmlTree.LI(noFramesContent);
-        return li;
-    }
-
-    /**
-     * Get "Tree" link in the navigation bar. If there is only one package
-     * specified on the command line, then the "Tree" link will be to the
-     * only "package-tree.html" file otherwise it will be to the
-     * "overview-tree.html" file.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkTree() {
-        List<PackageElement> packages = new ArrayList<>(configuration.getSpecifiedPackageElements());
-        DocPath docPath = packages.size() == 1 && configuration.getSpecifiedTypeElements().isEmpty()
-                ? pathString(packages.get(0), DocPaths.PACKAGE_TREE)
-                : pathToRoot.resolve(DocPaths.OVERVIEW_TREE);
-        return HtmlTree.LI(links.createLink(docPath, contents.treeLabel, "", ""));
-    }
-
     /**
      * Get the overview tree link for the main tree.
      *
@@ -758,91 +503,6 @@ protected Content getNavLinkMainTree(String label) {
         return li;
     }
 
-    /**
-     * Get the word "Class", to indicate that class link is not available.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkClass() {
-        Content li = HtmlTree.LI(contents.classLabel);
-        return li;
-    }
-
-    /**
-     * Get "Deprecated" API link in the navigation bar.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkDeprecated() {
-        Content linkContent = links.createLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
-                contents.deprecatedLabel, "", "");
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get link for generated index. If the user has used "-splitindex"
-     * command line option, then link to file "index-files/index-1.html" is
-     * generated otherwise link to file "index-all.html" is generated.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkClassIndex() {
-        Content allClassesContent = links.createLink(pathToRoot.resolve(
-                DocPaths.AllClasses(configuration.frames)),
-                contents.allClassesLabel, "", "");
-        Content li = HtmlTree.LI(allClassesContent);
-        return li;
-    }
-
-    /**
-     * Get link for generated class index.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkIndex() {
-        Content linkContent = links.createLink(pathToRoot.resolve(
-                (configuration.splitindex
-                    ? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1))
-                    : DocPaths.INDEX_ALL)),
-            contents.indexLabel, "", "");
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get help file link. If user has provided a help file, then generate a
-     * link to the user given file, which is already copied to current or
-     * destination directory.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkHelp() {
-        String helpfile = configuration.helpfile;
-        DocPath helpfilenm;
-        if (helpfile.isEmpty()) {
-            helpfilenm = DocPaths.HELP_DOC;
-        } else {
-            DocFile file = DocFile.createFileForInput(configuration, helpfile);
-            helpfilenm = DocPath.create(file.getName());
-        }
-        Content linkContent = links.createLink(pathToRoot.resolve(helpfilenm),
-                contents.helpLabel, "", "");
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Add gap between navigation bar elements.
-     *
-     * @param liNav the content tree to which the gap will be added
-     */
-    protected void addNavGap(Content liNav) {
-        liNav.addContent(Contents.SPACE);
-        liNav.addContent("|");
-        liNav.addContent(Contents.SPACE);
-    }
-
     /**
      * Get table caption.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
index 4090c3ddde4..00f8784b963 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java
@@ -40,7 +40,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
@@ -424,37 +424,4 @@ protected void addReturnType(ExecutableElement method, Content htmltree) {
             htmltree.addContent(Contents.SPACE);
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
-        if (link) {
-            if (typeElement == null) {
-                return links.createLink(
-                        SectionName.METHOD_SUMMARY,
-                        contents.navMethod);
-            } else {
-                return links.createLink(
-                        SectionName.METHODS_INHERITANCE,
-                        configuration.getClassName(typeElement), contents.navMethod);
-            }
-        } else {
-            return contents.navMethod;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(links.createLink(
-                    SectionName.METHOD_DETAIL, contents.navMethod));
-        } else {
-            liNav.addContent(contents.navMethod);
-        }
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
index cd249871e96..910e8b69ec0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
@@ -227,7 +227,8 @@ protected void addNavigationBarHeader(Content body) {
                 ? HtmlTree.HEADER()
                 : body;
         addTop(tree);
-        addNavLinks(true, tree);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        tree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             body.addContent(tree);
         }
@@ -244,7 +245,8 @@ protected void addNavigationBarFooter(Content body) {
         Content htmltree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : body;
-        addNavLinks(false, htmltree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmltree.addContent(navBar.getContent(false));
         addBottom(htmltree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(htmltree);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
index 221edc126cd..10e4fcd048b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
@@ -50,13 +50,14 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.ModuleSummaryWriter;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 
 /**
  * Class to generate file for each module contents in the right-hand frame. This will list all the
@@ -171,6 +172,8 @@ class PackageEntry {
      */
     protected HtmlTree sectionTree = HtmlTree.SECTION();
 
+    private final Navigation navBar;
+
     /**
      * Constructor to construct ModuleWriter object and to generate "moduleName-summary.html" file.
      *
@@ -181,6 +184,7 @@ public ModuleWriterImpl(HtmlConfiguration configuration, ModuleElement mdle) {
         super(configuration, configuration.docPaths.moduleSummary(mdle));
         this.mdle = mdle;
         this.moduleMode = configuration.docEnv.getModuleMode();
+        this.navBar = new Navigation(mdle, configuration, fixedNavDiv, PageMode.MODULE, path);
         computeModulesData();
     }
 
@@ -196,7 +200,13 @@ public Content getModuleHeader(String heading) {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        navBar.setDisplaySummaryModuleDescLink(!utils.getFullBody(mdle).isEmpty() && !configuration.nocomment);
+        navBar.setDisplaySummaryModulesLink(display(requires) || display(indirectModules));
+        navBar.setDisplaySummaryPackagesLink(display(packages) || display(indirectPackages)
+                || display(indirectOpenPackages));
+        navBar.setDisplaySummaryServicesLink(displayServices(uses, usesTrees) || displayServices(provides.keySet(), providesTrees));
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
@@ -913,47 +923,6 @@ public void addModuleTags(Content moduleContentTree) {
         }
     }
 
-    /**
-     * Add summary details to the navigation bar.
-     *
-     * @param subDiv the content tree to which the summary detail links will be added
-     */
-    @Override
-    protected void addSummaryDetailLinks(Content subDiv) {
-        Content div = HtmlTree.DIV(getNavSummaryLinks());
-        subDiv.addContent(div);
-    }
-
-    /**
-     * Get summary links for navigation bar.
-     *
-     * @return the content tree for the navigation summary links
-     */
-    protected Content getNavSummaryLinks() {
-        Content li = HtmlTree.LI(contents.moduleSubNavLabel);
-        li.addContent(Contents.SPACE);
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        Content liNav = new HtmlTree(HtmlTag.LI);
-        liNav.addContent(!utils.getFullBody(mdle).isEmpty() && !configuration.nocomment
-                ? links.createLink(SectionName.MODULE_DESCRIPTION, contents.navModuleDescription)
-                : contents.navModuleDescription);
-        addNavGap(liNav);
-        liNav.addContent((display(requires) || display(indirectModules))
-                ? links.createLink(SectionName.MODULES, contents.navModules)
-                : contents.navModules);
-        addNavGap(liNav);
-        liNav.addContent((display(packages)
-                || display(indirectPackages) || display(indirectOpenPackages))
-                ? links.createLink(SectionName.PACKAGES, contents.navPackages)
-                : contents.navPackages);
-        addNavGap(liNav);
-        liNav.addContent((displayServices(uses, usesTrees) || displayServices(provides.keySet(), providesTrees))
-                ? links.createLink(SectionName.SERVICES, contents.navServices)
-                : contents.navServices);
-        ulNav.addContent(liNav);
-        return ulNav;
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -975,7 +944,8 @@ public void addModuleFooter(Content contentTree) {
         Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : contentTree;
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             contentTree.addContent(htmlTree);
@@ -1017,15 +987,4 @@ public void addPackageDeprecationInfo(Content li, PackageElement pkg) {
             li.addContent(deprDiv);
         }
     }
-
-    /**
-     * Get this module link.
-     *
-     * @return a content tree for the module link
-     */
-    @Override
-    protected Content getNavLinkModule() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.moduleLabel);
-        return li;
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
index 31af5c7308e..bb38b687027 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java
@@ -37,7 +37,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
@@ -205,31 +205,4 @@ protected void addSummaryType(Element member, Content tdSummaryType) {
     protected Content getDeprecatedLink(Element member) {
         return writer.getQualifiedClassLink(LinkInfoImpl.Kind.MEMBER, member);
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
-        if (link) {
-            if (typeElement == null) {
-                return links.createLink(
-                        SectionName.NESTED_CLASS_SUMMARY,
-                        contents.navNested);
-            } else {
-                return links.createLink(
-                        SectionName.NESTED_CLASSES_INHERITANCE,
-                        utils.getFullyQualifiedName(typeElement), contents.navNested);
-            }
-        } else {
-            return contents.navNested;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void addNavDetailLink(boolean link, Content liNav) {
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
index 73a238595cc..9cc858ea82b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
@@ -209,7 +209,8 @@ protected void addNavigationBarHeader(Content body) {
                 ? HtmlTree.HEADER()
                 : body;
         addTop(tree);
-        addNavLinks(true, tree);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        tree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             body.addContent(tree);
         }
@@ -226,7 +227,8 @@ protected void addNavigationBarFooter(Content body) {
         Content tree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : body;
-        addNavLinks(false, tree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        tree.addContent(navBar.getContent(false));
         addBottom(tree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(tree);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
index 7e54b2e905c..063ac738b07 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
@@ -31,6 +31,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
@@ -57,6 +59,8 @@ public class PackageTreeWriter extends AbstractTreeWriter {
      */
     protected PackageElement packageElement;
 
+    private final Navigation navBar;
+
     /**
      * Constructor.
      * @param configuration the configuration
@@ -67,6 +71,7 @@ public PackageTreeWriter(HtmlConfiguration configuration, DocPath path, PackageE
         super(configuration, path,
               new ClassTree(configuration.typeElementCatalog.allClasses(packageElement), configuration));
         this.packageElement = packageElement;
+        this.navBar = new Navigation(packageElement, configuration, fixedNavDiv, PageMode.TREE, path);
     }
 
     /**
@@ -118,7 +123,8 @@ protected void generatePackageTreeFile() throws DocFileIOException {
         HtmlTree tree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : body;
-        addNavLinks(false, tree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        tree.addContent(navBar.getContent(false));
         addBottom(tree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(tree);
@@ -139,7 +145,11 @@ protected HtmlTree getPackageTreeHeader() {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
+                contents.moduleLabel);
+        navBar.setNavLinkModule(linkContent);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
@@ -160,30 +170,4 @@ protected void addLinkToMainTree(Content div) {
         ul.addContent(getNavLinkMainTree(configuration.getText("doclet.All_Packages")));
         div.addContent(ul);
     }
-
-    /**
-     * Get the module link.
-     *
-     * @return a content tree for the module link
-     */
-    @Override
-    protected Content getNavLinkModule() {
-        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
-                contents.moduleLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get link to the package summary page for the package of this tree.
-     *
-     * @return a content tree for the package link
-     */
-    @Override
-    protected Content getNavLinkPackage() {
-        Content linkContent = links.createLink(DocPaths.PACKAGE_SUMMARY,
-                contents.packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
index 2233d8549e3..ebed4a15e10 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
@@ -38,7 +38,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
@@ -63,6 +64,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
     final SortedMap<String, Set<TypeElement>> usingPackageToUsedClasses = new TreeMap<>();
     protected HtmlTree mainTree = HtmlTree.MAIN();
     final String packageUseTableSummary;
+    private final Navigation navBar;
 
     /**
      * Constructor.
@@ -100,6 +102,7 @@ public PackageUseWriter(HtmlConfiguration configuration,
 
         packageUseTableSummary = resources.getText("doclet.Use_Table_Summary",
                 resources.getText("doclet.packages"));
+        this.navBar = new Navigation(packageElement, configuration, fixedNavDiv, PageMode.USE, path);
     }
 
     /**
@@ -140,7 +143,8 @@ protected void generatePackageUseFile() throws DocFileIOException {
         HtmlTree tree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : body;
-        addNavLinks(false, tree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        tree.addContent(navBar.getContent(false));
         addBottom(tree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(tree);
@@ -249,7 +253,11 @@ private HtmlTree getPackageUseHeader() {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
+                contents.moduleLabel);
+        navBar.setNavLinkModule(linkContent);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
@@ -267,54 +275,4 @@ private HtmlTree getPackageUseHeader() {
         }
         return bodyTree;
     }
-
-    /**
-     * Get the module link.
-     *
-     * @return a content tree for the module link
-     */
-    @Override
-    protected Content getNavLinkModule() {
-        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
-                contents.moduleLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    @Override
-    protected Content getNavLinkPackage() {
-        Content linkContent = links.createLink(DocPaths.PACKAGE_SUMMARY,
-                contents.packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the use link.
-     *
-     * @return a content tree for the use link
-     */
-    @Override
-    protected Content getNavLinkClassUse() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.useLabel);
-        return li;
-    }
-
-    /**
-     * Get the tree link.
-     *
-     * @return a content tree for the tree link
-     */
-    @Override
-    protected Content getNavLinkTree() {
-        Content linkContent = links.createLink(DocPaths.PACKAGE_TREE,
-                contents.treeLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
index cb09a5b7b94..1beb5a7f992 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
@@ -40,12 +40,13 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.PackageSummaryWriter;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 
 /**
@@ -79,6 +80,8 @@ public class PackageWriterImpl extends HtmlDocletWriter
      */
     protected HtmlTree sectionTree = HtmlTree.SECTION();
 
+    private final Navigation navBar;
+
     /**
      * Constructor to construct PackageWriter object and to generate
      * "package-summary.html" file in the respective package directory.
@@ -95,6 +98,7 @@ public PackageWriterImpl(HtmlConfiguration configuration, PackageElement package
                 configuration.docPaths.forPackage(packageElement)
                 .resolve(DocPaths.PACKAGE_SUMMARY));
         this.packageElement = packageElement;
+        this.navBar = new Navigation(packageElement, configuration, fixedNavDiv, PageMode.PACKAGE, path);
     }
 
     /**
@@ -107,7 +111,11 @@ public Content getPackageHeader(String heading) {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
+                contents.moduleLabel);
+        navBar.setNavLinkModule(linkContent);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
@@ -346,7 +354,8 @@ public void addPackageFooter(Content contentTree) {
         Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : contentTree;
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             contentTree.addContent(htmlTree);
@@ -361,55 +370,4 @@ public void printDocument(Content contentTree) throws DocFileIOException {
         printHtmlDocument(configuration.metakeywords.getMetaKeywords(packageElement),
                 true, contentTree);
     }
-
-    /**
-     * Get "Use" link for this pacakge in the navigation bar.
-     *
-     * @return a content tree for the class use link
-     */
-    @Override
-    protected Content getNavLinkClassUse() {
-        Content useLink = links.createLink(DocPaths.PACKAGE_USE,
-                contents.useLabel, "", "");
-        Content li = HtmlTree.LI(useLink);
-        return li;
-    }
-
-    /**
-     * Get "Tree" link in the navigation bar. This will be link to the package
-     * tree file.
-     *
-     * @return a content tree for the tree link
-     */
-    @Override
-    protected Content getNavLinkTree() {
-        Content useLink = links.createLink(DocPaths.PACKAGE_TREE,
-                contents.treeLabel, "", "");
-        Content li = HtmlTree.LI(useLink);
-        return li;
-    }
-
-    /**
-     * Get the module link.
-     *
-     * @return a content tree for the module link
-     */
-    @Override
-    protected Content getNavLinkModule() {
-        Content linkContent = getModuleLink(utils.elementUtils.getModuleOf(packageElement),
-                contents.moduleLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Highlight "Package" in the navigation bar, as this is the package page.
-     *
-     * @return a content tree for the package link
-     */
-    @Override
-    protected Content getNavLinkPackage() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.packageLabel);
-        return li;
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
index 46dc452beca..d287f2eb8fa 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java
@@ -37,7 +37,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
@@ -324,38 +324,4 @@ protected Content getDeprecatedLink(Element member) {
         return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, member,
                 utils.getFullyQualifiedName(member));
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Content getNavSummaryLink(TypeElement typeElement, boolean link) {
-        if (link) {
-            if (typeElement == null) {
-                return links.createLink(
-                        SectionName.PROPERTY_SUMMARY,
-                        contents.navProperty);
-            } else {
-                return links.createLink(
-                        SectionName.PROPERTIES_INHERITANCE,
-                        configuration.getClassName(typeElement), contents.navProperty);
-            }
-        } else {
-            return contents.navProperty;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(links.createLink(
-                    SectionName.PROPERTY_DETAIL,
-                    contents.navProperty));
-        } else {
-            liNav.addContent(contents.navProperty);
-        }
-    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java
index 5be1a74e0a8..f76609cde4c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java
@@ -33,6 +33,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.SerializedFormWriter;
@@ -59,12 +61,15 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
      */
     private HtmlTree mainTree = HtmlTree.MAIN();
 
+    private final Navigation navBar;
+
     /**
      * @param configuration the configuration data for the doclet
      */
     public SerializedFormWriterImpl(HtmlConfiguration configuration) {
         super(configuration, DocPaths.SERIALIZED_FORM);
         visibleClasses = configuration.getIncludedTypeElements();
+        this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.SERIALIZEDFORM, path);
     }
 
     /**
@@ -79,7 +84,8 @@ public Content getHeader(String header) {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
@@ -261,7 +267,8 @@ public void addFooter(Content serializedTree) {
         Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
                 ? HtmlTree.FOOTER()
                 : serializedTree;
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             serializedTree.addContent(htmlTree);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java
index 1f6acfde7da..ed8175d36bd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java
@@ -97,7 +97,8 @@ protected void generateIndexFile() throws DocFileIOException {
                 ? HtmlTree.HEADER()
                 : body;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             body.addContent(htmlTree);
         }
@@ -123,7 +124,8 @@ protected void generateIndexFile() throws DocFileIOException {
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             htmlTree = HtmlTree.FOOTER();
         }
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(htmlTree);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java
index d9000fbef4d..179a50a9f67 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java
@@ -125,7 +125,8 @@ protected void generateIndexFile(Character unicode) throws DocFileIOException {
                 ? HtmlTree.HEADER()
                 : body;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             body.addContent(htmlTree);
         }
@@ -145,7 +146,8 @@ protected void generateIndexFile(Character unicode) throws DocFileIOException {
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             htmlTree = HtmlTree.FOOTER();
         }
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(htmlTree);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
index 3691e8d9621..62fad1d47ed 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
@@ -33,7 +33,8 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation;
+import jdk.javadoc.internal.doclets.formats.html.markup.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
@@ -68,6 +69,8 @@ public class TreeWriter extends AbstractTreeWriter {
      */
     private final boolean classesOnly;
 
+    private final Navigation navBar;
+
     /**
      * Constructor to construct TreeWriter object.
      *
@@ -79,6 +82,7 @@ public TreeWriter(HtmlConfiguration configuration, DocPath filename, ClassTree c
         super(configuration, filename, classtree);
         packages = configuration.packages;
         classesOnly = packages.isEmpty();
+        this.navBar = new Navigation(null, configuration, fixedNavDiv, PageMode.TREE, path);
     }
 
     /**
@@ -127,7 +131,8 @@ public void generateTreeFile() throws DocFileIOException {
         } else {
             htmlTree = body;
         }
-        addNavLinks(false, htmlTree);
+        navBar.setUserFooter(getUserHeaderFooter(false));
+        htmlTree.addContent(navBar.getContent(false));
         addBottom(htmlTree);
         if (configuration.allowTag(HtmlTag.FOOTER)) {
             body.addContent(htmlTree);
@@ -186,7 +191,8 @@ protected HtmlTree getTreeHeader() {
                 ? HtmlTree.HEADER()
                 : bodyTree;
         addTop(htmlTree);
-        addNavLinks(true, htmlTree);
+        navBar.setUserHeader(getUserHeaderFooter(true));
+        htmlTree.addContent(navBar.getContent(true));
         if (configuration.allowTag(HtmlTag.HEADER)) {
             bodyTree.addContent(htmlTree);
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java
new file mode 100644
index 00000000000..244a9eb1346
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java
@@ -0,0 +1,1089 @@
+/*
+ * Copyright (c) 2018, 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.javadoc.internal.doclets.formats.html.markup;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedSet;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ModuleElement;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+
+import jdk.javadoc.internal.doclets.formats.html.AbstractMemberWriter;
+import jdk.javadoc.internal.doclets.formats.html.Contents;
+import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
+import jdk.javadoc.internal.doclets.formats.html.SectionName;
+import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.builders.MemberSummaryBuilder;
+import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
+import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
+
+/**
+ * Factory for navigation bar.
+ *
+ * <p>
+ * <b>This is NOT part of any supported API. If you write code that depends on this, you do so at
+ * your own risk. This code and its internal interfaces are subject to change or deletion without
+ * notice.</b>
+ */
+public class Navigation {
+
+    private final HtmlConfiguration configuration;
+    private final Element element;
+    private final Contents contents;
+    private final DocPath path;
+    private final DocPath pathToRoot;
+    private final Links links;
+    private final HtmlTree fixedNavDiv;
+    private final PageMode documentedPage;
+    private Content navLinkModule;
+    private Content navLinkPackage;
+    private Content navLinkClass;
+    private MemberSummaryBuilder memberSummaryBuilder;
+    private boolean displaySummaryModuleDescLink;
+    private boolean displaySummaryModulesLink;
+    private boolean displaySummaryPackagesLink;
+    private boolean displaySummaryServicesLink;
+    private final Map<Position, Deque<Content>> topBottomNavContents;
+    private Content userHeader;
+    private Content userFooter;
+    private final String rowListTitle;
+    private final Content searchLabel;
+    private static final Script FIXED_NAV_SCRIPT = new Script("<!--\n"
+            + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
+            + "//-->\n");
+
+    public enum PageMode {
+        CLASS,
+        CONSTANTVALUES,
+        DEPRECATED,
+        DOCFILE,
+        HELP,
+        INDEX,
+        MODULE,
+        OVERVIEW,
+        PACKAGE,
+        SERIALIZEDFORM,
+        TREE,
+        USE;
+    }
+
+    enum Position {
+        BOTTOM("allclasses_navbar_bottom", HtmlConstants.START_OF_BOTTOM_NAVBAR, HtmlConstants.END_OF_BOTTOM_NAVBAR),
+        TOP("allclasses_navbar_top", HtmlConstants.START_OF_TOP_NAVBAR, HtmlConstants.END_OF_TOP_NAVBAR);
+
+        final String allClassesLinkId;
+        final Content startOfNav;
+        final Content endOfNav;
+
+        Position(String allClassesLinkId, Content startOfNav, Content endOfNav) {
+            this.allClassesLinkId = allClassesLinkId;
+            this.startOfNav = startOfNav;
+            this.endOfNav = endOfNav;
+        }
+
+        String allClassesLinkId() {
+            return allClassesLinkId;
+        }
+
+        Content startOfNav() {
+            return startOfNav;
+        }
+
+        Content endOfNav() {
+            return endOfNav;
+        }
+
+        Script allClassesLinkScript() {
+            return new Script("<!--\n"
+                    + "  allClassesLink = document.getElementById(")
+                    .appendStringLiteral(allClassesLinkId)
+                    .append(");\n"
+                            + "  if(window==top) {\n"
+                            + "    allClassesLink.style.display = \"block\";\n"
+                            + "  }\n"
+                            + "  else {\n"
+                            + "    allClassesLink.style.display = \"none\";\n"
+                            + "  }\n"
+                            + "  //-->\n");
+        }
+    }
+
+    /**
+     * Creates a {@code Navigation} object for a specific file, to be written in a specific HTML
+     * version.
+     *
+     * @param element element being documented. null if its not an element documentation page
+     * @param configuration the configuration object
+     * @param fixedNavDiv the fixed navigation for the header navigation
+     * @param page the kind of page being documented
+     * @param path the DocPath object
+     */
+    public Navigation(Element element, HtmlConfiguration configuration, HtmlTree fixedNavDiv,
+            PageMode page, DocPath path) {
+        this.configuration = configuration;
+        this.element = element;
+        this.fixedNavDiv = fixedNavDiv;
+        this.contents = configuration.contents;
+        this.documentedPage = page;
+        this.path = path;
+        this.pathToRoot = path.parent().invert();
+        this.links = new Links(path, configuration.htmlVersion);
+        this.topBottomNavContents = new HashMap<>();
+        this.rowListTitle = configuration.getText("doclet.Navigation");
+        this.searchLabel = configuration.getContent("doclet.search");
+        populateNavContents(Position.TOP);
+        populateNavContents(Position.BOTTOM);
+    }
+
+    /**
+     * Populate the navigation contents for top and bottom navigation
+     *
+     * @param position the position of the navigation bar on the page
+     */
+    private void populateNavContents(Position position) {
+        Deque<Content> queue = new ArrayDeque<>();
+        Content skipNavLinks = configuration.getContent("doclet.Skip_navigation_links");
+        switch (position) {
+            case TOP:
+                queue.addLast(links.createAnchor(SectionName.NAVBAR_TOP));
+                queue.addLast(links.createLink(SectionName.SKIP_NAVBAR_TOP, skipNavLinks,
+                        skipNavLinks.toString(), ""));
+                queue.addLast(links.createAnchor(SectionName.NAVBAR_TOP_FIRSTROW));
+                queue.addLast(links.createAnchor(SectionName.SKIP_NAVBAR_TOP));
+                topBottomNavContents.put(position, queue);
+                break;
+            case BOTTOM:
+                queue.addLast(links.createAnchor(SectionName.NAVBAR_BOTTOM));
+                queue.addLast(links.createLink(SectionName.SKIP_NAVBAR_BOTTOM, skipNavLinks,
+                        skipNavLinks.toString(), ""));
+                queue.addLast(links.createAnchor(SectionName.NAVBAR_BOTTOM_FIRSTROW));
+                queue.addLast(links.createAnchor(SectionName.SKIP_NAVBAR_BOTTOM));
+                topBottomNavContents.put(position, queue);
+                break;
+            default:
+                break;
+        }
+    }
+
+    public Navigation setNavLinkModule(Content navLinkModule) {
+        this.navLinkModule = navLinkModule;
+        return this;
+    }
+
+    public Navigation setNavLinkPackage(Content navLinkPackage) {
+        this.navLinkPackage = navLinkPackage;
+        return this;
+    }
+
+    public Navigation setNavLinkClass(Content navLinkClass) {
+        this.navLinkClass = navLinkClass;
+        return this;
+    }
+
+    public Navigation setMemberSummaryBuilder(MemberSummaryBuilder memberSummaryBuilder) {
+        this.memberSummaryBuilder = memberSummaryBuilder;
+        return this;
+    }
+
+    public Navigation setDisplaySummaryModuleDescLink(boolean displaySummaryModuleDescLink) {
+        this.displaySummaryModuleDescLink = displaySummaryModuleDescLink;
+        return this;
+    }
+
+    public Navigation setDisplaySummaryModulesLink(boolean displaySummaryModulesLink) {
+        this.displaySummaryModulesLink = displaySummaryModulesLink;
+        return this;
+    }
+
+    public Navigation setDisplaySummaryPackagesLink(boolean displaySummaryPackagesLink) {
+        this.displaySummaryPackagesLink = displaySummaryPackagesLink;
+        return this;
+    }
+
+    public Navigation setDisplaySummaryServicesLink(boolean displaySummaryServicesLink) {
+        this.displaySummaryServicesLink = displaySummaryServicesLink;
+        return this;
+    }
+
+    public Navigation setUserHeader(Content userHeader) {
+        this.userHeader = userHeader;
+        return this;
+    }
+
+    public Navigation setUserFooter(Content userFooter) {
+        this.userFooter = userFooter;
+        return this;
+    }
+
+    /**
+     * Add the links for the main navigation.
+     *
+     * @param tree the content tree to which the main navigation will added
+     */
+    private void addMainNavLinks(Content tree) {
+        switch (documentedPage) {
+            case OVERVIEW:
+                addActivePageLink(tree, contents.overviewLabel, configuration.createoverview);
+                addModuleLink(tree);
+                addPackageLink(tree);
+                addPageLabel(tree, contents.classLabel, true);
+                addPageLabel(tree, contents.useLabel, configuration.classuse);
+                addTreeLink(tree);
+                addDeprecatedLink(tree);
+                addIndexLink(tree);
+                addHelpLink(tree);
+                break;
+            case MODULE:
+                addOverviewLink(tree);
+                addActivePageLink(tree, contents.moduleLabel, configuration.showModules);
+                addPackageLink(tree);
+                addPageLabel(tree, contents.classLabel, true);
+                addPageLabel(tree, contents.useLabel, configuration.classuse);
+                addTreeLink(tree);
+                addDeprecatedLink(tree);
+                addIndexLink(tree);
+                addHelpLink(tree);
+                break;
+            case PACKAGE:
+                addOverviewLink(tree);
+                addModuleOfElementLink(tree);
+                addActivePageLink(tree, contents.packageLabel, true);
+                addPageLabel(tree, contents.classLabel, true);
+                if (configuration.classuse) {
+                    addContentToTree(tree, links.createLink(DocPaths.PACKAGE_USE,
+                            contents.useLabel, "", ""));
+                }
+                if (configuration.createtree) {
+                    addContentToTree(tree, links.createLink(DocPaths.PACKAGE_TREE,
+                            contents.treeLabel, "", ""));
+                }
+                addDeprecatedLink(tree);
+                addIndexLink(tree);
+                addHelpLink(tree);
+                break;
+            case CLASS:
+                addOverviewLink(tree);
+                addModuleOfElementLink(tree);
+                addPackageSummaryLink(tree);
+                addActivePageLink(tree, contents.classLabel, true);
+                if (configuration.classuse) {
+                    addContentToTree(tree, links.createLink(DocPaths.CLASS_USE.resolve(path.basename()),
+                            contents.useLabel));
+                }
+                if (configuration.createtree) {
+                    addContentToTree(tree, links.createLink(DocPaths.PACKAGE_TREE,
+                            contents.treeLabel, "", ""));
+                }
+                addDeprecatedLink(tree);
+                addIndexLink(tree);
+                addHelpLink(tree);
+                break;
+            case USE:
+                addOverviewLink(tree);
+                addModuleOfElementLink(tree);
+                if (element instanceof PackageElement) {
+                    addPackageSummaryLink(tree);
+                    addPageLabel(tree, contents.classLabel, true);
+                } else {
+                    addPackageOfElementLink(tree);
+                    addContentToTree(tree, navLinkClass);
+                }
+                addActivePageLink(tree, contents.useLabel, configuration.classuse);
+                if (element instanceof PackageElement) {
+                    addContentToTree(tree, links.createLink(DocPaths.PACKAGE_TREE, contents.treeLabel));
+                } else {
+                    addContentToTree(tree, configuration.utils.isEnclosingPackageIncluded((TypeElement) element)
+                            ? links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_TREE), contents.treeLabel)
+                            : links.createLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), contents.treeLabel));
+                }
+                addDeprecatedLink(tree);
+                addIndexLink(tree);
+                addHelpLink(tree);
+                break;
+            case TREE:
+                addOverviewLink(tree);
+                if (element == null) {
+                    addPageLabel(tree, contents.moduleLabel, configuration.showModules);
+                    addPageLabel(tree, contents.packageLabel, true);
+                } else {
+                    addModuleOfElementLink(tree);
+                    addPackageSummaryLink(tree);
+                }
+                addPageLabel(tree, contents.classLabel, true);
+                addPageLabel(tree, contents.useLabel, configuration.classuse);
+                addActivePageLink(tree, contents.treeLabel, configuration.createtree);
+                addDeprecatedLink(tree);
+                addIndexLink(tree);
+                addHelpLink(tree);
+                break;
+            case DEPRECATED:
+            case INDEX:
+            case HELP:
+                addOverviewLink(tree);
+                addModuleLink(tree);
+                addPackageLink(tree);
+                addPageLabel(tree, contents.classLabel, true);
+                addPageLabel(tree, contents.useLabel, configuration.classuse);
+                addTreeLink(tree);
+                if (documentedPage == PageMode.DEPRECATED) {
+                    addActivePageLink(tree, contents.deprecatedLabel, !(configuration.nodeprecated
+                            || configuration.nodeprecatedlist));
+                } else {
+                    addDeprecatedLink(tree);
+                }
+                if (documentedPage == PageMode.INDEX) {
+                    addActivePageLink(tree, contents.indexLabel, configuration.createindex);
+                } else {
+                    addIndexLink(tree);
+                }
+                if (documentedPage == PageMode.HELP) {
+                    addActivePageLink(tree, contents.helpLabel, !configuration.nohelp);
+                } else {
+                    addHelpLink(tree);
+                }
+                break;
+            case CONSTANTVALUES:
+            case SERIALIZEDFORM:
+                addOverviewLink(tree);
+                addModuleLink(tree);
+                addPackageLink(tree);
+                addPageLabel(tree, contents.classLabel, true);
+                addPageLabel(tree, contents.useLabel, configuration.classuse);
+                addTreeLink(tree);
+                addDeprecatedLink(tree);
+                addIndexLink(tree);
+                addHelpLink(tree);
+                break;
+            case DOCFILE:
+                addOverviewLink(tree);
+                addModuleOfElementLink(tree);
+                addContentToTree(tree, navLinkPackage);
+                addPageLabel(tree, contents.classLabel, true);
+                addPageLabel(tree, contents.useLabel, configuration.classuse);
+                addTreeLink(tree);
+                addDeprecatedLink(tree);
+                addIndexLink(tree);
+                addHelpLink(tree);
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Add the summary links to the sub-navigation.
+     *
+     * @param tree the content tree to which the sub-navigation will added
+     */
+    private void addSummaryLinks(Content tree) {
+        List<Content> listContents = new ArrayList<>();
+        switch (documentedPage) {
+            case CLASS:
+                if (element.getKind() == ElementKind.ANNOTATION_TYPE) {
+                    addAnnotationTypeSummaryLink("doclet.navField",
+                            VisibleMemberMap.Kind.ANNOTATION_TYPE_FIELDS, listContents);
+                    addAnnotationTypeSummaryLink("doclet.navAnnotationTypeRequiredMember",
+                            VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_REQUIRED, listContents);
+                    addAnnotationTypeSummaryLink("doclet.navAnnotationTypeOptionalMember",
+                            VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_OPTIONAL, listContents);
+                } else {
+                    TypeElement typeElement = (TypeElement) element;
+                    for (VisibleMemberMap.Kind kind : VisibleMemberMap.Kind.summarySet) {
+                        if (kind == VisibleMemberMap.Kind.ENUM_CONSTANTS && !configuration.utils.isEnum(typeElement)) {
+                            continue;
+                        }
+                        if (kind == VisibleMemberMap.Kind.CONSTRUCTORS && configuration.utils.isEnum(typeElement)) {
+                            continue;
+                        }
+                        AbstractMemberWriter writer
+                                = ((AbstractMemberWriter) memberSummaryBuilder.getMemberSummaryWriter(kind));
+                        if (writer == null) {
+                            addContentToList(listContents,
+                                    contents.getContent(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
+                        } else {
+                            addTypeSummaryLink(memberSummaryBuilder.members(kind),
+                                    memberSummaryBuilder.getVisibleMemberMap(kind), listContents);
+                        }
+                    }
+                }
+                if (!listContents.isEmpty()) {
+                    Content li = HtmlTree.LI(contents.summaryLabel);
+                    li.addContent(Contents.SPACE);
+                    tree.addContent(li);
+                    addListToNav(listContents, tree);
+                }
+                break;
+            case MODULE:
+                if (displaySummaryModuleDescLink) {
+                    addContentToList(listContents,
+                            links.createLink(SectionName.MODULE_DESCRIPTION, contents.navModuleDescription));
+                } else {
+                    addContentToList(listContents, contents.navModuleDescription);
+                }
+                if (displaySummaryModulesLink) {
+                    addContentToList(listContents,
+                            links.createLink(SectionName.MODULES, contents.navModules));
+                } else {
+                    addContentToList(listContents, contents.navModules);
+                }
+                if (displaySummaryPackagesLink) {
+                    addContentToList(listContents,
+                            links.createLink(SectionName.PACKAGES, contents.navPackages));
+                } else {
+                    addContentToList(listContents, contents.navPackages);
+                }
+                if (displaySummaryServicesLink) {
+                    addContentToList(listContents,
+                            links.createLink(SectionName.SERVICES, contents.navServices));
+                } else {
+                    addContentToList(listContents, contents.navServices);
+                }
+                if (!listContents.isEmpty()) {
+                    Content li = HtmlTree.LI(contents.moduleSubNavLabel);
+                    li.addContent(Contents.SPACE);
+                    tree.addContent(li);
+                    addListToNav(listContents, tree);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Add the navigation summary link.
+     *
+     * @param members members to be linked
+     * @param visibleMemberMap the visible inherited members map
+     * @param listContents the list of contents
+     */
+    private void addTypeSummaryLink(SortedSet<? extends Element> members,
+            VisibleMemberMap visibleMemberMap, List<Content> listContents) {
+        if (!members.isEmpty()) {
+            addTypeSummaryLink(null, visibleMemberMap.kind, true, listContents);
+            return;
+        }
+
+        SortedSet<TypeElement> visibleClasses = visibleMemberMap.getVisibleClasses();
+        for (TypeElement t : visibleClasses) {
+            if (!configuration.getVisibleMemberMap(t, visibleMemberMap.kind).getLeafMembers().isEmpty()) {
+                addTypeSummaryLink(null, visibleMemberMap.kind, true, listContents);
+                return;
+            }
+        }
+        addTypeSummaryLink(null, visibleMemberMap.kind, false, listContents);
+    }
+
+    /**
+     * Add the navigation Type summary link.
+     *
+     * @param typeElement the Type being documented
+     * @param kind the kind of member being documented
+     * @param link true if the members are listed and need to be linked
+     * @param listContents the list of contents to which the summary will be added
+     */
+    private void addTypeSummaryLink(TypeElement typeElement, VisibleMemberMap.Kind kind, boolean link,
+            List<Content> listContents) {
+        switch (kind) {
+            case CONSTRUCTORS:
+                if (link) {
+                    addContentToList(listContents, links.createLink(SectionName.CONSTRUCTOR_SUMMARY,
+                            contents.navConstructor));
+                } else {
+                    addContentToList(listContents, contents.navConstructor);
+                }
+                break;
+            case ENUM_CONSTANTS:
+                if (link) {
+                    if (typeElement == null) {
+                        addContentToList(listContents, links.createLink(SectionName.ENUM_CONSTANT_SUMMARY,
+                                contents.navEnum));
+                    } else {
+                        addContentToList(listContents, links.createLink(
+                                SectionName.ENUM_CONSTANTS_INHERITANCE,
+                                configuration.getClassName(typeElement), contents.navEnum));
+                    }
+                } else {
+                    addContentToList(listContents, contents.navEnum);
+                }
+                break;
+            case FIELDS:
+                if (link) {
+                    if (typeElement == null) {
+                        addContentToList(listContents,
+                                links.createLink(SectionName.FIELD_SUMMARY, contents.navField));
+                    } else {
+                        addContentToList(listContents, links.createLink(SectionName.FIELDS_INHERITANCE,
+                                configuration.getClassName(typeElement), contents.navField));
+                    }
+                } else {
+                    addContentToList(listContents, contents.navField);
+                }
+                break;
+            case METHODS:
+                if (link) {
+                    if (typeElement == null) {
+                        addContentToList(listContents,
+                                links.createLink(SectionName.METHOD_SUMMARY, contents.navMethod));
+                    } else {
+                        addContentToList(listContents, links.createLink(SectionName.METHODS_INHERITANCE,
+                                configuration.getClassName(typeElement), contents.navMethod));
+                    }
+                } else {
+                    addContentToList(listContents, contents.navMethod);
+                }
+                break;
+            case INNER_CLASSES:
+                if (link) {
+                    if (typeElement == null) {
+                        addContentToList(listContents,
+                                links.createLink(SectionName.NESTED_CLASS_SUMMARY, contents.navNested));
+                    } else {
+                        addContentToList(listContents, links.createLink(SectionName.NESTED_CLASSES_INHERITANCE,
+                                configuration.utils.getFullyQualifiedName(typeElement), contents.navNested));
+                    }
+                } else {
+                    addContentToList(listContents, contents.navNested);
+                }
+                break;
+            case PROPERTIES:
+                if (link) {
+                    if (typeElement == null) {
+                        addContentToList(listContents,
+                                links.createLink(SectionName.PROPERTY_SUMMARY, contents.navProperty));
+                    } else {
+                        addContentToList(listContents, links.createLink(SectionName.PROPERTIES_INHERITANCE,
+                                configuration.getClassName(typeElement), contents.navProperty));
+                    }
+                } else {
+                    addContentToList(listContents, contents.navProperty);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Add the navigation Type summary link.
+     *
+     * @param label the label to be added
+     * @param type the kind of member being documented
+     * @param listContents the list of contents to which the summary will be added
+     */
+    private void addAnnotationTypeSummaryLink(String label, VisibleMemberMap.Kind type, List<Content> listContents) {
+        AbstractMemberWriter writer = ((AbstractMemberWriter) memberSummaryBuilder.
+                getMemberSummaryWriter(type));
+        if (writer == null) {
+            addContentToList(listContents, contents.getContent(label));
+        } else {
+            boolean link = !memberSummaryBuilder.getVisibleMemberMap(type).noVisibleMembers();
+            switch (type) {
+                case ANNOTATION_TYPE_FIELDS:
+                    if (link) {
+                        addContentToList(listContents, links.createLink(SectionName.ANNOTATION_TYPE_FIELD_SUMMARY,
+                                contents.navField));
+                    } else {
+                        addContentToList(listContents, contents.navField);
+                    }
+                    break;
+                case ANNOTATION_TYPE_MEMBER_REQUIRED:
+                    if (link) {
+                        addContentToList(listContents, links.createLink(
+                                SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY,
+                                contents.navAnnotationTypeRequiredMember));
+                    } else {
+                        addContentToList(listContents, contents.navAnnotationTypeRequiredMember);
+                    }
+                    break;
+                case ANNOTATION_TYPE_MEMBER_OPTIONAL:
+                    if (link) {
+                        addContentToList(listContents, links.createLink(
+                                SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY,
+                                contents.navAnnotationTypeOptionalMember));
+                    } else {
+                        addContentToList(listContents, contents.navAnnotationTypeOptionalMember);
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Add the detail links to sub-navigation.
+     *
+     * @param tree the content tree to which the links will be added
+     */
+    private void addDetailLinks(Content tree) {
+        switch (documentedPage) {
+            case CLASS:
+                List<Content> listContents = new ArrayList<>();
+                if (element.getKind() == ElementKind.ANNOTATION_TYPE) {
+                    addAnnotationTypeDetailLink(listContents);
+                } else {
+                    TypeElement typeElement = (TypeElement) element;
+                    for (VisibleMemberMap.Kind kind : VisibleMemberMap.Kind.detailSet) {
+                        AbstractMemberWriter writer
+                                = ((AbstractMemberWriter) memberSummaryBuilder.
+                                        getMemberSummaryWriter(kind));
+                        if (kind == VisibleMemberMap.Kind.ENUM_CONSTANTS && !configuration.utils.isEnum(typeElement)) {
+                            continue;
+                        }
+                        if (kind == VisibleMemberMap.Kind.CONSTRUCTORS && configuration.utils.isEnum(typeElement)) {
+                            continue;
+                        }
+                        if (writer == null) {
+                            addContentToList(listContents, contents.getContent(VisibleMemberMap.Kind.getNavLinkLabels(kind)));
+                        } else {
+                            addTypeDetailLink(kind, !memberSummaryBuilder.members(kind).isEmpty(), listContents);
+                        }
+                    }
+                }
+                if (!listContents.isEmpty()) {
+                    Content li = HtmlTree.LI(contents.detailLabel);
+                    li.addContent(Contents.SPACE);
+                    tree.addContent(li);
+                    addListToNav(listContents, tree);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Add the navigation Type detail link.
+     *
+     * @param kind the kind of member being documented
+     * @param link true if the members are listed and need to be linked
+     * @param listContents the list of contents to which the detail will be added.
+     */
+    protected void addTypeDetailLink(VisibleMemberMap.Kind kind, boolean link, List<Content> listContents) {
+        switch (kind) {
+            case CONSTRUCTORS:
+                if (link) {
+                    addContentToList(listContents, links.createLink(SectionName.CONSTRUCTOR_DETAIL, contents.navConstructor));
+                } else {
+                    addContentToList(listContents, contents.navConstructor);
+                }
+                break;
+            case ENUM_CONSTANTS:
+                if (link) {
+                    addContentToList(listContents, links.createLink(SectionName.ENUM_CONSTANT_DETAIL, contents.navEnum));
+                } else {
+                    addContentToList(listContents, contents.navEnum);
+                }
+                break;
+            case FIELDS:
+                if (link) {
+                    addContentToList(listContents, links.createLink(SectionName.FIELD_DETAIL, contents.navField));
+                } else {
+                    addContentToList(listContents, contents.navField);
+                }
+                break;
+            case METHODS:
+                if (link) {
+                    addContentToList(listContents, links.createLink(SectionName.METHOD_DETAIL, contents.navMethod));
+                } else {
+                    addContentToList(listContents, contents.navMethod);
+                }
+                break;
+            case PROPERTIES:
+                if (link) {
+                    addContentToList(listContents, links.createLink(SectionName.PROPERTY_DETAIL, contents.navProperty));
+                } else {
+                    addContentToList(listContents, contents.navProperty);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Add the navigation Annotation Type detail link.
+     *
+     * @param listContents the list of contents to which the annotation detail will be added.
+     */
+    protected void addAnnotationTypeDetailLink(List<Content> listContents) {
+        TypeElement annotationType = (TypeElement) element;
+        AbstractMemberWriter writerField
+                = ((AbstractMemberWriter) memberSummaryBuilder.
+                        getMemberSummaryWriter(VisibleMemberMap.Kind.ANNOTATION_TYPE_FIELDS));
+        AbstractMemberWriter writerOptional
+                = ((AbstractMemberWriter) memberSummaryBuilder.
+                        getMemberSummaryWriter(VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_OPTIONAL));
+        AbstractMemberWriter writerRequired
+                = ((AbstractMemberWriter) memberSummaryBuilder.
+                        getMemberSummaryWriter(VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_REQUIRED));
+        if (writerField != null) {
+            addAnnotationTypeDetailLink(VisibleMemberMap.Kind.ANNOTATION_TYPE_FIELDS,
+                    !configuration.utils.getAnnotationFields(annotationType).isEmpty(),
+                    listContents);
+        } else {
+            addContentToList(listContents, contents.navField);
+        }
+        if (writerOptional != null) {
+            addAnnotationTypeDetailLink(VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_OPTIONAL,
+                    !annotationType.getAnnotationMirrors().isEmpty(), listContents);
+        } else if (writerRequired != null) {
+            addAnnotationTypeDetailLink(VisibleMemberMap.Kind.ANNOTATION_TYPE_MEMBER_REQUIRED,
+                    !annotationType.getAnnotationMirrors().isEmpty(), listContents);
+        } else {
+            addContentToList(listContents, contents.navAnnotationTypeMember);
+        }
+    }
+
+    /**
+     * Add the navigation Annotation Type detail link.
+     *
+     * @param type the kind of member being documented
+     * @param link true if the member details need to be linked
+     * @param listContents the list of contents to which the annotation detail will be added.
+     */
+    protected void addAnnotationTypeDetailLink(VisibleMemberMap.Kind type, boolean link, List<Content> listContents) {
+        switch (type) {
+            case ANNOTATION_TYPE_FIELDS:
+                if (link) {
+                    addContentToList(listContents, links.createLink(SectionName.ANNOTATION_TYPE_FIELD_DETAIL,
+                            contents.navField));
+                } else {
+                    addContentToList(listContents, contents.navField);
+                }
+                break;
+            case ANNOTATION_TYPE_MEMBER_REQUIRED:
+            case ANNOTATION_TYPE_MEMBER_OPTIONAL:
+                if (link) {
+                    addContentToList(listContents, links.createLink(SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL,
+                            contents.navAnnotationTypeMember));
+                } else {
+                    addContentToList(listContents, contents.navAnnotationTypeMember);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void addContentToList(List<Content> listContents, Content tree) {
+        listContents.add(HtmlTree.LI(tree));
+    }
+
+    private void addContentToTree(Content tree, Content content) {
+        tree.addContent(HtmlTree.LI(content));
+    }
+
+    private void addListToNav(List<Content> listContents, Content tree) {
+        int count = 0;
+        for (Content liContent : listContents) {
+            if (count < listContents.size() - 1) {
+                liContent.addContent(Contents.SPACE);
+                liContent.addContent("|");
+                liContent.addContent(Contents.SPACE);
+            }
+            tree.addContent(liContent);
+            count++;
+        }
+    }
+
+    private void addActivePageLink(Content tree, Content label, boolean display) {
+        if (display) {
+            tree.addContent(HtmlTree.LI(HtmlStyle.navBarCell1Rev, label));
+        }
+    }
+
+    private void addPageLabel(Content tree, Content label, boolean display) {
+        if (display) {
+            tree.addContent(HtmlTree.LI(label));
+        }
+    }
+
+    private void addOverviewLink(Content tree) {
+        if (configuration.createoverview) {
+            tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.overviewSummary(configuration.frames)),
+                    contents.overviewLabel, "", "")));
+        }
+    }
+
+    private void addModuleLink(Content tree) {
+        if (configuration.showModules) {
+            if (configuration.modules.size() == 1) {
+                ModuleElement mdle = configuration.modules.first();
+                boolean included = configuration.utils.isIncluded(mdle);
+                tree.addContent(HtmlTree.LI((included)
+                        ? links.createLink(pathToRoot.resolve(configuration.docPaths.moduleSummary(mdle)), contents.moduleLabel, "", "")
+                        : contents.moduleLabel));
+            } else if (!configuration.modules.isEmpty()) {
+                addPageLabel(tree, contents.moduleLabel, true);
+            }
+        }
+    }
+
+    private void addModuleOfElementLink(Content tree) {
+        if (configuration.showModules) {
+            tree.addContent(HtmlTree.LI(navLinkModule));
+        }
+    }
+
+    private void addPackageLink(Content tree) {
+        if (configuration.packages.size() == 1) {
+            PackageElement packageElement = configuration.packages.first();
+            boolean included = packageElement != null && configuration.utils.isIncluded(packageElement);
+            if (!included) {
+                for (PackageElement p : configuration.packages) {
+                    if (p.equals(packageElement)) {
+                        included = true;
+                        break;
+                    }
+                }
+            }
+            if (included || packageElement == null) {
+                tree.addContent(HtmlTree.LI(links.createLink(
+                        pathToRoot.resolve(configuration.docPaths.forPackage(packageElement).resolve(DocPaths.PACKAGE_SUMMARY)),
+                        contents.packageLabel)));
+            } else {
+                DocLink crossPkgLink = configuration.extern.getExternalLink(
+                        configuration.utils.getPackageName(packageElement), pathToRoot,
+                        DocPaths.PACKAGE_SUMMARY.getPath());
+                if (crossPkgLink != null) {
+                    tree.addContent(HtmlTree.LI(links.createLink(crossPkgLink, contents.packageLabel)));
+                } else {
+                    tree.addContent(HtmlTree.LI(contents.packageLabel));
+                }
+            }
+        } else if (!configuration.packages.isEmpty()) {
+            addPageLabel(tree, contents.packageLabel, true);
+        }
+    }
+
+    private void addPackageOfElementLink(Content tree) {
+        tree.addContent(HtmlTree.LI(links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY),
+                contents.packageLabel)));
+    }
+
+    private void addPackageSummaryLink(Content tree) {
+        tree.addContent(HtmlTree.LI(links.createLink(DocPaths.PACKAGE_SUMMARY, contents.packageLabel)));
+    }
+
+    private void addTreeLink(Content tree) {
+        if (configuration.createtree) {
+            List<PackageElement> packages = new ArrayList<>(configuration.getSpecifiedPackageElements());
+            DocPath docPath = packages.size() == 1 && configuration.getSpecifiedTypeElements().isEmpty()
+                    ? pathToRoot.resolve(configuration.docPaths.forPackage(packages.get(0)).resolve(DocPaths.PACKAGE_TREE))
+                    : pathToRoot.resolve(DocPaths.OVERVIEW_TREE);
+            tree.addContent(HtmlTree.LI(links.createLink(docPath, contents.treeLabel, "", "")));
+        }
+    }
+
+    private void addDeprecatedLink(Content tree) {
+        if (!(configuration.nodeprecated || configuration.nodeprecatedlist)) {
+            tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
+                    contents.deprecatedLabel, "", "")));
+        }
+    }
+
+    private void addIndexLink(Content tree) {
+        if (configuration.createindex) {
+            tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(
+                    (configuration.splitindex
+                            ? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1))
+                            : DocPaths.INDEX_ALL)),
+                    contents.indexLabel, "", "")));
+        }
+    }
+
+    private void addHelpLink(Content tree) {
+        if (!configuration.nohelp) {
+            String helpfile = configuration.helpfile;
+            DocPath helpfilenm;
+            if (helpfile.isEmpty()) {
+                helpfilenm = DocPaths.HELP_DOC;
+            } else {
+                DocFile file = DocFile.createFileForInput(configuration, helpfile);
+                helpfilenm = DocPath.create(file.getName());
+            }
+            tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(helpfilenm),
+                    contents.helpLabel, "", "")));
+        }
+    }
+
+    /**
+     * Add "FRAMES" link, to switch to the frame version of the output.
+     *
+     * @param tree the content tree to which the link will be added
+     */
+    private void addNavShowLists(Content tree) {
+        DocLink dl = new DocLink(pathToRoot.resolve(DocPaths.INDEX), path.getPath(), null);
+        Content framesContent = links.createLink(dl, contents.framesLabel, "", "_top");
+        tree.addContent(HtmlTree.LI(framesContent));
+    }
+
+    /**
+     * Add "NO FRAMES" link, to switch to the non-frame version of the output.
+     *
+     * @param tree the content tree to which the link will be added
+     */
+    private void addNavHideLists(Content tree) {
+        Content noFramesContent = links.createLink(path.basename(), contents.noFramesLabel, "", "_top");
+        tree.addContent(HtmlTree.LI(noFramesContent));
+    }
+
+    private void addNavLinkClassIndex(Content tree) {
+        Content allClassesContent = links.createLink(pathToRoot.resolve(
+                DocPaths.AllClasses(configuration.frames)),
+                contents.allClassesLabel, "", "");
+        tree.addContent(HtmlTree.LI(allClassesContent));
+    }
+
+    private void addSearch(Content tree) {
+        String searchValueId = "search";
+        String reset = "reset";
+        HtmlTree inputText = HtmlTree.INPUT("text", searchValueId, searchValueId);
+        HtmlTree inputReset = HtmlTree.INPUT(reset, reset, reset);
+        HtmlTree liInput = HtmlTree.LI(HtmlTree.LABEL(searchValueId, searchLabel));
+        liInput.addContent(inputText);
+        liInput.addContent(inputReset);
+        HtmlTree ulSearch = HtmlTree.UL(HtmlStyle.navListSearch, liInput);
+        tree.addContent(ulSearch);
+    }
+
+    private void addAllClassesLinkScript(Content tree, boolean top) {
+        Content div = HtmlTree.DIV(top
+                ? Position.TOP.allClassesLinkScript().asContent()
+                : Position.BOTTOM.allClassesLinkScript().asContent());
+        Content div_noscript = HtmlTree.DIV(contents.noScriptMessage);
+        Content noScript = HtmlTree.NOSCRIPT(div_noscript);
+        div.addContent(noScript);
+        tree.addContent(div);
+    }
+
+    private void addFixedNavScript(Content tree) {
+        tree.addContent(FIXED_NAV_SCRIPT.asContent());
+    }
+
+    /**
+     * Get the navigation content.
+     *
+     * @param top true if the top navigation bar is to be printed
+     * @return the navigation contents
+     */
+    public Content getContent(boolean top) {
+        Content contentTree = new ContentBuilder();
+        if (!configuration.nonavbar) {
+            Deque<Content> queue;
+            Content tree = (configuration.htmlVersion == HtmlVersion.HTML5)
+                    ? HtmlTree.NAV()
+                    : contentTree;
+            HtmlTree navDiv = new HtmlTree(HtmlTag.DIV);
+            if (top) {
+                queue = topBottomNavContents.get(Position.TOP);
+                fixedNavDiv.addContent(Position.TOP.startOfNav());
+                navDiv.setStyle(HtmlStyle.topNav);
+            } else {
+                queue = topBottomNavContents.get(Position.BOTTOM);
+                tree.addContent(Position.BOTTOM.startOfNav());
+                navDiv.setStyle(HtmlStyle.bottomNav);
+            }
+            navDiv.addContent(queue.poll());
+            HtmlTree skipLinkDiv = HtmlTree.DIV(HtmlStyle.skipNav, queue.poll());
+            navDiv.addContent(skipLinkDiv);
+            navDiv.addContent(queue.poll());
+            HtmlTree navList = new HtmlTree(HtmlTag.UL);
+            navList.setStyle(HtmlStyle.navList);
+            navList.addAttr(HtmlAttr.TITLE, rowListTitle);
+            fixedNavDiv.setStyle(HtmlStyle.fixedNav);
+            addMainNavLinks(navList);
+            navDiv.addContent(navList);
+            Content aboutDiv = HtmlTree.DIV(HtmlStyle.aboutLanguage, top ? userHeader : userFooter);
+            navDiv.addContent(aboutDiv);
+            if (top) {
+                fixedNavDiv.addContent(navDiv);
+            } else {
+                tree.addContent(navDiv);
+            }
+            HtmlTree subDiv = new HtmlTree(HtmlTag.DIV);
+            subDiv.setStyle(HtmlStyle.subNav);
+            HtmlTree ulFrames = new HtmlTree(HtmlTag.UL);
+            ulFrames.setStyle(HtmlStyle.navList);
+            if (!configuration.nonavbar) {
+                if (configuration.frames) {
+                    addNavShowLists(ulFrames);
+                    addNavHideLists(ulFrames);
+                }
+            }
+            subDiv.addContent(ulFrames);
+            HtmlTree ulAllClasses = new HtmlTree(HtmlTag.UL);
+            ulAllClasses.setStyle(HtmlStyle.navList);
+            ulAllClasses.addAttr(HtmlAttr.ID, top
+                    ? Position.TOP.allClassesLinkId()
+                    : Position.BOTTOM.allClassesLinkId());
+            addNavLinkClassIndex(ulAllClasses);
+            subDiv.addContent(ulAllClasses);
+            if (top && configuration.createindex) {
+                addSearch(subDiv);
+            }
+            addAllClassesLinkScript(subDiv, top);
+            HtmlTree div = new HtmlTree(HtmlTag.DIV);
+            // Add the summary links if present.
+            HtmlTree ulNavSummary = new HtmlTree(HtmlTag.UL);
+            ulNavSummary.setStyle(HtmlStyle.subNavList);
+            addSummaryLinks(ulNavSummary);
+            div.addContent(ulNavSummary);
+            // Add the detail links if present.
+            HtmlTree ulNavDetail = new HtmlTree(HtmlTag.UL);
+            ulNavDetail.setStyle(HtmlStyle.subNavList);
+            addDetailLinks(ulNavDetail);
+            div.addContent(ulNavDetail);
+            subDiv.addContent(div);
+            subDiv.addContent(queue.poll());
+            if (top) {
+                fixedNavDiv.addContent(subDiv);
+                fixedNavDiv.addContent(Position.TOP.endOfNav());
+                tree.addContent(fixedNavDiv);
+                HtmlTree paddingDiv = HtmlTree.DIV(HtmlStyle.navPadding, Contents.SPACE);
+                tree.addContent(paddingDiv);
+                addFixedNavScript(tree);
+            } else {
+                tree.addContent(subDiv);
+                tree.addContent(Position.BOTTOM.endOfNav());
+            }
+            return tree;
+        }
+        return contentTree;
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java
index 5c5fdc60ebf..a8977f3a41b 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8185151
+ * @bug 8185151 8196200
  * @summary test that navigation summary links are not linked when there are no dependencies
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -69,10 +69,10 @@ public void checkNavbarWithServices1(Path base) throws Exception {
         checkExit(Exit.OK);
 
         checkOutput("m/module-summary.html", true,
-                "<a href=\"#module.description\">Description</a>&nbsp;|"
-                + "&nbsp;Modules&nbsp;|"
-                + "&nbsp;<a href=\"#packages.summary\">Packages</a>&nbsp;|"
-                + "&nbsp;<a href=\"#services.summary\">Services</a>");
+                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
+                + "<li>Modules&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#services.summary\">Services</a></li>");
 
     }
 
@@ -93,10 +93,10 @@ public void checkNavbarWithServices2(Path base) throws Exception {
         checkExit(Exit.OK);
 
         checkOutput("m/module-summary.html", true,
-                "<a href=\"#module.description\">Description</a>&nbsp;|"
-                + "&nbsp;Modules&nbsp;|"
-                + "&nbsp;<a href=\"#packages.summary\">Packages</a>&nbsp;|"
-                + "&nbsp;<a href=\"#services.summary\">Services</a>");
+                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
+                + "<li>Modules&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#services.summary\">Services</a></li>");
 
     }
 
@@ -115,9 +115,10 @@ public void checkNavbarWithoutServices(Path base) throws Exception {
         checkExit(Exit.OK);
 
         checkOutput("m/module-summary.html", true,
-                "Description&nbsp;|&nbsp;Modules&nbsp;|"
-                + "&nbsp;<a href=\"#packages.summary\">Packages</a>&nbsp;|"
-                + "&nbsp;Services");
+                "<li>Description&nbsp;|&nbsp;</li>\n"
+                + "<li>Modules&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+                + "<li>Services</li>");
     }
 
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
index f127af8756c..d557b1c4dc2 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
@@ -26,7 +26,7 @@
  * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363
  *      8168766 8168688 8162674 8160196 8175799 8174974 8176778 8177562 8175218
  *      8175823 8166306 8178043 8181622 8183511 8169819 8074407 8183037 8191464
-        8164407 8192007 8182765
+        8164407 8192007 8182765 8196200
  * @summary Test modules support in javadoc.
  * @author bpatel
  * @library ../lib
@@ -940,9 +940,10 @@ void checkModuleSummary() {
         checkOutput("moduleA/module-summary.html", true,
                 "<ul class=\"subNavList\">\n"
                 + "<li>Module:&nbsp;</li>\n"
-                + "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;<a "
-                + "href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;<a href=\"#packages.summary\">"
-                + "Packages</a>&nbsp;|&nbsp;Services</li>\n"
+                + "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+                + "<li>Services</li>\n"
                 + "</ul>",
                 "<!-- ============ MODULES SUMMARY =========== -->\n"
                 + "<a id=\"modules.summary\">\n"
@@ -964,9 +965,10 @@ void checkModuleSummary() {
                 + "</td>\n"
                 + "</tr>");
         checkOutput("moduleB/module-summary.html", true,
-                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;Modules&nbsp;|&nbsp;"
-                + "<a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;<a href=\"#services.summary\">"
-                + "Services</a></li>",
+                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
+                + "<li>Modules&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#services.summary\">Services</a></li>",
                 "<!-- ============ PACKAGES SUMMARY =========== -->\n"
                 + "<a id=\"packages.summary\">\n"
                 + "<!--   -->\n"
@@ -1180,8 +1182,10 @@ void checkModuleModeCommon() {
                 + " Package Link: <a href=\"moduletags/testpkgmdltags/package-summary.html\"><code>testpkgmdltags</code></a>.<br></div>\n"
                 + "</td>");
         checkOutput("moduleA/module-summary.html", true,
-                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;<a href=\"#modules.summary\">"
-                + "Modules</a>&nbsp;|&nbsp;<a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;Services</li>",
+                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+                + "<li>Services</li>",
                 "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
                 + "<td class=\"colLast\"><a href=\"../moduleB/testpkgmdlB/package-summary.html\">testpkgmdlB</a></td>\n");
         checkOutput("moduleB/module-summary.html", true,
@@ -1189,8 +1193,10 @@ void checkModuleModeCommon() {
                 + "<td class=\"colLast\">\n"
                 + "<div class=\"block\">With a test description for uses.</div>\n</td>\n");
         checkOutput("moduletags/module-summary.html", true,
-                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;<a href=\"#modules.summary\">Modules"
-                + "</a>&nbsp;|&nbsp;<a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;Services</li>",
+                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+                + "<li>Services</li>",
                 "<table class=\"requiresSummary\">\n"
                 + "<caption><span>Indirect Requires</span><span class=\"tabEnd\">&nbsp;</span></caption>",
                 "<td class=\"colFirst\">transitive</td>\n"
@@ -1267,8 +1273,10 @@ void checkModuleModeApi(boolean found) {
                 "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
                 + "<td class=\"colLast\">&nbsp;</td>");
         checkOutput("moduleB/module-summary.html", found,
-                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;Modules&nbsp;|&nbsp;"
-                + "<a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;<a href=\"#services.summary\">Services</a></li>",
+                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
+                + "<li>Modules&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#services.summary\">Services</a></li>",
                 "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
                 + "<td class=\"colLast\">&nbsp;</td>",
                 "<table class=\"packagesSummary\">\n"
@@ -1329,8 +1337,10 @@ void checkModuleModeAll(boolean found) {
                 + "<td class=\"colSecond\">None</td>\n"
                 + "<td class=\"colLast\">&nbsp;</td>");
         checkOutput("moduleB/module-summary.html", found,
-                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;<a href=\"#modules.summary\">"
-                + "Modules</a>&nbsp;|&nbsp;<a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;<a href=\"#services.summary\">Services</a></li>",
+                "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
+                + "<li><a href=\"#services.summary\">Services</a></li>",
                 "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
                 + "<td class=\"colSecond\">None</td>\n"
                 + "<td class=\"colSecond\">All Modules</td>\n"
diff --git a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
index 95b9c308306..2bdda855a62 100644
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
@@ -24,24 +24,36 @@
 /*
  * @test
  * @bug      4131628 4664607 7025314 8023700 7198273 8025633 8026567 8081854 8150188 8151743 8196027 8182765
+ *           8196200
  * @summary  Make sure the Next/Prev Class links iterate through all types.
  *           Make sure the navagation is 2 columns, not 3.
  * @author   jamieh
- * @library  ../lib
+ * @library  /tools/lib ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
- * @build    JavadocTester
+ * @build    toolbox.ToolBox JavadocTester
  * @run main TestNavigation
  */
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import toolbox.*;
+
 public class TestNavigation extends JavadocTester {
 
+    public final ToolBox tb;
     public static void main(String... args) throws Exception {
         TestNavigation tester = new TestNavigation();
-        tester.runTests();
+        tester.runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    public TestNavigation() {
+        tb = new ToolBox();
     }
 
     @Test
-    void test() {
+    void test(Path ignore) {
         javadoc("-d", "out",
                 "-overview", testSrc("overview.html"),
                 "-sourcepath", testSrc,
@@ -96,7 +108,7 @@ void test() {
     }
 
     @Test
-    void test_html4() {
+    void test_html4(Path ignore) {
         javadoc("-d", "out-html4",
                 "-html4",
                 "-overview", testSrc("overview.html"),
@@ -135,7 +147,7 @@ void test_html4() {
 
     // Test for checking additional padding to offset the fixed navigation bar in HTML5.
     @Test
-    void test1() {
+    void test1(Path ignore) {
         javadoc("-d", "out-1",
                 "-html5",
                 "-sourcepath", testSrc,
@@ -167,7 +179,7 @@ void test1() {
 
     // Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified for HTML4.
     @Test
-    void test2() {
+    void test2(Path ignore) {
         javadoc("-d", "out-2",
                 "-nonavbar",
                 "-sourcepath", testSrc,
@@ -197,7 +209,7 @@ void test2() {
 
     // Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified for HTML5.
     @Test
-    void test3() {
+    void test3(Path ignore) {
         javadoc("-d", "out-3",
                 "-html5",
                 "-nonavbar",
@@ -227,4 +239,89 @@ void test3() {
                 + "</script>\n"
                 + "</nav>");
     }
+
+    @Test
+    void test4(Path base) throws IOException {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                "package pkg1; public class A {\n"
+                + "    /**\n"
+                + "     * Class with members.\n"
+                + "     */\n"
+                + "    public static class X {\n"
+                + "        /**\n"
+                + "         * A ctor\n"
+                + "         */\n"
+                + "        public X() {\n"
+                + "        }\n"
+                + "        /**\n"
+                + "         * A field\n"
+                + "         */\n"
+                + "        public int field;\n"
+                + "        /**\n"
+                + "         * A method\n"
+                + "         */\n"
+                + "        public void method() {\n"
+                + "        }\n"
+                + "        /**\n"
+                + "         * An inner class\n"
+                + "         */\n"
+                + "        public static class IC {\n"
+                + "        }\n"
+                + "    }\n"
+                + "    /**\n"
+                + "     * Class with all inherited members.\n"
+                + "     */\n"
+                + "    public static class Y extends X {\n"
+                + "    }\n"
+                + "}");
+
+        tb.writeJavaFiles(src,
+                "package pkg1; public class C {\n"
+                + "}");
+
+        tb.writeJavaFiles(src,
+                "package pkg1; public interface InterfaceWithNoMembers {\n"
+                + "}");
+
+        javadoc("-d", "out-4",
+                "-sourcepath", src.toString(),
+                "pkg1");
+        checkExit(Exit.OK);
+
+        checkOrder("pkg1/A.X.html",
+                "Summary",
+                "<li><a href=\"#nested.class.summary\">Nested</a>&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#field.summary\">Field</a>&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#constructor.summary\">Constr</a>&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#method.summary\">Method</a></li>");
+
+        checkOrder("pkg1/A.Y.html",
+                "Summary",
+                "<li><a href=\"#nested.class.summary\">Nested</a>&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#field.summary\">Field</a>&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#constructor.summary\">Constr</a>&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#method.summary\">Method</a></li>");
+
+        checkOrder("pkg1/A.X.IC.html",
+                "Summary",
+                "<li>Nested&nbsp;|&nbsp;</li>",
+                "<li>Field&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#constructor.summary\">Constr</a>&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#method.summary\">Method</a></li>");
+
+        checkOrder("pkg1/C.html",
+                "Summary",
+                "<li>Nested&nbsp;|&nbsp;</li>",
+                "<li>Field&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#constructor.summary\">Constr</a>&nbsp;|&nbsp;</li>",
+                "<li><a href=\"#method.summary\">Method</a></li>");
+
+        checkOrder("pkg1/InterfaceWithNoMembers.html",
+                "Summary",
+                "<li>Nested&nbsp;|&nbsp;</li>",
+                "<li>Field&nbsp;|&nbsp;</li>",
+                "<li>Constr&nbsp;|&nbsp;</li>",
+                "<li>Method</li>");
+    }
 }

From be8bccfaa836e033adfc98a4c63aaee27bc8bc17 Mon Sep 17 00:00:00 2001
From: mikael <unknown>
Date: Mon, 9 Apr 2018 10:19:33 -0700
Subject: [PATCH 102/196] 8201263: Trailing backslash in VS120COMNTOOLS leads
 to ugly error message when running tests Reviewed-by: erikj

---
 test/TestCommon.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/TestCommon.gmk b/test/TestCommon.gmk
index f039288b1a4..73db6f22642 100644
--- a/test/TestCommon.gmk
+++ b/test/TestCommon.gmk
@@ -446,7 +446,7 @@ JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA}
 # Give aot tests access to Visual Studio installation
 ifneq ($(VS120COMNTOOLS), )
-  JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS=$(shell $(GETMIXEDPATH) "$(VS120COMNTOOLS)")
+  JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS="$(shell $(GETMIXEDPATH) "$(patsubst %\,%,$(VS120COMNTOOLS))")"
 endif
 # Set other vm and test options
 JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)

From 7d91e74b924936f10984504b96679752308ac0d2 Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Mon, 9 Apr 2018 19:23:01 +0200
Subject: [PATCH 103/196] 8201236: Straighten out dtrace build logic
 Reviewed-by: erikj

---
 make/common/NativeCompilation.gmk             |   3 +-
 make/hotspot/gensrc/GensrcDtrace.gmk          |  52 ++++++++
 make/hotspot/lib/CompileDtraceLibraries.gmk   |  60 ++++++++++
 make/hotspot/lib/CompileDtracePreJvm.gmk      |  39 ------
 make/hotspot/lib/CompileJvm.gmk               |  77 +-----------
 make/hotspot/lib/CompileLibraries.gmk         |   7 +-
 ...DtracePostJvm.gmk => JvmDtraceObjects.gmk} | 111 ++++--------------
 make/hotspot/lib/JvmFlags.gmk                 |  97 +++++++++++++++
 .../src/native/dtrace/generateJvmOffsets.cpp  |  24 ++--
 .../src/native/dtrace/generateJvmOffsets.h    |  43 -------
 10 files changed, 247 insertions(+), 266 deletions(-)
 create mode 100644 make/hotspot/lib/CompileDtraceLibraries.gmk
 delete mode 100644 make/hotspot/lib/CompileDtracePreJvm.gmk
 rename make/hotspot/lib/{CompileDtracePostJvm.gmk => JvmDtraceObjects.gmk} (52%)
 create mode 100644 make/hotspot/lib/JvmFlags.gmk
 delete mode 100644 make/hotspot/src/native/dtrace/generateJvmOffsets.h

diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index da4d24d1c4c..9533493fd5c 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -297,7 +297,7 @@ define SetupCompileNativeFileBody
     endif
 
     $$($1_OBJ): $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
-        $$($1_VARDEPS_FILE) | $$($$($1_BASE)_BUILD_INFO)
+        $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE) | $$($$($1_BASE)_BUILD_INFO)
 	$$(call LogInfo, Compiling $$($1_FILENAME) (for $$($$($1_BASE)_BASENAME)))
 	$$(call MakeDir, $$(@D))
         ifneq ($(TOOLCHAIN_TYPE), microsoft)
@@ -366,6 +366,7 @@ endef
 #   EXCLUDE_PATTERN exclude files matching any of these substrings
 #   EXTRA_FILES List of extra files not in any of the SRC dirs
 #   EXTRA_OBJECT_FILES List of extra object files to include when linking
+#   EXTRA_DEPS List of extra dependencies to be added to each compiled file
 #   VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
 #   RC_FLAGS flags for RC.
 #   EMBED_MANIFEST if true, embed manifest on Windows.
diff --git a/make/hotspot/gensrc/GensrcDtrace.gmk b/make/hotspot/gensrc/GensrcDtrace.gmk
index e8a5bdb3ef4..3a013c71808 100644
--- a/make/hotspot/gensrc/GensrcDtrace.gmk
+++ b/make/hotspot/gensrc/GensrcDtrace.gmk
@@ -54,4 +54,56 @@ ifeq ($(call check-jvm-feature, dtrace), true)
   TARGETS += $(patsubst $(DTRACE_SOURCE_DIR)/%.d, \
       $(DTRACE_GENSRC_DIR)/%.h, $(wildcard $(DTRACE_SOURCE_DIR)/*.d))
 
+  ifeq ($(OPENJDK_TARGET_OS), solaris)
+    ############################################################################
+    # First we need to generate the dtraceGenOffsets tool. When run, this will
+    # produce two header files and a C++ file. Note that generateJvmOffsets.cpp
+    # is using the same JVM_CFLAGS as libjvm.so.
+
+    # Include support files that will setup JVM compiler flags.
+    include lib/JvmFeatures.gmk
+    include lib/JvmFlags.gmk
+
+    # We cannot compile until the JVMTI gensrc has finished
+    JVMTI_H := $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles/jvmti.h
+
+    $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \
+        NAME := dtraceGenOffsets, \
+        TYPE := EXECUTABLE, \
+        SRC := $(TOPDIR)/make/hotspot/src/native/dtrace, \
+        TOOLCHAIN := $(TOOLCHAIN_BUILD), \
+        LDFLAGS := -m64, \
+        CFLAGS := -m64 $(JVM_CFLAGS), \
+        EXTRA_DEPS := $(JVMTI_H), \
+        OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \
+        OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \
+    ))
+
+    DTRACE_GEN_OFFSETS_TOOL := $(BUILD_DTRACE_GEN_OFFSETS_TARGET)
+
+    # Argument 1: Output filename
+    # Argument 2: dtrace-gen-offset tool command line option
+    define SetupDtraceOffsetsGeneration
+      $1: $$(BUILD_DTRACE_GEN_OFFSETS)
+	$$(call LogInfo, Generating dtrace $2 file $$(@F))
+	$$(call MakeDir, $$(@D))
+	$$(call ExecuteWithLog, $$@, ( $$(DTRACE_GEN_OFFSETS_TOOL) -$$(strip $2) > $$@ ) )
+
+      TARGETS += $1
+    endef
+
+    JVM_OFFSETS_H := $(DTRACE_GENSRC_DIR)/JvmOffsets.h
+    JVM_OFFSETS_CPP := $(DTRACE_GENSRC_DIR)/JvmOffsets.cpp
+    JVM_OFFSETS_INDEX_H := $(DTRACE_GENSRC_DIR)/JvmOffsetsIndex.h
+
+    ############################################################################
+    # Run the dtrace-gen-offset tool to generate these three files.
+    # The generated JvmOffsets.cpp is compiled with the rest of libjvm.
+    # The header files are used by libjvm_db and jhelper.d, respectively.
+
+    $(eval $(call SetupDtraceOffsetsGeneration, $(JVM_OFFSETS_H), header))
+    $(eval $(call SetupDtraceOffsetsGeneration, $(JVM_OFFSETS_INDEX_H), index))
+    $(eval $(call SetupDtraceOffsetsGeneration, $(JVM_OFFSETS_CPP), table))
+  endif
+
 endif
diff --git a/make/hotspot/lib/CompileDtraceLibraries.gmk b/make/hotspot/lib/CompileDtraceLibraries.gmk
new file mode 100644
index 00000000000..391f1355472
--- /dev/null
+++ b/make/hotspot/lib/CompileDtraceLibraries.gmk
@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2013, 2018, 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.
+#
+
+ifeq ($(call check-jvm-feature, dtrace), true)
+  ifeq ($(OPENJDK_TARGET_OS), solaris)
+
+    ############################################################################
+    # Build the stand-alone dtrace libraries.
+
+    LIBJVM_DTRACE_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_dtrace
+    $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DTRACE, \
+        NAME := jvm_dtrace, \
+        OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
+        SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \
+        CFLAGS := -m64 -G -mt -KPIC, \
+        LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
+        LIBS := $(LIBDL) -lthread -ldoor, \
+        MAPFILE := $(TOPDIR)/make/mapfiles/libjvm_dtrace/mapfile-vers, \
+        OBJECT_DIR := $(LIBJVM_DTRACE_OUTPUTDIR)/objs, \
+    ))
+
+    # Note that libjvm_db.c has tests for COMPILER2, but this was never set by
+    # the old build.
+    LIBJVM_DB_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_db
+    $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DB, \
+        NAME := jvm_db, \
+        OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
+        SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \
+        CFLAGS := -I$(DTRACE_GENSRC_DIR) -m64 -G -mt -KPIC, \
+        LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
+        MAPFILE := $(TOPDIR)/make/mapfiles/libjvm_db/mapfile-vers, \
+        OBJECT_DIR := $(LIBJVM_DB_OUTPUTDIR)/objs, \
+    ))
+
+    TARGETS += $(BUILD_LIBJVM_DTRACE) $(BUILD_LIBJVM_DB)
+
+  endif
+endif
diff --git a/make/hotspot/lib/CompileDtracePreJvm.gmk b/make/hotspot/lib/CompileDtracePreJvm.gmk
deleted file mode 100644
index 66031394af8..00000000000
--- a/make/hotspot/lib/CompileDtracePreJvm.gmk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2016, 2018, 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.
-#
-
-ifeq ($(call check-jvm-feature, dtrace), true)
-  ifeq ($(OPENJDK_TARGET_OS), solaris)
-    # These files are are generated by CompileDtrace.gmk but consumed by
-    # CompileJvm.gmk
-    DTRACE_OBJ := $(JVM_OUTPUTDIR)/objs/dtrace.o
-    DTRACE_JHELPER_OBJ := $(JVM_OUTPUTDIR)/objs/dtrace_jhelper.o
-    DTRACE_EXTRA_OBJECT_FILES := $(DTRACE_OBJ) $(DTRACE_JHELPER_OBJ)
-
-    # Since we cannot generate JvmOffsets.cpp as part of the gensrc step,
-    # we need this special hook to get it to compile with the rest of libjvm.
-    JVM_OFFSETS_CPP := $(DTRACE_SUPPORT_DIR)/JvmOffsets.cpp
-    DTRACE_EXTRA_SOURCE_FILES := $(JVM_OFFSETS_CPP)
-  endif
-endif
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index 49d24a80700..61f84a145af 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -24,11 +24,13 @@
 #
 
 # Include support files that will setup compiler flags due to the selected
-# jvm feature set, and specific file overrides.
+# jvm feature set, specific file overrides, and general flags.
 include lib/JvmFeatures.gmk
 include lib/JvmOverrideFiles.gmk
+include lib/JvmFlags.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot/lib/CompileJvm.gmk))
+# Include support files that will setup DTRACE_EXTRA_OBJECT_FILES.
+include lib/JvmDtraceObjects.gmk
 
 ################################################################################
 # Setup compilation of the main Hotspot native library (libjvm).
@@ -39,71 +41,6 @@ JVM_MAPFILE := $(JVM_OUTPUTDIR)/mapfile
 ################################################################################
 # Platform independent setup
 
-# This variable may be added to by a custom extension
-JVM_SRC_ROOTS += $(TOPDIR)/src/hotspot
-
-JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \
-        $d/share \
-        $d/os/$(HOTSPOT_TARGET_OS) \
-        $d/os/$(HOTSPOT_TARGET_OS_TYPE) \
-        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH) \
-        $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH) \
-    ))) \
-    $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles \
-    $(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles \
-    #
-
-JVM_CFLAGS_INCLUDES += \
-    $(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \
-    -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \
-    -I$(TOPDIR)/src/hotspot/share/precompiled \
-    -I$(TOPDIR)/src/hotspot/share/include \
-    -I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \
-    -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
-    -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
-    -I$(TOPDIR)/src/java.base/share/native/libjimage \
-    #
-
-# INCLUDE_SUFFIX_* is only meant for including the proper
-# platform files. Don't use it to guard code. Use the value of
-# HOTSPOT_TARGET_CPU_DEFINE etc. instead.
-# Remaining TARGET_ARCH_* is needed to select the cpu specific
-# sources for 64-bit ARM ports (arm versus aarch64).
-JVM_CFLAGS_TARGET_DEFINES += \
-    -DTARGET_ARCH_$(HOTSPOT_TARGET_CPU_ARCH) \
-    -DINCLUDE_SUFFIX_OS=_$(HOTSPOT_TARGET_OS) \
-    -DINCLUDE_SUFFIX_CPU=_$(HOTSPOT_TARGET_CPU_ARCH) \
-    -DINCLUDE_SUFFIX_COMPILER=_$(HOTSPOT_TOOLCHAIN_TYPE) \
-    -DTARGET_COMPILER_$(HOTSPOT_TOOLCHAIN_TYPE) \
-    -D$(HOTSPOT_TARGET_CPU_DEFINE) \
-    -DHOTSPOT_LIB_ARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' \
-    #
-
-ifeq ($(DEBUG_LEVEL), release)
-  # For hotspot, release builds differ internally between "optimized" and "product"
-  # in that "optimize" does not define PRODUCT.
-  ifneq ($(HOTSPOT_DEBUG_LEVEL), optimized)
-    JVM_CFLAGS_DEBUGLEVEL := -DPRODUCT
-  endif
-else ifeq ($(DEBUG_LEVEL), fastdebug)
-  JVM_CFLAGS_DEBUGLEVEL := -DASSERT
-  ifeq ($(filter $(OPENJDK_TARGET_OS), windows aix), )
-    # NOTE: Old build did not define CHECK_UNHANDLED_OOPS on Windows and AIX.
-    JVM_CFLAGS_DEBUGLEVEL += -DCHECK_UNHANDLED_OOPS
-  endif
-else ifeq ($(DEBUG_LEVEL), slowdebug)
-  # _NMT_NOINLINE_ informs NMT that no inlining is done by the compiler
-  JVM_CFLAGS_DEBUGLEVEL := -DASSERT -D_NMT_NOINLINE_
-endif
-
-JVM_CFLAGS += \
-    $(JVM_CFLAGS_DEBUGLEVEL) \
-    $(JVM_CFLAGS_TARGET_DEFINES) \
-    $(JVM_CFLAGS_FEATURES) \
-    $(JVM_CFLAGS_INCLUDES) \
-    $(EXTRA_CFLAGS) \
-    #
-
 JVM_LDFLAGS += \
     $(SHARED_LIBRARY_FLAGS) \
     $(JVM_LDFLAGS_FEATURES) \
@@ -142,11 +79,6 @@ CFLAGS_VM_VERSION := \
     -DCPU='"$(OPENJDK_TARGET_CPU_VM_VERSION)"' \
     #
 
-# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
-ifeq ($(USE_PRECOMPILED_HEADER), false)
-  JVM_CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
-endif
-
 ################################################################################
 # Platform specific setup
 
@@ -214,7 +146,6 @@ $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
     SRC := $(JVM_SRC_DIRS), \
-    EXTRA_FILES := $(DTRACE_EXTRA_SOURCE_FILES), \
     EXCLUDES := $(JVM_EXCLUDES), \
     EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \
     EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
diff --git a/make/hotspot/lib/CompileLibraries.gmk b/make/hotspot/lib/CompileLibraries.gmk
index 5224de78534..9b04c406421 100644
--- a/make/hotspot/lib/CompileLibraries.gmk
+++ b/make/hotspot/lib/CompileLibraries.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2018, 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
@@ -31,11 +31,8 @@ include NativeCompilation.gmk
 
 include HotspotCommon.gmk
 
-# The dtrace setup must be done both before and after CompileJvm.gmk, due to
-# intricate dependencies.
-include lib/CompileDtracePreJvm.gmk
 include lib/CompileJvm.gmk
-include lib/CompileDtracePostJvm.gmk
+include lib/CompileDtraceLibraries.gmk
 
 ifeq ($(BUILD_GTEST), true)
   include lib/CompileGtest.gmk
diff --git a/make/hotspot/lib/CompileDtracePostJvm.gmk b/make/hotspot/lib/JvmDtraceObjects.gmk
similarity index 52%
rename from make/hotspot/lib/CompileDtracePostJvm.gmk
rename to make/hotspot/lib/JvmDtraceObjects.gmk
index ad0b23ef9b9..6f7f4059645 100644
--- a/make/hotspot/lib/CompileDtracePostJvm.gmk
+++ b/make/hotspot/lib/JvmDtraceObjects.gmk
@@ -23,64 +23,26 @@
 # questions.
 #
 
-################################################################################
-# Support for dtrace integration with libjvm, and stand-alone dtrace library
-# compilation.
-
 ifeq ($(call check-jvm-feature, dtrace), true)
-  ##############################################################################
-
   ifeq ($(OPENJDK_TARGET_OS), solaris)
+
     ############################################################################
-    # Integrate with libjvm. Here we generate three object files which are
+    # Integrate with libjvm. Here we generate two object files which are
     # linked with libjvm.so. This step is complicated from a dependency
-    # perspective, since it needs the rest of the compiled object files from the
-    # libjvm compilation, but the output is object files that are to be included
-    # when linking libjvm.so. So this generation must happen as a part of the
-    # libjvm compilation.
-
-    # First we need to generate the dtraceGenOffsets tool. When run, this will
-    # produce more header files and a C++ file.
-
-    # Note that generateJvmOffsets.cpp must be compiled as if it were a file
-    # in the libjvm.so, using JVM_CFLAGS as setup in CompileJvm.gmk. Otherwise
-    # this would preferrably have been done as a part of GensrcDtrace.gmk.
-    $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \
-        NAME := dtraceGenOffsets, \
-        TYPE := EXECUTABLE, \
-        SRC := $(TOPDIR)/make/hotspot/src/native/dtrace, \
-        TOOLCHAIN := $(TOOLCHAIN_BUILD), \
-        LDFLAGS := -m64, \
-        CFLAGS := -m64 $(JVM_CFLAGS), \
-        OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \
-        OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \
-    ))
-
-    DTRACE_GEN_OFFSETS_TOOL := $(BUILD_DTRACE_GEN_OFFSETS_TARGET)
-
-    # Argument 1: Output filename
-    # Argument 2: dtrace-gen-offset tool command line option
-    define SetupDtraceOffsetsGeneration
-      $1: $$(BUILD_DTRACE_GEN_OFFSETS)
-	$$(call LogInfo, Generating dtrace $2 file $$(@F))
-	$$(call MakeDir, $$(@D))
-	$$(call ExecuteWithLog, $$@, ( $$(DTRACE_GEN_OFFSETS_TOOL) -$$(strip $2) > $$@ ) )
-
-      TARGETS += $1
-    endef
-
-    JVM_OFFSETS_H := $(DTRACE_SUPPORT_DIR)/JvmOffsets.h
-    JVM_OFFSETS_CPP := $(DTRACE_SUPPORT_DIR)/JvmOffsets.cpp
-    JVM_OFFSETS_INDEX_H := $(DTRACE_SUPPORT_DIR)/JvmOffsetsIndex.h
-
-    # Run the dtrace-gen-offset tool to generate these three files.
-    # The generated JvmOffsets.cpp is compiled with the rest of libjvm.
-    $(eval $(call SetupDtraceOffsetsGeneration, $(JVM_OFFSETS_H), header))
-    $(eval $(call SetupDtraceOffsetsGeneration, $(JVM_OFFSETS_INDEX_H), index))
-    $(eval $(call SetupDtraceOffsetsGeneration, $(JVM_OFFSETS_CPP), table))
+    # perspective. We add these two files to the linking of libjvm using
+    # EXTRA_OBJECT_FILES, but they need to be created outside the call to
+    # SetupNativeCompilation. Also, one of the files is dependent on compiled
+    # object files from the libjvm compilation, so this generation must happen
+    # as a part of the libjvm compilation.
+
+    DTRACE_OBJ := $(JVM_OUTPUTDIR)/objs/dtrace.o
+    DTRACE_JHELPER_OBJ := $(JVM_OUTPUTDIR)/objs/dtrace_jhelper.o
+
+    DTRACE_EXTRA_OBJECT_FILES := $(DTRACE_OBJ) $(DTRACE_JHELPER_OBJ)
 
     ############################################################################
-    # Generate DTRACE_OBJ which is linked with libjvm.so.
+    # Generate DTRACE_OBJ which is linked with libjvm.so. It depends on a set of
+    # object files from the compilation.
 
     # Concatenate all *.d files into a single file
     DTRACE_SOURCE_FILES := $(addprefix $(TOPDIR)/src/hotspot/os/posix/dtrace/, \
@@ -138,13 +100,17 @@ ifeq ($(call check-jvm-feature, dtrace), true)
     ############################################################################
     # Generate DTRACE_JHELPER_OBJ which is linked with libjvm.so.
 
+    JHELPER_DTRACE_SRC := $(TOPDIR)/src/hotspot/os/solaris/dtrace/jhelper.d
+
+    # jhelper.d includes JvmOffsetsIndex.h which was created by the gensrc step.
+    DTRACE_GENSRC_DIR := $(JVM_VARIANT_OUTPUTDIR)/gensrc/dtracefiles
+    JVM_OFFSETS_INDEX_H := $(DTRACE_GENSRC_DIR)/JvmOffsetsIndex.h
+
     # Unfortunately dtrace generates incorrect types for some symbols in
     # dtrace_jhelper.o, resulting in "warning: symbol X has differing types"
     # See JDK-6890703 for details.
     # We work around this by fixing the types for these symbols using elfedit,
     # after dtrace has generated the .o file.
-    JHELPER_DTRACE_SRC := $(TOPDIR)/src/hotspot/os/solaris/dtrace/jhelper.d
-
     GetElfeditCommands = \
       $(foreach symbol, \
           $(shell $(GREP) ^extern $(JHELPER_DTRACE_SRC) | $(AWK) '{ gsub(";","") ; print $$3 }'), \
@@ -156,7 +122,7 @@ ifeq ($(call check-jvm-feature, dtrace), true)
 	$(call LogInfo, Running dtrace for $(<F))
 	$(call MakeDir, $(DTRACE_SUPPORT_DIR))
 	$(call ExecuteWithLog, $(DTRACE_SUPPORT_DIR)/$(@F).d, \
-	    ($(CPP) $(DTRACE_CPP_FLAGS) -I$(DTRACE_SUPPORT_DIR) $^ \
+	    ($(CPP) $(DTRACE_CPP_FLAGS) -I$(DTRACE_GENSRC_DIR) $^ \
 	    > $(DTRACE_SUPPORT_DIR)/$(@F).d))
 	$(call ExecuteWithLog, $@, $(DTRACE) $(DTRACE_FLAGS) -o $@ \
 	    -s $(DTRACE_SUPPORT_DIR)/$(@F).d)
@@ -164,40 +130,5 @@ ifeq ($(call check-jvm-feature, dtrace), true)
 	  $(call ExecuteWithLog, $@.elfedit, $(ELFEDIT) $(call GetElfeditCommands) $@)
         endif
 
-    ############################################################################
-    # Build the stand-alone dtrace libraries
-
-    LIBJVM_DTRACE_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_dtrace
-
-    $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DTRACE, \
-        NAME := jvm_dtrace, \
-        OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
-        SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \
-        CFLAGS := -m64 -G -mt -KPIC, \
-        LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
-        LIBS := $(LIBDL) -lthread -ldoor, \
-        MAPFILE := $(TOPDIR)/make/mapfiles/libjvm_dtrace/mapfile-vers, \
-        OBJECT_DIR := $(LIBJVM_DTRACE_OUTPUTDIR)/objs, \
-    ))
-
-    LIBJVM_DB_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_db
-
-    # Note that libjvm_db.c has tests for COMPILER2, but this was never set by
-    # the old build.
-    $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DB, \
-        NAME := jvm_db, \
-        OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
-        SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \
-        CFLAGS := -I$(JVM_VARIANT_OUTPUTDIR)/gensrc -I$(DTRACE_SUPPORT_DIR) \
-            -m64 -G -mt -KPIC, \
-        LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
-        MAPFILE := $(TOPDIR)/make/mapfiles/libjvm_db/mapfile-vers, \
-        OBJECT_DIR := $(LIBJVM_DB_OUTPUTDIR)/objs, \
-    ))
-
-    # We need the generated JvmOffsets.h before we can compile the libjvm_db source code.
-    $(BUILD_LIBJVM_DB_ALL_OBJS): $(JVM_OFFSETS_H)
-
-    TARGETS += $(BUILD_LIBJVM_DTRACE) $(BUILD_LIBJVM_DB)
   endif
 endif
diff --git a/make/hotspot/lib/JvmFlags.gmk b/make/hotspot/lib/JvmFlags.gmk
new file mode 100644
index 00000000000..9e62c37091d
--- /dev/null
+++ b/make/hotspot/lib/JvmFlags.gmk
@@ -0,0 +1,97 @@
+#
+# Copyright (c) 2013, 2018, 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.
+#
+
+$(eval $(call IncludeCustomExtension, hotspot/lib/JvmFlags.gmk))
+
+################################################################################
+# Setup JVM_CFLAGS. These are shared between GensrcDtrace.gmk and CompileJvm.gmk.
+
+# This variable may be added to by a custom extension
+JVM_SRC_ROOTS += $(TOPDIR)/src/hotspot
+
+JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \
+        $d/share \
+        $d/os/$(HOTSPOT_TARGET_OS) \
+        $d/os/$(HOTSPOT_TARGET_OS_TYPE) \
+        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH) \
+        $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH) \
+    ))) \
+    $(JVM_VARIANT_OUTPUTDIR)/gensrc
+    #
+
+JVM_CFLAGS_INCLUDES += \
+    $(patsubst %,-I%,$(JVM_SRC_DIRS)) \
+    -I$(TOPDIR)/src/hotspot/share/precompiled \
+    -I$(TOPDIR)/src/hotspot/share/include \
+    -I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \
+    -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
+    -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
+    -I$(TOPDIR)/src/java.base/share/native/libjimage \
+    #
+
+# INCLUDE_SUFFIX_* is only meant for including the proper
+# platform files. Don't use it to guard code. Use the value of
+# HOTSPOT_TARGET_CPU_DEFINE etc. instead.
+# Remaining TARGET_ARCH_* is needed to select the cpu specific
+# sources for 64-bit ARM ports (arm versus aarch64).
+JVM_CFLAGS_TARGET_DEFINES += \
+    -DTARGET_ARCH_$(HOTSPOT_TARGET_CPU_ARCH) \
+    -DINCLUDE_SUFFIX_OS=_$(HOTSPOT_TARGET_OS) \
+    -DINCLUDE_SUFFIX_CPU=_$(HOTSPOT_TARGET_CPU_ARCH) \
+    -DINCLUDE_SUFFIX_COMPILER=_$(HOTSPOT_TOOLCHAIN_TYPE) \
+    -DTARGET_COMPILER_$(HOTSPOT_TOOLCHAIN_TYPE) \
+    -D$(HOTSPOT_TARGET_CPU_DEFINE) \
+    -DHOTSPOT_LIB_ARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' \
+    #
+
+ifeq ($(DEBUG_LEVEL), release)
+  # For hotspot, release builds differ internally between "optimized" and "product"
+  # in that "optimize" does not define PRODUCT.
+  ifneq ($(HOTSPOT_DEBUG_LEVEL), optimized)
+    JVM_CFLAGS_DEBUGLEVEL := -DPRODUCT
+  endif
+else ifeq ($(DEBUG_LEVEL), fastdebug)
+  JVM_CFLAGS_DEBUGLEVEL := -DASSERT
+  ifeq ($(filter $(OPENJDK_TARGET_OS), windows aix), )
+    # NOTE: Old build did not define CHECK_UNHANDLED_OOPS on Windows and AIX.
+    JVM_CFLAGS_DEBUGLEVEL += -DCHECK_UNHANDLED_OOPS
+  endif
+else ifeq ($(DEBUG_LEVEL), slowdebug)
+  # _NMT_NOINLINE_ informs NMT that no inlining is done by the compiler
+  JVM_CFLAGS_DEBUGLEVEL := -DASSERT -D_NMT_NOINLINE_
+endif
+
+JVM_CFLAGS += \
+    $(JVM_CFLAGS_DEBUGLEVEL) \
+    $(JVM_CFLAGS_TARGET_DEFINES) \
+    $(JVM_CFLAGS_FEATURES) \
+    $(JVM_CFLAGS_INCLUDES) \
+    $(EXTRA_CFLAGS) \
+    #
+
+# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
+ifeq ($(USE_PRECOMPILED_HEADER), false)
+  JVM_CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
+endif
diff --git a/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp b/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp
index 417286e9777..259b881ef2c 100644
--- a/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp
+++ b/make/hotspot/src/native/dtrace/generateJvmOffsets.cpp
@@ -31,29 +31,23 @@
  * GENOFFS_SCCS_VER 34
  */
 
-#include "generateJvmOffsets.h"
+#include <stdio.h>
+#include <strings.h>
 
 /* A workaround for private and protected fields */
 #define private   public
 #define protected public
 
 #include <proc_service.h>
-#include "code/codeBlob.hpp"
-#include "code/nmethod.hpp"
-#include "code/pcDesc.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "memory/heap.hpp"
-#include "memory/memRegion.hpp"
-#include "memory/universe.hpp"
-#include "memory/virtualspace.hpp"
-#include "oops/constMethod.hpp"
-#include "oops/klass.hpp"
-#include "oops/method.hpp"
-#include "oops/oop.hpp"
-#include "oops/symbol.hpp"
 #include "runtime/vmStructs.hpp"
-#include "utilities/accessFlags.hpp"
-#include "utilities/globalDefinitions.hpp"
+
+typedef enum GEN_variant {
+        GEN_OFFSET = 0,
+        GEN_INDEX  = 1,
+        GEN_TABLE  = 2
+} GEN_variant;
+
 #ifdef COMPILER1
 #ifdef ASSERT
 
diff --git a/make/hotspot/src/native/dtrace/generateJvmOffsets.h b/make/hotspot/src/native/dtrace/generateJvmOffsets.h
deleted file mode 100644
index 99146f12c3b..00000000000
--- a/make/hotspot/src/native/dtrace/generateJvmOffsets.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, 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.
- *
- */
-
-#ifndef OS_SOLARIS_DTRACE_GENERATEJVMOFFSETS_H
-#define OS_SOLARIS_DTRACE_GENERATEJVMOFFSETS_H
-
-#include <stdio.h>
-#include <strings.h>
-
-typedef enum GEN_variant {
-        GEN_OFFSET = 0,
-        GEN_INDEX  = 1,
-        GEN_TABLE  = 2
-} GEN_variant;
-
-extern "C" {
-        int generateJvmOffsets(GEN_variant gen_var);
-        void gen_prologue(GEN_variant gen_var);
-        void gen_epilogue(GEN_variant gen_var);
-}
-
-#endif // OS_SOLARIS_DTRACE_GENERATEJVMOFFSETS_H

From bb388bb1db599e13b4e1075d4bfdd86ae8f13f31 Mon Sep 17 00:00:00 2001
From: vtheeyarath <unknown>
Date: Mon, 9 Apr 2018 10:39:29 -0700
Subject: [PATCH 104/196] 8164781: Pattern.asPredicate specification is
 incomplete Summary: Updated specification to reflect usage of find()
 Reviewed-by: psandoz

---
 .../share/classes/java/util/regex/Pattern.java    | 15 +++++++++++++--
 test/jdk/java/util/regex/RegExTest.java           |  3 +++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index 898cfb2135c..4c5b1cc6634 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -5809,10 +5809,21 @@ static CharPredicate CIRangeU(int lower, int upper) {
     static final Node lastAccept = new LastNode();
 
     /**
-     * Creates a predicate which can be used to match a string.
+     * Creates a predicate that tests if this pattern is found in a given input
+     * string.
      *
-     * @return  The predicate which can be used for matching on a string
+     * @apiNote
+     * This method creates a predicate that behaves as if it creates a matcher
+     * from the input sequence and then calls {@code find}, for example a
+     * predicate of the form:
+     * <pre>{@code
+     *   s -> matcher(s).find();
+     * }</pre>
+     *
+     * @return  The predicate which can be used for finding a match on a
+     * subsequence of a string
      * @since   1.8
+     * @see Matcher#find
      */
     public Predicate<String> asPredicate() {
         return s -> matcher(s).find();
diff --git a/test/jdk/java/util/regex/RegExTest.java b/test/jdk/java/util/regex/RegExTest.java
index d2cc74d6880..d4f1815828f 100644
--- a/test/jdk/java/util/regex/RegExTest.java
+++ b/test/jdk/java/util/regex/RegExTest.java
@@ -4683,6 +4683,9 @@ private static void patternAsPredicate() throws Exception {
         if (p.test("1234")) {
             failCount++;
         }
+        if (!p.test("word1234")) {
+            failCount++;
+        }
         report("Pattern.asPredicate");
     }
 

From b3d61351185efb56d60ed6a742d33ba5753c5a94 Mon Sep 17 00:00:00 2001
From: weijun <unknown>
Date: Tue, 10 Apr 2018 11:02:09 +0800
Subject: [PATCH 105/196] 8200152: KerberosString should use UTF-8 by default
 Reviewed-by: xuelei

---
 .../krb5/internal/util/KerberosString.java    | 27 ++++++-----
 test/jdk/sun/security/krb5/auto/NonAscii.java | 47 +++++++++++++++++++
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 test/jdk/sun/security/krb5/auto/NonAscii.java

diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java
index bdca3cf7d76..f4a6dc4dd3d 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/util/KerberosString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, 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
@@ -26,8 +26,7 @@
 package sun.security.krb5.internal.util;
 
 import java.io.IOException;
-import java.security.AccessController;
-import sun.security.action.GetBooleanAction;
+import sun.security.action.GetPropertyAction;
 import sun.security.util.DerValue;
 
 /**
@@ -45,15 +44,21 @@
 public final class KerberosString {
     /**
      * RFC 4120 defines KerberosString as GeneralString (IA5String), which
-     * only includes ASCII characters. However, other implementations have been
-     * known to use GeneralString to contain UTF-8 encoding. To interop
-     * with these implementations, the following system property is defined.
-     * When set as true, KerberosString is encoded as UTF-8. Note that this
-     * only affects the byte encoding, the tag of the ASN.1 type is still
-     * GeneralString.
+     * only includes ASCII characters. However, most implementations have been
+     * known to use GeneralString to contain UTF-8 encoding. The following
+     * system property is defined. When set as true, KerberosString is encoded
+     * as UTF-8. Otherwise, it's ASCII. The default is true.
+     *
+     * Note that this only affects the byte encoding, the tag of the ASN.1
+     * type is still GeneralString.
      */
-    public static final boolean MSNAME = AccessController.doPrivileged(
-            new GetBooleanAction("sun.security.krb5.msinterop.kstring"));
+    public static final boolean MSNAME;
+
+    static {
+        String prop = GetPropertyAction.privilegedGetProperty(
+                "sun.security.krb5.msinterop.kstring", "true");
+        MSNAME = Boolean.parseBoolean(prop);
+    }
 
     private final String s;
 
diff --git a/test/jdk/sun/security/krb5/auto/NonAscii.java b/test/jdk/sun/security/krb5/auto/NonAscii.java
new file mode 100644
index 00000000000..f4716b91f10
--- /dev/null
+++ b/test/jdk/sun/security/krb5/auto/NonAscii.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8200152
+ * @summary KerberosString should use UTF-8 by default
+ * @library /test/lib
+ * @compile -XDignore.symbol.file NonAscii.java
+ * @run main jdk.test.lib.FileInstaller TestHosts TestHosts
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts NonAscii
+ * @run main/othervm/fail -Djdk.net.hosts.file=TestHosts
+ *                        -Dsun.security.krb5.msinterop.kstring=false
+ *                        NonAscii
+ * @run main/othervm/fail -Djdk.net.hosts.file=TestHosts
+ *                        -Dsun.security.krb5.msinterop.kstring=no
+ *                        NonAscii
+ */
+
+public class NonAscii {
+    public static void main(String[] args) throws Exception {
+        String name = "ab\u00e7";
+        char[] password = "password".toCharArray();
+        new OneKDC(null).addPrincipal(name, password);
+        Context.fromUserPass(name, password, false);
+    }
+}

From 0037a19968ce2afdde7669426c5f07e66d913db6 Mon Sep 17 00:00:00 2001
From: iignatyev <unknown>
Date: Thu, 19 Apr 2018 15:31:06 -0700
Subject: [PATCH 106/196] 8202037: Split slow ctw_1 tests Reviewed-by: kvn

---
 test/hotspot/jtreg/TEST.groups | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index 9406782a18a..5cd46140424 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -70,7 +70,13 @@ tier1_compiler = \
 
 hotspot_not_fast_compiler = \
   :hotspot_compiler \
-  -:tier1_compiler
+  -:tier1_compiler \
+  -:hotspot_slow_compiler
+
+hotspot_slow_compiler = \
+  compiler/codegen/aes \
+  compiler/codecache/stress \
+  compiler/gcbarriers/PreserveFPRegistersTest.java
 
 tier1_compiler_1 = \
   compiler/arraycopy/ \
@@ -102,9 +108,7 @@ tier1_compiler_2 = \
   compiler/integerArithmetic/ \
   compiler/interpreter/ \
   compiler/jvmci/ \
-  -compiler/codegen/aes \
-  -compiler/codecache/stress \
-  -compiler/gcbarriers/PreserveFPRegistersTest.java
+  -:hotspot_slow_compiler
 
 tier1_compiler_3 = \
   compiler/intrinsics/ \
@@ -133,12 +137,21 @@ tier1_compiler_not_xcomp = \
 
 ctw_1 = \
   applications/ctw/modules/ \
-  -:ctw_2
+  -:ctw_2 \
+  -:ctw_3
 
 ctw_2 = \
   applications/ctw/modules/java_base.java \
   applications/ctw/modules/java_desktop.java
 
+ctw_3 = \
+  applications/ctw/modules/javafx_graphics.java \
+  applications/ctw/modules/java_xml.java \
+  applications/ctw/modules/jdk_compiler.java \
+  applications/ctw/modules/jdk_internal_vm_compiler.java \
+  applications/ctw/modules/jdk_localedata.java \
+  applications/ctw/modules/jdk_scripting_nashorn.java \
+
 tier1_gc = \
   :tier1_gc_1 \
   :tier1_gc_2 \

From de5c0cb09600e176ba4facab6ae5fe75f238b835 Mon Sep 17 00:00:00 2001
From: mikael <unknown>
Date: Thu, 19 Apr 2018 17:13:19 -0700
Subject: [PATCH 107/196] 8202052: Disable warnings when building libawt with
 VS2017 Reviewed-by: erikj, prr

---
 make/lib/Awt2dLibraries.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index 1229274869e..ce30a65af98 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -224,7 +224,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
         format-nonliteral parentheses, \
     DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \
     DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
-    DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \
+    DISABLED_WARNINGS_microsoft := 4297 4244 4267 4291 4302 4311 4996, \
     ASFLAGS := $(LIBAWT_ASFLAGS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \

From 1f3bfe725e40f7db487fef72496967cdae1e71eb Mon Sep 17 00:00:00 2001
From: mli <unknown>
Date: Fri, 20 Apr 2018 15:16:36 +0800
Subject: [PATCH 108/196] 8161991:
 java/nio/channels/AsynchronousSocketChannel/Basic.java failed due to
 RuntimeException: WritePendingException expected 8171404:
 java/nio/channels/AsynchronousSocketChannel/Basic.java failed with
 "AsynchronousCloseException expected" 8201520:
 AsynchronousSocketChannel/Basic.java timeout intermitently Reviewed-by: alanb

---
 .../AsynchronousSocketChannel/Basic.java      | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java b/test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java
index 0dc0318ab68..2b67f4ee7d9 100644
--- a/test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java
+++ b/test/jdk/java/nio/channels/AsynchronousSocketChannel/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -25,8 +25,8 @@
  * @bug 4607272 6842687 6878369 6944810 7023403
  * @summary Unit test for AsynchronousSocketChannel(use -Dseed=X to set PRNG seed)
  * @library /test/lib
- * @build jdk.test.lib.RandomFactory
- * @run main Basic -skipSlowConnectTest
+ * @build jdk.test.lib.RandomFactory jdk.test.lib.Utils
+ * @run main/othervm/timeout=600 Basic -skipSlowConnectTest
  * @key randomness intermittent
  */
 
@@ -79,11 +79,16 @@ static class Server implements Closeable {
         private final InetSocketAddress address;
 
         Server() throws IOException {
-            ssc = ServerSocketChannel.open().bind(new InetSocketAddress(0));
+            this(0);
+        }
 
-            InetAddress lh = InetAddress.getLocalHost();
-            int port = ((InetSocketAddress)(ssc.getLocalAddress())).getPort();
-            address = new InetSocketAddress(lh, port);
+        Server(int recvBufSize) throws IOException {
+            ssc = ServerSocketChannel.open();
+            if (recvBufSize > 0) {
+                ssc.setOption(SO_RCVBUF, recvBufSize);
+            }
+            ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+            address = (InetSocketAddress)ssc.getLocalAddress();
         }
 
         InetSocketAddress address() {
@@ -293,7 +298,7 @@ static void testCloseWhenPending() throws Exception {
 
         System.out.println("-- asynchronous close when reading --");
 
-        try (Server server = new Server()) {
+        try (Server server = new Server(1)) {
             ch = AsynchronousSocketChannel.open();
             ch.connect(server.address()).get();
 
@@ -325,6 +330,8 @@ static void testCloseWhenPending() throws Exception {
 
             ch = AsynchronousSocketChannel.open();
             ch.connect(server.address()).get();
+            SocketChannel peer = server.accept();
+            peer.setOption(SO_RCVBUF, 1);
 
             final AtomicReference<Throwable> writeException =
                 new AtomicReference<Throwable>();
@@ -333,10 +340,13 @@ static void testCloseWhenPending() throws Exception {
             final AtomicInteger numCompleted = new AtomicInteger();
             ch.write(genBuffer(), ch, new CompletionHandler<Integer,AsynchronousSocketChannel>() {
                 public void completed(Integer result, AsynchronousSocketChannel ch) {
+                    System.out.println("completed write to async channel: " + result);
                     numCompleted.incrementAndGet();
                     ch.write(genBuffer(), ch, this);
+                    System.out.println("started another write to async channel: " + result);
                 }
                 public void failed(Throwable x, AsynchronousSocketChannel ch) {
+                    System.out.println("failed write to async channel");
                     writeException.set(x);
                 }
             });
@@ -347,7 +357,8 @@ public void failed(Throwable x, AsynchronousSocketChannel ch) {
             // the internal channel state indicates it is writing
             int prevNumCompleted = numCompleted.get();
             do {
-                Thread.sleep(1000);
+                Thread.sleep((long)(1000 * jdk.test.lib.Utils.TIMEOUT_FACTOR));
+                System.out.println("check if buffer is filled up");
                 if (numCompleted.get() == prevNumCompleted) {
                     break;
                 }
@@ -357,14 +368,19 @@ public void failed(Throwable x, AsynchronousSocketChannel ch) {
             // attempt a concurrent write -
             // should fail with WritePendingException
             try {
+                System.out.println("concurrent write to async channel");
                 ch.write(genBuffer());
+                System.out.format("prevNumCompleted: %d, numCompleted: %d%n",
+                                  prevNumCompleted, numCompleted.get());
                 throw new RuntimeException("WritePendingException expected");
             } catch (WritePendingException x) {
             }
 
             // close channel - should cause initial write to complete
+            System.out.println("closing async channel...");
             ch.close();
-            server.accept().close();
+            System.out.println("closed async channel");
+            peer.close();
 
             // wait for exception
             while (writeException.get() == null) {

From 69856d6458782a63953fe9f056d45e19b3f46c95 Mon Sep 17 00:00:00 2001
From: sgehwolf <unknown>
Date: Thu, 19 Apr 2018 17:43:26 +0200
Subject: [PATCH 109/196] 8201788: Number of make jobs wrong for
 bootcycle-images target Reviewed-by: erikj, ihse

---
 make/Init.gmk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/make/Init.gmk b/make/Init.gmk
index 6de559e2c60..fa1c5e6fdaf 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -310,9 +310,13 @@ else # HAS_SPEC=true
           ifneq ($(PARALLEL_TARGETS), )
 	    $(call StartGlobalTimer)
 	    $(call PrepareSmartJavac)
+            # JOBS will only be empty for a bootcycle-images recursive call
+            # or if specified via a make argument directly. In those cases
+            # treat it as NOT using jobs at all.
 	    ( cd $(TOPDIR) && \
 	        $(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
-	            -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
+                    $(if $(JOBS), -j $(JOBS)) \
+	            -f make/Main.gmk $(USER_MAKE_VARS) \
 	            $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
 	        ( exitcode=$$? && \
 	        $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \

From 0b0dbd8e7abd3d51ad4879e848eb2208f1cefd01 Mon Sep 17 00:00:00 2001
From: mbaesken <unknown>
Date: Tue, 10 Apr 2018 08:38:56 +0200
Subject: [PATCH 110/196] 8201226: missing JNIEXPORT / JNICALL at some places
 in function declarations/implementations Reviewed-by: ihse, mdoerr
 Contributed-by: matthias.baesken@sap.com, alexey.ivanov@oracle.com

---
 src/java.base/share/native/launcher/main.c         |  2 +-
 src/java.base/share/native/libjimage/jimage.cpp    | 14 +++++++-------
 src/java.base/share/native/libjimage/jimage.hpp    | 12 ++++++------
 src/java.base/share/native/libzip/CRC32.c          |  2 +-
 src/java.base/share/native/libzip/zip_util.c       | 14 +++++++-------
 src/java.base/share/native/libzip/zip_util.h       | 14 +++++++-------
 .../native/common/awt/medialib/mlib_ImageCreate.c  |  6 +++---
 .../share/native/libmlib_image/mlib_ImageAffine.c  |  2 +-
 .../libmlib_image/mlib_ImageConvKernelConvert.c    |  2 +-
 .../share/native/libmlib_image/mlib_ImageConvMxN.c |  2 +-
 .../native/libmlib_image/mlib_c_ImageLookUp.c      |  2 +-
 .../native/libsplashscreen/splashscreen_impl.h     |  6 +-----
 .../native/libsplashscreen/splashscreen_sys.c      |  2 +-
 src/jdk.pack/share/native/unpack200/main.cpp       |  2 +-
 14 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/src/java.base/share/native/launcher/main.c b/src/java.base/share/native/launcher/main.c
index 58ed4702e12..a477c80784b 100644
--- a/src/java.base/share/native/launcher/main.c
+++ b/src/java.base/share/native/launcher/main.c
@@ -93,7 +93,7 @@ WinMain(HINSTANCE inst, HINSTANCE previnst, LPSTR cmdline, int cmdshow)
     __initenv = _environ;
 
 #else /* JAVAW */
-JNIEXPORT int JNICALL
+JNIEXPORT int
 main(int argc, char **argv)
 {
     int margc;
diff --git a/src/java.base/share/native/libjimage/jimage.cpp b/src/java.base/share/native/libjimage/jimage.cpp
index e6d5b9707b0..2d8fc02c9d1 100644
--- a/src/java.base/share/native/libjimage/jimage.cpp
+++ b/src/java.base/share/native/libjimage/jimage.cpp
@@ -55,7 +55,7 @@
  *   }
  *   ...
  */
-extern "C" JNIEXPORT JImageFile* JNICALL
+extern "C" JNIEXPORT JImageFile*
 JIMAGE_Open(const char *name, jint* error) {
     // TODO - return a meaningful error code
     *error = 0;
@@ -72,7 +72,7 @@ JIMAGE_Open(const char *name, jint* error) {
  * Ex.
  *  (*JImageClose)(image);
  */
-extern "C" JNIEXPORT void JNICALL
+extern "C" JNIEXPORT void
 JIMAGE_Close(JImageFile* image) {
     ImageFileReader::close((ImageFileReader*) image);
 }
@@ -89,7 +89,7 @@ JIMAGE_Close(JImageFile* image) {
  *  tty->print_cr(package);
  *  -> java.base
  */
-extern "C" JNIEXPORT const char* JNICALL
+extern "C" JNIEXPORT const char*
 JIMAGE_PackageToModule(JImageFile* image, const char* package_name) {
     return ((ImageFileReader*) image)->get_image_module_data()->package_to_module(package_name);
 }
@@ -108,7 +108,7 @@ JIMAGE_PackageToModule(JImageFile* image, const char* package_name) {
  *   JImageLocationRef location = (*JImageFindResource)(image,
  *                                 "java.base", "9.0", "java/lang/String.class", &size);
  */
-extern "C" JNIEXPORT JImageLocationRef JNICALL
+extern "C" JNIEXPORT JImageLocationRef
 JIMAGE_FindResource(JImageFile* image,
         const char* module_name, const char* version, const char* name,
         jlong* size) {
@@ -155,7 +155,7 @@ JIMAGE_FindResource(JImageFile* image,
  *  char* buffer = new char[size];
  *  (*JImageGetResource)(image, location, buffer, size);
  */
-extern "C" JNIEXPORT jlong JNICALL
+extern "C" JNIEXPORT jlong
 JIMAGE_GetResource(JImageFile* image, JImageLocationRef location,
         char* buffer, jlong size) {
     ((ImageFileReader*) image)->get_resource((u4) location, (u1*) buffer);
@@ -184,7 +184,7 @@ JIMAGE_GetResource(JImageFile* image, JImageLocationRef location,
  *   }
  *   (*JImageResourceIterator)(image, ctw_visitor, loader);
  */
-extern "C" JNIEXPORT void JNICALL
+extern "C" JNIEXPORT void
 JIMAGE_ResourceIterator(JImageFile* image,
         JImageResourceVisitor_t visitor, void* arg) {
     ImageFileReader* imageFile = (ImageFileReader*) image;
@@ -226,7 +226,7 @@ JIMAGE_ResourceIterator(JImageFile* image,
  *   char path[JIMAGE_MAX_PATH];
  *    (*JImageResourcePath)(image, location, path, JIMAGE_MAX_PATH);
  */
-extern "C" JNIEXPORT bool JNICALL
+extern "C" JNIEXPORT bool
 JIMAGE_ResourcePath(JImageFile* image, JImageLocationRef locationRef,
                                     char* path, size_t max) {
     ImageFileReader* imageFile = (ImageFileReader*) image;
diff --git a/src/java.base/share/native/libjimage/jimage.hpp b/src/java.base/share/native/libjimage/jimage.hpp
index a7a35dc1f74..37dfb5de344 100644
--- a/src/java.base/share/native/libjimage/jimage.hpp
+++ b/src/java.base/share/native/libjimage/jimage.hpp
@@ -72,7 +72,7 @@ typedef jlong JImageLocationRef;
  *   ...
  */
 
-extern "C" JNIEXPORT JImageFile* JNICALL
+extern "C" JNIEXPORT JImageFile*
 JIMAGE_Open(const char *name, jint* error);
 
 typedef JImageFile* (*JImageOpen_t)(const char *name, jint* error);
@@ -87,7 +87,7 @@ typedef JImageFile* (*JImageOpen_t)(const char *name, jint* error);
  *  (*JImageClose)(image);
  */
 
-extern "C" JNIEXPORT void JNICALL
+extern "C" JNIEXPORT void
 JIMAGE_Close(JImageFile* jimage);
 
 typedef void (*JImageClose_t)(JImageFile* jimage);
@@ -106,7 +106,7 @@ typedef void (*JImageClose_t)(JImageFile* jimage);
  *  -> java.base
  */
 
-extern "C" JNIEXPORT const char * JNICALL
+extern "C" JNIEXPORT const char *
 JIMAGE_PackageToModule(JImageFile* jimage, const char* package_name);
 
 typedef const char* (*JImagePackageToModule_t)(JImageFile* jimage, const char* package_name);
@@ -150,7 +150,7 @@ typedef JImageLocationRef(*JImageFindResource_t)(JImageFile* jimage,
  *  char* buffer = new char[size];
  *  (*JImageGetResource)(image, location, buffer, size);
  */
-extern "C" JNIEXPORT jlong JNICALL
+extern "C" JNIEXPORT jlong
 JIMAGE_GetResource(JImageFile* jimage, JImageLocationRef location,
         char* buffer, jlong size);
 
@@ -185,7 +185,7 @@ typedef bool (*JImageResourceVisitor_t)(JImageFile* jimage,
         const char* module_name, const char* version, const char* package,
         const char* name, const char* extension, void* arg);
 
-extern "C" JNIEXPORT void JNICALL
+extern "C" JNIEXPORT void
 JIMAGE_ResourceIterator(JImageFile* jimage,
         JImageResourceVisitor_t visitor, void *arg);
 
@@ -202,7 +202,7 @@ typedef void (*JImageResourceIterator_t)(JImageFile* jimage,
  *   char path[JIMAGE_MAX_PATH];
  *    (*JImageResourcePath)(image, location, path, JIMAGE_MAX_PATH);
  */
-extern "C" JNIEXPORT bool JNICALL
+extern "C" JNIEXPORT bool
 JIMAGE_ResourcePath(JImageFile* image, JImageLocationRef locationRef,
                                     char* path, size_t max);
 
diff --git a/src/java.base/share/native/libzip/CRC32.c b/src/java.base/share/native/libzip/CRC32.c
index 3715baae569..13cd3f1d3c4 100644
--- a/src/java.base/share/native/libzip/CRC32.c
+++ b/src/java.base/share/native/libzip/CRC32.c
@@ -54,7 +54,7 @@ Java_java_util_zip_CRC32_updateBytes0(JNIEnv *env, jclass cls, jint crc,
     return crc;
 }
 
-JNIEXPORT jint JNICALL
+JNIEXPORT jint
 ZIP_CRC32(jint crc, const jbyte *buf, jint len)
 {
     return crc32(crc, (Bytef*)buf, len);
diff --git a/src/java.base/share/native/libzip/zip_util.c b/src/java.base/share/native/libzip/zip_util.c
index 5c6b3ffa40e..597c3498d74 100644
--- a/src/java.base/share/native/libzip/zip_util.c
+++ b/src/java.base/share/native/libzip/zip_util.c
@@ -881,7 +881,7 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
  * set to the error message text if msg != 0. Otherwise, *msg will be
  * set to NULL. Caller doesn't need to free the error message.
  */
-JNIEXPORT jzfile * JNICALL
+JNIEXPORT jzfile *
 ZIP_Open(const char *name, char **pmsg)
 {
     jzfile *file = ZIP_Open_Generic(name, pmsg, O_RDONLY, 0);
@@ -895,7 +895,7 @@ ZIP_Open(const char *name, char **pmsg)
 /*
  * Closes the specified zip file object.
  */
-JNIEXPORT void JNICALL
+JNIEXPORT void
 ZIP_Close(jzfile *zip)
 {
     MLOCK(zfiles_lock);
@@ -1115,7 +1115,7 @@ ZIP_FreeEntry(jzfile *jz, jzentry *ze)
  * Returns the zip entry corresponding to the specified name, or
  * NULL if not found.
  */
-JNIEXPORT jzentry * JNICALL
+JNIEXPORT jzentry *
 ZIP_GetEntry(jzfile *zip, char *name, jint ulen)
 {
     if (ulen == 0) {
@@ -1238,7 +1238,7 @@ ZIP_GetEntry2(jzfile *zip, char *name, jint ulen, jboolean addSlash)
  * Returns the n'th (starting at zero) zip file entry, or NULL if the
  * specified index was out of range.
  */
-JNIEXPORT jzentry * JNICALL
+JNIEXPORT jzentry *
 ZIP_GetNextEntry(jzfile *zip, jint n)
 {
     jzentry *result;
@@ -1439,7 +1439,7 @@ InflateFully(jzfile *zip, jzentry *entry, void *buf, char **msg)
  * The current implementation does not support reading an entry that
  * has the size bigger than 2**32 bytes in ONE invocation.
  */
-JNIEXPORT jzentry * JNICALL
+JNIEXPORT jzentry *
 ZIP_FindEntry(jzfile *zip, char *name, jint *sizeP, jint *nameLenP)
 {
     jzentry *entry = ZIP_GetEntry(zip, name, 0);
@@ -1456,7 +1456,7 @@ ZIP_FindEntry(jzfile *zip, char *name, jint *sizeP, jint *nameLenP)
  * Note: this is called from the separately delivered VM (hotspot/classic)
  * so we have to be careful to maintain the expected behaviour.
  */
-JNIEXPORT jboolean JNICALL
+JNIEXPORT jboolean
 ZIP_ReadEntry(jzfile *zip, jzentry *entry, unsigned char *buf, char *entryname)
 {
     char *msg;
@@ -1515,7 +1515,7 @@ ZIP_ReadEntry(jzfile *zip, jzentry *entry, unsigned char *buf, char *entryname)
     return JNI_TRUE;
 }
 
-JNIEXPORT jboolean JNICALL
+JNIEXPORT jboolean
 ZIP_InflateFully(void *inBuf, jlong inLen, void *outBuf, jlong outLen, char **pmsg)
 {
     z_stream strm;
diff --git a/src/java.base/share/native/libzip/zip_util.h b/src/java.base/share/native/libzip/zip_util.h
index 663913edafa..41c48a8508c 100644
--- a/src/java.base/share/native/libzip/zip_util.h
+++ b/src/java.base/share/native/libzip/zip_util.h
@@ -241,16 +241,16 @@ typedef struct jzfile {   /* Zip file */
  */
 #define ZIP_ENDCHAIN ((jint)-1)
 
-JNIEXPORT jzentry * JNICALL
+JNIEXPORT jzentry *
 ZIP_FindEntry(jzfile *zip, char *name, jint *sizeP, jint *nameLenP);
 
-JNIEXPORT jboolean JNICALL
+JNIEXPORT jboolean
 ZIP_ReadEntry(jzfile *zip, jzentry *entry, unsigned char *buf, char *entrynm);
 
-JNIEXPORT jzentry * JNICALL
+JNIEXPORT jzentry *
 ZIP_GetNextEntry(jzfile *zip, jint n);
 
-JNIEXPORT jzfile * JNICALL
+JNIEXPORT jzfile *
 ZIP_Open(const char *name, char **pmsg);
 
 jzfile *
@@ -265,10 +265,10 @@ ZIP_Put_In_Cache(const char *name, ZFILE zfd, char **pmsg, jlong lastModified);
 jzfile *
 ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified, jboolean usemmap);
 
-JNIEXPORT void JNICALL
+JNIEXPORT void
 ZIP_Close(jzfile *zip);
 
-JNIEXPORT jzentry * JNICALL
+JNIEXPORT jzentry *
 ZIP_GetEntry(jzfile *zip, char *name, jint ulen);
 JNIEXPORT void JNICALL
 ZIP_Lock(jzfile *zip);
@@ -281,7 +281,7 @@ ZIP_FreeEntry(jzfile *zip, jzentry *ze);
 jlong ZIP_GetEntryDataOffset(jzfile *zip, jzentry *entry);
 jzentry * ZIP_GetEntry2(jzfile *zip, char *name, jint ulen, jboolean addSlash);
 
-JNIEXPORT jboolean JNICALL
+JNIEXPORT jboolean
 ZIP_InflateFully(void *inBuf, jlong inLen, void *outBuf, jlong outLen, char **pmsg);
 
 #endif /* !_ZIP_H_ */
diff --git a/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c b/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c
index b91bf8891c9..da65a9f433d 100644
--- a/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c
+++ b/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c
@@ -227,7 +227,7 @@ mlib_image* mlib_ImageSet(mlib_image *image,
 }
 
 /***************************************************************/
-mlib_image *mlib_ImageCreateStruct(mlib_type  type,
+JNIEXPORT mlib_image* JNICALL mlib_ImageCreateStruct(mlib_type  type,
                                    mlib_s32   channels,
                                    mlib_s32   width,
                                    mlib_s32   height,
@@ -253,7 +253,7 @@ mlib_image *mlib_ImageCreateStruct(mlib_type  type,
 }
 
 /***************************************************************/
-mlib_image *mlib_ImageCreate(mlib_type type,
+JNIEXPORT mlib_image* JNICALL mlib_ImageCreate(mlib_type type,
                              mlib_s32  channels,
                              mlib_s32  width,
                              mlib_s32  height)
@@ -352,7 +352,7 @@ mlib_image *mlib_ImageCreate(mlib_type type,
 }
 
 /***************************************************************/
-void mlib_ImageDelete(mlib_image *img)
+JNIEXPORT void JNICALL mlib_ImageDelete(mlib_image *img)
 {
   if (img == NULL) return;
   if ((img -> flags & MLIB_IMAGE_USERALLOCATED) == 0) {
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c
index 84d8a147aa3..e614d5e3410 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c
@@ -299,7 +299,7 @@ mlib_status mlib_ImageAffine_alltypes(mlib_image       *dst,
 }
 
 /***************************************************************/
-mlib_status mlib_ImageAffine(mlib_image       *dst,
+JNIEXPORT mlib_status JNICALL mlib_ImageAffine(mlib_image       *dst,
                              const mlib_image *src,
                              const mlib_d64   *mtx,
                              mlib_filter      filter,
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c
index 6e4fdbdca5b..ff62e7b788e 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c
@@ -78,7 +78,7 @@
 #endif /* __sparc */
 
 /***************************************************************/
-mlib_status mlib_ImageConvKernelConvert(mlib_s32       *ikernel,
+JNIEXPORT mlib_status JNICALL mlib_ImageConvKernelConvert(mlib_s32       *ikernel,
                                         mlib_s32       *iscale,
                                         const mlib_d64 *fkernel,
                                         mlib_s32       m,
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c
index 3c7e835cf62..2206ad11faf 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c
@@ -90,7 +90,7 @@
 #include "mlib_ImageConvEdge.h"
 
 /***************************************************************/
-mlib_status mlib_ImageConvMxN(mlib_image       *dst,
+JNIEXPORT mlib_status JNICALL mlib_ImageConvMxN(mlib_image       *dst,
                               const mlib_image *src,
                               const mlib_s32   *kernel,
                               mlib_s32         m,
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c
index d86d0b17e9f..c98c3ed5407 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c
@@ -78,7 +78,7 @@
 #include "mlib_c_ImageLookUp.h"
 
 /***************************************************************/
-mlib_status mlib_ImageLookUp(mlib_image       *dst,
+JNIEXPORT mlib_status JNICALL mlib_ImageLookUp(mlib_image       *dst,
                              const mlib_image *src,
                              const void       **table)
 {
diff --git a/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h b/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h
index a10ade1b8cd..b6743af1e65 100644
--- a/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h
+++ b/src/java.desktop/share/native/libsplashscreen/splashscreen_impl.h
@@ -132,9 +132,6 @@ void SplashDonePlatform(Splash * splash);
 
 unsigned SplashTime();
 char* SplashConvertStringAlloc(const char* in, int *size);
-jboolean SplashGetScaledImageName(const char* jarName,
-                 const char* fileName, float *scaleFactor,
-                 char *scaleImageName, const size_t scaledImageNameLength);
 void SplashLock(Splash * splash);
 void SplashUnlock(Splash * splash);
 
@@ -157,8 +154,7 @@ void SplashDone(Splash * splash);
 void SplashUpdateScreenData(Splash * splash);
 
 void SplashCleanup(Splash * splash);
-void SplashSetScaleFactor(float scaleFactor);
-int  SplashGetScaledImgNameMaxPstfixLen(const char *fileName);
+
 void cleanUp(char *fName, char *xName, char *pctName, float *scaleFactor);
 jboolean GetScaledImageName(const char *fileName, char *scaledImgName,
                   float *scaleFactor, const size_t scaledImageLength);
diff --git a/src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c b/src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c
index bf516068f8d..83a7fb36e3b 100644
--- a/src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c
+++ b/src/java.desktop/windows/native/libsplashscreen/splashscreen_sys.c
@@ -574,7 +574,7 @@ SplashReconfigure(Splash * splash)
     PostMessage(splash->hWnd, WM_SPLASHRECONFIGURE, 0, 0);
 }
 
-jboolean
+JNIEXPORT jboolean JNICALL
 SplashGetScaledImageName(const char* jarName, const char* fileName,
                            float *scaleFactor, char *scaleImageName,
                            const size_t scaledImageLength)
diff --git a/src/jdk.pack/share/native/unpack200/main.cpp b/src/jdk.pack/share/native/unpack200/main.cpp
index 8ff25d1b476..e16314e3665 100644
--- a/src/jdk.pack/share/native/unpack200/main.cpp
+++ b/src/jdk.pack/share/native/unpack200/main.cpp
@@ -59,7 +59,7 @@
 #include "unpack.h"
 
 
-JNIEXPORT int JNICALL
+JNIEXPORT int
 main(int argc, char **argv) {
     return unpacker::run(argc, argv);
 }

From d64742359e14fdff2f7c896bf58524dc37abd315 Mon Sep 17 00:00:00 2001
From: ctornqvi <unknown>
Date: Tue, 10 Apr 2018 08:13:06 -0400
Subject: [PATCH 111/196] 8201334: Move runtime/NMT/MallocStressTest.java to
 hotspot_tier3_runtime Reviewed-by: lfoltan, mseledtsov, mikael

---
 test/hotspot/jtreg/TEST.groups | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index b4b06329530..666ad5f9751 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -265,7 +265,8 @@ hotspot_tier2_runtime = \
  -:tier1_runtime \
  -:tier1_serviceability \
  -:hotspot_tier2_runtime_platform_agnostic \
- -runtime/signal
+ -runtime/signal \
+ -runtime/NMT/MallocStressTest.java
 
 hotspot_tier2_runtime_platform_agnostic = \
   runtime/SelectionResolution \

From 59123da37637595b6fdc4851bcf173304f33a506 Mon Sep 17 00:00:00 2001
From: Andrew Leonard <andrew_m_leonard@uk.ibm.com>
Date: Tue, 10 Apr 2018 15:16:20 +0100
Subject: [PATCH 112/196] Add missing jdk9 patches...

Signed-off-by: Andrew Leonard <andrew_m_leonard@uk.ibm.com>
---
 closed/OpenJ9.gmk                             | 10 +-
 closed/autoconf/custom-hook.m4                | 96 +++++++++++++------
 closed/autoconf/custom-spec.gmk.in            |  4 +
 .../jdk/internal/module/ModuleBootstrap.java  | 13 ++-
 4 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
index 0a1c585923c..bc7538eb9af 100644
--- a/closed/OpenJ9.gmk
+++ b/closed/OpenJ9.gmk
@@ -369,6 +369,7 @@ run-preprocessors-j9 : stage-j9 \
 		&& cd $(OUTPUTDIR)/vm \
 		&& $(MAKE) $(MAKEFLAGS) -f buildtools.mk \
 			BUILD_ID=$(BUILD_ID) \
+			CMAKE=$(CMAKE) $(if $(findstring true,$(OPENJ9_ENABLE_CMAKE)),ENABLE_CMAKE=true CALLED_BY_SOURCE_ZIP=yes) \
 			EXTRA_CONFIGURE_ARGS=$(OMR_EXTRA_CONFIGURE_ARGS) \
 			FREEMARKER_JAR="$(FREEMARKER_JAR)" \
 			J9VM_SHA=$(OPENJ9_SHA) \
@@ -382,10 +383,17 @@ run-preprocessors-j9 : stage-j9 \
 
 build-j9 : run-preprocessors-j9
 	@$(ECHO) Compiling OpenJ9 in $(OUTPUTDIR)/vm
-	(export OPENJ9_BUILD=true $(EXPORT_NO_USE_MINGW) \
+ifeq (true,$(OPENJ9_ENABLE_CMAKE))
+	(export OPENJ9_BUILD=true $(EXPORT_MSVS_ENV_VARS) \
+		&& cd $(OUTPUTDIR)/vm/build \
+		&& $(MAKE) $(MAKEFLAGS) install \
+	)
+else
+	(export OPENJ9_BUILD=true $(EXPORT_NO_USE_MINGW) $(EXPORT_MSVS_ENV_VARS) \
 		&& cd $(OUTPUTDIR)/vm \
 		&& $(MAKE) $(MAKEFLAGS) all \
 	)
+endif
 	@$(ECHO) OpenJ9 compile complete
 
 	@$(MKDIR) -p $(MODULES_LIBS_DIR)/java.base
diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4
index cf77e3bd0d2..37521e18292 100644
--- a/closed/autoconf/custom-hook.m4
+++ b/closed/autoconf/custom-hook.m4
@@ -38,12 +38,35 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
   OPENJ9_BASIC_SETUP_FUNDAMENTAL_TOOLS
   OPENJ9_PLATFORM_SETUP
   OPENJDK_VERSION_DETAILS
+  OPENJ9_CONFIGURE_CMAKE
   OPENJ9_CONFIGURE_CUDA
   OPENJ9_CONFIGURE_DDR
   OPENJ9_CONFIGURE_NUMA
   OPENJ9_THIRD_PARTY_REQUIREMENTS
 ])
 
+AC_DEFUN([OPENJ9_CONFIGURE_CMAKE],
+[
+	AC_ARG_WITH(cmake, [AS_HELP_STRING([--with-cmake], [enable building openJ9 with CMake])],
+		[
+			if test "x$with_cmake" != "x"; then
+				CMAKE=$with_cmake
+			fi
+			with_cmake=yes
+		],
+		[with_cmake=no])
+	if test "$with_cmake" == "yes"; then
+		AC_PATH_PROG([CMAKE], [cmake])
+		if test "x$CMAKE" == x; then
+			AC_MSG_ERROR([Could not find CMake])
+		fi
+		OPENJ9_ENABLE_CMAKE=true
+	else
+		OPENJ9_ENABLE_CMAKE=false
+	fi
+	AC_SUBST(OPENJ9_ENABLE_CMAKE)
+])
+
 AC_DEFUN([OPENJ9_BASIC_SETUP_FUNDAMENTAL_TOOLS],
 [
   BASIC_REQUIRE_PROGS(M4, m4)
@@ -151,6 +174,9 @@ AC_DEFUN([OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU],
     powerpc64)
       OPENJ9_CPU=ppc-64
       ;;
+    arm)
+      OPENJ9_CPU=arm
+      ;;
     *)
       AC_MSG_ERROR([unsupported OpenJ9 cpu $1])
       ;;
@@ -158,35 +184,45 @@ AC_DEFUN([OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU],
 ])
 
 AC_DEFUN_ONCE([OPENJ9_PLATFORM_SETUP],
-[
-  OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
-  OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_${OPENJ9_CPU}_cmprssptrs"
-  OPENJ9_LIBS_SUBDIR=compressedrefs
-
-  if test "x$OPENJ9_CPU" = xx86-64; then
-    if test "x$OPENJDK_BUILD_OS" = xlinux; then
-      OPENJ9_PLATFORM_CODE=xa64
-    elif test "x$OPENJDK_BUILD_OS" = xwindows; then
-      OPENJ9_PLATFORM_CODE=wa64
-      OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs"
-    else
-      AC_MSG_ERROR([Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!])
-    fi
-  elif test "x$OPENJ9_CPU" = xppc-64_le; then
-    OPENJ9_PLATFORM_CODE=xl64
-    OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_ppc-64_cmprssptrs_le_gcc"
-  elif test "x$OPENJ9_CPU" = x390-64; then
-    OPENJ9_PLATFORM_CODE=xz64
-  elif test "x$OPENJ9_CPU" = xppc-64; then
-    OPENJ9_PLATFORM_CODE=ap64
-  else
-    AC_MSG_ERROR([Unsupported OpenJ9 cpu ${OPENJ9_CPU}, contact support team!])
-  fi
-
-  AC_SUBST(OPENJ9_BUILDSPEC)
-  AC_SUBST(OPENJ9_PLATFORM_CODE)
-  AC_SUBST(COMPILER_VERSION_STRING)
-  AC_SUBST(OPENJ9_LIBS_SUBDIR)
+ [
+   # When compiling natively host_cpu and build_cpu are the same. But when
+   # cross compiling we need to work with the host_cpu (which is where the final
+   # JVM will run).
+   OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
+   OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_${OPENJ9_CPU}_cmprssptrs"
+   OPENJ9_LIBS_SUBDIR=compressedrefs
+ 
+   if test "x$OPENJ9_CPU" = xx86-64; then
+     if test "x$OPENJDK_BUILD_OS" = xlinux; then
+       OPENJ9_PLATFORM_CODE=xa64
+     elif test "x$OPENJDK_BUILD_OS" = xwindows; then
+       OPENJ9_PLATFORM_CODE=wa64
+       OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs"
+     elif test "x$OPENJDK_BUILD_OS" = xmacosx; then
+       OPENJ9_PLATFORM_CODE=oa64
+       OPENJ9_BUILDSPEC="osx_x86-64"
+     else
+       AC_MSG_ERROR([Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!])
+     fi
+   elif test "x$OPENJ9_CPU" = xppc-64_le; then
+     OPENJ9_PLATFORM_CODE=xl64
+     OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_ppc-64_cmprssptrs_le_gcc"
+   elif test "x$OPENJ9_CPU" = x390-64; then
+     OPENJ9_PLATFORM_CODE=xz64
+   elif test "x$OPENJ9_CPU" = xppc-64; then
+     OPENJ9_PLATFORM_CODE=ap64
+   elif test "x$OPENJ9_CPU" = xarm; then
+     OPENJ9_PLATFORM_CODE=xr32
+     OPENJ9_BUILDSPEC=linux_arm_linaro
+     OPENJ9_LIBS_SUBDIR=default
+   else
+     AC_MSG_ERROR([Unsupported OpenJ9 cpu ${OPENJ9_CPU}, contact support team!])
+   fi
+ 
+   AC_SUBST(OPENJ9_BUILDSPEC)
+   AC_SUBST(OPENJ9_PLATFORM_CODE)
+   AC_SUBST(COMPILER_VERSION_STRING)
+   AC_SUBST(OPENJ9_LIBS_SUBDIR)
 ])
 
 AC_DEFUN_ONCE([OPENJDK_VERSION_DETAILS],
@@ -194,7 +230,7 @@ AC_DEFUN_ONCE([OPENJDK_VERSION_DETAILS],
   OPENJDK_SHA=`git -C $TOPDIR rev-parse --short HEAD`
   LAST_TAGGED_SHA=`git -C $TOPDIR rev-list --tags="jdk-11*" --max-count=1 2>/dev/null`
   if test "x$LAST_TAGGED_SHA" != x; then
-    OPENJDK_TAG=`git -C $TOPDIR describe --abbrev=0 --tags "$LAST_TAGGED_SHA"`
+    OPENJDK_TAG=`git -C $TOPDIR describe --tags "$LAST_TAGGED_SHA"`
   else
     OPENJDK_TAG=
   fi
diff --git a/closed/autoconf/custom-spec.gmk.in b/closed/autoconf/custom-spec.gmk.in
index 8169e334b3e..2800a4e1b88 100644
--- a/closed/autoconf/custom-spec.gmk.in
+++ b/closed/autoconf/custom-spec.gmk.in
@@ -54,6 +54,10 @@ OPENJDK_TAG             := @OPENJDK_TAG@
 J9JDK_EXT_VERSION       := ${VERSION_NUMBER_FOUR_POSITIONS}
 J9JDK_EXT_NAME          := Extensions for OpenJDK for Eclipse OpenJ9
 
+# required by CMake
+CMAKE                   := @CMAKE@
+OPENJ9_ENABLE_CMAKE     := @OPENJ9_ENABLE_CMAKE@
+
 # required by UMA
 FREEMARKER_JAR          := @FREEMARKER_JAR@
 OPENJ9_BUILDSPEC        := @OPENJ9_BUILDSPEC@
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
index 9176455af18..06c06d6dee0 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
@@ -1,6 +1,6 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2014, 2017 All Rights Reserved
+ * (c) Copyright IBM Corp. 2014, 2018 All Rights Reserved
  * ===========================================================================
  */
 
@@ -350,12 +350,6 @@ public static ModuleLayer boot() throws Exception {
 
         Counters.add("jdk.module.boot.4.resolveTime", t4);
 
-        ClassLoader appLoader = ClassLoaders.appClassLoader();							//IBM-shared_classes_misc
-        ClassLoader platformLoader = ClassLoaders.platformClassLoader();				//IBM-shared_classes_misc
-        ((BuiltinClassLoader)platformLoader).initializeSharedClassesSupport();			//IBM-shared_classes_misc
-        ((BuiltinClassLoader)appLoader).initializeSharedClassesSupport();				//IBM-shared_classes_misc
-
-
         // Step 5: Map the modules in the configuration to class loaders.
         // The static configuration provides the mapping of standard and JDK
         // modules to the boot and platform loaders. All other modules (JDK
@@ -424,6 +418,11 @@ public static ModuleLayer boot() throws Exception {
                 limitedFinder = new SafeModuleFinder(finder);
         }
 
+        ClassLoader appLoader = ClassLoaders.appClassLoader();                                                  //IBM-shared_classes_misc
+        ClassLoader platformLoader = ClassLoaders.platformClassLoader();                                //IBM-shared_classes_misc
+        ((BuiltinClassLoader)platformLoader).initializeSharedClassesSupport();                  //IBM-shared_classes_misc
+        ((BuiltinClassLoader)appLoader).initializeSharedClassesSupport();                               //IBM-shared_classes_misc
+
         // total time to initialize
         Counters.add("jdk.module.boot.totalTime", t0);
         Counters.publish();

From d606bd0a24e2f8601d0d7a5ebf00a14db9928cc7 Mon Sep 17 00:00:00 2001
From: redestad <unknown>
Date: Tue, 10 Apr 2018 16:16:34 +0200
Subject: [PATCH 113/196] 8201179: Regression due loading
 java.nio.charset.StandardCharsets during bootstrap Reviewed-by: sherman,
 martin

---
 .../share/classes/java/lang/StringCoding.java |  8 ++++----
 .../classes/java/nio/charset/Charset.java     |  2 +-
 .../java/nio/charset/StandardCharsets.java    | 12 ++++++++---
 .../share/classes/sun/nio/cs/ISO_8859_1.java  |  2 ++
 .../sun/nio/cs/StandardCharsets.java.template | 20 +++++++++++--------
 .../share/classes/sun/nio/cs/US_ASCII.java    |  2 ++
 .../share/classes/sun/nio/cs/UTF_8.java       |  3 +++
 7 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/StringCoding.java b/src/java.base/share/classes/java/lang/StringCoding.java
index 32af7076752..77e142dbffd 100644
--- a/src/java.base/share/classes/java/lang/StringCoding.java
+++ b/src/java.base/share/classes/java/lang/StringCoding.java
@@ -42,7 +42,6 @@
 import sun.nio.cs.HistoricallyNamedCharset;
 import sun.nio.cs.ArrayDecoder;
 import sun.nio.cs.ArrayEncoder;
-import sun.nio.cs.StandardCharsets;
 
 import static java.lang.String.LATIN1;
 import static java.lang.String.UTF16;
@@ -52,9 +51,6 @@
 import static java.lang.Character.lowSurrogate;
 import static java.lang.Character.isSupplementaryCodePoint;
 import static java.lang.StringUTF16.putChar;
-import static java.nio.charset.StandardCharsets.ISO_8859_1;
-import static java.nio.charset.StandardCharsets.US_ASCII;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
  * Utility class for string encoding and decoding.
@@ -70,6 +66,10 @@ private StringCoding() { }
     private static final ThreadLocal<SoftReference<StringEncoder>> encoder =
         new ThreadLocal<>();
 
+    private static final Charset ISO_8859_1 = sun.nio.cs.ISO_8859_1.INSTANCE;
+    private static final Charset US_ASCII = sun.nio.cs.US_ASCII.INSTANCE;
+    private static final Charset UTF_8 = sun.nio.cs.UTF_8.INSTANCE;
+
     private static <T> T deref(ThreadLocal<SoftReference<T>> tl) {
         SoftReference<T> sr = tl.get();
         if (sr == null)
diff --git a/src/java.base/share/classes/java/nio/charset/Charset.java b/src/java.base/share/classes/java/nio/charset/Charset.java
index f77650e1c08..eacaae5024a 100644
--- a/src/java.base/share/classes/java/nio/charset/Charset.java
+++ b/src/java.base/share/classes/java/nio/charset/Charset.java
@@ -609,7 +609,7 @@ public static Charset defaultCharset() {
                 if (cs != null)
                     defaultCharset = cs;
                 else
-                    defaultCharset = StandardCharsets.UTF_8;
+                    defaultCharset = sun.nio.cs.UTF_8.INSTANCE;
             }
         }
         return defaultCharset;
diff --git a/src/java.base/share/classes/java/nio/charset/StandardCharsets.java b/src/java.base/share/classes/java/nio/charset/StandardCharsets.java
index 47f1236c893..e67f839e29f 100644
--- a/src/java.base/share/classes/java/nio/charset/StandardCharsets.java
+++ b/src/java.base/share/classes/java/nio/charset/StandardCharsets.java
@@ -34,22 +34,28 @@
  */
 public final class StandardCharsets {
 
+    // To avoid accidental eager initialization of often unused Charsets
+    // from happening while the VM is booting up, which may delay
+    // initialization of VM components, we should generally avoid depending
+    // on this class from elsewhere in java.base.
+
     private StandardCharsets() {
         throw new AssertionError("No java.nio.charset.StandardCharsets instances for you!");
     }
+
     /**
      * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the
      * Unicode character set
      */
-    public static final Charset US_ASCII = new sun.nio.cs.US_ASCII();
+    public static final Charset US_ASCII = sun.nio.cs.US_ASCII.INSTANCE;
     /**
      * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1
      */
-    public static final Charset ISO_8859_1 = new sun.nio.cs.ISO_8859_1();
+    public static final Charset ISO_8859_1 = sun.nio.cs.ISO_8859_1.INSTANCE;
     /**
      * Eight-bit UCS Transformation Format
      */
-    public static final Charset UTF_8 = new sun.nio.cs.UTF_8();
+    public static final Charset UTF_8 = sun.nio.cs.UTF_8.INSTANCE;
     /**
      * Sixteen-bit UCS Transformation Format, big-endian byte order
      */
diff --git a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
index 2ef76f37a01..9aa0d5c6204 100644
--- a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
+++ b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
@@ -39,6 +39,8 @@ public class ISO_8859_1
     extends Charset
     implements HistoricallyNamedCharset
 {
+    public static final ISO_8859_1 INSTANCE = new ISO_8859_1();
+
     public ISO_8859_1() {
         super("ISO-8859-1", StandardCharsets.aliases_ISO_8859_1());
     }
diff --git a/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template b/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
index 55d43212aab..8f673f9ea2e 100644
--- a/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
+++ b/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
@@ -83,9 +83,9 @@ public class StandardCharsets extends CharsetProvider {
         Map<String,Charset> map = cache;
         if (map == null) {
             map = new Cache();
-            map.put("utf-8", java.nio.charset.StandardCharsets.UTF_8);
-            map.put("iso-8859-1", java.nio.charset.StandardCharsets.ISO_8859_1);
-            map.put("us-ascii", java.nio.charset.StandardCharsets.US_ASCII);
+            map.put("utf-8", UTF_8.INSTANCE);
+            map.put("iso-8859-1", ISO_8859_1.INSTANCE);
+            map.put("us-ascii", US_ASCII.INSTANCE);
             map.put("utf-16", java.nio.charset.StandardCharsets.UTF_16);
             map.put("utf-16be", java.nio.charset.StandardCharsets.UTF_16BE);
             map.put("utf-16le", java.nio.charset.StandardCharsets.UTF_16LE);
@@ -122,15 +122,19 @@ public class StandardCharsets extends CharsetProvider {
     private Charset lookup(String charsetName) {
         init();
 
-        // By checking these built-ins we can avoid initializing Aliases and
-        // Classes eagerly during bootstrap
+        // By checking these built-ins we can avoid initializing Aliases,
+        // Classes and Cache eagerly during bootstrap.
+        //
+        // Initialization of java.nio.charset.StandardCharsets should be
+        // avoided here to minimize time spent in System.initPhase1, as it
+        // may delay initialization of performance critical VM subsystems.
         String csn;
         if (charsetName.equals("UTF-8")) {
-            return java.nio.charset.StandardCharsets.UTF_8;
+            return UTF_8.INSTANCE;
         } else if (charsetName.equals("US-ASCII")) {
-            return java.nio.charset.StandardCharsets.US_ASCII;
+            return US_ASCII.INSTANCE;
         } else if (charsetName.equals("ISO-8859-1")) {
-            return java.nio.charset.StandardCharsets.ISO_8859_1;
+            return ISO_8859_1.INSTANCE;
         } else {
             csn = canonicalize(toLower(charsetName));
         }
diff --git a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
index c40c61bfbdf..100748aa695 100644
--- a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
+++ b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
@@ -36,6 +36,8 @@ public class US_ASCII
     extends Charset
     implements HistoricallyNamedCharset
 {
+    public static final US_ASCII INSTANCE = new US_ASCII();
+
     public US_ASCII() {
         super("US-ASCII", StandardCharsets.aliases_US_ASCII());
     }
diff --git a/src/java.base/share/classes/sun/nio/cs/UTF_8.java b/src/java.base/share/classes/sun/nio/cs/UTF_8.java
index 6f4dee867db..5561fc30065 100644
--- a/src/java.base/share/classes/sun/nio/cs/UTF_8.java
+++ b/src/java.base/share/classes/sun/nio/cs/UTF_8.java
@@ -55,6 +55,9 @@
  */
 
 public final class UTF_8 extends Unicode {
+
+    public static final UTF_8 INSTANCE = new UTF_8();
+
     public UTF_8() {
         super("UTF-8", StandardCharsets.aliases_UTF_8());
     }

From 1c10e1ab15f5d5b1b0bfa02f21d941b8893be6f9 Mon Sep 17 00:00:00 2001
From: "Keith W. Campbell" <keithc@ca.ibm.com>
Date: Tue, 10 Apr 2018 10:42:51 -0400
Subject: [PATCH 114/196] Make indentation consistent

* no tabs, two spaces per level

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
---
 closed/autoconf/custom-hook.m4 | 114 ++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4
index 37521e18292..f21dcdb7cda 100644
--- a/closed/autoconf/custom-hook.m4
+++ b/closed/autoconf/custom-hook.m4
@@ -47,24 +47,24 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
 
 AC_DEFUN([OPENJ9_CONFIGURE_CMAKE],
 [
-	AC_ARG_WITH(cmake, [AS_HELP_STRING([--with-cmake], [enable building openJ9 with CMake])],
-		[
-			if test "x$with_cmake" != "x"; then
-				CMAKE=$with_cmake
-			fi
-			with_cmake=yes
-		],
-		[with_cmake=no])
-	if test "$with_cmake" == "yes"; then
-		AC_PATH_PROG([CMAKE], [cmake])
-		if test "x$CMAKE" == x; then
-			AC_MSG_ERROR([Could not find CMake])
-		fi
-		OPENJ9_ENABLE_CMAKE=true
-	else
-		OPENJ9_ENABLE_CMAKE=false
-	fi
-	AC_SUBST(OPENJ9_ENABLE_CMAKE)
+  AC_ARG_WITH(cmake, [AS_HELP_STRING([--with-cmake], [enable building openJ9 with CMake])],
+    [
+      if test "x$with_cmake" != "x"; then
+        CMAKE=$with_cmake
+      fi
+      with_cmake=yes
+    ],
+    [with_cmake=no])
+  if test "$with_cmake" == "yes"; then
+    AC_PATH_PROG([CMAKE], [cmake])
+    if test "x$CMAKE" == x; then
+      AC_MSG_ERROR([Could not find CMake])
+    fi
+    OPENJ9_ENABLE_CMAKE=true
+  else
+    OPENJ9_ENABLE_CMAKE=false
+  fi
+  AC_SUBST(OPENJ9_ENABLE_CMAKE)
 ])
 
 AC_DEFUN([OPENJ9_BASIC_SETUP_FUNDAMENTAL_TOOLS],
@@ -184,45 +184,45 @@ AC_DEFUN([OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU],
 ])
 
 AC_DEFUN_ONCE([OPENJ9_PLATFORM_SETUP],
- [
-   # When compiling natively host_cpu and build_cpu are the same. But when
-   # cross compiling we need to work with the host_cpu (which is where the final
-   # JVM will run).
-   OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
-   OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_${OPENJ9_CPU}_cmprssptrs"
-   OPENJ9_LIBS_SUBDIR=compressedrefs
- 
-   if test "x$OPENJ9_CPU" = xx86-64; then
-     if test "x$OPENJDK_BUILD_OS" = xlinux; then
-       OPENJ9_PLATFORM_CODE=xa64
-     elif test "x$OPENJDK_BUILD_OS" = xwindows; then
-       OPENJ9_PLATFORM_CODE=wa64
-       OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs"
-     elif test "x$OPENJDK_BUILD_OS" = xmacosx; then
-       OPENJ9_PLATFORM_CODE=oa64
-       OPENJ9_BUILDSPEC="osx_x86-64"
-     else
-       AC_MSG_ERROR([Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!])
-     fi
-   elif test "x$OPENJ9_CPU" = xppc-64_le; then
-     OPENJ9_PLATFORM_CODE=xl64
-     OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_ppc-64_cmprssptrs_le_gcc"
-   elif test "x$OPENJ9_CPU" = x390-64; then
-     OPENJ9_PLATFORM_CODE=xz64
-   elif test "x$OPENJ9_CPU" = xppc-64; then
-     OPENJ9_PLATFORM_CODE=ap64
-   elif test "x$OPENJ9_CPU" = xarm; then
-     OPENJ9_PLATFORM_CODE=xr32
-     OPENJ9_BUILDSPEC=linux_arm_linaro
-     OPENJ9_LIBS_SUBDIR=default
-   else
-     AC_MSG_ERROR([Unsupported OpenJ9 cpu ${OPENJ9_CPU}, contact support team!])
-   fi
- 
-   AC_SUBST(OPENJ9_BUILDSPEC)
-   AC_SUBST(OPENJ9_PLATFORM_CODE)
-   AC_SUBST(COMPILER_VERSION_STRING)
-   AC_SUBST(OPENJ9_LIBS_SUBDIR)
+[
+  # When compiling natively host_cpu and build_cpu are the same. But when
+  # cross compiling we need to work with the host_cpu (which is where the final
+  # JVM will run).
+  OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
+  OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_${OPENJ9_CPU}_cmprssptrs"
+  OPENJ9_LIBS_SUBDIR=compressedrefs
+
+  if test "x$OPENJ9_CPU" = xx86-64; then
+    if test "x$OPENJDK_BUILD_OS" = xlinux; then
+      OPENJ9_PLATFORM_CODE=xa64
+    elif test "x$OPENJDK_BUILD_OS" = xwindows; then
+      OPENJ9_PLATFORM_CODE=wa64
+      OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs"
+    elif test "x$OPENJDK_BUILD_OS" = xmacosx; then
+      OPENJ9_PLATFORM_CODE=oa64
+      OPENJ9_BUILDSPEC="osx_x86-64"
+    else
+      AC_MSG_ERROR([Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!])
+    fi
+  elif test "x$OPENJ9_CPU" = xppc-64_le; then
+    OPENJ9_PLATFORM_CODE=xl64
+    OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_ppc-64_cmprssptrs_le_gcc"
+  elif test "x$OPENJ9_CPU" = x390-64; then
+    OPENJ9_PLATFORM_CODE=xz64
+  elif test "x$OPENJ9_CPU" = xppc-64; then
+    OPENJ9_PLATFORM_CODE=ap64
+  elif test "x$OPENJ9_CPU" = xarm; then
+    OPENJ9_PLATFORM_CODE=xr32
+    OPENJ9_BUILDSPEC=linux_arm_linaro
+    OPENJ9_LIBS_SUBDIR=default
+  else
+    AC_MSG_ERROR([Unsupported OpenJ9 cpu ${OPENJ9_CPU}, contact support team!])
+  fi
+
+  AC_SUBST(OPENJ9_BUILDSPEC)
+  AC_SUBST(OPENJ9_PLATFORM_CODE)
+  AC_SUBST(COMPILER_VERSION_STRING)
+  AC_SUBST(OPENJ9_LIBS_SUBDIR)
 ])
 
 AC_DEFUN_ONCE([OPENJDK_VERSION_DETAILS],

From 451e9409a35b4279f9bccb469e72665b4894ed12 Mon Sep 17 00:00:00 2001
From: rriggs <unknown>
Date: Tue, 10 Apr 2018 10:49:17 -0400
Subject: [PATCH 115/196] 8201246: Export native function to set platform
 encoding Reviewed-by: rriggs Contributed-by: andrew_m_leonard@uk.ibm.com

---
 src/java.base/share/native/libjava/jni_util.c | 6 ++++--
 src/java.base/share/native/libjava/jni_util.h | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/native/libjava/jni_util.c b/src/java.base/share/native/libjava/jni_util.c
index e42a1c32b38..fa4e39b8a43 100644
--- a/src/java.base/share/native/libjava/jni_util.c
+++ b/src/java.base/share/native/libjava/jni_util.c
@@ -774,8 +774,10 @@ newStringUTF8(JNIEnv *env, const char *str)
     return newSizedStringJava(env, str, len);
 }
 
-/* Initialize the fast encoding from the encoding name. */
-void
+/* Initialize the fast encoding from the encoding name.
+ * Export InitializeEncoding so that the VM can initialize it if required.
+ */
+JNIEXPORT void
 InitializeEncoding(JNIEnv *env, const char *encname)
 {
     jclass strClazz = NULL;
diff --git a/src/java.base/share/native/libjava/jni_util.h b/src/java.base/share/native/libjava/jni_util.h
index f043d2f2c57..4be49acf698 100644
--- a/src/java.base/share/native/libjava/jni_util.h
+++ b/src/java.base/share/native/libjava/jni_util.h
@@ -388,7 +388,7 @@ enum {
 
 int getFastEncoding();
 
-void InitializeEncoding(JNIEnv *env, const char *name);
+JNIEXPORT void InitializeEncoding(JNIEnv *env, const char *name);
 
 void* getProcessHandle();
 

From 5fca31668dd913fb363ee6bbab03901e0475eca0 Mon Sep 17 00:00:00 2001
From: martin <unknown>
Date: Tue, 10 Apr 2018 10:17:35 -0700
Subject: [PATCH 116/196] 8201327: Make Sensor deeply immutably thread safe
 Reviewed-by: alanb, chegar, asmundak

---
 .../classes/sun/management/MemoryPoolImpl.java   | 16 +++++++---------
 .../share/classes/sun/management/Sensor.java     | 11 ++++-------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/java.management/share/classes/sun/management/MemoryPoolImpl.java b/src/java.management/share/classes/sun/management/MemoryPoolImpl.java
index 881207ae63e..227d19947db 100644
--- a/src/java.management/share/classes/sun/management/MemoryPoolImpl.java
+++ b/src/java.management/share/classes/sun/management/MemoryPoolImpl.java
@@ -55,10 +55,10 @@ class MemoryPoolImpl implements MemoryPoolMXBean {
     private long  usageThreshold;
     private long  collectionThreshold;
 
-    private boolean usageSensorRegistered;
-    private boolean gcSensorRegistered;
-    private Sensor  usageSensor;
-    private Sensor  gcSensor;
+    private boolean usageSensorRegistered; // VM-initialized to false
+    private boolean gcSensorRegistered;    // VM-initialized to false
+    private final Sensor usageSensor;
+    private final Sensor gcSensor;
 
     MemoryPoolImpl(String name, boolean isHeap, long usageThreshold,
                    long gcThreshold) {
@@ -72,8 +72,6 @@ class MemoryPoolImpl implements MemoryPoolMXBean {
         this.collectionThresholdSupported = (gcThreshold >= 0);
         this.usageSensor = new PoolSensor(this, name + " usage sensor");
         this.gcSensor = new CollectionSensor(this, name + " collection sensor");
-        this.usageSensorRegistered = false;
-        this.gcSensorRegistered = false;
     }
 
     public String getName() {
@@ -290,7 +288,7 @@ public boolean isCollectionUsageThresholdSupported() {
      * unless the memory usage has returned below the threshold.
      */
     class PoolSensor extends Sensor {
-        MemoryPoolImpl pool;
+        final MemoryPoolImpl pool;
 
         PoolSensor(MemoryPoolImpl pool, String name) {
             super(name);
@@ -316,10 +314,10 @@ void clearAction() {
      * when the memory usage of a memory pool after GC is crossing
      * the collection threshold.
      * The VM will trigger this sensor in subsequent crossing
-     * regardless if the memory usage has changed siince the previous GC.
+     * regardless if the memory usage has changed since the previous GC.
      */
     class CollectionSensor extends Sensor {
-        MemoryPoolImpl pool;
+        final MemoryPoolImpl pool;
         CollectionSensor(MemoryPoolImpl pool, String name) {
             super(name);
             this.pool = pool;
diff --git a/src/java.management/share/classes/sun/management/Sensor.java b/src/java.management/share/classes/sun/management/Sensor.java
index c2da61d174c..58a7e5142df 100644
--- a/src/java.management/share/classes/sun/management/Sensor.java
+++ b/src/java.management/share/classes/sun/management/Sensor.java
@@ -48,10 +48,10 @@
  */
 
 public abstract class Sensor {
-    private Object  lock;
-    private String  name;
-    private long    count;
-    private boolean on;
+    private final Object lock = new Object();
+    private final String name;
+    private long count;                 // VM-initialized to 0
+    private boolean on;                 // VM-initialized to false
 
     /**
      * Constructs a {@code Sensor} object.
@@ -60,9 +60,6 @@ public abstract class Sensor {
      */
     public Sensor(String name) {
         this.name = name;
-        this.count = 0;
-        this.on = false;
-        this.lock = new Object();
     }
 
     /**

From d0deb78922d9a62589abcd9b6bd760fa9eaccb8f Mon Sep 17 00:00:00 2001
From: martin <unknown>
Date: Tue, 10 Apr 2018 10:18:01 -0700
Subject: [PATCH 117/196] 8201328: SynthParser should use Boolean.parseBoolean
 Reviewed-by: serb

---
 .../classes/javax/swing/plaf/synth/SynthParser.java | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
index d590b3f2317..8bebd502302 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
@@ -746,12 +746,7 @@ else if (aName.equals(ATTRIBUTE_KEY)) {
                 value = lookup(aValue, Object.class);
                 break;
             case 1: // boolean
-                if (aValue.toUpperCase().equals("TRUE")) {
-                    value = Boolean.TRUE;
-                }
-                else {
-                    value = Boolean.FALSE;
-                }
+                value = Boolean.parseBoolean(aValue);
                 break;
             case 2: // dimension
                 StringTokenizer tok = new StringTokenizer(aValue);
@@ -939,11 +934,11 @@ else if (key.equals(ATTRIBUTE_DEST_INSETS)) {
                   ": destinationInsets must be top left bottom right");
             }
             else if (key.equals(ATTRIBUTE_PAINT_CENTER)) {
-                paintCenter = value.toLowerCase().equals("true");
+                paintCenter = Boolean.parseBoolean(value);
                 paintCenterSpecified = true;
             }
             else if (key.equals(ATTRIBUTE_STRETCH)) {
-                stretch = value.toLowerCase().equals("true");
+                stretch = Boolean.parseBoolean(value);
                 stretchSpecified = true;
             }
             else if (key.equals(ATTRIBUTE_DIRECTION)) {
@@ -989,7 +984,7 @@ else if (value == "VERTICAL_SPLIT") {
                 }
             }
             else if (key.equals(ATTRIBUTE_CENTER)) {
-                center = value.toLowerCase().equals("true");
+                center = Boolean.parseBoolean(value);
             }
         }
         if (painter == null) {

From 2b43a0c501a33b49f7c4d5f45e46fe5f6550486a Mon Sep 17 00:00:00 2001
From: martin <unknown>
Date: Tue, 10 Apr 2018 10:18:55 -0700
Subject: [PATCH 118/196] 8201357: ALSA_CFLAGS is needed; was dropped in
 JDK-8071469 Reviewed-by: ihse, asmundak

---
 make/lib/Lib-java.desktop.gmk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/make/lib/Lib-java.desktop.gmk b/make/lib/Lib-java.desktop.gmk
index 0c682a46070..5a2f77f878b 100644
--- a/make/lib/Lib-java.desktop.gmk
+++ b/make/lib/Lib-java.desktop.gmk
@@ -50,6 +50,7 @@ ifneq ($(OPENJDK_TARGET_OS), aix)
 
   LIBJSOUND_CFLAGS := \
       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
+      $(ALSA_CFLAGS) \
       $(LIBJAVA_HEADER_FLAGS) \
       $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \
       -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \

From a3220dae8abbe82e83574e6725f9a3eb62d005e6 Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Tue, 10 Apr 2018 19:46:02 +0200
Subject: [PATCH 119/196] 8200298: Unify all unix versions of libjsig/jsig.c
 Reviewed-by: dholmes, stuefe

---
 make/lib/Lib-java.base.gmk                    |   4 +-
 make/mapfiles/libjsig/mapfile-vers-solaris    |   3 +-
 src/java.base/linux/native/libjsig/jsig.c     | 230 -----------------
 src/java.base/macosx/native/libjsig/jsig.c    | 237 ------------------
 .../{solaris => unix}/native/libjsig/jsig.c   | 186 +++++++++-----
 5 files changed, 120 insertions(+), 540 deletions(-)
 delete mode 100644 src/java.base/linux/native/libjsig/jsig.c
 delete mode 100644 src/java.base/macosx/native/libjsig/jsig.c
 rename src/java.base/{solaris => unix}/native/libjsig/jsig.c (66%)

diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
index 714e8d74fc9..1d29fb9e820 100644
--- a/make/lib/Lib-java.base.gmk
+++ b/make/lib/Lib-java.base.gmk
@@ -155,10 +155,10 @@ endif
 ################################################################################
 # Create the jsig library
 
-ifneq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
   ifeq ($(STATIC_BUILD), false)
 
-    LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjsig
+    LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjsig
     LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS))
 
     ifeq ($(OPENJDK_TARGET_OS), linux)
diff --git a/make/mapfiles/libjsig/mapfile-vers-solaris b/make/mapfiles/libjsig/mapfile-vers-solaris
index ddb46c050ec..f8f130d3d5b 100644
--- a/make/mapfiles/libjsig/mapfile-vers-solaris
+++ b/make/mapfiles/libjsig/mapfile-vers-solaris
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2018, 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
@@ -28,7 +28,6 @@ SUNWprivate_1.1 {
         global:
             JVM_begin_signal_setting;
             JVM_end_signal_setting;
-            JVM_get_libjsig_version;
             JVM_get_signal_action;
             sigaction;
             signal;
diff --git a/src/java.base/linux/native/libjsig/jsig.c b/src/java.base/linux/native/libjsig/jsig.c
deleted file mode 100644
index f4221355ca0..00000000000
--- a/src/java.base/linux/native/libjsig/jsig.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2001, 2013, 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.
- *
- */
-
-/* CopyrightVersion 1.2 */
-
-/* This is a special library that should be loaded before libc &
- * libthread to interpose the signal handler installation functions:
- * sigaction(), signal(), sigset().
- * Used for signal-chaining. See RFE 4381843.
- */
-
-#include <signal.h>
-#include <dlfcn.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#define bool int
-#define true 1
-#define false 0
-
-#define MASK(sig) ((uint64_t)1 << (sig-1))  // 0 is not a signal.
-// Check whether all signals fit into jvmsigs. -1 as MASK shifts by -1.
-#if (64 < NSIG-1)
-#error "Not all signals can be encoded in jvmsigs. Adapt its type!"
-#endif
-static struct sigaction sact[NSIG]; /* saved signal handlers */
-static uint64_t jvmsigs = 0; /* signals used by jvm */
-
-/* used to synchronize the installation of signal handlers */
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-static pthread_t tid = 0;
-
-typedef void (*sa_handler_t)(int);
-typedef void (*sa_sigaction_t)(int, siginfo_t *, void *);
-typedef sa_handler_t (*signal_t)(int, sa_handler_t);
-typedef int (*sigaction_t)(int, const struct sigaction *, struct sigaction *);
-
-static signal_t os_signal = 0; /* os's version of signal()/sigset() */
-static sigaction_t os_sigaction = 0; /* os's version of sigaction() */
-
-static bool jvm_signal_installing = false;
-static bool jvm_signal_installed = false;
-
-static void signal_lock() {
-  pthread_mutex_lock(&mutex);
-  /* When the jvm is installing its set of signal handlers, threads
-   * other than the jvm thread should wait */
-  if (jvm_signal_installing) {
-    if (tid != pthread_self()) {
-      pthread_cond_wait(&cond, &mutex);
-    }
-  }
-}
-
-static void signal_unlock() {
-  pthread_mutex_unlock(&mutex);
-}
-
-static sa_handler_t call_os_signal(int sig, sa_handler_t disp,
-                                   bool is_sigset) {
-  if (os_signal == NULL) {
-    if (!is_sigset) {
-      os_signal = (signal_t)dlsym(RTLD_NEXT, "signal");
-    } else {
-      os_signal = (signal_t)dlsym(RTLD_NEXT, "sigset");
-    }
-    if (os_signal == NULL) {
-      printf("%s\n", dlerror());
-      exit(0);
-    }
-  }
-  return (*os_signal)(sig, disp);
-}
-
-static void save_signal_handler(int sig, sa_handler_t disp) {
-  sigset_t set;
-  sact[sig].sa_handler = disp;
-  sigemptyset(&set);
-  sact[sig].sa_mask = set;
-  sact[sig].sa_flags = 0;
-}
-
-static sa_handler_t set_signal(int sig, sa_handler_t disp, bool is_sigset) {
-  sa_handler_t oldhandler;
-  bool sigused;
-
-  signal_lock();
-
-  sigused = (sig < NSIG) && ((MASK(sig) & jvmsigs) != 0);
-  if (jvm_signal_installed && sigused) {
-    /* jvm has installed its signal handler for this signal. */
-    /* Save the handler. Don't really install it. */
-    oldhandler = sact[sig].sa_handler;
-    save_signal_handler(sig, disp);
-
-    signal_unlock();
-    return oldhandler;
-  } else if (sig < NSIG && jvm_signal_installing) {
-    /* jvm is installing its signal handlers. Install the new
-     * handlers and save the old ones. jvm uses sigaction().
-     * Leave the piece here just in case. */
-    oldhandler = call_os_signal(sig, disp, is_sigset);
-    save_signal_handler(sig, oldhandler);
-
-    /* Record the signals used by jvm */
-    jvmsigs |= MASK(sig);
-
-    signal_unlock();
-    return oldhandler;
-  } else {
-    /* jvm has no relation with this signal (yet). Install the
-     * the handler. */
-    oldhandler = call_os_signal(sig, disp, is_sigset);
-
-    signal_unlock();
-    return oldhandler;
-  }
-}
-
-sa_handler_t signal(int sig, sa_handler_t disp) {
-  return set_signal(sig, disp, false);
-}
-
-sa_handler_t sigset(int sig, sa_handler_t disp) {
-  return set_signal(sig, disp, true);
- }
-
-static int call_os_sigaction(int sig, const struct sigaction  *act,
-                             struct sigaction *oact) {
-  if (os_sigaction == NULL) {
-    os_sigaction = (sigaction_t)dlsym(RTLD_NEXT, "sigaction");
-    if (os_sigaction == NULL) {
-      printf("%s\n", dlerror());
-      exit(0);
-    }
-  }
-  return (*os_sigaction)(sig, act, oact);
-}
-
-int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
-  int res;
-  bool sigused;
-  struct sigaction oldAct;
-
-  signal_lock();
-
-  sigused = (sig < NSIG) && ((MASK(sig) & jvmsigs) != 0);
-  if (jvm_signal_installed && sigused) {
-    /* jvm has installed its signal handler for this signal. */
-    /* Save the handler. Don't really install it. */
-    if (oact != NULL) {
-      *oact = sact[sig];
-    }
-    if (act != NULL) {
-      sact[sig] = *act;
-    }
-
-    signal_unlock();
-    return 0;
-  } else if (sig < NSIG && jvm_signal_installing) {
-    /* jvm is installing its signal handlers. Install the new
-     * handlers and save the old ones. */
-    res = call_os_sigaction(sig, act, &oldAct);
-    sact[sig] = oldAct;
-    if (oact != NULL) {
-      *oact = oldAct;
-    }
-
-    /* Record the signals used by jvm */
-    jvmsigs |= MASK(sig);
-
-    signal_unlock();
-    return res;
-  } else {
-    /* jvm has no relation with this signal (yet). Install the
-     * the handler. */
-    res = call_os_sigaction(sig, act, oact);
-
-    signal_unlock();
-    return res;
-  }
-}
-
-/* The three functions for the jvm to call into */
-void JVM_begin_signal_setting() {
-  signal_lock();
-  jvm_signal_installing = true;
-  tid = pthread_self();
-  signal_unlock();
-}
-
-void JVM_end_signal_setting() {
-  signal_lock();
-  jvm_signal_installed = true;
-  jvm_signal_installing = false;
-  pthread_cond_broadcast(&cond);
-  signal_unlock();
-}
-
-struct sigaction *JVM_get_signal_action(int sig) {
-  /* Does race condition make sense here? */
-  if ((MASK(sig) & jvmsigs) != 0) {
-    return &sact[sig];
-  }
-  return NULL;
-}
diff --git a/src/java.base/macosx/native/libjsig/jsig.c b/src/java.base/macosx/native/libjsig/jsig.c
deleted file mode 100644
index d7b1e8be1a7..00000000000
--- a/src/java.base/macosx/native/libjsig/jsig.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (c) 2001, 2015, 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.
- *
- */
-
-/* CopyrightVersion 1.2 */
-
-/* This is a special library that should be loaded before libc &
- * libthread to interpose the signal handler installation functions:
- * sigaction(), signal(), sigset().
- * Used for signal-chaining. See RFE 4381843.
- */
-
-#include <signal.h>
-#include <dlfcn.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#define MASK(sig) ((uint32_t)1 << (sig-1))  // 0 is not a signal.
-#if (32 < NSIG-1)
-#error "Not all signals can be encoded in jvmsigs. Adapt its type!"
-#endif
-static struct sigaction sact[NSIG]; /* saved signal handlers */
-static uint32_t jvmsigs = 0; /* signals used by jvm */
-static __thread bool reentry = false; /* prevent reentry deadlock (per-thread) */
-
-/* used to synchronize the installation of signal handlers */
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-static pthread_t tid = 0;
-
-typedef void (*sa_handler_t)(int);
-typedef void (*sa_sigaction_t)(int, siginfo_t *, void *);
-typedef sa_handler_t (*signal_t)(int, sa_handler_t);
-typedef int (*sigaction_t)(int, const struct sigaction *, struct sigaction *);
-
-static signal_t os_signal = 0; /* os's version of signal()/sigset() */
-static sigaction_t os_sigaction = 0; /* os's version of sigaction() */
-
-static bool jvm_signal_installing = false;
-static bool jvm_signal_installed = false;
-
-static void signal_lock() {
-  pthread_mutex_lock(&mutex);
-  /* When the jvm is installing its set of signal handlers, threads
-   * other than the jvm thread should wait */
-  if (jvm_signal_installing) {
-    if (tid != pthread_self()) {
-      pthread_cond_wait(&cond, &mutex);
-    }
-  }
-}
-
-static void signal_unlock() {
-  pthread_mutex_unlock(&mutex);
-}
-
-static sa_handler_t call_os_signal(int sig, sa_handler_t disp,
-                                   bool is_sigset) {
-  sa_handler_t res;
-
-  if (os_signal == NULL) {
-    if (!is_sigset) {
-      os_signal = (signal_t)dlsym(RTLD_NEXT, "signal");
-    } else {
-      os_signal = (signal_t)dlsym(RTLD_NEXT, "sigset");
-    }
-    if (os_signal == NULL) {
-      printf("%s\n", dlerror());
-      exit(0);
-    }
-  }
-  reentry = true;
-  res = (*os_signal)(sig, disp);
-  reentry = false;
-  return res;
-}
-
-static void save_signal_handler(int sig, sa_handler_t disp) {
-  sigset_t set;
-  sact[sig].sa_handler = disp;
-  sigemptyset(&set);
-  sact[sig].sa_mask = set;
-  sact[sig].sa_flags = 0;
-}
-
-static sa_handler_t set_signal(int sig, sa_handler_t disp, bool is_sigset) {
-  sa_handler_t oldhandler;
-  bool sigused;
-
-  signal_lock();
-
-  sigused = (MASK(sig) & jvmsigs) != 0;
-  if (jvm_signal_installed && sigused) {
-    /* jvm has installed its signal handler for this signal. */
-    /* Save the handler. Don't really install it. */
-    oldhandler = sact[sig].sa_handler;
-    save_signal_handler(sig, disp);
-
-    signal_unlock();
-    return oldhandler;
-  } else if (jvm_signal_installing) {
-    /* jvm is installing its signal handlers. Install the new
-     * handlers and save the old ones. jvm uses sigaction().
-     * Leave the piece here just in case. */
-    oldhandler = call_os_signal(sig, disp, is_sigset);
-    save_signal_handler(sig, oldhandler);
-
-    /* Record the signals used by jvm */
-    jvmsigs |= MASK(sig);
-
-    signal_unlock();
-    return oldhandler;
-  } else {
-    /* jvm has no relation with this signal (yet). Install the
-     * the handler. */
-    oldhandler = call_os_signal(sig, disp, is_sigset);
-
-    signal_unlock();
-    return oldhandler;
-  }
-}
-
-sa_handler_t signal(int sig, sa_handler_t disp) {
-  return set_signal(sig, disp, false);
-}
-
-sa_handler_t sigset(int sig, sa_handler_t disp) {
-  printf("sigset() is not supported by BSD");
-  exit(0);
- }
-
-static int call_os_sigaction(int sig, const struct sigaction  *act,
-                             struct sigaction *oact) {
-  if (os_sigaction == NULL) {
-    os_sigaction = (sigaction_t)dlsym(RTLD_NEXT, "sigaction");
-    if (os_sigaction == NULL) {
-      printf("%s\n", dlerror());
-      exit(0);
-    }
-  }
-  return (*os_sigaction)(sig, act, oact);
-}
-
-int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
-  int res;
-  bool sigused;
-  struct sigaction oldAct;
-
-  if (reentry) {
-    return call_os_sigaction(sig, act, oact);
-  }
-
-  signal_lock();
-
-  sigused = (MASK(sig) & jvmsigs) != 0;
-  if (jvm_signal_installed && sigused) {
-    /* jvm has installed its signal handler for this signal. */
-    /* Save the handler. Don't really install it. */
-    if (oact != NULL) {
-      *oact = sact[sig];
-    }
-    if (act != NULL) {
-      sact[sig] = *act;
-    }
-
-    signal_unlock();
-    return 0;
-  } else if (jvm_signal_installing) {
-    /* jvm is installing its signal handlers. Install the new
-     * handlers and save the old ones. */
-    res = call_os_sigaction(sig, act, &oldAct);
-    sact[sig] = oldAct;
-    if (oact != NULL) {
-      *oact = oldAct;
-    }
-
-    /* Record the signals used by jvm */
-    jvmsigs |= MASK(sig);
-
-    signal_unlock();
-    return res;
-  } else {
-    /* jvm has no relation with this signal (yet). Install the
-     * the handler. */
-    res = call_os_sigaction(sig, act, oact);
-
-    signal_unlock();
-    return res;
-  }
-}
-
-/* The three functions for the jvm to call into */
-void JVM_begin_signal_setting() {
-  signal_lock();
-  jvm_signal_installing = true;
-  tid = pthread_self();
-  signal_unlock();
-}
-
-void JVM_end_signal_setting() {
-  signal_lock();
-  jvm_signal_installed = true;
-  jvm_signal_installing = false;
-  pthread_cond_broadcast(&cond);
-  signal_unlock();
-}
-
-struct sigaction *JVM_get_signal_action(int sig) {
-  /* Does race condition make sense here? */
-  if ((MASK(sig) & jvmsigs) != 0) {
-    return &sact[sig];
-  }
-  return NULL;
-}
diff --git a/src/java.base/solaris/native/libjsig/jsig.c b/src/java.base/unix/native/libjsig/jsig.c
similarity index 66%
rename from src/java.base/solaris/native/libjsig/jsig.c
rename to src/java.base/unix/native/libjsig/jsig.c
index ea3b5ab46ab..1ea79a6a07b 100644
--- a/src/java.base/solaris/native/libjsig/jsig.c
+++ b/src/java.base/unix/native/libjsig/jsig.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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,42 +23,56 @@
  *
  */
 
-/* CopyrightVersion 1.2 */
-
 /* This is a special library that should be loaded before libc &
  * libthread to interpose the signal handler installation functions:
  * sigaction(), signal(), sigset().
  * Used for signal-chaining. See RFE 4381843.
  */
 
-#include <stdlib.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <pthread.h>
+#include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <signal.h>
-#include <dlfcn.h>
-#include <thread.h>
-#include <synch.h>
-#include "jni.h"
-#include "jvm_md.h"
 
-#define bool int
-#define true 1
-#define false 0
+#if (__STDC_VERSION__ >= 199901L)
+  #include <stdbool.h>
+#else
+  #define bool int
+  #define true 1
+  #define false 0
+#endif
+
+#ifdef SOLARIS
+#define MAX_SIGNALS (SIGRTMAX+1)
 
+/* On solaris, MAX_SIGNALS is a macro, not a constant, so we must allocate sact dynamically. */
 static struct sigaction *sact = (struct sigaction *)NULL; /* saved signal handlers */
-static sigset_t jvmsigs;
+#else
+#define MAX_SIGNALS NSIG
+
+static struct sigaction sact[MAX_SIGNALS]; /* saved signal handlers */
+#endif
 
-/* used to synchronize the installation of signal handlers */
-static mutex_t mutex = DEFAULTMUTEX;
-static cond_t cond = DEFAULTCV;
-static thread_t tid = 0;
+static sigset_t jvmsigs; /* Signals used by jvm. */
+
+#ifdef MACOSX
+static __thread bool reentry = false; /* prevent reentry deadlock (per-thread) */
+#endif
+
+/* Used to synchronize the installation of signal handlers. */
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+static pthread_t tid = 0;
 
 typedef void (*sa_handler_t)(int);
 typedef void (*sa_sigaction_t)(int, siginfo_t *, void *);
-typedef sa_handler_t (*signal_t)(int, sa_handler_t);
+typedef sa_handler_t (*signal_function_t)(int, sa_handler_t);
 typedef int (*sigaction_t)(int, const struct sigaction *, struct sigaction *);
 
-static signal_t os_signal = 0; /* os's version of signal()/sigset() */
+static signal_function_t os_signal = 0; /* os's version of signal()/sigset() */
 static sigaction_t os_sigaction = 0; /* os's version of sigaction() */
 
 static bool jvm_signal_installing = false;
@@ -66,65 +81,79 @@ static bool jvm_signal_installed = false;
 
 /* assume called within signal_lock */
 static void allocate_sact() {
-  size_t maxsignum;
-  maxsignum = SIGRTMAX;
+#ifdef SOLARIS
   if (sact == NULL) {
-    sact = (struct sigaction *)malloc((maxsignum+1) * (size_t)sizeof(struct sigaction));
-    memset(sact, 0, (maxsignum+1) * (size_t)sizeof(struct sigaction));
-  }
-
-  if (sact == NULL) {
-    printf("%s\n", "libjsig.so unable to allocate memory");
-    exit(0);
+    sact = (struct sigaction *)malloc((MAX_SIGNALS) * (size_t)sizeof(struct sigaction));
+    if (sact == NULL) {
+      printf("%s\n", "libjsig.so unable to allocate memory");
+      exit(0);
+    }
+    memset(sact, 0, (MAX_SIGNALS) * (size_t)sizeof(struct sigaction));
   }
-
-  sigemptyset(&jvmsigs);
+#endif
 }
 
 static void signal_lock() {
-  mutex_lock(&mutex);
+  pthread_mutex_lock(&mutex);
   /* When the jvm is installing its set of signal handlers, threads
-   * other than the jvm thread should wait */
+   * other than the jvm thread should wait. */
   if (jvm_signal_installing) {
-    if (tid != thr_self()) {
-      cond_wait(&cond, &mutex);
+    if (tid != pthread_self()) {
+      pthread_cond_wait(&cond, &mutex);
     }
   }
 }
 
 static void signal_unlock() {
-  mutex_unlock(&mutex);
+  pthread_mutex_unlock(&mutex);
 }
 
 static sa_handler_t call_os_signal(int sig, sa_handler_t disp,
                                    bool is_sigset) {
+  sa_handler_t res;
+
   if (os_signal == NULL) {
     if (!is_sigset) {
-      os_signal = (signal_t)dlsym(RTLD_NEXT, "signal");
+      os_signal = (signal_function_t)dlsym(RTLD_NEXT, "signal");
     } else {
-      os_signal = (signal_t)dlsym(RTLD_NEXT, "sigset");
+      os_signal = (signal_function_t)dlsym(RTLD_NEXT, "sigset");
     }
     if (os_signal == NULL) {
       printf("%s\n", dlerror());
       exit(0);
     }
   }
-  return (*os_signal)(sig, disp);
+
+#ifdef MACOSX
+  /* On macosx, the OS implementation of signal calls sigaction.
+   * Make sure we do not deadlock with ourself. (See JDK-8072147). */
+  reentry = true;
+#endif
+
+  res = (*os_signal)(sig, disp);
+
+#ifdef MACOSX
+  reentry = false;
+#endif
+
+  return res;
 }
 
 static void save_signal_handler(int sig, sa_handler_t disp, bool is_sigset) {
   sigset_t set;
-  if (sact == NULL) {
-    allocate_sact();
-  }
+
   sact[sig].sa_handler = disp;
   sigemptyset(&set);
   sact[sig].sa_mask = set;
   if (!is_sigset) {
+#ifdef SOLARIS
     sact[sig].sa_flags = SA_NODEFER;
     if (sig != SIGILL && sig != SIGTRAP && sig != SIGPWR) {
       sact[sig].sa_flags |= SA_RESETHAND;
     }
+#else
+    sact[sig].sa_flags = 0;
+#endif
   } else {
     sact[sig].sa_flags = 0;
   }
@@ -132,26 +161,28 @@ static void save_signal_handler(int sig, sa_handler_t disp, bool is_sigset) {
 
 static sa_handler_t set_signal(int sig, sa_handler_t disp, bool is_sigset) {
   sa_handler_t oldhandler;
+  bool sigused;
   bool sigblocked;
 
   signal_lock();
-  if (sact == NULL) {
-    allocate_sact();
-  }
+  allocate_sact();
 
-  if (jvm_signal_installed && sigismember(&jvmsigs, sig)) {
+  sigused = sigismember(&jvmsigs, sig);
+  if (jvm_signal_installed && sigused) {
     /* jvm has installed its signal handler for this signal. */
     /* Save the handler. Don't really install it. */
     if (is_sigset) {
-      /* We won't honor the SIG_HOLD request to change the signal mask */
       sigblocked = sigismember(&(sact[sig].sa_mask), sig);
     }
     oldhandler = sact[sig].sa_handler;
     save_signal_handler(sig, disp, is_sigset);
 
+#ifdef SOLARIS
     if (is_sigset && sigblocked) {
+      /* We won't honor the SIG_HOLD request to change the signal mask */
       oldhandler = SIG_HOLD;
     }
+#endif
 
     signal_unlock();
     return oldhandler;
@@ -178,11 +209,26 @@ static sa_handler_t set_signal(int sig, sa_handler_t disp, bool is_sigset) {
 }
 
 sa_handler_t signal(int sig, sa_handler_t disp) {
+  if (sig < 0 || sig >= MAX_SIGNALS) {
+    errno = EINVAL;
+    return SIG_ERR;
+  }
+
   return set_signal(sig, disp, false);
 }
 
 sa_handler_t sigset(int sig, sa_handler_t disp) {
+#ifdef _ALLBSD_SOURCE
+  printf("sigset() is not supported by BSD");
+  exit(0);
+#else
+  if (sig < 0 || sig >= MAX_SIGNALS) {
+    errno = EINVAL;
+    return (sa_handler_t)-1;
+  }
+
   return set_signal(sig, disp, true);
+#endif
 }
 
 static int call_os_sigaction(int sig, const struct sigaction  *act,
@@ -199,14 +245,25 @@ static int call_os_sigaction(int sig, const struct sigaction  *act,
 
 int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
   int res;
+  bool sigused;
   struct sigaction oldAct;
 
-  signal_lock();
+  if (sig < 0 || sig >= MAX_SIGNALS) {
+    errno = EINVAL;
+    return -1;
+  }
 
-  if (sact == NULL ) {
-    allocate_sact();
+#ifdef MACOSX
+  if (reentry) {
+    return call_os_sigaction(sig, act, oact);
   }
-  if (jvm_signal_installed && sigismember(&jvmsigs, sig)) {
+#endif
+
+  signal_lock();
+
+  allocate_sact();
+  sigused = sigismember(&jvmsigs, sig);
+  if (jvm_signal_installed && sigused) {
     /* jvm has installed its signal handler for this signal. */
     /* Save the handler. Don't really install it. */
     if (oact != NULL) {
@@ -227,7 +284,7 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
       *oact = oldAct;
     }
 
-    /* Record the signals used by jvm */
+    /* Record the signals used by jvm. */
     sigaddset(&jvmsigs, sig);
 
     signal_unlock();
@@ -242,37 +299,28 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
   }
 }
 
-/* The four functions for the jvm to call into */
-JNIEXPORT void JNICALL
-JVM_begin_signal_setting() {
+/* The three functions for the jvm to call into. */
+void JVM_begin_signal_setting() {
   signal_lock();
+  sigemptyset(&jvmsigs);
   jvm_signal_installing = true;
-  tid = thr_self();
+  tid = pthread_self();
   signal_unlock();
 }
 
-JNIEXPORT void JNICALL
-JVM_end_signal_setting() {
+void JVM_end_signal_setting() {
   signal_lock();
   jvm_signal_installed = true;
   jvm_signal_installing = false;
-  cond_broadcast(&cond);
+  pthread_cond_broadcast(&cond);
   signal_unlock();
 }
 
-JNIEXPORT struct sigaction * JNICALL
-JVM_get_signal_action(int sig) {
-  if (sact == NULL) {
-    allocate_sact();
-  }
+struct sigaction *JVM_get_signal_action(int sig) {
+  allocate_sact();
   /* Does race condition make sense here? */
   if (sigismember(&jvmsigs, sig)) {
     return &sact[sig];
   }
   return NULL;
 }
-
-JNIEXPORT int JNICALL
-JVM_get_libjsig_version() {
-  return JSIG_VERSION_1_4_1;
-}

From 8f5a3260329c6cf3d5fc6513340c658048180ec3 Mon Sep 17 00:00:00 2001
From: dl <unknown>
Date: Tue, 10 Apr 2018 11:25:46 -0700
Subject: [PATCH 120/196] 8200728: Docs (Comparison of Stack and Deque methods)
 for Deque is not correct Reviewed-by: martin, psandoz

---
 src/java.base/share/classes/java/util/Deque.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Deque.java b/src/java.base/share/classes/java/util/Deque.java
index 5147a4951c7..b5532a2b60d 100644
--- a/src/java.base/share/classes/java/util/Deque.java
+++ b/src/java.base/share/classes/java/util/Deque.java
@@ -141,8 +141,8 @@
  * <p>Deques can also be used as LIFO (Last-In-First-Out) stacks.  This
  * interface should be used in preference to the legacy {@link Stack} class.
  * When a deque is used as a stack, elements are pushed and popped from the
- * beginning of the deque.  Stack methods are precisely equivalent to
- * {@code Deque} methods as indicated in the table below:
+ * beginning of the deque.  Stack methods are equivalent to {@code Deque}
+ * methods as indicated in the table below:
  *
  * <table class="striped">
  * <caption>Comparison of Stack and Deque methods</caption>
@@ -163,7 +163,7 @@
  *  </tr>
  *  <tr>
  *    <th scope="row">{@link #peek() peek()}</th>
- *    <td>{@link #peekFirst() peekFirst()}</td>
+ *    <td>{@link #getFirst() getFirst()}</td>
  *  </tr>
  *  </tbody>
  * </table>

From 04b05d1692d81ff29484d1c66c07252f4b1e635d Mon Sep 17 00:00:00 2001
From: dl <unknown>
Date: Tue, 10 Apr 2018 11:29:37 -0700
Subject: [PATCH 121/196] 8200520: forkjoin tasks interrupted after shutdown
 Reviewed-by: martin, psandoz, chegar, dholmes

---
 .../java/util/concurrent/ForkJoinPool.java    | 1216 ++++++++---------
 1 file changed, 581 insertions(+), 635 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
index 3d3b105ba06..d1f5e567190 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
@@ -184,17 +184,22 @@ public class ForkJoinPool extends AbstractExecutorService {
      * functionality and control for a set of worker threads:
      * Submissions from non-FJ threads enter into submission queues.
      * Workers take these tasks and typically split them into subtasks
-     * that may be stolen by other workers.  Preference rules give
-     * first priority to processing tasks from their own queues (LIFO
-     * or FIFO, depending on mode), then to randomized FIFO steals of
-     * tasks in other queues.  This framework began as vehicle for
-     * supporting tree-structured parallelism using work-stealing.
-     * Over time, its scalability advantages led to extensions and
-     * changes to better support more diverse usage contexts.  Because
-     * most internal methods and nested classes are interrelated,
-     * their main rationale and descriptions are presented here;
-     * individual methods and nested classes contain only brief
-     * comments about details.
+     * that may be stolen by other workers. Work-stealing based on
+     * randomized scans generally leads to better throughput than
+     * "work dealing" in which producers assign tasks to idle threads,
+     * in part because threads that have finished other tasks before
+     * the signalled thread wakes up (which can be a long time) can
+     * take the task instead.  Preference rules give first priority to
+     * processing tasks from their own queues (LIFO or FIFO, depending
+     * on mode), then to randomized FIFO steals of tasks in other
+     * queues.  This framework began as vehicle for supporting
+     * tree-structured parallelism using work-stealing.  Over time,
+     * its scalability advantages led to extensions and changes to
+     * better support more diverse usage contexts.  Because most
+     * internal methods and nested classes are interrelated, their
+     * main rationale and descriptions are presented here; individual
+     * methods and nested classes contain only brief comments about
+     * details.
      *
      * WorkQueues
      * ==========
@@ -227,9 +232,10 @@ public class ForkJoinPool extends AbstractExecutorService {
      *
      * (The actual code needs to null-check and size-check the array,
      * uses masking, not mod, for indexing a power-of-two-sized array,
-     * properly fences accesses, and possibly signals waiting workers
-     * to start scanning -- see below.)  Both a successful pop and
-     * poll mainly entail a CAS of a slot from non-null to null.
+     * adds a release fence for publication, and possibly signals
+     * waiting workers to start scanning -- see below.)  Both a
+     * successful pop and poll mainly entail a CAS of a slot from
+     * non-null to null.
      *
      * The pop operation (always performed by owner) is:
      *   if ((the task at top slot is not null) and
@@ -241,9 +247,14 @@ public class ForkJoinPool extends AbstractExecutorService {
      *        (CAS slot to null))
      *           increment base and return task;
      *
-     * There are several variants of each of these. In particular,
-     * almost all uses of poll occur within scan operations that also
-     * interleave contention tracking (with associated code sprawl.)
+     * There are several variants of each of these. Most uses occur
+     * within operations that also interleave contention or emptiness
+     * tracking or inspection of elements before extracting them, so
+     * must interleave these with the above code. When performed by
+     * owner, getAndSet is used instead of CAS (see for example method
+     * nextLocalTask) which is usually more efficient, and possible
+     * because the top index cannot independently change during the
+     * operation.
      *
      * Memory ordering.  See "Correct and Efficient Work-Stealing for
      * Weak Memory Models" by Le, Pop, Cohen, and Nardelli, PPoPP 2013
@@ -252,30 +263,37 @@ public class ForkJoinPool extends AbstractExecutorService {
      * algorithms similar to (but different than) the one used here.
      * Extracting tasks in array slots via (fully fenced) CAS provides
      * primary synchronization. The base and top indices imprecisely
-     * guide where to extract from. We do not always require strict
-     * orderings of array and index updates, so sometimes let them be
-     * subject to compiler and processor reorderings. However, the
-     * volatile "base" index also serves as a basis for memory
-     * ordering: Slot accesses are preceded by a read of base,
-     * ensuring happens-before ordering with respect to stealers (so
-     * the slots themselves can be read via plain array reads.)  The
-     * only other memory orderings relied on are maintained in the
-     * course of signalling and activation (see below).  A check that
-     * base == top indicates (momentary) emptiness, but otherwise may
-     * err on the side of possibly making the queue appear nonempty
-     * when a push, pop, or poll have not fully committed, or making
-     * it appear empty when an update of top has not yet been visibly
-     * written.  (Method isEmpty() checks the case of a partially
-     * completed removal of the last element.)  Because of this, the
-     * poll operation, considered individually, is not wait-free. One
-     * thief cannot successfully continue until another in-progress
-     * one (or, if previously empty, a push) visibly completes.
-     * However, in the aggregate, we ensure at least probabilistic
+     * guide where to extract from. We do not usually require strict
+     * orderings of array and index updates. Many index accesses use
+     * plain mode, with ordering constrained by surrounding context
+     * (usually with respect to element CASes or the two WorkQueue
+     * volatile fields source and phase). When not otherwise already
+     * constrained, reads of "base" by queue owners use acquire-mode,
+     * and some externally callable methods preface accesses with
+     * acquire fences.  Additionally, to ensure that index update
+     * writes are not coalesced or postponed in loops etc, "opaque"
+     * mode is used in a few cases where timely writes are not
+     * otherwise ensured. The "locked" versions of push- and pop-
+     * based methods for shared queues differ from owned versions
+     * because locking already forces some of the ordering.
+     *
+     * Because indices and slot contents cannot always be consistent,
+     * a check that base == top indicates (momentary) emptiness, but
+     * otherwise may err on the side of possibly making the queue
+     * appear nonempty when a push, pop, or poll have not fully
+     * committed, or making it appear empty when an update of top has
+     * not yet been visibly written.  (Method isEmpty() checks the
+     * case of a partially completed removal of the last element.)
+     * Because of this, the poll operation, considered individually,
+     * is not wait-free. One thief cannot successfully continue until
+     * another in-progress one (or, if previously empty, a push)
+     * visibly completes.  This can stall threads when required to
+     * consume from a given queue (see method poll()).  However, in
+     * the aggregate, we ensure at least probabilistic
      * non-blockingness.  If an attempted steal fails, a scanning
      * thief chooses a different random victim target to try next. So,
      * in order for one thief to progress, it suffices for any
-     * in-progress poll or new push on any empty queue to
-     * complete.
+     * in-progress poll or new push on any empty queue to complete.
      *
      * This approach also enables support of a user mode in which
      * local task processing is in FIFO, not LIFO order, simply by
@@ -296,7 +314,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * different position to use or create other queues -- they block
      * only when creating and registering new queues. Because it is
      * used only as a spinlock, unlocking requires only a "releasing"
-     * store (using setRelease).
+     * store (using setRelease) unless otherwise signalling.
      *
      * Management
      * ==========
@@ -317,10 +335,10 @@ public class ForkJoinPool extends AbstractExecutorService {
      *
      * Field "ctl" contains 64 bits holding information needed to
      * atomically decide to add, enqueue (on an event queue), and
-     * dequeue (and release)-activate workers.  To enable this
-     * packing, we restrict maximum parallelism to (1<<15)-1 (which is
-     * far in excess of normal operating range) to allow ids, counts,
-     * and their negations (used for thresholding) to fit into 16bit
+     * dequeue and release workers.  To enable this packing, we
+     * restrict maximum parallelism to (1<<15)-1 (which is far in
+     * excess of normal operating range) to allow ids, counts, and
+     * their negations (used for thresholding) to fit into 16bit
      * subfields.
      *
      * Field "mode" holds configuration parameters as well as lifetime
@@ -332,13 +350,14 @@ public class ForkJoinPool extends AbstractExecutorService {
      * lock (using field workerNamePrefix as lock), but is otherwise
      * concurrently readable, and accessed directly. We also ensure
      * that uses of the array reference itself never become too stale
-     * in case of resizing.  To simplify index-based operations, the
-     * array size is always a power of two, and all readers must
-     * tolerate null slots. Worker queues are at odd indices. Shared
-     * (submission) queues are at even indices, up to a maximum of 64
-     * slots, to limit growth even if array needs to expand to add
-     * more workers. Grouping them together in this way simplifies and
-     * speeds up task scanning.
+     * in case of resizing, by arranging that (re-)reads are separated
+     * by at least one acquiring read access.  To simplify index-based
+     * operations, the array size is always a power of two, and all
+     * readers must tolerate null slots. Worker queues are at odd
+     * indices. Shared (submission) queues are at even indices, up to
+     * a maximum of 64 slots, to limit growth even if the array needs
+     * to expand to add more workers. Grouping them together in this
+     * way simplifies and speeds up task scanning.
      *
      * All worker thread creation is on-demand, triggered by task
      * submissions, replacement of terminated workers, and/or
@@ -416,8 +435,8 @@ public class ForkJoinPool extends AbstractExecutorService {
      * releases so usage requires care -- seeing a negative phase does
      * not guarantee that the worker is available. When queued, the
      * lower 16 bits of scanState must hold its pool index. So we
-     * place the index there upon initialization (see registerWorker)
-     * and otherwise keep it there or restore it when necessary.
+     * place the index there upon initialization and otherwise keep it
+     * there or restore it when necessary.
      *
      * The ctl field also serves as the basis for memory
      * synchronization surrounding activation. This uses a more
@@ -425,48 +444,56 @@ public class ForkJoinPool extends AbstractExecutorService {
      * consumers sync with each other by both writing/CASing ctl (even
      * if to its current value).  This would be extremely costly. So
      * we relax it in several ways: (1) Producers only signal when
-     * their queue is empty. Other workers propagate this signal (in
-     * method scan) when they find tasks; to further reduce flailing,
-     * each worker signals only one other per activation. (2) Workers
-     * only enqueue after scanning (see below) and not finding any
-     * tasks.  (3) Rather than CASing ctl to its current value in the
-     * common case where no action is required, we reduce write
+     * their queue is possibly empty at some point during a push
+     * operation (which requires conservatively checking size zero or
+     * one to cover races). (2) Other workers propagate this signal
+     * when they find tasks in a queue with size greater than one. (3)
+     * Workers only enqueue after scanning (see below) and not finding
+     * any tasks.  (4) Rather than CASing ctl to its current value in
+     * the common case where no action is required, we reduce write
      * contention by equivalently prefacing signalWork when called by
      * an external task producer using a memory access with
      * full-volatile semantics or a "fullFence".
      *
-     * Almost always, too many signals are issued. A task producer
-     * cannot in general tell if some existing worker is in the midst
-     * of finishing one task (or already scanning) and ready to take
-     * another without being signalled. So the producer might instead
-     * activate a different worker that does not find any work, and
-     * then inactivates. This scarcely matters in steady-state
-     * computations involving all workers, but can create contention
-     * and bookkeeping bottlenecks during ramp-up, ramp-down, and small
-     * computations involving only a few workers.
-     *
-     * Scanning. Method runWorker performs top-level scanning for
-     * tasks.  Each scan traverses and tries to poll from each queue
-     * starting at a random index and circularly stepping. Scans are
-     * not performed in ideal random permutation order, to reduce
-     * cacheline contention.  The pseudorandom generator need not have
+     * Almost always, too many signals are issued, in part because a
+     * task producer cannot tell if some existing worker is in the
+     * midst of finishing one task (or already scanning) and ready to
+     * take another without being signalled. So the producer might
+     * instead activate a different worker that does not find any
+     * work, and then inactivates. This scarcely matters in
+     * steady-state computations involving all workers, but can create
+     * contention and bookkeeping bottlenecks during ramp-up,
+     * ramp-down, and small computations involving only a few workers.
+     *
+     * Scanning. Method scan (from runWorker) performs top-level
+     * scanning for tasks. (Similar scans appear in helpQuiesce and
+     * pollScan.)  Each scan traverses and tries to poll from each
+     * queue starting at a random index. Scans are not performed in
+     * ideal random permutation order, to reduce cacheline
+     * contention. The pseudorandom generator need not have
      * high-quality statistical properties in the long term, but just
      * within computations; We use Marsaglia XorShifts (often via
      * ThreadLocalRandom.nextSecondarySeed), which are cheap and
-     * suffice. Scanning also employs contention reduction: When
+     * suffice. Scanning also includes contention reduction: When
      * scanning workers fail to extract an apparently existing task,
-     * they soon restart at a different pseudorandom index.  This
-     * improves throughput when many threads are trying to take tasks
-     * from few queues, which can be common in some usages.  Scans do
-     * not otherwise explicitly take into account core affinities,
-     * loads, cache localities, etc, However, they do exploit temporal
-     * locality (which usually approximates these) by preferring to
-     * re-poll (at most #workers times) from the same queue after a
-     * successful poll before trying others.
+     * they soon restart at a different pseudorandom index.  This form
+     * of backoff improves throughput when many threads are trying to
+     * take tasks from few queues, which can be common in some usages.
+     * Scans do not otherwise explicitly take into account core
+     * affinities, loads, cache localities, etc, However, they do
+     * exploit temporal locality (which usually approximates these) by
+     * preferring to re-poll from the same queue after a successful
+     * poll before trying others (see method topLevelExec). However
+     * this preference is bounded (see TOP_BOUND_SHIFT) as a safeguard
+     * against infinitely unfair looping under unbounded user task
+     * recursion, and also to reduce long-term contention when many
+     * threads poll few queues holding many small tasks. The bound is
+     * high enough to avoid much impact on locality and scheduling
+     * overhead.
      *
      * Trimming workers. To release resources after periods of lack of
      * use, a worker starting to wait when the pool is quiescent will
-     * time out and terminate (see method scan) if the pool has
+     * time out and terminate (see method runWorker) if the pool has
      * remained quiescent for period given by field keepAlive.
      *
      * Shutdown and Termination. A call to shutdownNow invokes
@@ -534,13 +561,14 @@ public class ForkJoinPool extends AbstractExecutorService {
      * time. Some previous versions of this class employed immediate
      * compensations for any blocked join. However, in practice, the
      * vast majority of blockages are transient byproducts of GC and
-     * other JVM or OS activities that are made worse by replacement.
-     * Rather than impose arbitrary policies, we allow users to
-     * override the default of only adding threads upon apparent
-     * starvation.  The compensation mechanism may also be bounded.
-     * Bounds for the commonPool (see COMMON_MAX_SPARES) better enable
-     * JVMs to cope with programming errors and abuse before running
-     * out of resources to do so.
+     * other JVM or OS activities that are made worse by replacement
+     * when they cause longer-term oversubscription.  Rather than
+     * impose arbitrary policies, we allow users to override the
+     * default of only adding threads upon apparent starvation.  The
+     * compensation mechanism may also be bounded.  Bounds for the
+     * commonPool (see COMMON_MAX_SPARES) better enable JVMs to cope
+     * with programming errors and abuse before running out of
+     * resources to do so.
      *
      * Common Pool
      * ===========
@@ -573,6 +601,18 @@ public class ForkJoinPool extends AbstractExecutorService {
      * in ForkJoinWorkerThread) may be JVM-dependent and must access
      * particular Thread class fields to achieve this effect.
      *
+     * Memory placement
+     * ================
+     *
+     * Performance can be very sensitive to placement of instances of
+     * ForkJoinPool and WorkQueues and their queue arrays. To reduce
+     * false-sharing impact, the @Contended annotation isolates
+     * adjacent WorkQueue instances, as well as the ForkJoinPool.ctl
+     * field. WorkQueue arrays are allocated (by their threads) with
+     * larger initial sizes than most ever need, mostly to reduce
+     * false sharing with current garbage collectors that use cardmark
+     * tables.
+     *
      * Style notes
      * ===========
      *
@@ -580,13 +620,15 @@ public class ForkJoinPool extends AbstractExecutorService {
      * awkward and ugly, but also reflects the need to control
      * outcomes across the unusual cases that arise in very racy code
      * with very few invariants. All fields are read into locals
-     * before use, and null-checked if they are references.  This is
-     * usually done in a "C"-like style of listing declarations at the
-     * heads of methods or blocks, and using inline assignments on
-     * first encounter.  Nearly all explicit checks lead to
-     * bypass/return, not exception throws, because they may
-     * legitimately arise due to cancellation/revocation during
-     * shutdown.
+     * before use, and null-checked if they are references.  Array
+     * accesses using masked indices include checks (that are always
+     * true) that the array length is non-zero to avoid compilers
+     * inserting more expensive traps.  This is usually done in a
+     * "C"-like style of listing declarations at the heads of methods
+     * or blocks, and using inline assignments on first encounter.
+     * Nearly all explicit checks lead to bypass/return, not exception
+     * throws, because they may legitimately arise due to
+     * cancellation/revocation during shutdown.
      *
      * There is a lot of representation-level coupling among classes
      * ForkJoinPool, ForkJoinWorkerThread, and ForkJoinTask.  The
@@ -596,10 +638,11 @@ public class ForkJoinPool extends AbstractExecutorService {
      * representations will need to be accompanied by algorithmic
      * changes anyway. Several methods intrinsically sprawl because
      * they must accumulate sets of consistent reads of fields held in
-     * local variables.  There are also other coding oddities
-     * (including several unnecessary-looking hoisted null checks)
-     * that help some methods perform reasonably even when interpreted
-     * (not compiled).
+     * local variables. Some others are artificially broken up to
+     * reduce producer/consumer imbalances due to dynamic compilation.
+     * There are also other coding oddities (including several
+     * unnecessary-looking hoisted null checks) that help some methods
+     * perform reasonably even when interpreted (not compiled).
      *
      * The order of declarations in this file is (with a few exceptions):
      * (1) Static utility functions
@@ -703,54 +746,43 @@ public ForkJoinWorkerThread run() {
     static final int DORMANT      = QUIET | UNSIGNALLED;
 
     /**
-     * The maximum number of local polls from the same queue before
-     * checking others. This is a safeguard against infinitely unfair
-     * looping under unbounded user task recursion, and must be larger
-     * than plausible cases of intentional bounded task recursion.
+     * Initial capacity of work-stealing queue array.
+     * Must be a power of two, at least 2.
+     */
+    static final int INITIAL_QUEUE_CAPACITY = 1 << 13;
+
+    /**
+     * Maximum capacity for queue arrays. Must be a power of two less
+     * than or equal to 1 << (31 - width of array entry) to ensure
+     * lack of wraparound of index calculations, but defined to a
+     * value a bit less than this to help users trap runaway programs
+     * before saturating systems.
+     */
+    static final int MAXIMUM_QUEUE_CAPACITY = 1 << 26; // 64M
+
+    /**
+     * The maximum number of top-level polls per worker before
+     * checking other queues, expressed as a bit shift to, in effect,
+     * multiply by pool size, and then use as random value mask, so
+     * average bound is about poolSize*(1<<TOP_BOUND_SHIFT).  See
+     * above for rationale.
      */
-    static final int POLL_LIMIT = 1 << 10;
+    static final int TOP_BOUND_SHIFT = 10;
 
     /**
      * Queues supporting work-stealing as well as external task
      * submission. See above for descriptions and algorithms.
-     * Performance on most platforms is very sensitive to placement of
-     * instances of both WorkQueues and their arrays -- we absolutely
-     * do not want multiple WorkQueue instances or multiple queue
-     * arrays sharing cache lines. The @Contended annotation alerts
-     * JVMs to try to keep instances apart.
      */
     @jdk.internal.vm.annotation.Contended
     static final class WorkQueue {
-
-        /**
-         * Capacity of work-stealing queue array upon initialization.
-         * Must be a power of two; at least 4, but should be larger to
-         * reduce or eliminate cacheline sharing among queues.
-         * Currently, it is much larger, as a partial workaround for
-         * the fact that JVMs often place arrays in locations that
-         * share GC bookkeeping (especially cardmarks) such that
-         * per-write accesses encounter serious memory contention.
-         */
-        static final int INITIAL_QUEUE_CAPACITY = 1 << 13;
-
-        /**
-         * Maximum size for queue arrays. Must be a power of two less
-         * than or equal to 1 << (31 - width of array entry) to ensure
-         * lack of wraparound of index calculations, but defined to a
-         * value a bit less than this to help users trap runaway
-         * programs before saturating systems.
-         */
-        static final int MAXIMUM_QUEUE_CAPACITY = 1 << 26; // 64M
-
-        // Instance fields
+        volatile int source;       // source queue id, or sentinel
+        int id;                    // pool index, mode, tag
+        int base;                  // index of next slot for poll
+        int top;                   // index of next slot for push
         volatile int phase;        // versioned, negative: queued, 1: locked
         int stackPred;             // pool stack (ctl) predecessor link
         int nsteals;               // number of steals
-        int id;                    // index, mode, tag
-        volatile int source;       // source queue id, or sentinel
-        volatile int base;         // index of next slot for poll
-        int top;                   // index of next slot for push
-        ForkJoinTask<?>[] array;   // the elements (initially unallocated)
+        ForkJoinTask<?>[] array;   // the queued tasks; power of 2 size
         final ForkJoinPool pool;   // the containing pool (may be null)
         final ForkJoinWorkerThread owner; // owning thread or null if shared
 
@@ -761,6 +793,17 @@ static final class WorkQueue {
             base = top = INITIAL_QUEUE_CAPACITY >>> 1;
         }
 
+        /**
+         * Tries to lock shared queue by CASing phase field.
+         */
+        final boolean tryLockPhase() {
+            return PHASE.compareAndSet(this, 0, 1);
+        }
+
+        final void releasePhaseLock() {
+            PHASE.setRelease(this, 0);
+        }
+
         /**
          * Returns an exportable index (used by ForkJoinWorkerThread).
          */
@@ -772,7 +815,7 @@ final int getPoolIndex() {
          * Returns the approximate number of tasks in the queue.
          */
         final int queueSize() {
-            int n = base - top;       // read base first
+            int n = (int)BASE.getAcquire(this) - top;
             return (n >= 0) ? 0 : -n; // ignore transient negative
         }
 
@@ -782,14 +825,14 @@ final int queueSize() {
          * near-empty queue has at least one unclaimed task.
          */
         final boolean isEmpty() {
-            ForkJoinTask<?>[] a; int n, al, b;
+            ForkJoinTask<?>[] a; int n, cap, b;
+            VarHandle.acquireFence(); // needed by external callers
             return ((n = (b = base) - top) >= 0 || // possibly one task
                     (n == -1 && ((a = array) == null ||
-                                 (al = a.length) == 0 ||
-                                 a[(al - 1) & b] == null)));
+                                 (cap = a.length) == 0 ||
+                                 a[(cap - 1) & b] == null)));
         }
 
-
         /**
          * Pushes a task. Call only by owner in unshared queues.
          *
@@ -797,94 +840,99 @@ final boolean isEmpty() {
          * @throws RejectedExecutionException if array cannot be resized
          */
         final void push(ForkJoinTask<?> task) {
-            int s = top; ForkJoinTask<?>[] a; int al, d;
-            if ((a = array) != null && (al = a.length) > 0) {
-                int index = (al - 1) & s;
-                ForkJoinPool p = pool;
+            ForkJoinTask<?>[] a;
+            int s = top, d, cap, m;
+            ForkJoinPool p = pool;
+            if ((a = array) != null && (cap = a.length) > 0) {
+                QA.setRelease(a, (m = cap - 1) & s, task);
                 top = s + 1;
-                QA.setRelease(a, index, task);
-                if ((d = base - s) == 0 && p != null) {
+                if (((d = s - (int)BASE.getAcquire(this)) & ~1) == 0 &&
+                    p != null) {                 // size 0 or 1
                     VarHandle.fullFence();
                     p.signalWork();
                 }
-                else if (d + al == 1)
-                    growArray();
+                else if (d == m)
+                    growArray(false);
             }
         }
 
         /**
-         * Initializes or doubles the capacity of array. Call either
-         * by owner or with lock held -- it is OK for base, but not
-         * top, to move while resizings are in progress.
+         * Version of push for shared queues. Call only with phase lock held.
+         * @return true if should signal work
          */
-        final ForkJoinTask<?>[] growArray() {
-            ForkJoinTask<?>[] oldA = array;
-            int oldSize = oldA != null ? oldA.length : 0;
-            int size = oldSize > 0 ? oldSize << 1 : INITIAL_QUEUE_CAPACITY;
-            if (size < INITIAL_QUEUE_CAPACITY || size > MAXIMUM_QUEUE_CAPACITY)
-                throw new RejectedExecutionException("Queue capacity exceeded");
-            int oldMask, t, b;
-            ForkJoinTask<?>[] a = array = new ForkJoinTask<?>[size];
-            if (oldA != null && (oldMask = oldSize - 1) > 0 &&
-                (t = top) - (b = base) > 0) {
-                int mask = size - 1;
-                do { // emulate poll from old array, push to new array
-                    int index = b & oldMask;
-                    ForkJoinTask<?> x = (ForkJoinTask<?>)
-                        QA.getAcquire(oldA, index);
-                    if (x != null &&
-                        QA.compareAndSet(oldA, index, x, null))
-                        a[b & mask] = x;
-                } while (++b != t);
-                VarHandle.releaseFence();
+        final boolean lockedPush(ForkJoinTask<?> task) {
+            ForkJoinTask<?>[] a;
+            boolean signal = false;
+            int s = top, b = base, cap, d;
+            if ((a = array) != null && (cap = a.length) > 0) {
+                a[(cap - 1) & s] = task;
+                top = s + 1;
+                if (b - s + cap - 1 == 0)
+                    growArray(true);
+                else {
+                    phase = 0; // full volatile unlock
+                    if (((s - base) & ~1) == 0) // size 0 or 1
+                        signal = true;
+                }
             }
-            return a;
+            return signal;
         }
 
         /**
-         * Takes next task, if one exists, in LIFO order.  Call only
-         * by owner in unshared queues.
+         * Doubles the capacity of array. Call either by owner or with
+         * lock held -- it is OK for base, but not top, to move while
+         * resizings are in progress.
          */
-        final ForkJoinTask<?> pop() {
-            int b = base, s = top, al, i; ForkJoinTask<?>[] a;
-            if ((a = array) != null && b != s && (al = a.length) > 0) {
-                int index = (al - 1) & --s;
-                ForkJoinTask<?> t = (ForkJoinTask<?>)
-                    QA.get(a, index);
-                if (t != null &&
-                    QA.compareAndSet(a, index, t, null)) {
-                    top = s;
-                    VarHandle.releaseFence();
-                    return t;
+        final void growArray(boolean locked) {
+            ForkJoinTask<?>[] newA = null;
+            try {
+                ForkJoinTask<?>[] oldA; int oldSize, newSize;
+                if ((oldA = array) != null && (oldSize = oldA.length) > 0 &&
+                    (newSize = oldSize << 1) <= MAXIMUM_QUEUE_CAPACITY &&
+                    newSize > 0) {
+                    try {
+                        newA = new ForkJoinTask<?>[newSize];
+                    } catch (OutOfMemoryError ex) {
+                    }
+                    if (newA != null) { // poll from old array, push to new
+                        int oldMask = oldSize - 1, newMask = newSize - 1;
+                        for (int s = top - 1, k = oldMask; k >= 0; --k) {
+                            ForkJoinTask<?> x = (ForkJoinTask<?>)
+                                QA.getAndSet(oldA, s & oldMask, null);
+                            if (x != null)
+                                newA[s-- & newMask] = x;
+                            else
+                                break;
+                        }
+                        array = newA;
+                        VarHandle.releaseFence();
+                    }
                 }
+            } finally {
+                if (locked)
+                    phase = 0;
             }
-            return null;
+            if (newA == null)
+                throw new RejectedExecutionException("Queue capacity exceeded");
         }
 
         /**
          * Takes next task, if one exists, in FIFO order.
          */
         final ForkJoinTask<?> poll() {
-            for (;;) {
-                int b = base, s = top, d, al; ForkJoinTask<?>[] a;
-                if ((a = array) != null && (d = b - s) < 0 &&
-                    (al = a.length) > 0) {
-                    int index = (al - 1) & b;
-                    ForkJoinTask<?> t = (ForkJoinTask<?>)
-                        QA.getAcquire(a, index);
-                    if (b++ == base) {
-                        if (t != null) {
-                            if (QA.compareAndSet(a, index, t, null)) {
-                                base = b;
-                                return t;
-                            }
-                        }
-                        else if (d == -1)
-                            break; // now empty
+            int b, k, cap; ForkJoinTask<?>[] a;
+            while ((a = array) != null && (cap = a.length) > 0 &&
+                   top - (b = base) > 0) {
+                ForkJoinTask<?> t = (ForkJoinTask<?>)
+                    QA.getAcquire(a, k = (cap - 1) & b);
+                if (base == b++) {
+                    if (t == null)
+                        Thread.yield(); // await index advance
+                    else if (QA.compareAndSet(a, k, t, null)) {
+                        BASE.setOpaque(this, b);
+                        return t;
                     }
                 }
-                else
-                    break;
             }
             return null;
         }
@@ -893,33 +941,61 @@ else if (d == -1)
          * Takes next task, if one exists, in order specified by mode.
          */
         final ForkJoinTask<?> nextLocalTask() {
-            return ((id & FIFO) != 0) ? poll() : pop();
+            ForkJoinTask<?> t = null;
+            int md = id, b, s, d, cap; ForkJoinTask<?>[] a;
+            if ((a = array) != null && (cap = a.length) > 0 &&
+                (d = (s = top) - (b = base)) > 0) {
+                if ((md & FIFO) == 0 || d == 1) {
+                    if ((t = (ForkJoinTask<?>)
+                         QA.getAndSet(a, (cap - 1) & --s, null)) != null)
+                        TOP.setOpaque(this, s);
+                }
+                else if ((t = (ForkJoinTask<?>)
+                          QA.getAndSet(a, (cap - 1) & b++, null)) != null) {
+                    BASE.setOpaque(this, b);
+                }
+                else // on contention in FIFO mode, use regular poll
+                    t = poll();
+            }
+            return t;
         }
 
         /**
          * Returns next task, if one exists, in order specified by mode.
          */
         final ForkJoinTask<?> peek() {
-            int al; ForkJoinTask<?>[] a;
-            return ((a = array) != null && (al = a.length) > 0) ?
-                a[(al - 1) &
-                  ((id & FIFO) != 0 ? base : top - 1)] : null;
+            int cap; ForkJoinTask<?>[] a;
+            return ((a = array) != null && (cap = a.length) > 0) ?
+                a[(cap - 1) & ((id & FIFO) != 0 ? base : top - 1)] : null;
         }
 
         /**
          * Pops the given task only if it is at the current top.
          */
         final boolean tryUnpush(ForkJoinTask<?> task) {
-            int b = base, s = top, al; ForkJoinTask<?>[] a;
-            if ((a = array) != null && b != s && (al = a.length) > 0) {
-                int index = (al - 1) & --s;
-                if (QA.compareAndSet(a, index, task, null)) {
+            boolean popped = false;
+            int s, cap; ForkJoinTask<?>[] a;
+            if ((a = array) != null && (cap = a.length) > 0 &&
+                (s = top) != base &&
+                (popped = QA.compareAndSet(a, (cap - 1) & --s, task, null)))
+                TOP.setOpaque(this, s);
+            return popped;
+        }
+
+        /**
+         * Shared version of tryUnpush.
+         */
+        final boolean tryLockedUnpush(ForkJoinTask<?> task) {
+            boolean popped = false;
+            int s = top - 1, k, cap; ForkJoinTask<?>[] a;
+            if ((a = array) != null && (cap = a.length) > 0 &&
+                a[k = (cap - 1) & s] == task && tryLockPhase()) {
+                if (top == s + 1 && array == a &&
+                    (popped = QA.compareAndSet(a, k, task, null)))
                     top = s;
-                    VarHandle.releaseFence();
-                    return true;
-                }
+                releasePhaseLock();
             }
-            return false;
+            return popped;
         }
 
         /**
@@ -933,58 +1009,29 @@ final void cancelAll() {
         // Specialized execution methods
 
         /**
-         * Pops and executes up to limit consecutive tasks or until empty.
-         *
-         * @param limit max runs, or zero for no limit
+         * Runs the given (stolen) task if nonnull, as well as
+         * remaining local tasks and others available from the given
+         * queue, up to bound n (to avoid infinite unfairness).
          */
-        final void localPopAndExec(int limit) {
-            for (;;) {
-                int b = base, s = top, al; ForkJoinTask<?>[] a;
-                if ((a = array) != null && b != s && (al = a.length) > 0) {
-                    int index = (al - 1) & --s;
-                    ForkJoinTask<?> t = (ForkJoinTask<?>)
-                        QA.getAndSet(a, index, null);
-                    if (t != null) {
-                        top = s;
-                        VarHandle.releaseFence();
-                        t.doExec();
-                        if (limit != 0 && --limit == 0)
-                            break;
-                    }
-                    else
+        final void topLevelExec(ForkJoinTask<?> t, WorkQueue q, int n) {
+            if (t != null && q != null) { // hoist checks
+                int nstolen = 1;
+                for (;;) {
+                    t.doExec();
+                    if (n-- < 0)
                         break;
-                }
-                else
-                    break;
-            }
-        }
-
-        /**
-         * Polls and executes up to limit consecutive tasks or until empty.
-         *
-         * @param limit, or zero for no limit
-         */
-        final void localPollAndExec(int limit) {
-            for (int polls = 0;;) {
-                int b = base, s = top, d, al; ForkJoinTask<?>[] a;
-                if ((a = array) != null && (d = b - s) < 0 &&
-                    (al = a.length) > 0) {
-                    int index = (al - 1) & b++;
-                    ForkJoinTask<?> t = (ForkJoinTask<?>)
-                        QA.getAndSet(a, index, null);
-                    if (t != null) {
-                        base = b;
-                        t.doExec();
-                        if (limit != 0 && ++polls == limit)
+                    else if ((t = nextLocalTask()) == null) {
+                        if ((t = q.poll()) == null)
                             break;
+                        else
+                            ++nstolen;
                     }
-                    else if (d == -1)
-                        break;     // now empty
-                    else
-                        polls = 0; // stolen; reset
                 }
-                else
-                    break;
+                ForkJoinWorkerThread thread = owner;
+                nsteals += nstolen;
+                source = 0;
+                if (thread != null)
+                    thread.afterTopLevelExec();
             }
         }
 
@@ -992,25 +1039,24 @@ else if (d == -1)
          * If present, removes task from queue and executes it.
          */
         final void tryRemoveAndExec(ForkJoinTask<?> task) {
-            ForkJoinTask<?>[] wa; int s, wal;
-            if (base - (s = top) < 0 && // traverse from top
-                (wa = array) != null && (wal = wa.length) > 0) {
-                for (int m = wal - 1, ns = s - 1, i = ns; ; --i) {
+            ForkJoinTask<?>[] a; int s, cap;
+            if ((a = array) != null && (cap = a.length) > 0 &&
+                (s = top) - base > 0) { // traverse from top
+                for (int m = cap - 1, ns = s - 1, i = ns; ; --i) {
                     int index = i & m;
-                    ForkJoinTask<?> t = (ForkJoinTask<?>)
-                        QA.get(wa, index);
+                    ForkJoinTask<?> t = (ForkJoinTask<?>)QA.get(a, index);
                     if (t == null)
                         break;
                     else if (t == task) {
-                        if (QA.compareAndSet(wa, index, t, null)) {
+                        if (QA.compareAndSet(a, index, t, null)) {
                             top = ns;   // safely shift down
                             for (int j = i; j != ns; ++j) {
                                 ForkJoinTask<?> f;
                                 int pindex = (j + 1) & m;
-                                f = (ForkJoinTask<?>)QA.get(wa, pindex);
-                                QA.setVolatile(wa, pindex, null);
+                                f = (ForkJoinTask<?>)QA.get(a, pindex);
+                                QA.setVolatile(a, pindex, null);
                                 int jindex = j & m;
-                                QA.setRelease(wa, jindex, f);
+                                QA.setRelease(a, jindex, f);
                             }
                             VarHandle.releaseFence();
                             t.doExec();
@@ -1022,43 +1068,52 @@ else if (t == task) {
         }
 
         /**
-         * Tries to steal and run tasks within the target's
-         * computation until done, not found, or limit exceeded.
+         * Tries to pop and run tasks within the target's computation
+         * until done, not found, or limit exceeded.
          *
          * @param task root of CountedCompleter computation
          * @param limit max runs, or zero for no limit
+         * @param shared true if must lock to extract task
          * @return task status on exit
          */
-        final int localHelpCC(CountedCompleter<?> task, int limit) {
+        final int helpCC(CountedCompleter<?> task, int limit, boolean shared) {
             int status = 0;
             if (task != null && (status = task.status) >= 0) {
-                for (;;) {
-                    boolean help = false;
-                    int b = base, s = top, al; ForkJoinTask<?>[] a;
-                    if ((a = array) != null && b != s && (al = a.length) > 0) {
-                        int index = (al - 1) & (s - 1);
-                        ForkJoinTask<?> o = (ForkJoinTask<?>)
-                            QA.get(a, index);
-                        if (o instanceof CountedCompleter) {
-                            CountedCompleter<?> t = (CountedCompleter<?>)o;
-                            for (CountedCompleter<?> f = t;;) {
-                                if (f != task) {
-                                    if ((f = f.completer) == null) // try parent
-                                        break;
-                                }
-                                else {
-                                    if (QA.compareAndSet(a, index, t, null)) {
+                int s, k, cap; ForkJoinTask<?>[] a;
+                while ((a = array) != null && (cap = a.length) > 0 &&
+                       (s = top) - base > 0) {
+                    CountedCompleter<?> v = null;
+                    ForkJoinTask<?> o = a[k = (cap - 1) & (s - 1)];
+                    if (o instanceof CountedCompleter) {
+                        CountedCompleter<?> t = (CountedCompleter<?>)o;
+                        for (CountedCompleter<?> f = t;;) {
+                            if (f != task) {
+                                if ((f = f.completer) == null)
+                                    break;
+                            }
+                            else if (shared) {
+                                if (tryLockPhase()) {
+                                    if (top == s && array == a &&
+                                        QA.compareAndSet(a, k, t, null)) {
                                         top = s - 1;
-                                        VarHandle.releaseFence();
-                                        t.doExec();
-                                        help = true;
+                                        v = t;
                                     }
-                                    break;
+                                    releasePhaseLock();
+                                }
+                                break;
+                            }
+                            else {
+                                if (QA.compareAndSet(a, k, t, null)) {
+                                    top = s - 1;
+                                    v = t;
                                 }
+                                break;
                             }
                         }
                     }
-                    if ((status = task.status) < 0 || !help ||
+                    if (v != null)
+                        v.doExec();
+                    if ((status = task.status) < 0 || v == null ||
                         (limit != 0 && --limit == 0))
                         break;
                 }
@@ -1066,79 +1121,31 @@ final int localHelpCC(CountedCompleter<?> task, int limit) {
             return status;
         }
 
-        // Operations on shared queues
-
-        /**
-         * Tries to lock shared queue by CASing phase field.
-         */
-        final boolean tryLockSharedQueue() {
-            return PHASE.compareAndSet(this, 0, QLOCK);
-        }
-
-        /**
-         * Shared version of tryUnpush.
-         */
-        final boolean trySharedUnpush(ForkJoinTask<?> task) {
-            boolean popped = false;
-            int s = top - 1, al; ForkJoinTask<?>[] a;
-            if ((a = array) != null && (al = a.length) > 0) {
-                int index = (al - 1) & s;
-                ForkJoinTask<?> t = (ForkJoinTask<?>) QA.get(a, index);
-                if (t == task &&
-                    PHASE.compareAndSet(this, 0, QLOCK)) {
-                    if (top == s + 1 && array == a &&
-                        QA.compareAndSet(a, index, task, null)) {
-                        popped = true;
-                        top = s;
-                    }
-                    PHASE.setRelease(this, 0);
-                }
-            }
-            return popped;
-        }
-
         /**
-         * Shared version of localHelpCC.
+         * Tries to poll and run AsynchronousCompletionTasks until
+         * none found or blocker is released
+         *
+         * @param blocker the blocker
          */
-        final int sharedHelpCC(CountedCompleter<?> task, int limit) {
-            int status = 0;
-            if (task != null && (status = task.status) >= 0) {
-                for (;;) {
-                    boolean help = false;
-                    int b = base, s = top, al; ForkJoinTask<?>[] a;
-                    if ((a = array) != null && b != s && (al = a.length) > 0) {
-                        int index = (al - 1) & (s - 1);
-                        ForkJoinTask<?> o = (ForkJoinTask<?>)
-                            QA.get(a, index);
-                        if (o instanceof CountedCompleter) {
-                            CountedCompleter<?> t = (CountedCompleter<?>)o;
-                            for (CountedCompleter<?> f = t;;) {
-                                if (f != task) {
-                                    if ((f = f.completer) == null)
-                                        break;
-                                }
-                                else {
-                                    if (PHASE.compareAndSet(this, 0, QLOCK)) {
-                                        if (top == s && array == a &&
-                                            QA.compareAndSet(a, index, t, null)) {
-                                            help = true;
-                                            top = s - 1;
-                                        }
-                                        PHASE.setRelease(this, 0);
-                                        if (help)
-                                            t.doExec();
-                                    }
-                                    break;
-                                }
-                            }
+        final void helpAsyncBlocker(ManagedBlocker blocker) {
+            if (blocker != null) {
+                int b, k, cap; ForkJoinTask<?>[] a; ForkJoinTask<?> t;
+                while ((a = array) != null && (cap = a.length) > 0 &&
+                       top - (b = base) > 0) {
+                    t = (ForkJoinTask<?>)QA.getAcquire(a, k = (cap - 1) & b);
+                    if (blocker.isReleasable())
+                        break;
+                    else if (base == b++ && t != null) {
+                        if (!(t instanceof CompletableFuture.
+                              AsynchronousCompletionTask))
+                            break;
+                        else if (QA.compareAndSet(a, k, t, null)) {
+                            BASE.setOpaque(this, b);
+                            t.doExec();
                         }
                     }
-                    if ((status = task.status) < 0 || !help ||
-                        (limit != 0 && --limit == 0))
-                        break;
                 }
             }
-            return status;
         }
 
         /**
@@ -1153,13 +1160,17 @@ final boolean isApparentlyUnblocked() {
         }
 
         // VarHandle mechanics.
-        private static final VarHandle PHASE;
+        static final VarHandle PHASE;
+        static final VarHandle BASE;
+        static final VarHandle TOP;
         static {
             try {
                 MethodHandles.Lookup l = MethodHandles.lookup();
                 PHASE = l.findVarHandle(WorkQueue.class, "phase", int.class);
+                BASE = l.findVarHandle(WorkQueue.class, "base", int.class);
+                TOP = l.findVarHandle(WorkQueue.class, "top", int.class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
         }
     }
@@ -1356,39 +1367,37 @@ final WorkQueue registerWorker(ForkJoinWorkerThread wt) {
         wt.setDaemon(true);                             // configure thread
         if ((handler = ueh) != null)
             wt.setUncaughtExceptionHandler(handler);
-        WorkQueue w = new WorkQueue(this, wt);
         int tid = 0;                                    // for thread name
-        int fifo = mode & FIFO;
+        int idbits = mode & FIFO;
         String prefix = workerNamePrefix;
+        WorkQueue w = new WorkQueue(this, wt);
         if (prefix != null) {
             synchronized (prefix) {
                 WorkQueue[] ws = workQueues; int n;
                 int s = indexSeed += SEED_INCREMENT;
+                idbits |= (s & ~(SMASK | FIFO | DORMANT));
                 if (ws != null && (n = ws.length) > 1) {
                     int m = n - 1;
-                    tid = s & m;
-                    int i = m & ((s << 1) | 1);         // odd-numbered indices
+                    tid = m & ((s << 1) | 1);           // odd-numbered indices
                     for (int probes = n >>> 1;;) {      // find empty slot
                         WorkQueue q;
-                        if ((q = ws[i]) == null || q.phase == QUIET)
+                        if ((q = ws[tid]) == null || q.phase == QUIET)
                             break;
                         else if (--probes == 0) {
-                            i = n | 1;                  // resize below
+                            tid = n | 1;                // resize below
                             break;
                         }
                         else
-                            i = (i + 2) & m;
+                            tid = (tid + 2) & m;
                     }
+                    w.phase = w.id = tid | idbits;      // now publishable
 
-                    int id = i | fifo | (s & ~(SMASK | FIFO | DORMANT));
-                    w.phase = w.id = id;                // now publishable
-
-                    if (i < n)
-                        ws[i] = w;
+                    if (tid < n)
+                        ws[tid] = w;
                     else {                              // expand array
                         int an = n << 1;
                         WorkQueue[] as = new WorkQueue[an];
-                        as[i] = w;
+                        as[tid] = w;
                         int am = an - 1;
                         for (int j = 0; j < n; ++j) {
                             WorkQueue v;                // copy external queue
@@ -1421,14 +1430,14 @@ final void deregisterWorker(ForkJoinWorkerThread wt, Throwable ex) {
         int phase = 0;
         if (wt != null && (w = wt.workQueue) != null) {
             Object lock = workerNamePrefix;
+            int wid = w.id;
             long ns = (long)w.nsteals & 0xffffffffL;
-            int idx = w.id & SMASK;
             if (lock != null) {
-                WorkQueue[] ws;                       // remove index from array
                 synchronized (lock) {
-                    if ((ws = workQueues) != null && ws.length > idx &&
-                        ws[idx] == w)
-                        ws[idx] = null;
+                    WorkQueue[] ws; int n, i;         // remove index from array
+                    if ((ws = workQueues) != null && (n = ws.length) > 0 &&
+                        ws[i = wid & (n - 1)] == w)
+                        ws[i] = null;
                     stealCount += ns;
                 }
             }
@@ -1480,7 +1489,7 @@ else if ((v = ws[i]) == null)
                 Thread vt = v.owner;
                 if (sp == vp && CTL.compareAndSet(this, c, nc)) {
                     v.phase = np;
-                    if (v.source < 0)
+                    if (vt != null && v.source < 0)
                         LockSupport.unpark(vt);
                     break;
                 }
@@ -1521,7 +1530,7 @@ else if ((sp = (int)c) != 0) {       // replace or release
                     long nc = ((long)v.stackPred & SP_MASK) | uc;
                     if (vp == sp && CTL.compareAndSet(this, c, nc)) {
                         v.phase = np;
-                        if (v.source < 0)
+                        if (vt != null && v.source < 0)
                             LockSupport.unpark(vt);
                         return (wp < 0) ? -1 : 1;
                     }
@@ -1578,98 +1587,85 @@ else if (bc < pc) {          // lagging
      * See above for explanation.
      */
     final void runWorker(WorkQueue w) {
-        WorkQueue[] ws;
-        w.growArray();                                  // allocate queue
-        int r = w.id ^ ThreadLocalRandom.nextSecondarySeed();
-        if (r == 0)                                     // initial nonzero seed
-            r = 1;
-        int lastSignalId = 0;                           // avoid unneeded signals
-        while ((ws = workQueues) != null) {
-            boolean nonempty = false;                   // scan
-            for (int n = ws.length, j = n, m = n - 1; j > 0; --j) {
-                WorkQueue q; int i, b, al; ForkJoinTask<?>[] a;
-                if ((i = r & m) >= 0 && i < n &&        // always true
-                    (q = ws[i]) != null && (b = q.base) - q.top < 0 &&
-                    (a = q.array) != null && (al = a.length) > 0) {
-                    int qid = q.id;                     // (never zero)
-                    int index = (al - 1) & b;
-                    ForkJoinTask<?> t = (ForkJoinTask<?>)
-                        QA.getAcquire(a, index);
-                    if (t != null && b++ == q.base &&
-                        QA.compareAndSet(a, index, t, null)) {
-                        if ((q.base = b) - q.top < 0 && qid != lastSignalId)
-                            signalWork();               // propagate signal
-                        w.source = lastSignalId = qid;
-                        t.doExec();
-                        if ((w.id & FIFO) != 0)         // run remaining locals
-                            w.localPollAndExec(POLL_LIMIT);
-                        else
-                            w.localPopAndExec(POLL_LIMIT);
-                        ForkJoinWorkerThread thread = w.owner;
-                        ++w.nsteals;
-                        w.source = 0;                   // now idle
-                        if (thread != null)
-                            thread.afterTopLevelExec();
+        int r = (w.id ^ ThreadLocalRandom.nextSecondarySeed()) | FIFO; // rng
+        w.array = new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY]; // initialize
+        for (;;) {
+            int phase;
+            if (scan(w, r)) {                     // scan until apparently empty
+                r ^= r << 13; r ^= r >>> 17; r ^= r << 5; // move (xorshift)
+            }
+            else if ((phase = w.phase) >= 0) {    // enqueue, then rescan
+                long np = (w.phase = (phase + SS_SEQ) | UNSIGNALLED) & SP_MASK;
+                long c, nc;
+                do {
+                    w.stackPred = (int)(c = ctl);
+                    nc = ((c - RC_UNIT) & UC_MASK) | np;
+                } while (!CTL.weakCompareAndSet(this, c, nc));
+            }
+            else {                                // already queued
+                int pred = w.stackPred;
+                Thread.interrupted();             // clear before park
+                w.source = DORMANT;               // enable signal
+                long c = ctl;
+                int md = mode, rc = (md & SMASK) + (int)(c >> RC_SHIFT);
+                if (md < 0)                       // terminating
+                    break;
+                else if (rc <= 0 && (md & SHUTDOWN) != 0 &&
+                         tryTerminate(false, false))
+                    break;                        // quiescent shutdown
+                else if (rc <= 0 && pred != 0 && phase == (int)c) {
+                    long nc = (UC_MASK & (c - TC_UNIT)) | (SP_MASK & pred);
+                    long d = keepAlive + System.currentTimeMillis();
+                    LockSupport.parkUntil(this, d);
+                    if (ctl == c &&               // drop on timeout if all idle
+                        d - System.currentTimeMillis() <= TIMEOUT_SLOP &&
+                        CTL.compareAndSet(this, c, nc)) {
+                        w.phase = QUIET;
+                        break;
                     }
-                    nonempty = true;
                 }
-                else if (nonempty)
-                    break;
-                else
-                    ++r;
+                else if (w.phase < 0)
+                    LockSupport.park(this);       // OK if spuriously woken
+                w.source = 0;                     // disable signal
             }
+        }
+    }
 
-            if (nonempty) {                             // move (xorshift)
-                r ^= r << 13; r ^= r >>> 17; r ^= r << 5;
-            }
-            else {
-                int phase;
-                lastSignalId = 0;                       // clear for next scan
-                if ((phase = w.phase) >= 0) {           // enqueue
-                    int np = w.phase = (phase + SS_SEQ) | UNSIGNALLED;
-                    long c, nc;
-                    do {
-                        w.stackPred = (int)(c = ctl);
-                        nc = ((c - RC_UNIT) & UC_MASK) | (SP_MASK & np);
-                    } while (!CTL.weakCompareAndSet(this, c, nc));
-                }
-                else {                                  // already queued
-                    int pred = w.stackPred;
-                    w.source = DORMANT;                 // enable signal
-                    for (int steps = 0;;) {
-                        int md, rc; long c;
-                        if (w.phase >= 0) {
-                            w.source = 0;
-                            break;
-                        }
-                        else if ((md = mode) < 0)       // shutting down
-                            return;
-                        else if ((rc = ((md & SMASK) +  // possibly quiescent
-                                        (int)((c = ctl) >> RC_SHIFT))) <= 0 &&
-                                 (md & SHUTDOWN) != 0 &&
-                                 tryTerminate(false, false))
-                            return;                     // help terminate
-                        else if ((++steps & 1) == 0)
-                            Thread.interrupted();       // clear between parks
-                        else if (rc <= 0 && pred != 0 && phase == (int)c) {
-                            long d = keepAlive + System.currentTimeMillis();
-                            LockSupport.parkUntil(this, d);
-                            if (ctl == c &&
-                                d - System.currentTimeMillis() <= TIMEOUT_SLOP) {
-                                long nc = ((UC_MASK & (c - TC_UNIT)) |
-                                           (SP_MASK & pred));
-                                if (CTL.compareAndSet(this, c, nc)) {
-                                    w.phase = QUIET;
-                                    return;             // drop on timeout
-                                }
-                            }
+    /**
+     * Scans for and if found executes one or more top-level tasks from a queue.
+     *
+     * @return true if found an apparently non-empty queue, and
+     * possibly ran task(s).
+     */
+    private boolean scan(WorkQueue w, int r) {
+        WorkQueue[] ws; int n;
+        if ((ws = workQueues) != null && (n = ws.length) > 0 && w != null) {
+            for (int m = n - 1, j = r & m;;) {
+                WorkQueue q; int b;
+                if ((q = ws[j]) != null && q.top != (b = q.base)) {
+                    int qid = q.id;
+                    ForkJoinTask<?>[] a; int cap, k; ForkJoinTask<?> t;
+                    if ((a = q.array) != null && (cap = a.length) > 0) {
+                        t = (ForkJoinTask<?>)QA.getAcquire(a, k = (cap - 1) & b);
+                        if (q.base == b++ && t != null &&
+                            QA.compareAndSet(a, k, t, null)) {
+                            q.base = b;
+                            w.source = qid;
+                            if (q.top - b > 0)
+                                signalWork();
+                            w.topLevelExec(t, q,  // random fairness bound
+                                           r & ((n << TOP_BOUND_SHIFT) - 1));
                         }
-                        else
-                            LockSupport.park(this);
                     }
+                    return true;
                 }
+                else if (--n > 0)
+                    j = (j + 1) & m;
+                else
+                    break;
             }
         }
+        return false;
     }
 
     /**
@@ -1685,42 +1681,44 @@ else if (rc <= 0 && pred != 0 && phase == (int)c) {
      */
     final int awaitJoin(WorkQueue w, ForkJoinTask<?> task, long deadline) {
         int s = 0;
+        int seed = ThreadLocalRandom.nextSecondarySeed();
         if (w != null && task != null &&
             (!(task instanceof CountedCompleter) ||
-             (s = w.localHelpCC((CountedCompleter<?>)task, 0)) >= 0)) {
+             (s = w.helpCC((CountedCompleter<?>)task, 0, false)) >= 0)) {
             w.tryRemoveAndExec(task);
             int src = w.source, id = w.id;
+            int r = (seed >>> 16) | 1, step = (seed & ~1) | 2;
             s = task.status;
             while (s >= 0) {
                 WorkQueue[] ws;
-                boolean nonempty = false;
-                int r = ThreadLocalRandom.nextSecondarySeed() | 1; // odd indices
-                if ((ws = workQueues) != null) {       // scan for matching id
-                    for (int n = ws.length, m = n - 1, j = -n; j < n; j += 2) {
-                        WorkQueue q; int i, b, al; ForkJoinTask<?>[] a;
-                        if ((i = (r + j) & m) >= 0 && i < n &&
-                            (q = ws[i]) != null && q.source == id &&
-                            (b = q.base) - q.top < 0 &&
-                            (a = q.array) != null && (al = a.length) > 0) {
-                            int qid = q.id;
-                            int index = (al - 1) & b;
+                int n = (ws = workQueues) == null ? 0 : ws.length, m = n - 1;
+                while (n > 0) {
+                    WorkQueue q; int b;
+                    if ((q = ws[r & m]) != null && q.source == id &&
+                        q.top != (b = q.base)) {
+                        ForkJoinTask<?>[] a; int cap, k;
+                        int qid = q.id;
+                        if ((a = q.array) != null && (cap = a.length) > 0) {
                             ForkJoinTask<?> t = (ForkJoinTask<?>)
-                                QA.getAcquire(a, index);
-                            if (t != null && b++ == q.base && id == q.source &&
-                                QA.compareAndSet(a, index, t, null)) {
+                                QA.getAcquire(a, k = (cap - 1) & b);
+                            if (q.source == id && q.base == b++ &&
+                                t != null && QA.compareAndSet(a, k, t, null)) {
                                 q.base = b;
                                 w.source = qid;
                                 t.doExec();
                                 w.source = src;
                             }
-                            nonempty = true;
-                            break;
                         }
+                        break;
+                    }
+                    else {
+                        r += step;
+                        --n;
                     }
                 }
                 if ((s = task.status) < 0)
                     break;
-                else if (!nonempty) {
+                else if (n == 0) { // empty scan
                     long ms, ns; int block;
                     if (deadline == 0L)
                         ms = 0L;                       // untimed
@@ -1745,44 +1743,44 @@ else if ((ms = TimeUnit.NANOSECONDS.toMillis(ns)) <= 0L)
      * find tasks either.
      */
     final void helpQuiescePool(WorkQueue w) {
-        int prevSrc = w.source, fifo = w.id & FIFO;
+        int prevSrc = w.source;
+        int seed = ThreadLocalRandom.nextSecondarySeed();
+        int r = seed >>> 16, step = r | 1;
         for (int source = prevSrc, released = -1;;) { // -1 until known
-            WorkQueue[] ws;
-            if (fifo != 0)
-                w.localPollAndExec(0);
-            else
-                w.localPopAndExec(0);
-            if (released == -1 && w.phase >= 0)
+            ForkJoinTask<?> localTask; WorkQueue[] ws;
+            while ((localTask = w.nextLocalTask()) != null)
+                localTask.doExec();
+            if (w.phase >= 0 && released == -1)
                 released = 1;
             boolean quiet = true, empty = true;
-            int r = ThreadLocalRandom.nextSecondarySeed();
-            if ((ws = workQueues) != null) {
-                for (int n = ws.length, j = n, m = n - 1; j > 0; --j) {
-                    WorkQueue q; int i, b, al; ForkJoinTask<?>[] a;
-                    if ((i = (r - j) & m) >= 0 && i < n && (q = ws[i]) != null) {
-                        if ((b = q.base) - q.top < 0 &&
-                            (a = q.array) != null && (al = a.length) > 0) {
-                            int qid = q.id;
+            int n = (ws = workQueues) == null ? 0 : ws.length;
+            for (int m = n - 1; n > 0; r += step, --n) {
+                WorkQueue q; int b;
+                if ((q = ws[r & m]) != null) {
+                    int qs = q.source;
+                    if (q.top != (b = q.base)) {
+                        quiet = empty = false;
+                        ForkJoinTask<?>[] a; int cap, k;
+                        int qid = q.id;
+                        if ((a = q.array) != null && (cap = a.length) > 0) {
                             if (released == 0) {    // increment
                                 released = 1;
                                 CTL.getAndAdd(this, RC_UNIT);
                             }
-                            int index = (al - 1) & b;
                             ForkJoinTask<?> t = (ForkJoinTask<?>)
-                                QA.getAcquire(a, index);
-                            if (t != null && b++ == q.base &&
-                                QA.compareAndSet(a, index, t, null)) {
+                                QA.getAcquire(a, k = (cap - 1) & b);
+                            if (q.base == b++ && t != null &&
+                                QA.compareAndSet(a, k, t, null)) {
                                 q.base = b;
-                                w.source = source = q.id;
+                                w.source = qid;
                                 t.doExec();
                                 w.source = source = prevSrc;
                             }
-                            quiet = empty = false;
-                            break;
                         }
-                        else if ((q.source & QUIET) == 0)
-                            quiet = false;
+                        break;
                     }
+                    else if ((qs & QUIET) == 0)
+                        quiet = false;
                 }
             }
             if (quiet) {
@@ -1824,28 +1822,24 @@ private ForkJoinTask<?> pollScan(boolean submissionsOnly) {
                 origin = r & m;
                 step = h | 1;
             }
-            for (int k = origin, oldSum = 0, checkSum = 0;;) {
-                WorkQueue q; int b, al; ForkJoinTask<?>[] a;
-                if ((q = ws[k]) != null) {
-                    checkSum += b = q.base;
-                    if (b - q.top < 0 &&
-                        (a = q.array) != null && (al = a.length) > 0) {
-                        int index = (al - 1) & b;
-                        ForkJoinTask<?> t = (ForkJoinTask<?>)
-                            QA.getAcquire(a, index);
-                        if (t != null && b++ == q.base &&
-                            QA.compareAndSet(a, index, t, null)) {
-                            q.base = b;
+            boolean nonempty = false;
+            for (int i = origin, oldSum = 0, checkSum = 0;;) {
+                WorkQueue q;
+                if ((q = ws[i]) != null) {
+                    int b; ForkJoinTask<?> t;
+                    if (q.top - (b = q.base) > 0) {
+                        nonempty = true;
+                        if ((t = q.poll()) != null)
                             return t;
-                        }
-                        else
-                            break; // restart
                     }
+                    else
+                        checkSum += b + q.id;
                 }
-                if ((k = (k + step) & m) == origin) {
-                    if (oldSum == (oldSum = checkSum))
+                if ((i = (i + step) & m) == origin) {
+                    if (!nonempty && oldSum == (oldSum = checkSum))
                         break rescan;
                     checkSum = 0;
+                    nonempty = false;
                 }
             }
         }
@@ -1859,11 +1853,9 @@ private ForkJoinTask<?> pollScan(boolean submissionsOnly) {
      */
     final ForkJoinTask<?> nextTaskFor(WorkQueue w) {
         ForkJoinTask<?> t;
-        if (w != null &&
-            (t = (w.id & FIFO) != 0 ? w.poll() : w.pop()) != null)
-            return t;
-        else
-            return pollScan(false);
+        if (w == null || (t = w.nextLocalTask()) == null)
+            t = pollScan(false);
+        return t;
     }
 
     // External operations
@@ -1881,64 +1873,35 @@ final void externalPush(ForkJoinTask<?> task) {
             r = ThreadLocalRandom.getProbe();
         }
         for (;;) {
+            WorkQueue q;
             int md = mode, n;
             WorkQueue[] ws = workQueues;
             if ((md & SHUTDOWN) != 0 || ws == null || (n = ws.length) <= 0)
                 throw new RejectedExecutionException();
-            else {
-                WorkQueue q;
-                boolean push = false, grow = false;
-                if ((q = ws[(n - 1) & r & SQMASK]) == null) {
-                    Object lock = workerNamePrefix;
-                    int qid = (r | QUIET) & ~(FIFO | OWNED);
-                    q = new WorkQueue(this, null);
-                    q.id = qid;
-                    q.source = QUIET;
-                    q.phase = QLOCK;          // lock queue
-                    if (lock != null) {
-                        synchronized (lock) { // lock pool to install
-                            int i;
-                            if ((ws = workQueues) != null &&
-                                (n = ws.length) > 0 &&
-                                ws[i = qid & (n - 1) & SQMASK] == null) {
-                                ws[i] = q;
-                                push = grow = true;
-                            }
-                        }
+            else if ((q = ws[(n - 1) & r & SQMASK]) == null) { // add queue
+                int qid = (r | QUIET) & ~(FIFO | OWNED);
+                Object lock = workerNamePrefix;
+                ForkJoinTask<?>[] qa =
+                    new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY];
+                q = new WorkQueue(this, null);
+                q.array = qa;
+                q.id = qid;
+                q.source = QUIET;
+                if (lock != null) {     // unless disabled, lock pool to install
+                    synchronized (lock) {
+                        WorkQueue[] vs; int i, vn;
+                        if ((vs = workQueues) != null && (vn = vs.length) > 0 &&
+                            vs[i = qid & (vn - 1) & SQMASK] == null)
+                            vs[i] = q;  // else another thread already installed
                     }
                 }
-                else if (q.tryLockSharedQueue()) {
-                    int b = q.base, s = q.top, al, d; ForkJoinTask<?>[] a;
-                    if ((a = q.array) != null && (al = a.length) > 0 &&
-                        al - 1 + (d = b - s) > 0) {
-                        a[(al - 1) & s] = task;
-                        q.top = s + 1;        // relaxed writes OK here
-                        q.phase = 0;
-                        if (d < 0 && q.base - s < -1)
-                            break;            // no signal needed
-                    }
-                    else
-                        grow = true;
-                    push = true;
-                }
-                if (push) {
-                    if (grow) {
-                        try {
-                            q.growArray();
-                            int s = q.top, al; ForkJoinTask<?>[] a;
-                            if ((a = q.array) != null && (al = a.length) > 0) {
-                                a[(al - 1) & s] = task;
-                                q.top = s + 1;
-                            }
-                        } finally {
-                            q.phase = 0;
-                        }
-                    }
+            }
+            else if (!q.tryLockPhase()) // move if busy
+                r = ThreadLocalRandom.advanceProbe(r);
+            else {
+                if (q.lockedPush(task))
                     signalWork();
-                    break;
-                }
-                else                          // move if busy
-                    r = ThreadLocalRandom.advanceProbe(r);
+                return;
             }
         }
     }
@@ -1980,7 +1943,7 @@ final boolean tryExternalUnpush(ForkJoinTask<?> task) {
         return ((ws = workQueues) != null &&
                 (n = ws.length) > 0 &&
                 (w = ws[(n - 1) & r & SQMASK]) != null &&
-                w.trySharedUnpush(task));
+                w.tryLockedUnpush(task));
     }
 
     /**
@@ -1991,7 +1954,7 @@ final int externalHelpComplete(CountedCompleter<?> task, int maxTasks) {
         WorkQueue[] ws; WorkQueue w; int n;
         return ((ws = workQueues) != null && (n = ws.length) > 0 &&
                 (w = ws[(n - 1) & r & SQMASK]) != null) ?
-            w.sharedHelpCC(task, maxTasks) : 0;
+            w.helpCC(task, maxTasks, true) : 0;
     }
 
     /**
@@ -2006,7 +1969,7 @@ final int externalHelpComplete(CountedCompleter<?> task, int maxTasks) {
      */
     final int helpComplete(WorkQueue w, CountedCompleter<?> task,
                            int maxTasks) {
-        return (w == null) ? 0 : w.localHelpCC(task, maxTasks);
+        return (w == null) ? 0 : w.helpCC(task, maxTasks, false);
     }
 
     /**
@@ -2097,15 +2060,18 @@ private boolean tryTerminate(boolean now, boolean enable) {
                     if ((md & SMASK) + (int)(checkSum >> RC_SHIFT) > 0)
                         running = true;
                     else if (ws != null) {
-                        WorkQueue w; int b;
+                        WorkQueue w;
                         for (int i = 0; i < ws.length; ++i) {
                             if ((w = ws[i]) != null) {
-                                checkSum += (b = w.base) + w.id;
+                                int s = w.source, p = w.phase;
+                                int d = w.id, b = w.base;
                                 if (b != w.top ||
-                                    ((i & 1) == 1 && w.source >= 0)) {
+                                    ((d & 1) == 1 && (s >= 0 || p >= 0))) {
                                     running = true;
-                                    break;
+                                    break;     // working, scanning, or have work
                                 }
+                                checkSum += (((long)s << 48) + ((long)p << 32) +
+                                             ((long)b << 16) + (long)d);
                             }
                         }
                     }
@@ -2136,7 +2102,7 @@ else if (workQueues == ws && oldSum == (oldSum = checkSum))
                                 } catch (Throwable ignore) {
                                 }
                             }
-                            checkSum += w.base + w.id;
+                            checkSum += ((long)w.phase << 32) + w.base;
                         }
                     }
                 }
@@ -2629,8 +2595,9 @@ public boolean getAsyncMode() {
      * @return the number of worker threads
      */
     public int getRunningThreadCount() {
-        int rc = 0;
         WorkQueue[] ws; WorkQueue w;
+        VarHandle.acquireFence();
+        int rc = 0;
         if ((ws = workQueues) != null) {
             for (int i = 1; i < ws.length; i += 2) {
                 if ((w = ws[i]) != null && w.isApparentlyUnblocked())
@@ -2678,7 +2645,7 @@ else if (rc > 0)
                 if ((ws = workQueues) != null) {
                     for (int i = 1; i < ws.length; i += 2) {
                         if ((v = ws[i]) != null) {
-                            if ((v.source & QUIET) == 0)
+                            if (v.source > 0)
                                 return false;
                             --tc;
                         }
@@ -2724,8 +2691,9 @@ public long getStealCount() {
      * @return the number of queued tasks
      */
     public long getQueuedTaskCount() {
-        long count = 0;
         WorkQueue[] ws; WorkQueue w;
+        VarHandle.acquireFence();
+        int count = 0;
         if ((ws = workQueues) != null) {
             for (int i = 1; i < ws.length; i += 2) {
                 if ((w = ws[i]) != null)
@@ -2743,8 +2711,9 @@ public long getQueuedTaskCount() {
      * @return the number of queued submissions
      */
     public int getQueuedSubmissionCount() {
-        int count = 0;
         WorkQueue[] ws; WorkQueue w;
+        VarHandle.acquireFence();
+        int count = 0;
         if ((ws = workQueues) != null) {
             for (int i = 0; i < ws.length; i += 2) {
                 if ((w = ws[i]) != null)
@@ -2762,6 +2731,7 @@ public int getQueuedSubmissionCount() {
      */
     public boolean hasQueuedSubmissions() {
         WorkQueue[] ws; WorkQueue w;
+        VarHandle.acquireFence();
         if ((ws = workQueues) != null) {
             for (int i = 0; i < ws.length; i += 2) {
                 if ((w = ws[i]) != null && !w.isEmpty())
@@ -2800,8 +2770,9 @@ protected ForkJoinTask<?> pollSubmission() {
      * @return the number of elements transferred
      */
     protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
-        int count = 0;
         WorkQueue[] ws; WorkQueue w; ForkJoinTask<?> t;
+        VarHandle.acquireFence();
+        int count = 0;
         if ((ws = workQueues) != null) {
             for (int i = 0; i < ws.length; ++i) {
                 if ((w = ws[i]) != null) {
@@ -2824,8 +2795,10 @@ protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
      */
     public String toString() {
         // Use a single pass through workQueues to collect counts
-        long qt = 0L, qs = 0L; int rc = 0;
+        int md = mode; // read volatile fields first
+        long c = ctl;
         long st = stealCount;
+        long qt = 0L, qs = 0L; int rc = 0;
         WorkQueue[] ws; WorkQueue w;
         if ((ws = workQueues) != null) {
             for (int i = 0; i < ws.length; ++i) {
@@ -2843,9 +2816,7 @@ public String toString() {
             }
         }
 
-        int md = mode;
         int pc = (md & SMASK);
-        long c = ctl;
         int tc = pc + (short)(c >>> TC_SHIFT);
         int ac = pc + (int)(c >> RC_SHIFT);
         if (ac < 0) // ignore transient negative
@@ -3131,6 +3102,7 @@ public static interface ManagedBlocker {
      */
     public static void managedBlock(ManagedBlocker blocker)
         throws InterruptedException {
+        if (blocker == null) throw new NullPointerException();
         ForkJoinPool p;
         ForkJoinWorkerThread wt;
         WorkQueue w;
@@ -3163,7 +3135,7 @@ public static void managedBlock(ManagedBlocker blocker)
      * available or blocker is released.
      */
     static void helpAsyncBlocker(Executor e, ManagedBlocker blocker) {
-        if (blocker != null && (e instanceof ForkJoinPool)) {
+        if (e instanceof ForkJoinPool) {
             WorkQueue w; ForkJoinWorkerThread wt; WorkQueue[] ws; int r, n;
             ForkJoinPool p = (ForkJoinPool)e;
             Thread thread = Thread.currentThread();
@@ -3175,34 +3147,8 @@ else if ((r = ThreadLocalRandom.getProbe()) != 0 &&
                 w = ws[(n - 1) & r & SQMASK];
             else
                 w = null;
-            if (w != null) {
-                for (;;) {
-                    int b = w.base, s = w.top, d, al; ForkJoinTask<?>[] a;
-                    if ((a = w.array) != null && (d = b - s) < 0 &&
-                        (al = a.length) > 0) {
-                        int index = (al - 1) & b;
-                        ForkJoinTask<?> t = (ForkJoinTask<?>)
-                            QA.getAcquire(a, index);
-                        if (blocker.isReleasable())
-                            break;
-                        else if (b++ == w.base) {
-                            if (t == null) {
-                                if (d == -1)
-                                    break;
-                            }
-                            else if (!(t instanceof CompletableFuture.
-                                  AsynchronousCompletionTask))
-                                break;
-                            else if (QA.compareAndSet(a, index, t, null)) {
-                                w.base = b;
-                                t.doExec();
-                            }
-                        }
-                    }
-                    else
-                        break;
-                }
-            }
+            if (w != null)
+                w.helpAsyncBlocker(blocker);
         }
     }
 
@@ -3221,7 +3167,7 @@ protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
     // VarHandle mechanics
     private static final VarHandle CTL;
     private static final VarHandle MODE;
-    private static final VarHandle QA;
+    static final VarHandle QA;
 
     static {
         try {
@@ -3230,7 +3176,7 @@ protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
             MODE = l.findVarHandle(ForkJoinPool.class, "mode", int.class);
             QA = MethodHandles.arrayElementVarHandle(ForkJoinTask[].class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to

From d9527c91c8c5179976cb28be6f8882ce84a3a8df Mon Sep 17 00:00:00 2001
From: dl <unknown>
Date: Tue, 10 Apr 2018 11:33:29 -0700
Subject: [PATCH 122/196] 8200258: Improve CopyOnWriteArrayList subList code
 Reviewed-by: martin, psandoz, smarks

---
 .../util/concurrent/CopyOnWriteArrayList.java | 514 ++++++++------
 .../Collection/IteratorMicroBenchmark.java    | 160 +++--
 .../util/Collection/RemoveMicroBenchmark.java | 316 ++++-----
 .../util/concurrent/tck/Collection8Test.java  |  59 +-
 .../tck/CopyOnWriteArrayListTest.java         | 626 ++++++++----------
 .../tck/CopyOnWriteArraySetTest.java          |  11 +-
 .../util/concurrent/tck/JSR166TestCase.java   |  62 +-
 .../util/concurrent/tck/LinkedListTest.java   |  13 +-
 .../java/util/concurrent/tck/VectorTest.java  | 401 ++++++++++-
 9 files changed, 1391 insertions(+), 771 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
index df28a5bc12e..e725b1da740 100644
--- a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
@@ -35,7 +35,6 @@
 package java.util.concurrent;
 
 import java.lang.reflect.Field;
-import java.util.AbstractList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
@@ -134,17 +133,17 @@ public CopyOnWriteArrayList() {
      * @throws NullPointerException if the specified collection is null
      */
     public CopyOnWriteArrayList(Collection<? extends E> c) {
-        Object[] elements;
+        Object[] es;
         if (c.getClass() == CopyOnWriteArrayList.class)
-            elements = ((CopyOnWriteArrayList<?>)c).getArray();
+            es = ((CopyOnWriteArrayList<?>)c).getArray();
         else {
-            elements = c.toArray();
+            es = c.toArray();
             // defend against c.toArray (incorrectly) not returning Object[]
             // (see e.g. https://bugs.openjdk.java.net/browse/JDK-6260652)
-            if (elements.getClass() != Object[].class)
-                elements = Arrays.copyOf(elements, elements.length, Object[].class);
+            if (es.getClass() != Object[].class)
+                es = Arrays.copyOf(es, es.length, Object[].class);
         }
-        setArray(elements);
+        setArray(es);
     }
 
     /**
@@ -180,20 +179,19 @@ public boolean isEmpty() {
      * static version of indexOf, to allow repeated calls without
      * needing to re-acquire array each time.
      * @param o element to search for
-     * @param elements the array
-     * @param index first index to search
-     * @param fence one past last index to search
+     * @param es the array
+     * @param from first index to search
+     * @param to one past last index to search
      * @return index of element, or -1 if absent
      */
-    private static int indexOf(Object o, Object[] elements,
-                               int index, int fence) {
+    private static int indexOfRange(Object o, Object[] es, int from, int to) {
         if (o == null) {
-            for (int i = index; i < fence; i++)
-                if (elements[i] == null)
+            for (int i = from; i < to; i++)
+                if (es[i] == null)
                     return i;
         } else {
-            for (int i = index; i < fence; i++)
-                if (o.equals(elements[i]))
+            for (int i = from; i < to; i++)
+                if (o.equals(es[i]))
                     return i;
         }
         return -1;
@@ -202,18 +200,19 @@ private static int indexOf(Object o, Object[] elements,
     /**
      * static version of lastIndexOf.
      * @param o element to search for
-     * @param elements the array
-     * @param index first index to search
+     * @param es the array
+     * @param from index of first element of range, last element to search
+     * @param to one past last element of range, first element to search
      * @return index of element, or -1 if absent
      */
-    private static int lastIndexOf(Object o, Object[] elements, int index) {
+    private static int lastIndexOfRange(Object o, Object[] es, int from, int to) {
         if (o == null) {
-            for (int i = index; i >= 0; i--)
-                if (elements[i] == null)
+            for (int i = to - 1; i >= from; i--)
+                if (es[i] == null)
                     return i;
         } else {
-            for (int i = index; i >= 0; i--)
-                if (o.equals(elements[i]))
+            for (int i = to - 1; i >= from; i--)
+                if (o.equals(es[i]))
                     return i;
         }
         return -1;
@@ -228,16 +227,15 @@ private static int lastIndexOf(Object o, Object[] elements, int index) {
      * @return {@code true} if this list contains the specified element
      */
     public boolean contains(Object o) {
-        Object[] elements = getArray();
-        return indexOf(o, elements, 0, elements.length) >= 0;
+        return indexOf(o) >= 0;
     }
 
     /**
      * {@inheritDoc}
      */
     public int indexOf(Object o) {
-        Object[] elements = getArray();
-        return indexOf(o, elements, 0, elements.length);
+        Object[] es = getArray();
+        return indexOfRange(o, es, 0, es.length);
     }
 
     /**
@@ -256,16 +254,16 @@ public int indexOf(Object o) {
      * @throws IndexOutOfBoundsException if the specified index is negative
      */
     public int indexOf(E e, int index) {
-        Object[] elements = getArray();
-        return indexOf(e, elements, index, elements.length);
+        Object[] es = getArray();
+        return indexOfRange(e, es, index, es.length);
     }
 
     /**
      * {@inheritDoc}
      */
     public int lastIndexOf(Object o) {
-        Object[] elements = getArray();
-        return lastIndexOf(o, elements, elements.length - 1);
+        Object[] es = getArray();
+        return lastIndexOfRange(o, es, 0, es.length);
     }
 
     /**
@@ -285,8 +283,8 @@ public int lastIndexOf(Object o) {
      *         than or equal to the current size of this list
      */
     public int lastIndexOf(E e, int index) {
-        Object[] elements = getArray();
-        return lastIndexOf(e, elements, index);
+        Object[] es = getArray();
+        return lastIndexOfRange(e, es, 0, index + 1);
     }
 
     /**
@@ -322,8 +320,7 @@ public Object clone() {
      * @return an array containing all the elements in this list
      */
     public Object[] toArray() {
-        Object[] elements = getArray();
-        return Arrays.copyOf(elements, elements.length);
+        return getArray().clone();
     }
 
     /**
@@ -366,12 +363,12 @@ public Object[] toArray() {
      */
     @SuppressWarnings("unchecked")
     public <T> T[] toArray(T[] a) {
-        Object[] elements = getArray();
-        int len = elements.length;
+        Object[] es = getArray();
+        int len = es.length;
         if (a.length < len)
-            return (T[]) Arrays.copyOf(elements, len, a.getClass());
+            return (T[]) Arrays.copyOf(es, len, a.getClass());
         else {
-            System.arraycopy(elements, 0, a, 0, len);
+            System.arraycopy(es, 0, a, 0, len);
             if (a.length > len)
                 a[len] = null;
             return a;
@@ -406,17 +403,13 @@ public E get(int index) {
      */
     public E set(int index, E element) {
         synchronized (lock) {
-            Object[] elements = getArray();
-            E oldValue = elementAt(elements, index);
+            Object[] es = getArray();
+            E oldValue = elementAt(es, index);
 
             if (oldValue != element) {
-                int len = elements.length;
-                Object[] newElements = Arrays.copyOf(elements, len);
-                newElements[index] = element;
-                setArray(newElements);
-            } else {
-                // Not quite a no-op; ensures volatile write semantics
-                setArray(elements);
+                es = es.clone();
+                es[index] = element;
+                setArray(es);
             }
             return oldValue;
         }
@@ -430,11 +423,11 @@ public E set(int index, E element) {
      */
     public boolean add(E e) {
         synchronized (lock) {
-            Object[] elements = getArray();
-            int len = elements.length;
-            Object[] newElements = Arrays.copyOf(elements, len + 1);
-            newElements[len] = e;
-            setArray(newElements);
+            Object[] es = getArray();
+            int len = es.length;
+            es = Arrays.copyOf(es, len + 1);
+            es[len] = e;
+            setArray(es);
             return true;
         }
     }
@@ -448,18 +441,18 @@ public boolean add(E e) {
      */
     public void add(int index, E element) {
         synchronized (lock) {
-            Object[] elements = getArray();
-            int len = elements.length;
+            Object[] es = getArray();
+            int len = es.length;
             if (index > len || index < 0)
                 throw new IndexOutOfBoundsException(outOfBounds(index, len));
             Object[] newElements;
             int numMoved = len - index;
             if (numMoved == 0)
-                newElements = Arrays.copyOf(elements, len + 1);
+                newElements = Arrays.copyOf(es, len + 1);
             else {
                 newElements = new Object[len + 1];
-                System.arraycopy(elements, 0, newElements, 0, index);
-                System.arraycopy(elements, index, newElements, index + 1,
+                System.arraycopy(es, 0, newElements, 0, index);
+                System.arraycopy(es, index, newElements, index + 1,
                                  numMoved);
             }
             newElements[index] = element;
@@ -476,19 +469,20 @@ public void add(int index, E element) {
      */
     public E remove(int index) {
         synchronized (lock) {
-            Object[] elements = getArray();
-            int len = elements.length;
-            E oldValue = elementAt(elements, index);
+            Object[] es = getArray();
+            int len = es.length;
+            E oldValue = elementAt(es, index);
             int numMoved = len - index - 1;
+            Object[] newElements;
             if (numMoved == 0)
-                setArray(Arrays.copyOf(elements, len - 1));
+                newElements = Arrays.copyOf(es, len - 1);
             else {
-                Object[] newElements = new Object[len - 1];
-                System.arraycopy(elements, 0, newElements, 0, index);
-                System.arraycopy(elements, index + 1, newElements, index,
+                newElements = new Object[len - 1];
+                System.arraycopy(es, 0, newElements, 0, index);
+                System.arraycopy(es, index + 1, newElements, index,
                                  numMoved);
-                setArray(newElements);
             }
+            setArray(newElements);
             return oldValue;
         }
     }
@@ -507,7 +501,7 @@ public E remove(int index) {
      */
     public boolean remove(Object o) {
         Object[] snapshot = getArray();
-        int index = indexOf(o, snapshot, 0, snapshot.length);
+        int index = indexOfRange(o, snapshot, 0, snapshot.length);
         return index >= 0 && remove(o, snapshot, index);
     }
 
@@ -532,7 +526,7 @@ private boolean remove(Object o, Object[] snapshot, int index) {
                     return false;
                 if (current[index] == o)
                     break findIndex;
-                index = indexOf(o, current, index, len);
+                index = indexOfRange(o, current, index, len);
                 if (index < 0)
                     return false;
             }
@@ -560,19 +554,19 @@ private boolean remove(Object o, Object[] snapshot, int index) {
      */
     void removeRange(int fromIndex, int toIndex) {
         synchronized (lock) {
-            Object[] elements = getArray();
-            int len = elements.length;
+            Object[] es = getArray();
+            int len = es.length;
 
             if (fromIndex < 0 || toIndex > len || toIndex < fromIndex)
                 throw new IndexOutOfBoundsException();
             int newlen = len - (toIndex - fromIndex);
             int numMoved = len - toIndex;
             if (numMoved == 0)
-                setArray(Arrays.copyOf(elements, newlen));
+                setArray(Arrays.copyOf(es, newlen));
             else {
                 Object[] newElements = new Object[newlen];
-                System.arraycopy(elements, 0, newElements, 0, fromIndex);
-                System.arraycopy(elements, toIndex, newElements,
+                System.arraycopy(es, 0, newElements, 0, fromIndex);
+                System.arraycopy(es, toIndex, newElements,
                                  fromIndex, numMoved);
                 setArray(newElements);
             }
@@ -587,7 +581,7 @@ void removeRange(int fromIndex, int toIndex) {
      */
     public boolean addIfAbsent(E e) {
         Object[] snapshot = getArray();
-        return indexOf(e, snapshot, 0, snapshot.length) < 0
+        return indexOfRange(e, snapshot, 0, snapshot.length) < 0
             && addIfAbsent(e, snapshot);
     }
 
@@ -606,7 +600,7 @@ private boolean addIfAbsent(E e, Object[] snapshot) {
                     if (current[i] != snapshot[i]
                         && Objects.equals(e, current[i]))
                         return false;
-                if (indexOf(e, current, common, len) >= 0)
+                if (indexOfRange(e, current, common, len) >= 0)
                         return false;
             }
             Object[] newElements = Arrays.copyOf(current, len + 1);
@@ -627,10 +621,10 @@ private boolean addIfAbsent(E e, Object[] snapshot) {
      * @see #contains(Object)
      */
     public boolean containsAll(Collection<?> c) {
-        Object[] elements = getArray();
-        int len = elements.length;
+        Object[] es = getArray();
+        int len = es.length;
         for (Object e : c) {
-            if (indexOf(e, elements, 0, len) < 0)
+            if (indexOfRange(e, es, 0, len) < 0)
                 return false;
         }
         return true;
@@ -694,18 +688,18 @@ public int addAllAbsent(Collection<? extends E> c) {
         if (cs.length == 0)
             return 0;
         synchronized (lock) {
-            Object[] elements = getArray();
-            int len = elements.length;
+            Object[] es = getArray();
+            int len = es.length;
             int added = 0;
             // uniquify and compact elements in cs
             for (int i = 0; i < cs.length; ++i) {
                 Object e = cs[i];
-                if (indexOf(e, elements, 0, len) < 0 &&
-                    indexOf(e, cs, 0, added) < 0)
+                if (indexOfRange(e, es, 0, len) < 0 &&
+                    indexOfRange(e, cs, 0, added) < 0)
                     cs[added++] = e;
             }
             if (added > 0) {
-                Object[] newElements = Arrays.copyOf(elements, len + added);
+                Object[] newElements = Arrays.copyOf(es, len + added);
                 System.arraycopy(cs, 0, newElements, len, added);
                 setArray(newElements);
             }
@@ -739,15 +733,16 @@ public boolean addAll(Collection<? extends E> c) {
         if (cs.length == 0)
             return false;
         synchronized (lock) {
-            Object[] elements = getArray();
-            int len = elements.length;
+            Object[] es = getArray();
+            int len = es.length;
+            Object[] newElements;
             if (len == 0 && cs.getClass() == Object[].class)
-                setArray(cs);
+                newElements = cs;
             else {
-                Object[] newElements = Arrays.copyOf(elements, len + cs.length);
+                newElements = Arrays.copyOf(es, len + cs.length);
                 System.arraycopy(cs, 0, newElements, len, cs.length);
-                setArray(newElements);
             }
+            setArray(newElements);
             return true;
         }
     }
@@ -771,8 +766,8 @@ public boolean addAll(Collection<? extends E> c) {
     public boolean addAll(int index, Collection<? extends E> c) {
         Object[] cs = c.toArray();
         synchronized (lock) {
-            Object[] elements = getArray();
-            int len = elements.length;
+            Object[] es = getArray();
+            int len = es.length;
             if (index > len || index < 0)
                 throw new IndexOutOfBoundsException(outOfBounds(index, len));
             if (cs.length == 0)
@@ -780,11 +775,11 @@ public boolean addAll(int index, Collection<? extends E> c) {
             int numMoved = len - index;
             Object[] newElements;
             if (numMoved == 0)
-                newElements = Arrays.copyOf(elements, len + cs.length);
+                newElements = Arrays.copyOf(es, len + cs.length);
             else {
                 newElements = new Object[len + cs.length];
-                System.arraycopy(elements, 0, newElements, 0, index);
-                System.arraycopy(elements, index,
+                System.arraycopy(es, 0, newElements, 0, index);
+                System.arraycopy(es, index,
                                  newElements, index + cs.length,
                                  numMoved);
             }
@@ -866,14 +861,14 @@ boolean bulkRemove(Predicate<? super E> filter, int i, int end) {
     }
 
     public void replaceAll(UnaryOperator<E> operator) {
-        Objects.requireNonNull(operator);
         synchronized (lock) {
-            replaceAll(operator, 0, getArray().length);
+            replaceAllRange(operator, 0, getArray().length);
         }
     }
 
-    void replaceAll(UnaryOperator<E> operator, int i, int end) {
+    void replaceAllRange(UnaryOperator<E> operator, int i, int end) {
         // assert Thread.holdsLock(lock);
+        Objects.requireNonNull(operator);
         final Object[] es = getArray().clone();
         for (; i < end; i++)
             es[i] = operator.apply(elementAt(es, i));
@@ -882,12 +877,12 @@ void replaceAll(UnaryOperator<E> operator, int i, int end) {
 
     public void sort(Comparator<? super E> c) {
         synchronized (lock) {
-            sort(c, 0, getArray().length);
+            sortRange(c, 0, getArray().length);
         }
     }
 
     @SuppressWarnings("unchecked")
-    void sort(Comparator<? super E> c, int i, int end) {
+    void sortRange(Comparator<? super E> c, int i, int end) {
         // assert Thread.holdsLock(lock);
         final Object[] es = getArray().clone();
         Arrays.sort(es, i, end, (Comparator<Object>)c);
@@ -908,12 +903,12 @@ private void writeObject(java.io.ObjectOutputStream s)
 
         s.defaultWriteObject();
 
-        Object[] elements = getArray();
+        Object[] es = getArray();
         // Write out array length
-        s.writeInt(elements.length);
+        s.writeInt(es.length);
 
         // Write out all elements in the proper order.
-        for (Object element : elements)
+        for (Object element : es)
             s.writeObject(element);
     }
 
@@ -935,12 +930,12 @@ private void readObject(java.io.ObjectInputStream s)
         // Read in array length and allocate array
         int len = s.readInt();
         SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, len);
-        Object[] elements = new Object[len];
+        Object[] es = new Object[len];
 
         // Read in all elements in the proper order.
         for (int i = 0; i < len; i++)
-            elements[i] = s.readObject();
-        setArray(elements);
+            es[i] = s.readObject();
+        setArray(es);
     }
 
     /**
@@ -986,6 +981,15 @@ public boolean equals(Object o) {
         return !it.hasNext();
     }
 
+    private static int hashCodeOfRange(Object[] es, int from, int to) {
+        int hashCode = 1;
+        for (int i = from; i < to; i++) {
+            Object x = es[i];
+            hashCode = 31 * hashCode + (x == null ? 0 : x.hashCode());
+        }
+        return hashCode;
+    }
+
     /**
      * Returns the hash code value for this list.
      *
@@ -994,10 +998,8 @@ public boolean equals(Object o) {
      * @return the hash code value for this list
      */
     public int hashCode() {
-        int hashCode = 1;
-        for (Object x : getArray())
-            hashCode = 31 * hashCode + (x == null ? 0 : x.hashCode());
-        return hashCode;
+        Object[] es = getArray();
+        return hashCodeOfRange(es, 0, es.length);
     }
 
     /**
@@ -1037,12 +1039,12 @@ public ListIterator<E> listIterator() {
      * @throws IndexOutOfBoundsException {@inheritDoc}
      */
     public ListIterator<E> listIterator(int index) {
-        Object[] elements = getArray();
-        int len = elements.length;
+        Object[] es = getArray();
+        int len = es.length;
         if (index < 0 || index > len)
             throw new IndexOutOfBoundsException(outOfBounds(index, len));
 
-        return new COWIterator<E>(elements, index);
+        return new COWIterator<E>(es, index);
     }
 
     /**
@@ -1070,9 +1072,9 @@ static final class COWIterator<E> implements ListIterator<E> {
         /** Index of element to be returned by subsequent call to next.  */
         private int cursor;
 
-        COWIterator(Object[] elements, int initialCursor) {
+        COWIterator(Object[] es, int initialCursor) {
             cursor = initialCursor;
-            snapshot = elements;
+            snapshot = es;
         }
 
         public boolean hasNext() {
@@ -1102,7 +1104,7 @@ public int nextIndex() {
         }
 
         public int previousIndex() {
-            return cursor-1;
+            return cursor - 1;
         }
 
         /**
@@ -1133,14 +1135,13 @@ public void add(E e) {
         }
 
         @Override
-        @SuppressWarnings("unchecked")
         public void forEachRemaining(Consumer<? super E> action) {
             Objects.requireNonNull(action);
             final int size = snapshot.length;
-            for (int i = cursor; i < size; i++) {
-                action.accept((E) snapshot[i]);
-            }
+            int i = cursor;
             cursor = size;
+            for (; i < size; i++)
+                action.accept(elementAt(snapshot, i));
         }
     }
 
@@ -1161,136 +1162,264 @@ public void forEachRemaining(Consumer<? super E> action) {
      */
     public List<E> subList(int fromIndex, int toIndex) {
         synchronized (lock) {
-            Object[] elements = getArray();
-            int len = elements.length;
-            if (fromIndex < 0 || toIndex > len || fromIndex > toIndex)
+            Object[] es = getArray();
+            int len = es.length;
+            int size = toIndex - fromIndex;
+            if (fromIndex < 0 || toIndex > len || size < 0)
                 throw new IndexOutOfBoundsException();
-            return new COWSubList<E>(this, fromIndex, toIndex);
+            return new COWSubList(es, fromIndex, size);
         }
     }
 
     /**
      * Sublist for CopyOnWriteArrayList.
      */
-    private static class COWSubList<E>
-        extends AbstractList<E>
-        implements RandomAccess
-    {
-        private final CopyOnWriteArrayList<E> l;
+    private class COWSubList implements List<E>, RandomAccess {
         private final int offset;
         private int size;
         private Object[] expectedArray;
 
-        // only call this holding l's lock
-        COWSubList(CopyOnWriteArrayList<E> list,
-                   int fromIndex, int toIndex) {
-            // assert Thread.holdsLock(list.lock);
-            l = list;
-            expectedArray = l.getArray();
-            offset = fromIndex;
-            size = toIndex - fromIndex;
+        COWSubList(Object[] es, int offset, int size) {
+            // assert Thread.holdsLock(lock);
+            expectedArray = es;
+            this.offset = offset;
+            this.size = size;
         }
 
-        // only call this holding l's lock
         private void checkForComodification() {
-            // assert Thread.holdsLock(l.lock);
-            if (l.getArray() != expectedArray)
+            // assert Thread.holdsLock(lock);
+            if (getArray() != expectedArray)
                 throw new ConcurrentModificationException();
         }
 
         private Object[] getArrayChecked() {
-            // assert Thread.holdsLock(l.lock);
-            Object[] a = l.getArray();
+            // assert Thread.holdsLock(lock);
+            Object[] a = getArray();
             if (a != expectedArray)
                 throw new ConcurrentModificationException();
             return a;
         }
 
-        // only call this holding l's lock
         private void rangeCheck(int index) {
-            // assert Thread.holdsLock(l.lock);
+            // assert Thread.holdsLock(lock);
             if (index < 0 || index >= size)
                 throw new IndexOutOfBoundsException(outOfBounds(index, size));
         }
 
+        private void rangeCheckForAdd(int index) {
+            // assert Thread.holdsLock(lock);
+            if (index < 0 || index > size)
+                throw new IndexOutOfBoundsException(outOfBounds(index, size));
+        }
+
+        public Object[] toArray() {
+            final Object[] es;
+            final int offset;
+            final int size;
+            synchronized (lock) {
+                es = getArrayChecked();
+                offset = this.offset;
+                size = this.size;
+            }
+            return Arrays.copyOfRange(es, offset, offset + size);
+        }
+
+        @SuppressWarnings("unchecked")
+        public <T> T[] toArray(T[] a) {
+            final Object[] es;
+            final int offset;
+            final int size;
+            synchronized (lock) {
+                es = getArrayChecked();
+                offset = this.offset;
+                size = this.size;
+            }
+            if (a.length < size)
+                return (T[]) Arrays.copyOfRange(
+                        es, offset, offset + size, a.getClass());
+            else {
+                System.arraycopy(es, offset, a, 0, size);
+                if (a.length > size)
+                    a[size] = null;
+                return a;
+            }
+        }
+
+        public int indexOf(Object o) {
+            final Object[] es;
+            final int offset;
+            final int size;
+            synchronized (lock) {
+                es = getArrayChecked();
+                offset = this.offset;
+                size = this.size;
+            }
+            int i = indexOfRange(o, es, offset, offset + size);
+            return (i == -1) ? -1 : i - offset;
+        }
+
+        public int lastIndexOf(Object o) {
+            final Object[] es;
+            final int offset;
+            final int size;
+            synchronized (lock) {
+                es = getArrayChecked();
+                offset = this.offset;
+                size = this.size;
+            }
+            int i = lastIndexOfRange(o, es, offset, offset + size);
+            return (i == -1) ? -1 : i - offset;
+        }
+
+        public boolean contains(Object o) {
+            return indexOf(o) >= 0;
+        }
+
+        public boolean containsAll(Collection<?> c) {
+            final Object[] es;
+            final int offset;
+            final int size;
+            synchronized (lock) {
+                es = getArrayChecked();
+                offset = this.offset;
+                size = this.size;
+            }
+            for (Object o : c)
+                if (indexOfRange(o, es, offset, offset + size) < 0)
+                    return false;
+            return true;
+        }
+
+        public boolean isEmpty() {
+            return size() == 0;
+        }
+
+        public String toString() {
+            return Arrays.toString(toArray());
+        }
+
+        public int hashCode() {
+            final Object[] es;
+            final int offset;
+            final int size;
+            synchronized (lock) {
+                es = getArrayChecked();
+                offset = this.offset;
+                size = this.size;
+            }
+            return hashCodeOfRange(es, offset, offset + size);
+        }
+
+        public boolean equals(Object o) {
+            if (o == this)
+                return true;
+            if (!(o instanceof List))
+                return false;
+            Iterator<?> it = ((List<?>)o).iterator();
+
+            final Object[] es;
+            final int offset;
+            final int size;
+            synchronized (lock) {
+                es = getArrayChecked();
+                offset = this.offset;
+                size = this.size;
+            }
+
+            for (int i = offset, end = offset + size; i < end; i++)
+                if (!it.hasNext() || !Objects.equals(es[i], it.next()))
+                    return false;
+            return !it.hasNext();
+        }
+
         public E set(int index, E element) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 rangeCheck(index);
                 checkForComodification();
-                E x = l.set(offset + index, element);
-                expectedArray = l.getArray();
+                E x = CopyOnWriteArrayList.this.set(offset + index, element);
+                expectedArray = getArray();
                 return x;
             }
         }
 
         public E get(int index) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 rangeCheck(index);
                 checkForComodification();
-                return l.get(offset + index);
+                return CopyOnWriteArrayList.this.get(offset + index);
             }
         }
 
         public int size() {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 checkForComodification();
                 return size;
             }
         }
 
         public boolean add(E element) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 checkForComodification();
-                l.add(offset + size, element);
-                expectedArray = l.getArray();
+                CopyOnWriteArrayList.this.add(offset + size, element);
+                expectedArray = getArray();
                 size++;
             }
             return true;
         }
 
         public void add(int index, E element) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 checkForComodification();
-                if (index < 0 || index > size)
-                    throw new IndexOutOfBoundsException
-                        (outOfBounds(index, size));
-                l.add(offset + index, element);
-                expectedArray = l.getArray();
+                rangeCheckForAdd(index);
+                CopyOnWriteArrayList.this.add(offset + index, element);
+                expectedArray = getArray();
                 size++;
             }
         }
 
         public boolean addAll(Collection<? extends E> c) {
-            synchronized (l.lock) {
+            synchronized (lock) {
+                final Object[] oldArray = getArrayChecked();
+                boolean modified =
+                    CopyOnWriteArrayList.this.addAll(offset + size, c);
+                size += (expectedArray = getArray()).length - oldArray.length;
+                return modified;
+            }
+        }
+
+        public boolean addAll(int index, Collection<? extends E> c) {
+            synchronized (lock) {
+                rangeCheckForAdd(index);
                 final Object[] oldArray = getArrayChecked();
-                boolean modified = l.addAll(offset + size, c);
-                size += (expectedArray = l.getArray()).length - oldArray.length;
+                boolean modified =
+                    CopyOnWriteArrayList.this.addAll(offset + index, c);
+                size += (expectedArray = getArray()).length - oldArray.length;
                 return modified;
             }
         }
 
         public void clear() {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 checkForComodification();
-                l.removeRange(offset, offset + size);
-                expectedArray = l.getArray();
+                removeRange(offset, offset + size);
+                expectedArray = getArray();
                 size = 0;
             }
         }
 
         public E remove(int index) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 rangeCheck(index);
                 checkForComodification();
-                E result = l.remove(offset + index);
-                expectedArray = l.getArray();
+                E result = CopyOnWriteArrayList.this.remove(offset + index);
+                expectedArray = getArray();
                 size--;
                 return result;
             }
         }
 
         public boolean remove(Object o) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 checkForComodification();
                 int index = indexOf(o);
                 if (index == -1)
@@ -1301,36 +1430,35 @@ public boolean remove(Object o) {
         }
 
         public Iterator<E> iterator() {
-            synchronized (l.lock) {
-                checkForComodification();
-                return new COWSubListIterator<E>(l, 0, offset, size);
-            }
+            return listIterator(0);
+        }
+
+        public ListIterator<E> listIterator() {
+            return listIterator(0);
         }
 
         public ListIterator<E> listIterator(int index) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 checkForComodification();
-                if (index < 0 || index > size)
-                    throw new IndexOutOfBoundsException
-                        (outOfBounds(index, size));
-                return new COWSubListIterator<E>(l, index, offset, size);
+                rangeCheckForAdd(index);
+                return new COWSubListIterator<E>(
+                    CopyOnWriteArrayList.this, index, offset, size);
             }
         }
 
         public List<E> subList(int fromIndex, int toIndex) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 checkForComodification();
                 if (fromIndex < 0 || toIndex > size || fromIndex > toIndex)
                     throw new IndexOutOfBoundsException();
-                return new COWSubList<E>(l, fromIndex + offset,
-                                         toIndex + offset);
+                return new COWSubList(expectedArray, fromIndex + offset, toIndex - fromIndex);
             }
         }
 
         public void forEach(Consumer<? super E> action) {
             Objects.requireNonNull(action);
             int i, end; final Object[] es;
-            synchronized (l.lock) {
+            synchronized (lock) {
                 es = getArrayChecked();
                 i = offset;
                 end = i + size;
@@ -1340,19 +1468,18 @@ public void forEach(Consumer<? super E> action) {
         }
 
         public void replaceAll(UnaryOperator<E> operator) {
-            Objects.requireNonNull(operator);
-            synchronized (l.lock) {
+            synchronized (lock) {
                 checkForComodification();
-                l.replaceAll(operator, offset, offset + size);
-                expectedArray = l.getArray();
+                replaceAllRange(operator, offset, offset + size);
+                expectedArray = getArray();
             }
         }
 
         public void sort(Comparator<? super E> c) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 checkForComodification();
-                l.sort(c, offset, offset + size);
-                expectedArray = l.getArray();
+                sortRange(c, offset, offset + size);
+                expectedArray = getArray();
             }
         }
 
@@ -1372,16 +1499,17 @@ public boolean removeIf(Predicate<? super E> filter) {
         }
 
         private boolean bulkRemove(Predicate<? super E> filter) {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 final Object[] oldArray = getArrayChecked();
-                boolean modified = l.bulkRemove(filter, offset, offset + size);
-                size += (expectedArray = l.getArray()).length - oldArray.length;
+                boolean modified = CopyOnWriteArrayList.this.bulkRemove(
+                    filter, offset, offset + size);
+                size += (expectedArray = getArray()).length - oldArray.length;
                 return modified;
             }
         }
 
         public Spliterator<E> spliterator() {
-            synchronized (l.lock) {
+            synchronized (lock) {
                 return Spliterators.spliterator(
                         getArrayChecked(), offset, offset + size,
                         Spliterator.IMMUTABLE | Spliterator.ORDERED);
@@ -1398,7 +1526,7 @@ private static class COWSubListIterator<E> implements ListIterator<E> {
         COWSubListIterator(List<E> l, int index, int offset, int size) {
             this.offset = offset;
             this.size = size;
-            it = l.listIterator(index+offset);
+            it = l.listIterator(index + offset);
         }
 
         public boolean hasNext() {
@@ -1447,7 +1575,7 @@ public void add(E e) {
         @SuppressWarnings("unchecked")
         public void forEachRemaining(Consumer<? super E> action) {
             Objects.requireNonNull(action);
-            while (nextIndex() < size) {
+            while (hasNext()) {
                 action.accept(it.next());
             }
         }
diff --git a/test/jdk/java/util/Collection/IteratorMicroBenchmark.java b/test/jdk/java/util/Collection/IteratorMicroBenchmark.java
index 8c9fa1c35c1..d2efdc09c99 100644
--- a/test/jdk/java/util/Collection/IteratorMicroBenchmark.java
+++ b/test/jdk/java/util/Collection/IteratorMicroBenchmark.java
@@ -36,6 +36,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -55,6 +56,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.LongAdder;
+import java.util.function.UnaryOperator;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
@@ -75,6 +77,13 @@ abstract static class Job {
         public Job(String name) { this.name = name; }
         public String name() { return name; }
         public abstract void work() throws Throwable;
+        public void run() {
+            try { work(); }
+            catch (Throwable ex) {
+                // current job cannot always be deduced from stacktrace.
+                throw new RuntimeException("Job failed: " + name(), ex);
+            }
+        }
     }
 
     final int iterations;
@@ -102,6 +111,7 @@ abstract static class Job {
     static void forceFullGc() {
         CountDownLatch finalizeDone = new CountDownLatch(1);
         WeakReference<?> ref = new WeakReference<Object>(new Object() {
+            @SuppressWarnings("deprecation")
             protected void finalize() { finalizeDone.countDown(); }});
         try {
             for (int i = 0; i < 10; i++) {
@@ -123,7 +133,7 @@ static void forceFullGc() {
      * compiling everything worth compiling.
      * Returns array of average times per job per run.
      */
-    long[] time0(List<Job> jobs) throws Throwable {
+    long[] time0(List<Job> jobs) {
         final int size = jobs.size();
         long[] nanoss = new long[size];
         for (int i = 0; i < size; i++) {
@@ -132,7 +142,7 @@ long[] time0(List<Job> jobs) throws Throwable {
             long totalTime;
             int runs = 0;
             long startTime = System.nanoTime();
-            do { job.work(); runs++; }
+            do { job.run(); runs++; }
             while ((totalTime = System.nanoTime() - startTime) < warmupNanos);
             nanoss[i] = totalTime/runs;
         }
@@ -211,10 +221,6 @@ private static void deoptimize(int sum) {
             System.out.println("the answer");
     }
 
-    private static <T> List<T> asSubList(List<T> list) {
-        return list.subList(0, list.size());
-    }
-
     private static <T> Iterable<T> backwards(final List<T> list) {
         return new Iterable<T>() {
             public Iterator<T> iterator() {
@@ -241,11 +247,32 @@ public static void main(String[] args) throws Throwable {
         new IteratorMicroBenchmark(args).run();
     }
 
-    void run() throws Throwable {
-//         System.out.printf(
-//             "iterations=%d size=%d, warmup=%1g, filter=\"%s\"%n",
-//             iterations, size, warmupSeconds, nameFilter);
+    HashMap<Class<?>, String> goodClassName = new HashMap<>();
+
+    String goodClassName(Class<?> klazz) {
+        return goodClassName.computeIfAbsent(
+            klazz,
+            k -> {
+                String simple = k.getSimpleName();
+                return (simple.equals("SubList")) // too simple!
+                    ? k.getName().replaceFirst(".*\\.", "")
+                    : simple;
+            });
+    }
 
+    static List<Integer> makeSubList(List<Integer> list) {
+        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
+        int size = list.size();
+        if (size <= 2) return list.subList(0, size);
+        List<Integer> subList = list.subList(rnd.nextInt(0, 2),
+                                             size - rnd.nextInt(0, 2));
+        List<Integer> copy = new ArrayList<>(list);
+        subList.clear();
+        subList.addAll(copy);
+        return subList;
+    }
+
+    void run() throws Throwable {
         final ArrayList<Integer> al = new ArrayList<>(size);
 
         // Populate collections with random data
@@ -265,10 +292,14 @@ void run() throws Throwable {
 
         ArrayList<Job> jobs = Stream.<Collection<Integer>>of(
                 al, ad, abq,
+                makeSubList(new ArrayList<>(al)),
                 new LinkedList<>(al),
+                makeSubList(new LinkedList<>(al)),
                 new PriorityQueue<>(al),
                 new Vector<>(al),
+                makeSubList(new Vector<>(al)),
                 new CopyOnWriteArrayList<>(al),
+                makeSubList(new CopyOnWriteArrayList<>(al)),
                 new ConcurrentLinkedQueue<>(al),
                 new ConcurrentLinkedDeque<>(al),
                 new LinkedBlockingQueue<>(al),
@@ -294,16 +325,25 @@ private <T> Stream<T> concatStreams(Stream<T> ... streams) {
     Stream<Job> jobs(Collection<Integer> x) {
         return concatStreams(
             collectionJobs(x),
+
             (x instanceof Deque)
             ? dequeJobs((Deque<Integer>)x)
             : Stream.empty(),
+
             (x instanceof List)
             ? listJobs((List<Integer>)x)
             : Stream.empty());
     }
 
+    Object sneakyAdder(int[] sneakySum) {
+        return new Object() {
+            public int hashCode() { throw new AssertionError(); }
+            public boolean equals(Object z) {
+                sneakySum[0] += (int) z; return false; }};
+    }
+
     Stream<Job> collectionJobs(Collection<Integer> x) {
-        String klazz = x.getClass().getSimpleName();
+        final String klazz = goodClassName(x.getClass());
         return Stream.of(
             new Job(klazz + " iterate for loop") {
                 public void work() throws Throwable {
@@ -345,22 +385,28 @@ public void work() throws Throwable {
             new Job(klazz + " contains") {
                 public void work() throws Throwable {
                     int[] sum = new int[1];
-                    Object y = new Object() {
-                        public boolean equals(Object z) {
-                            sum[0] += (int) z; return false; }};
+                    Object sneakyAdder = sneakyAdder(sum);
+                    for (int i = 0; i < iterations; i++) {
+                        sum[0] = 0;
+                        if (x.contains(sneakyAdder)) throw new AssertionError();
+                        check.sum(sum[0]);}}},
+            new Job(klazz + " containsAll") {
+                public void work() throws Throwable {
+                    int[] sum = new int[1];
+                    Collection<Object> sneakyAdderCollection =
+                        Collections.singleton(sneakyAdder(sum));
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        if (x.contains(y)) throw new AssertionError();
+                        if (x.containsAll(sneakyAdderCollection))
+                            throw new AssertionError();
                         check.sum(sum[0]);}}},
             new Job(klazz + " remove(Object)") {
                 public void work() throws Throwable {
                     int[] sum = new int[1];
-                    Object y = new Object() {
-                        public boolean equals(Object z) {
-                            sum[0] += (int) z; return false; }};
+                    Object sneakyAdder = sneakyAdder(sum);
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        if (x.remove(y)) throw new AssertionError();
+                        if (x.remove(sneakyAdder)) throw new AssertionError();
                         check.sum(sum[0]);}}},
             new Job(klazz + " forEach") {
                 public void work() throws Throwable {
@@ -446,7 +492,7 @@ public void work() throws Throwable {
     }
 
     Stream<Job> dequeJobs(Deque<Integer> x) {
-        String klazz = x.getClass().getSimpleName();
+        String klazz = goodClassName(x.getClass());
         return Stream.of(
             new Job(klazz + " descendingIterator() loop") {
                 public void work() throws Throwable {
@@ -466,48 +512,50 @@ public void work() throws Throwable {
     }
 
     Stream<Job> listJobs(List<Integer> x) {
-        String klazz = x.getClass().getSimpleName();
+        final String klazz = goodClassName(x.getClass());
         return Stream.of(
-            new Job(klazz + " subList toArray()") {
+            new Job(klazz + " listIterator forward loop") {
+                public void work() throws Throwable {
+                    for (int i = 0; i < iterations; i++) {
+                        int sum = 0;
+                        ListIterator<Integer> it = x.listIterator();
+                        while (it.hasNext())
+                            sum += it.next();
+                        check.sum(sum);}}},
+            new Job(klazz + " listIterator backward loop") {
                 public void work() throws Throwable {
-                    int size = x.size();
                     for (int i = 0; i < iterations; i++) {
-                        int total = Stream.of(x.subList(0, size / 2),
-                                              x.subList(size / 2, size))
-                            .mapToInt(subList -> {
-                                int sum = 0;
-                                for (Object o : subList.toArray())
-                                    sum += (Integer) o;
-                                return sum; })
-                            .sum();
-                        check.sum(total);}}},
-            new Job(klazz + " subList toArray(a)") {
+                        int sum = 0;
+                        ListIterator<Integer> it = x.listIterator(x.size());
+                        while (it.hasPrevious())
+                            sum += it.previous();
+                        check.sum(sum);}}},
+            new Job(klazz + " indexOf") {
                 public void work() throws Throwable {
-                    int size = x.size();
+                    int[] sum = new int[1];
+                    Object sneakyAdder = sneakyAdder(sum);
                     for (int i = 0; i < iterations; i++) {
-                        int total = Stream.of(x.subList(0, size / 2),
-                                              x.subList(size / 2, size))
-                            .mapToInt(subList -> {
-                                int sum = 0;
-                                Integer[] a = new Integer[subList.size()];
-                                for (Object o : subList.toArray(a))
-                                    sum += (Integer) o;
-                                return sum; })
-                            .sum();
-                        check.sum(total);}}},
-            new Job(klazz + " subList toArray(empty)") {
+                        sum[0] = 0;
+                        if (x.indexOf(sneakyAdder) != -1)
+                            throw new AssertionError();
+                        check.sum(sum[0]);}}},
+            new Job(klazz + " lastIndexOf") {
                 public void work() throws Throwable {
-                    int size = x.size();
-                    Integer[] empty = new Integer[0];
+                    int[] sum = new int[1];
+                    Object sneakyAdder = sneakyAdder(sum);
+                    for (int i = 0; i < iterations; i++) {
+                        sum[0] = 0;
+                        if (x.lastIndexOf(sneakyAdder) != -1)
+                            throw new AssertionError();
+                        check.sum(sum[0]);}}},
+            new Job(klazz + " replaceAll") {
+                public void work() throws Throwable {
+                    int[] sum = new int[1];
+                    UnaryOperator<Integer> sneakyAdder =
+                        x -> { sum[0] += x; return x; };
                     for (int i = 0; i < iterations; i++) {
-                        int total = Stream.of(x.subList(0, size / 2),
-                                              x.subList(size / 2, size))
-                            .mapToInt(subList -> {
-                                int sum = 0;
-                                for (Object o : subList.toArray(empty))
-                                    sum += (Integer) o;
-                                return sum; })
-                            .sum();
-                        check.sum(total);}}});
+                        sum[0] = 0;
+                        x.replaceAll(sneakyAdder);
+                        check.sum(sum[0]);}}});
     }
 }
diff --git a/test/jdk/java/util/Collection/RemoveMicroBenchmark.java b/test/jdk/java/util/Collection/RemoveMicroBenchmark.java
index a9decce621a..989dd0895d3 100644
--- a/test/jdk/java/util/Collection/RemoveMicroBenchmark.java
+++ b/test/jdk/java/util/Collection/RemoveMicroBenchmark.java
@@ -27,7 +27,7 @@
  * @run main RemoveMicroBenchmark iterations=1 size=8 warmup=0
  */
 
-import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toCollection;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayDeque;
@@ -35,6 +35,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -47,6 +48,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -55,7 +57,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
-import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 /**
  * Usage: [iterations=N] [size=N] [filter=REGEXP] [warmup=SECONDS]
@@ -72,25 +74,38 @@ abstract static class Job {
         public Job(String name) { this.name = name; }
         public String name() { return name; }
         public abstract void work() throws Throwable;
+        public void run() {
+            try { work(); }
+            catch (Throwable ex) {
+                // current job cannot always be deduced from stacktrace.
+                throw new RuntimeException("Job failed: " + name(), ex);
+            }
+        }
     }
 
     final int iterations;
     final int size;             // number of elements in collections
     final double warmupSeconds;
     final long warmupNanos;
-    final Pattern filter;       // select subset of Jobs to run
+    final Pattern nameFilter;   // select subset of Jobs to run
     final boolean reverse;      // reverse order of Jobs
     final boolean shuffle;      // randomize order of Jobs
 
+    final ArrayList<Integer> elements; // contains size random Integers
+
     RemoveMicroBenchmark(String[] args) {
         iterations    = intArg(args, "iterations", 10_000);
         size          = intArg(args, "size", 1000);
         warmupSeconds = doubleArg(args, "warmup", 7.0);
-        filter        = patternArg(args, "filter");
+        nameFilter    = patternArg(args, "filter");
         reverse       = booleanArg(args, "reverse");
         shuffle       = booleanArg(args, "shuffle");
 
         warmupNanos = (long) (warmupSeconds * (1000L * 1000L * 1000L));
+
+        elements = ThreadLocalRandom.current().ints(size)
+            .mapToObj(x -> x)
+            .collect(toCollection(ArrayList::new));
     }
 
     // --------------- GC finalization infrastructure ---------------
@@ -99,6 +114,7 @@ abstract static class Job {
     static void forceFullGc() {
         CountDownLatch finalizeDone = new CountDownLatch(1);
         WeakReference<?> ref = new WeakReference<Object>(new Object() {
+            @SuppressWarnings("deprecation")
             protected void finalize() { finalizeDone.countDown(); }});
         try {
             for (int i = 0; i < 10; i++) {
@@ -120,7 +136,7 @@ static void forceFullGc() {
      * compiling everything worth compiling.
      * Returns array of average times per job per run.
      */
-    long[] time0(List<Job> jobs) throws Throwable {
+    long[] time0(List<Job> jobs) {
         final int size = jobs.size();
         long[] nanoss = new long[size];
         for (int i = 0; i < size; i++) {
@@ -129,7 +145,7 @@ long[] time0(List<Job> jobs) throws Throwable {
             long totalTime;
             int runs = 0;
             long startTime = System.nanoTime();
-            do { job.work(); runs++; }
+            do { job.run(); runs++; }
             while ((totalTime = System.nanoTime() - startTime) < warmupNanos);
             nanoss[i] = totalTime/runs;
         }
@@ -203,22 +219,11 @@ private static boolean booleanArg(String[] args, String keyword) {
         throw new IllegalArgumentException(val);
     }
 
-    private static List<Job> filter(Pattern filter, List<Job> jobs) {
-        return (filter == null) ? jobs
-            : jobs.stream()
-            .filter(job -> filter.matcher(job.name()).find())
-            .collect(toList());
-    }
-
     private static void deoptimize(int sum) {
         if (sum == 42)
             System.out.println("the answer");
     }
 
-    private static <T> List<T> asSubList(List<T> list) {
-        return list.subList(0, list.size());
-    }
-
     private static <T> Iterable<T> backwards(final List<T> list) {
         return new Iterable<T>() {
             public Iterator<T> iterator() {
@@ -245,66 +250,99 @@ public static void main(String[] args) throws Throwable {
         new RemoveMicroBenchmark(args).run();
     }
 
-    void run() throws Throwable {
-//         System.out.printf(
-//             "iterations=%d size=%d, warmup=%1g, filter=\"%s\"%n",
-//             iterations, size, warmupSeconds, filter);
-
-        final ArrayList<Integer> al = new ArrayList<>(size);
+    HashMap<Class<?>, String> goodClassName = new HashMap<>();
+
+    String goodClassName(Class<?> klazz) {
+        return goodClassName.computeIfAbsent(
+            klazz,
+            k -> {
+                String simple = k.getSimpleName();
+                return (simple.equals("SubList")) // too simple!
+                    ? k.getName().replaceFirst(".*\\.", "")
+                    : simple;
+            });
+    }
 
-        // Populate collections with random data
+    static List<Integer> makeSubList(List<Integer> list) {
         final ThreadLocalRandom rnd = ThreadLocalRandom.current();
-        for (int i = 0; i < size; i++)
-            al.add(rnd.nextInt(size));
-
-        ArrayList<Job> jobs = new ArrayList<>();
-
-        List.<Collection<Integer>>of(
-            new ArrayList<>(),
-            new LinkedList<>(),
-            new Vector<>(),
-            new ArrayDeque<>(),
-            new PriorityQueue<>(),
-            new ArrayBlockingQueue<>(al.size()),
-            new ConcurrentLinkedQueue<>(),
-            new ConcurrentLinkedDeque<>(),
-            new LinkedBlockingQueue<>(),
-            new LinkedBlockingDeque<>(),
-            new LinkedTransferQueue<>(),
-            new PriorityBlockingQueue<>()).forEach(
-                x -> {
-                    String klazz = x.getClass().getSimpleName();
-                    jobs.addAll(collectionJobs(klazz, () -> x, al));
-                    if (x instanceof Queue) {
-                        Queue<Integer> queue = (Queue<Integer>) x;
-                        jobs.addAll(queueJobs(klazz, () -> queue, al));
-                    }
-                    if (x instanceof Deque) {
-                        Deque<Integer> deque = (Deque<Integer>) x;
-                        jobs.addAll(dequeJobs(klazz, () -> deque, al));
-                    }
-                    if (x instanceof BlockingQueue) {
-                        BlockingQueue<Integer> q = (BlockingQueue<Integer>) x;
-                        jobs.addAll(blockingQueueJobs(klazz, () -> q, al));
-                    }
-                    if (x instanceof BlockingDeque) {
-                        BlockingDeque<Integer> q = (BlockingDeque<Integer>) x;
-                        jobs.addAll(blockingDequeJobs(klazz, () -> q, al));
-                    }
-                    if (x instanceof List) {
-                        List<Integer> list = (List<Integer>) x;
-                        jobs.addAll(
-                            collectionJobs(
-                                klazz + " subList",
-                                () -> list.subList(0, x.size()),
-                                al));
-                    }
-                });
+        int size = rnd.nextInt(4);
+        for (int i = size; i--> 0; )
+            list.add(rnd.nextInt());
+        int index = rnd.nextInt(size + 1);
+        return list.subList(index, index);
+    }
+
+    private static <T> List<T> asSubList(List<T> list) {
+        return list.subList(0, list.size());
+    }
+
+    @SafeVarargs @SuppressWarnings("varargs")
+    private <T> Stream<T> concatStreams(Stream<T> ... streams) {
+        return Stream.of(streams).flatMap(s -> s);
+    }
+
+    Class<?> topLevelClass(Object x) {
+        for (Class<?> k = x.getClass();; ) {
+            Class<?> enclosing = k.getEnclosingClass();
+            if (enclosing == null)
+                return k;
+            k = enclosing;
+        }
+    }
+
+    void run() throws Throwable {
+        ArrayList<Job> jobs = Stream.<Collection<Integer>>of(
+                new ArrayList<>(),
+                makeSubList(new ArrayList<>()),
+                new LinkedList<>(),
+                makeSubList(new LinkedList<>()),
+                new Vector<>(),
+                makeSubList(new Vector<>()),
+                new CopyOnWriteArrayList<>(),
+                makeSubList(new CopyOnWriteArrayList<>()),
+                new ArrayDeque<>(),
+                new PriorityQueue<>(),
+                new ArrayBlockingQueue<>(elements.size()),
+                new ConcurrentLinkedQueue<>(),
+                new ConcurrentLinkedDeque<>(),
+                new LinkedBlockingQueue<>(),
+                new LinkedBlockingDeque<>(),
+                new LinkedTransferQueue<>(),
+                new PriorityBlockingQueue<>())
+            .flatMap(x -> jobs(x))
+            .filter(job ->
+                nameFilter == null || nameFilter.matcher(job.name()).find())
+            .collect(toCollection(ArrayList::new));
 
         if (reverse) Collections.reverse(jobs);
         if (shuffle) Collections.shuffle(jobs);
 
-        time(filter(filter, jobs));
+        time(jobs);
+    }
+
+    Stream<Job> jobs(Collection<Integer> x) {
+        return concatStreams(
+            collectionJobs(x),
+
+            (CopyOnWriteArrayList.class.isAssignableFrom(topLevelClass(x)))
+            ? Stream.empty()
+            : iteratorRemoveJobs(x),
+
+            (x instanceof Queue)
+            ? queueJobs((Queue<Integer>)x)
+            : Stream.empty(),
+
+            (x instanceof Deque)
+            ? dequeJobs((Deque<Integer>)x)
+            : Stream.empty(),
+
+            (x instanceof BlockingQueue)
+            ? blockingQueueJobs((BlockingQueue<Integer>)x)
+            : Stream.empty(),
+
+            (x instanceof BlockingDeque)
+            ? blockingDequeJobs((BlockingDeque<Integer>)x)
+            : Stream.empty());
     }
 
     Collection<Integer> universeRecorder(int[] sum) {
@@ -323,75 +361,81 @@ public boolean contains(Object x) {
             }};
     }
 
-    List<Job> collectionJobs(
-        String description,
-        Supplier<Collection<Integer>> supplier,
-        ArrayList<Integer> al) {
-        return List.of(
-            new Job(description + " removeIf") {
+    Stream<Job> collectionJobs(Collection<Integer> x) {
+        final String klazz = goodClassName(x.getClass());
+        return Stream.of(
+            new Job(klazz + " removeIf") {
                 public void work() throws Throwable {
-                    Collection<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         x.removeIf(n -> { sum[0] += n; return true; });
                         check.sum(sum[0]);}}},
-            new Job(description + " removeIf rnd-two-pass") {
+            new Job(klazz + " removeIf rnd-two-pass") {
                 public void work() throws Throwable {
                     ThreadLocalRandom rnd = ThreadLocalRandom.current();
-                    Collection<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         x.removeIf(n -> {
                             boolean b = rnd.nextBoolean();
                             if (b) sum[0] += n;
                             return b; });
                         x.removeIf(n -> { sum[0] += n; return true; });
                         check.sum(sum[0]);}}},
-            new Job(description + " removeAll") {
+            new Job(klazz + " removeAll") {
                 public void work() throws Throwable {
-                    Collection<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     Collection<Integer> universe = universeRecorder(sum);
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         x.removeAll(universe);
                         check.sum(sum[0]);}}},
-            new Job(description + " retainAll") {
+            new Job(klazz + " retainAll") {
                 public void work() throws Throwable {
-                    Collection<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     Collection<Integer> empty = emptyRecorder(sum);
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         x.retainAll(empty);
                         check.sum(sum[0]);}}},
-            new Job(description + " Iterator.remove") {
+            new Job(klazz + " clear") {
+                public void work() throws Throwable {
+                    int[] sum = new int[1];
+                    for (int i = 0; i < iterations; i++) {
+                        sum[0] = 0;
+                        x.addAll(elements);
+                        x.forEach(e -> sum[0] += e);
+                        x.clear();
+                        check.sum(sum[0]);}}});
+    }
+
+    Stream<Job> iteratorRemoveJobs(Collection<Integer> x) {
+        final String klazz = goodClassName(x.getClass());
+        return Stream.of(
+             new Job(klazz + " Iterator.remove") {
                 public void work() throws Throwable {
-                    Collection<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         Iterator<Integer> it = x.iterator();
                         while (it.hasNext()) {
                             sum[0] += it.next();
                             it.remove();
                         }
                         check.sum(sum[0]);}}},
-            new Job(description + " Iterator.remove-rnd-two-pass") {
+            new Job(klazz + " Iterator.remove-rnd-two-pass") {
                 public void work() throws Throwable {
                     ThreadLocalRandom rnd = ThreadLocalRandom.current();
-                    Collection<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         for (Iterator<Integer> it = x.iterator();
                              it.hasNext(); ) {
                             Integer e = it.next();
@@ -405,129 +449,103 @@ public void work() throws Throwable {
                             sum[0] += it.next();
                             it.remove();
                         }
-                        check.sum(sum[0]);}}},
-            new Job(description + " clear") {
-                public void work() throws Throwable {
-                    Collection<Integer> x = supplier.get();
-                    int[] sum = new int[1];
-                    for (int i = 0; i < iterations; i++) {
-                        sum[0] = 0;
-                        x.addAll(al);
-                        x.forEach(e -> sum[0] += e);
-                        x.clear();
                         check.sum(sum[0]);}}});
     }
 
-    List<Job> queueJobs(
-        String description,
-        Supplier<Queue<Integer>> supplier,
-        ArrayList<Integer> al) {
-        return List.of(
-            new Job(description + " poll()") {
+    Stream<Job> queueJobs(Queue<Integer> x) {
+        final String klazz = goodClassName(x.getClass());
+        return Stream.of(
+            new Job(klazz + " poll()") {
                 public void work() throws Throwable {
-                    Queue<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         for (Integer e; (e = x.poll()) != null; )
                             sum[0] += e;
                         check.sum(sum[0]);}}});
     }
 
-    List<Job> dequeJobs(
-        String description,
-        Supplier<Deque<Integer>> supplier,
-        ArrayList<Integer> al) {
-        return List.of(
-            new Job(description + " descendingIterator().remove") {
+    Stream<Job> dequeJobs(Deque<Integer> x) {
+        final String klazz = goodClassName(x.getClass());
+        return Stream.of(
+            new Job(klazz + " descendingIterator().remove") {
                 public void work() throws Throwable {
-                    Deque<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         Iterator<Integer> it = x.descendingIterator();
                         while (it.hasNext()) {
                             sum[0] += it.next();
                             it.remove();
                         }
                         check.sum(sum[0]);}}},
-            new Job(description + " pollFirst()") {
+            new Job(klazz + " pollFirst()") {
                 public void work() throws Throwable {
-                    Deque<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         for (Integer e; (e = x.pollFirst()) != null; )
                             sum[0] += e;
                         check.sum(sum[0]);}}},
-            new Job(description + " pollLast()") {
+            new Job(klazz + " pollLast()") {
                 public void work() throws Throwable {
-                    Deque<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         for (Integer e; (e = x.pollLast()) != null; )
                             sum[0] += e;
                         check.sum(sum[0]);}}});
     }
 
-    List<Job> blockingQueueJobs(
-        String description,
-        Supplier<BlockingQueue<Integer>> supplier,
-        ArrayList<Integer> al) {
-        return List.of(
-            new Job(description + " drainTo(sink)") {
+    Stream<Job> blockingQueueJobs(BlockingQueue<Integer> x) {
+        final String klazz = goodClassName(x.getClass());
+        return Stream.of(
+            new Job(klazz + " drainTo(sink)") {
                 public void work() throws Throwable {
-                    BlockingQueue<Integer> x = supplier.get();
                     ArrayList<Integer> sink = new ArrayList<>();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
                         sink.clear();
-                        x.addAll(al);
+                        x.addAll(elements);
                         x.drainTo(sink);
                         sink.forEach(e -> sum[0] += e);
                         check.sum(sum[0]);}}},
-            new Job(description + " drainTo(sink, n)") {
+            new Job(klazz + " drainTo(sink, n)") {
                 public void work() throws Throwable {
-                    BlockingQueue<Integer> x = supplier.get();
                     ArrayList<Integer> sink = new ArrayList<>();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
                         sink.clear();
-                        x.addAll(al);
-                        x.drainTo(sink, al.size());
+                        x.addAll(elements);
+                        x.drainTo(sink, elements.size());
                         sink.forEach(e -> sum[0] += e);
                         check.sum(sum[0]);}}});
     }
 
-    List<Job> blockingDequeJobs(
-        String description,
-        Supplier<BlockingDeque<Integer>> supplier,
-        ArrayList<Integer> al) {
-        return List.of(
-            new Job(description + " timed pollFirst()") {
+    Stream<Job> blockingDequeJobs(BlockingDeque<Integer> x) {
+        final String klazz = goodClassName(x.getClass());
+        return Stream.of(
+            new Job(klazz + " timed pollFirst()") {
                 public void work() throws Throwable {
-                    BlockingDeque<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         for (Integer e; (e = x.pollFirst(0L, TimeUnit.DAYS)) != null; )
                             sum[0] += e;
                         check.sum(sum[0]);}}},
-            new Job(description + " timed pollLast()") {
+            new Job(klazz + " timed pollLast()") {
                 public void work() throws Throwable {
-                    BlockingDeque<Integer> x = supplier.get();
                     int[] sum = new int[1];
                     for (int i = 0; i < iterations; i++) {
                         sum[0] = 0;
-                        x.addAll(al);
+                        x.addAll(elements);
                         for (Integer e; (e = x.pollLast(0L, TimeUnit.DAYS)) != null; )
                             sum[0] += e;
                         check.sum(sum[0]);}}});
diff --git a/test/jdk/java/util/concurrent/tck/Collection8Test.java b/test/jdk/java/util/concurrent/tck/Collection8Test.java
index f097b07ccca..7735a55c054 100644
--- a/test/jdk/java/util/concurrent/tck/Collection8Test.java
+++ b/test/jdk/java/util/concurrent/tck/Collection8Test.java
@@ -35,6 +35,7 @@
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -46,6 +47,7 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Queue;
+import java.util.Set;
 import java.util.Spliterator;
 import java.util.concurrent.BlockingDeque;
 import java.util.concurrent.BlockingQueue;
@@ -86,8 +88,9 @@ public static Test testSuite(CollectionImplementation impl) {
 
     Object bomb() {
         return new Object() {
-            public boolean equals(Object x) { throw new AssertionError(); }
-            public int hashCode() { throw new AssertionError(); }
+            @Override public boolean equals(Object x) { throw new AssertionError(); }
+            @Override public int hashCode() { throw new AssertionError(); }
+            @Override public String toString() { throw new AssertionError(); }
         };
     }
 
@@ -119,6 +122,23 @@ void emptyMeansEmpty(Collection c) throws InterruptedException {
         assertTrue(c.isEmpty());
         assertEquals(0, c.size());
         assertEquals("[]", c.toString());
+        if (c instanceof List<?>) {
+            List x = (List) c;
+            assertEquals(1, x.hashCode());
+            assertEquals(x, Collections.emptyList());
+            assertEquals(Collections.emptyList(), x);
+            assertEquals(-1, x.indexOf(impl.makeElement(86)));
+            assertEquals(-1, x.lastIndexOf(impl.makeElement(99)));
+            assertThrows(
+                IndexOutOfBoundsException.class,
+                () -> x.get(0),
+                () -> x.set(0, impl.makeElement(42)));
+        }
+        else if (c instanceof Set<?>) {
+            assertEquals(0, c.hashCode());
+            assertEquals(c, Collections.emptySet());
+            assertEquals(Collections.emptySet(), c);
+        }
         {
             Object[] a = c.toArray();
             assertEquals(0, a.length);
@@ -279,6 +299,16 @@ public void testNoSuchElementExceptions() {
                 () -> d.pop(),
                 () -> d.descendingIterator().next());
         }
+        if (c instanceof List) {
+            List x = (List) c;
+            assertThrows(
+                NoSuchElementException.class,
+                () -> x.iterator().next(),
+                () -> x.listIterator().next(),
+                () -> x.listIterator(0).next(),
+                () -> x.listIterator().previous(),
+                () -> x.listIterator(0).previous());
+        }
     }
 
     public void testRemoveIf() {
@@ -904,6 +934,31 @@ public void testGetComparator_IllegalStateException() {
         }
     }
 
+    public void testCollectionCopies() throws Exception {
+        ThreadLocalRandom rnd = ThreadLocalRandom.current();
+        Collection c = impl.emptyCollection();
+        for (int n = rnd.nextInt(4); n--> 0; )
+            c.add(impl.makeElement(rnd.nextInt()));
+        assertEquals(c, c);
+        if (c instanceof List)
+            assertCollectionsEquals(c, new ArrayList(c));
+        else if (c instanceof Set)
+            assertCollectionsEquals(c, new HashSet(c));
+        else if (c instanceof Deque)
+            assertCollectionsEquivalent(c, new ArrayDeque(c));
+
+        Collection clone = cloneableClone(c);
+        if (clone != null) {
+            assertSame(c.getClass(), clone.getClass());
+            assertCollectionsEquivalent(c, clone);
+        }
+        try {
+            Collection serialClone = serialClonePossiblyFailing(c);
+            assertSame(c.getClass(), serialClone.getClass());
+            assertCollectionsEquivalent(c, serialClone);
+        } catch (java.io.NotSerializableException acceptable) {}
+    }
+
 //     public void testCollection8DebugFail() {
 //         fail(impl.klazz().getSimpleName());
 //     }
diff --git a/test/jdk/java/util/concurrent/tck/CopyOnWriteArrayListTest.java b/test/jdk/java/util/concurrent/tck/CopyOnWriteArrayListTest.java
index 52995cff224..d893ba3fbc9 100644
--- a/test/jdk/java/util/concurrent/tck/CopyOnWriteArrayListTest.java
+++ b/test/jdk/java/util/concurrent/tck/CopyOnWriteArrayListTest.java
@@ -36,12 +36,13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ThreadLocalRandom;
 
 import junit.framework.Test;
 
@@ -61,7 +62,12 @@ class Implementation implements CollectionImplementation {
         }
         class SubListImplementation extends Implementation {
             public List emptyCollection() {
-                return super.emptyCollection().subList(0, 0);
+                List list = super.emptyCollection();
+                ThreadLocalRandom rnd = ThreadLocalRandom.current();
+                if (rnd.nextBoolean())
+                    list.add(makeElement(rnd.nextInt()));
+                int i = rnd.nextInt(list.size() + 1);
+                return list.subList(i, i);
             }
         }
         return newTestSuite(
@@ -70,67 +76,67 @@ public List emptyCollection() {
                 CollectionTest.testSuite(new SubListImplementation()));
     }
 
-    static CopyOnWriteArrayList<Integer> populatedArray(int n) {
-        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<>();
-        assertTrue(a.isEmpty());
+    static CopyOnWriteArrayList<Integer> populatedList(int n) {
+        CopyOnWriteArrayList<Integer> list = new CopyOnWriteArrayList<>();
+        assertTrue(list.isEmpty());
         for (int i = 0; i < n; i++)
-            a.add(i);
-        assertFalse(a.isEmpty());
-        assertEquals(n, a.size());
-        return a;
+            list.add(i);
+        assertEquals(n <= 0, list.isEmpty());
+        assertEquals(n, list.size());
+        return list;
     }
 
-    static CopyOnWriteArrayList<Integer> populatedArray(Integer[] elements) {
-        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<>();
-        assertTrue(a.isEmpty());
+    static CopyOnWriteArrayList<Integer> populatedList(Integer[] elements) {
+        CopyOnWriteArrayList<Integer> list = new CopyOnWriteArrayList<>();
+        assertTrue(list.isEmpty());
         for (Integer element : elements)
-            a.add(element);
-        assertFalse(a.isEmpty());
-        assertEquals(elements.length, a.size());
-        return a;
+            list.add(element);
+        assertFalse(list.isEmpty());
+        assertEquals(elements.length, list.size());
+        return list;
     }
 
     /**
      * a new list is empty
      */
     public void testConstructor() {
-        CopyOnWriteArrayList a = new CopyOnWriteArrayList();
-        assertTrue(a.isEmpty());
+        List list = new CopyOnWriteArrayList();
+        assertTrue(list.isEmpty());
     }
 
     /**
      * new list contains all elements of initializing array
      */
     public void testConstructor2() {
-        Integer[] ints = new Integer[SIZE];
+        Integer[] elts = new Integer[SIZE];
         for (int i = 0; i < SIZE - 1; ++i)
-            ints[i] = new Integer(i);
-        CopyOnWriteArrayList a = new CopyOnWriteArrayList(ints);
+            elts[i] = i;
+        List list = new CopyOnWriteArrayList(elts);
         for (int i = 0; i < SIZE; ++i)
-            assertEquals(ints[i], a.get(i));
+            assertEquals(elts[i], list.get(i));
     }
 
     /**
      * new list contains all elements of initializing collection
      */
     public void testConstructor3() {
-        Integer[] ints = new Integer[SIZE];
+        Integer[] elts = new Integer[SIZE];
         for (int i = 0; i < SIZE - 1; ++i)
-            ints[i] = new Integer(i);
-        CopyOnWriteArrayList a = new CopyOnWriteArrayList(Arrays.asList(ints));
+            elts[i] = i;
+        List list = new CopyOnWriteArrayList(Arrays.asList(elts));
         for (int i = 0; i < SIZE; ++i)
-            assertEquals(ints[i], a.get(i));
+            assertEquals(elts[i], list.get(i));
     }
 
     /**
      * addAll adds each element from the given collection, including duplicates
      */
     public void testAddAll() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        assertTrue(full.addAll(Arrays.asList(three, four, five)));
-        assertEquals(6, full.size());
-        assertTrue(full.addAll(Arrays.asList(three, four, five)));
-        assertEquals(9, full.size());
+        List list = populatedList(3);
+        assertTrue(list.addAll(Arrays.asList(three, four, five)));
+        assertEquals(6, list.size());
+        assertTrue(list.addAll(Arrays.asList(three, four, five)));
+        assertEquals(9, list.size());
     }
 
     /**
@@ -138,46 +144,46 @@ public void testAddAll() {
      * already exist in the List
      */
     public void testAddAllAbsent() {
-        CopyOnWriteArrayList full = populatedArray(3);
+        CopyOnWriteArrayList list = populatedList(3);
         // "one" is duplicate and will not be added
-        assertEquals(2, full.addAllAbsent(Arrays.asList(three, four, one)));
-        assertEquals(5, full.size());
-        assertEquals(0, full.addAllAbsent(Arrays.asList(three, four, one)));
-        assertEquals(5, full.size());
+        assertEquals(2, list.addAllAbsent(Arrays.asList(three, four, one)));
+        assertEquals(5, list.size());
+        assertEquals(0, list.addAllAbsent(Arrays.asList(three, four, one)));
+        assertEquals(5, list.size());
     }
 
     /**
      * addIfAbsent will not add the element if it already exists in the list
      */
     public void testAddIfAbsent() {
-        CopyOnWriteArrayList full = populatedArray(SIZE);
-        full.addIfAbsent(one);
-        assertEquals(SIZE, full.size());
+        CopyOnWriteArrayList list = populatedList(SIZE);
+        list.addIfAbsent(one);
+        assertEquals(SIZE, list.size());
     }
 
     /**
      * addIfAbsent adds the element when it does not exist in the list
      */
     public void testAddIfAbsent2() {
-        CopyOnWriteArrayList full = populatedArray(SIZE);
-        full.addIfAbsent(three);
-        assertTrue(full.contains(three));
+        CopyOnWriteArrayList list = populatedList(SIZE);
+        list.addIfAbsent(three);
+        assertTrue(list.contains(three));
     }
 
     /**
      * clear removes all elements from the list
      */
     public void testClear() {
-        CopyOnWriteArrayList full = populatedArray(SIZE);
-        full.clear();
-        assertEquals(0, full.size());
+        List list = populatedList(SIZE);
+        list.clear();
+        assertEquals(0, list.size());
     }
 
     /**
      * Cloned list is equal
      */
     public void testClone() {
-        CopyOnWriteArrayList l1 = populatedArray(SIZE);
+        CopyOnWriteArrayList l1 = populatedList(SIZE);
         CopyOnWriteArrayList l2 = (CopyOnWriteArrayList)(l1.clone());
         assertEquals(l1, l2);
         l1.clear();
@@ -188,33 +194,33 @@ public void testClone() {
      * contains is true for added elements
      */
     public void testContains() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        assertTrue(full.contains(one));
-        assertFalse(full.contains(five));
+        List list = populatedList(3);
+        assertTrue(list.contains(one));
+        assertFalse(list.contains(five));
     }
 
     /**
      * adding at an index places it in the indicated index
      */
     public void testAddIndex() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        full.add(0, m1);
-        assertEquals(4, full.size());
-        assertEquals(m1, full.get(0));
-        assertEquals(zero, full.get(1));
+        List list = populatedList(3);
+        list.add(0, m1);
+        assertEquals(4, list.size());
+        assertEquals(m1, list.get(0));
+        assertEquals(zero, list.get(1));
 
-        full.add(2, m2);
-        assertEquals(5, full.size());
-        assertEquals(m2, full.get(2));
-        assertEquals(two, full.get(4));
+        list.add(2, m2);
+        assertEquals(5, list.size());
+        assertEquals(m2, list.get(2));
+        assertEquals(two, list.get(4));
     }
 
     /**
      * lists with same elements are equal and have same hashCode
      */
     public void testEquals() {
-        CopyOnWriteArrayList a = populatedArray(3);
-        CopyOnWriteArrayList b = populatedArray(3);
+        List a = populatedList(3);
+        List b = populatedList(3);
         assertTrue(a.equals(b));
         assertTrue(b.equals(a));
         assertTrue(a.containsAll(b));
@@ -239,15 +245,15 @@ public void testEquals() {
      * containsAll returns true for collections with subset of elements
      */
     public void testContainsAll() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        assertTrue(full.containsAll(Arrays.asList()));
-        assertTrue(full.containsAll(Arrays.asList(one)));
-        assertTrue(full.containsAll(Arrays.asList(one, two)));
-        assertFalse(full.containsAll(Arrays.asList(one, two, six)));
-        assertFalse(full.containsAll(Arrays.asList(six)));
+        List list = populatedList(3);
+        assertTrue(list.containsAll(Arrays.asList()));
+        assertTrue(list.containsAll(Arrays.asList(one)));
+        assertTrue(list.containsAll(Arrays.asList(one, two)));
+        assertFalse(list.containsAll(Arrays.asList(one, two, six)));
+        assertFalse(list.containsAll(Arrays.asList(six)));
 
         try {
-            full.containsAll(null);
+            list.containsAll(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -256,37 +262,81 @@ public void testContainsAll() {
      * get returns the value at the given index
      */
     public void testGet() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        assertEquals(0, full.get(0));
+        List list = populatedList(3);
+        assertEquals(0, list.get(0));
     }
 
     /**
-     * indexOf gives the index for the given object
+     * indexOf(Object) returns the index of the first occurrence of the
+     * specified element in this list, or -1 if this list does not
+     * contain the element
      */
     public void testIndexOf() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        assertEquals(1, full.indexOf(one));
-        assertEquals(-1, full.indexOf("puppies"));
+        List list = populatedList(3);
+        assertEquals(-1, list.indexOf(-42));
+        int size = list.size();
+        for (int i = 0; i < size; i++) {
+            assertEquals(i, list.indexOf(i));
+            assertEquals(i, list.subList(0, size).indexOf(i));
+            assertEquals(i, list.subList(0, i + 1).indexOf(i));
+            assertEquals(-1, list.subList(0, i).indexOf(i));
+            assertEquals(0, list.subList(i, size).indexOf(i));
+            assertEquals(-1, list.subList(i + 1, size).indexOf(i));
+        }
+
+        list.add(1);
+        assertEquals(1, list.indexOf(1));
+        assertEquals(1, list.subList(0, size + 1).indexOf(1));
+        assertEquals(0, list.subList(1, size + 1).indexOf(1));
+        assertEquals(size - 2, list.subList(2, size + 1).indexOf(1));
+        assertEquals(0, list.subList(size, size + 1).indexOf(1));
+        assertEquals(-1, list.subList(size + 1, size + 1).indexOf(1));
     }
 
     /**
-     * indexOf gives the index based on the given index
-     * at which to start searching
+     * indexOf(E, int) returns the index of the first occurrence of the
+     * specified element in this list, searching forwards from index,
+     * or returns -1 if the element is not found
      */
     public void testIndexOf2() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        assertEquals(1, full.indexOf(one, 0));
-        assertEquals(-1, full.indexOf(one, 2));
+        CopyOnWriteArrayList list = populatedList(3);
+        int size = list.size();
+        assertEquals(-1, list.indexOf(-42, 0));
+
+        // we might expect IOOBE, but spec says otherwise
+        assertEquals(-1, list.indexOf(0, size));
+        assertEquals(-1, list.indexOf(0, Integer.MAX_VALUE));
+
+        assertThrows(
+            IndexOutOfBoundsException.class,
+            () -> list.indexOf(0, -1),
+            () -> list.indexOf(0, Integer.MIN_VALUE));
+
+        for (int i = 0; i < size; i++) {
+            assertEquals(i, list.indexOf(i, 0));
+            assertEquals(i, list.indexOf(i, i));
+            assertEquals(-1, list.indexOf(i, i + 1));
+        }
+
+        list.add(1);
+        assertEquals(1, list.indexOf(1, 0));
+        assertEquals(1, list.indexOf(1, 1));
+        assertEquals(size, list.indexOf(1, 2));
+        assertEquals(size, list.indexOf(1, size));
     }
 
     /**
      * isEmpty returns true when empty, else false
      */
     public void testIsEmpty() {
-        CopyOnWriteArrayList empty = new CopyOnWriteArrayList();
-        CopyOnWriteArrayList full = populatedArray(SIZE);
+        List empty = new CopyOnWriteArrayList();
         assertTrue(empty.isEmpty());
+        assertTrue(empty.subList(0, 0).isEmpty());
+
+        List full = populatedList(SIZE);
         assertFalse(full.isEmpty());
+        assertTrue(full.subList(0, 0).isEmpty());
+        assertTrue(full.subList(SIZE, SIZE).isEmpty());
     }
 
     /**
@@ -305,7 +355,7 @@ public void testIterator() {
         for (int i = 0; i < SIZE; i++)
             elements[i] = i;
         shuffle(elements);
-        Collection<Integer> full = populatedArray(elements);
+        Collection<Integer> full = populatedList(elements);
 
         Iterator it = full.iterator();
         for (int j = 0; j < SIZE; j++) {
@@ -327,8 +377,8 @@ public void testEmptyIterator() {
      * iterator.remove throws UnsupportedOperationException
      */
     public void testIteratorRemove() {
-        CopyOnWriteArrayList full = populatedArray(SIZE);
-        Iterator it = full.iterator();
+        CopyOnWriteArrayList list = populatedList(SIZE);
+        Iterator it = list.iterator();
         it.next();
         try {
             it.remove();
@@ -341,42 +391,78 @@ public void testIteratorRemove() {
      */
     public void testToString() {
         assertEquals("[]", new CopyOnWriteArrayList().toString());
-        CopyOnWriteArrayList full = populatedArray(3);
-        String s = full.toString();
+        List list = populatedList(3);
+        String s = list.toString();
         for (int i = 0; i < 3; ++i)
             assertTrue(s.contains(String.valueOf(i)));
-        assertEquals(new ArrayList(full).toString(),
-                     full.toString());
+        assertEquals(new ArrayList(list).toString(),
+                     list.toString());
     }
 
     /**
-     * lastIndexOf returns the index for the given object
+     * lastIndexOf(Object) returns the index of the last occurrence of
+     * the specified element in this list, or -1 if this list does not
+     * contain the element
      */
     public void testLastIndexOf1() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        full.add(one);
-        full.add(three);
-        assertEquals(3, full.lastIndexOf(one));
-        assertEquals(-1, full.lastIndexOf(six));
+        List list = populatedList(3);
+        assertEquals(-1, list.lastIndexOf(-42));
+        int size = list.size();
+        for (int i = 0; i < size; i++) {
+            assertEquals(i, list.lastIndexOf(i));
+            assertEquals(i, list.subList(0, size).lastIndexOf(i));
+            assertEquals(i, list.subList(0, i + 1).lastIndexOf(i));
+            assertEquals(-1, list.subList(0, i).lastIndexOf(i));
+            assertEquals(0, list.subList(i, size).lastIndexOf(i));
+            assertEquals(-1, list.subList(i + 1, size).lastIndexOf(i));
+        }
+
+        list.add(1);
+        assertEquals(size, list.lastIndexOf(1));
+        assertEquals(size, list.subList(0, size + 1).lastIndexOf(1));
+        assertEquals(1, list.subList(0, size).lastIndexOf(1));
+        assertEquals(0, list.subList(1, 2).lastIndexOf(1));
+        assertEquals(-1, list.subList(0, 1).indexOf(1));
     }
 
     /**
-     * lastIndexOf returns the index from the given starting point
+     * lastIndexOf(E, int) returns the index of the last occurrence of the
+     * specified element in this list, searching backwards from index, or
+     * returns -1 if the element is not found
      */
     public void testLastIndexOf2() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        full.add(one);
-        full.add(three);
-        assertEquals(3, full.lastIndexOf(one, 4));
-        assertEquals(-1, full.lastIndexOf(three, 3));
+        CopyOnWriteArrayList list = populatedList(3);
+
+        // we might expect IOOBE, but spec says otherwise
+        assertEquals(-1, list.lastIndexOf(0, -1));
+
+        int size = list.size();
+        assertThrows(
+            IndexOutOfBoundsException.class,
+            () -> list.lastIndexOf(0, size),
+            () -> list.lastIndexOf(0, Integer.MAX_VALUE));
+
+        for (int i = 0; i < size; i++) {
+            assertEquals(i, list.lastIndexOf(i, i));
+            assertEquals(list.indexOf(i), list.lastIndexOf(i, i));
+            if (i > 0)
+                assertEquals(-1, list.lastIndexOf(i, i - 1));
+        }
+        list.add(one);
+        list.add(three);
+        assertEquals(1, list.lastIndexOf(one, 1));
+        assertEquals(1, list.lastIndexOf(one, 2));
+        assertEquals(3, list.lastIndexOf(one, 3));
+        assertEquals(3, list.lastIndexOf(one, 4));
+        assertEquals(-1, list.lastIndexOf(three, 3));
     }
 
     /**
      * listIterator traverses all elements
      */
     public void testListIterator1() {
-        CopyOnWriteArrayList full = populatedArray(SIZE);
-        ListIterator i = full.listIterator();
+        List list = populatedList(SIZE);
+        ListIterator i = list.listIterator();
         int j;
         for (j = 0; i.hasNext(); j++)
             assertEquals(j, i.next());
@@ -387,8 +473,8 @@ public void testListIterator1() {
      * listIterator only returns those elements after the given index
      */
     public void testListIterator2() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        ListIterator i = full.listIterator(1);
+        List list = populatedList(3);
+        ListIterator i = list.listIterator(1);
         int j;
         for (j = 0; i.hasNext(); j++)
             assertEquals(j + 1, i.next());
@@ -401,10 +487,10 @@ public void testListIterator2() {
     public void testRemove_int() {
         int SIZE = 3;
         for (int i = 0; i < SIZE; i++) {
-            CopyOnWriteArrayList full = populatedArray(SIZE);
-            assertEquals(i, full.remove(i));
-            assertEquals(SIZE - 1, full.size());
-            assertFalse(full.contains(new Integer(i)));
+            List list = populatedList(SIZE);
+            assertEquals(i, list.remove(i));
+            assertEquals(SIZE - 1, list.size());
+            assertFalse(list.contains(new Integer(i)));
         }
     }
 
@@ -414,11 +500,11 @@ public void testRemove_int() {
     public void testRemove_Object() {
         int SIZE = 3;
         for (int i = 0; i < SIZE; i++) {
-            CopyOnWriteArrayList full = populatedArray(SIZE);
-            assertFalse(full.remove(new Integer(-42)));
-            assertTrue(full.remove(new Integer(i)));
-            assertEquals(SIZE - 1, full.size());
-            assertFalse(full.contains(new Integer(i)));
+            List list = populatedList(SIZE);
+            assertFalse(list.remove(new Integer(-42)));
+            assertTrue(list.remove(new Integer(i)));
+            assertEquals(SIZE - 1, list.size());
+            assertFalse(list.contains(new Integer(i)));
         }
         CopyOnWriteArrayList x = new CopyOnWriteArrayList(Arrays.asList(4, 5, 6));
         assertTrue(x.remove(new Integer(6)));
@@ -434,30 +520,34 @@ public void testRemove_Object() {
      * removeAll removes all elements from the given collection
      */
     public void testRemoveAll() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        assertTrue(full.removeAll(Arrays.asList(one, two)));
-        assertEquals(1, full.size());
-        assertFalse(full.removeAll(Arrays.asList(one, two)));
-        assertEquals(1, full.size());
+        List list = populatedList(3);
+        assertTrue(list.removeAll(Arrays.asList(one, two)));
+        assertEquals(1, list.size());
+        assertFalse(list.removeAll(Arrays.asList(one, two)));
+        assertEquals(1, list.size());
     }
 
     /**
      * set changes the element at the given index
      */
     public void testSet() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        assertEquals(2, full.set(2, four));
-        assertEquals(4, full.get(2));
+        List list = populatedList(3);
+        assertEquals(2, list.set(2, four));
+        assertEquals(4, list.get(2));
     }
 
     /**
      * size returns the number of elements
      */
     public void testSize() {
-        CopyOnWriteArrayList empty = new CopyOnWriteArrayList();
-        CopyOnWriteArrayList full = populatedArray(SIZE);
-        assertEquals(SIZE, full.size());
+        List empty = new CopyOnWriteArrayList();
         assertEquals(0, empty.size());
+        assertEquals(0, empty.subList(0, 0).size());
+
+        List full = populatedList(SIZE);
+        assertEquals(SIZE, full.size());
+        assertEquals(0, full.subList(0, 0).size());
+        assertEquals(0, full.subList(SIZE, SIZE).size());
     }
 
     /**
@@ -473,7 +563,7 @@ public void testToArray() {
         for (int i = 0; i < SIZE; i++)
             elements[i] = i;
         shuffle(elements);
-        Collection<Integer> full = populatedArray(elements);
+        Collection<Integer> full = populatedList(elements);
 
         assertTrue(Arrays.equals(elements, full.toArray()));
         assertSame(Object[].class, full.toArray().getClass());
@@ -501,7 +591,7 @@ public void testToArray2() {
         for (int i = 0; i < SIZE; i++)
             elements[i] = i;
         shuffle(elements);
-        Collection<Integer> full = populatedArray(elements);
+        Collection<Integer> full = populatedList(elements);
 
         Arrays.fill(a, 42);
         assertTrue(Arrays.equals(elements, full.toArray(a)));
@@ -527,7 +617,7 @@ public void testToArray2() {
      * sublists contains elements at indexes offset from their base
      */
     public void testSubList() {
-        CopyOnWriteArrayList a = populatedArray(10);
+        List a = populatedList(10);
         assertTrue(a.subList(1,1).isEmpty());
         for (int j = 0; j < 9; ++j) {
             for (int i = j ; i < 10; ++i) {
@@ -544,6 +634,11 @@ public void testSubList() {
         assertEquals(a.get(4), m1);
         s.clear();
         assertEquals(7, a.size());
+
+        assertThrows(
+            IndexOutOfBoundsException.class,
+            () -> s.get(0),
+            () -> s.set(0, 42));
     }
 
     // Exception tests
@@ -553,231 +648,72 @@ public void testSubList() {
      * can not store the objects inside the list
      */
     public void testToArray_ArrayStoreException() {
-        CopyOnWriteArrayList c = new CopyOnWriteArrayList();
-        c.add("zfasdfsdf");
-        c.add("asdadasd");
-        try {
-            c.toArray(new Long[5]);
-            shouldThrow();
-        } catch (ArrayStoreException success) {}
-    }
-
-    /**
-     * get throws an IndexOutOfBoundsException on a negative index
-     */
-    public void testGet1_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.get(-1);
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * get throws an IndexOutOfBoundsException on a too high index
-     */
-    public void testGet2_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.get(list.size());
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * set throws an IndexOutOfBoundsException on a negative index
-     */
-    public void testSet1_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.set(-1, "qwerty");
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * set throws an IndexOutOfBoundsException on a too high index
-     */
-    public void testSet2() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.set(list.size(), "qwerty");
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * add throws an IndexOutOfBoundsException on a negative index
-     */
-    public void testAdd1_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.add(-1, "qwerty");
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * add throws an IndexOutOfBoundsException on a too high index
-     */
-    public void testAdd2_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.add(list.size() + 1, "qwerty");
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * remove throws an IndexOutOfBoundsException on a negative index
-     */
-    public void testRemove1_IndexOutOfBounds() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.remove(-1);
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * remove throws an IndexOutOfBoundsException on a too high index
-     */
-    public void testRemove2_IndexOutOfBounds() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.remove(list.size());
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * addAll throws an IndexOutOfBoundsException on a negative index
-     */
-    public void testAddAll1_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.addAll(-1, new LinkedList());
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * addAll throws an IndexOutOfBoundsException on a too high index
-     */
-    public void testAddAll2_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.addAll(list.size() + 1, new LinkedList());
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * listIterator throws an IndexOutOfBoundsException on a negative index
-     */
-    public void testListIterator1_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.listIterator(-1);
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * listIterator throws an IndexOutOfBoundsException on a too high index
-     */
-    public void testListIterator2_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.listIterator(list.size() + 1);
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * subList throws an IndexOutOfBoundsException on a negative index
-     */
-    public void testSubList1_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.subList(-1, list.size());
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * subList throws an IndexOutOfBoundsException on a too high index
-     */
-    public void testSubList2_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.subList(0, list.size() + 1);
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
-    }
-
-    /**
-     * subList throws IndexOutOfBoundsException when the second index
-     * is lower then the first
-     */
-    public void testSubList3_IndexOutOfBoundsException() {
-        CopyOnWriteArrayList c = populatedArray(5);
-        List[] lists = { c, c.subList(1, c.size() - 1) };
-        for (List list : lists) {
-            try {
-                list.subList(list.size() - 1, 1);
-                shouldThrow();
-            } catch (IndexOutOfBoundsException success) {}
-        }
+        List list = new CopyOnWriteArrayList();
+        // Integers are not auto-converted to Longs
+        list.add(86);
+        list.add(99);
+        assertThrows(
+            ArrayStoreException.class,
+            () -> list.toArray(new Long[0]),
+            () -> list.toArray(new Long[5]));
+    }
+
+    void testIndexOutOfBoundsException(List list) {
+        int size = list.size();
+        assertThrows(
+            IndexOutOfBoundsException.class,
+            () -> list.get(-1),
+            () -> list.get(size),
+            () -> list.set(-1, "qwerty"),
+            () -> list.set(size, "qwerty"),
+            () -> list.add(-1, "qwerty"),
+            () -> list.add(size + 1, "qwerty"),
+            () -> list.remove(-1),
+            () -> list.remove(size),
+            () -> list.addAll(-1, Collections.emptyList()),
+            () -> list.addAll(size + 1, Collections.emptyList()),
+            () -> list.listIterator(-1),
+            () -> list.listIterator(size + 1),
+            () -> list.subList(-1, size),
+            () -> list.subList(0, size + 1));
+
+        // Conversely, operations that must not throw
+        list.addAll(0, Collections.emptyList());
+        list.addAll(size, Collections.emptyList());
+        list.add(0, "qwerty");
+        list.add(list.size(), "qwerty");
+        list.get(0);
+        list.get(list.size() - 1);
+        list.set(0, "azerty");
+        list.set(list.size() - 1, "azerty");
+        list.listIterator(0);
+        list.listIterator(list.size());
+        list.subList(0, list.size());
+        list.remove(list.size() - 1);
+    }
+
+    /**
+     * IndexOutOfBoundsException is thrown when specified
+     */
+    public void testIndexOutOfBoundsException() {
+        ThreadLocalRandom rnd = ThreadLocalRandom.current();
+        List x = populatedList(rnd.nextInt(5));
+        testIndexOutOfBoundsException(x);
+
+        int start = rnd.nextInt(x.size() + 1);
+        int end = rnd.nextInt(start, x.size() + 1);
+        assertThrows(
+            IndexOutOfBoundsException.class,
+            () -> x.subList(start, start - 1));
+        List subList = x.subList(start, end);
+        testIndexOutOfBoundsException(x);
     }
 
     /**
      * a deserialized/reserialized list equals original
      */
     public void testSerialization() throws Exception {
-        List x = populatedArray(SIZE);
+        List x = populatedList(SIZE);
         List y = serialClone(x);
 
         assertNotSame(x, y);
diff --git a/test/jdk/java/util/concurrent/tck/CopyOnWriteArraySetTest.java b/test/jdk/java/util/concurrent/tck/CopyOnWriteArraySetTest.java
index c28051a9b68..ad5c3802c69 100644
--- a/test/jdk/java/util/concurrent/tck/CopyOnWriteArraySetTest.java
+++ b/test/jdk/java/util/concurrent/tck/CopyOnWriteArraySetTest.java
@@ -49,7 +49,16 @@ public static void main(String[] args) {
         main(suite(), args);
     }
     public static Test suite() {
-        return new TestSuite(CopyOnWriteArraySetTest.class);
+        class Implementation implements CollectionImplementation {
+            public Class<?> klazz() { return CopyOnWriteArraySet.class; }
+            public Set emptyCollection() { return new CopyOnWriteArraySet(); }
+            public Object makeElement(int i) { return i; }
+            public boolean isConcurrent() { return true; }
+            public boolean permitsNulls() { return true; }
+        }
+        return newTestSuite(
+                CopyOnWriteArraySetTest.class,
+                CollectionTest.testSuite(new Implementation()));
     }
 
     static CopyOnWriteArraySet<Integer> populatedSet(int n) {
diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
index cb3a41e00ef..c936a3e9e27 100644
--- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
+++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
@@ -93,11 +93,14 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.Deque;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.PropertyPermission;
+import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -475,6 +478,7 @@ public String run() {
     public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
     public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
     public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
+    public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
 
     /**
      * Collects all JSR166 unit tests as one suite.
@@ -1473,26 +1477,6 @@ public final void run() {
         }
     }
 
-    public abstract class RunnableShouldThrow implements Runnable {
-        protected abstract void realRun() throws Throwable;
-
-        final Class<?> exceptionClass;
-
-        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
-            this.exceptionClass = exceptionClass;
-        }
-
-        public final void run() {
-            try {
-                realRun();
-                threadShouldThrow(exceptionClass.getSimpleName());
-            } catch (Throwable t) {
-                if (! exceptionClass.isInstance(t))
-                    threadUnexpectedException(t);
-            }
-        }
-    }
-
     public abstract class ThreadShouldThrow extends Thread {
         protected abstract void realRun() throws Throwable;
 
@@ -2098,4 +2082,42 @@ public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
         assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
         assertEquals(savedQueueSize, p.getQueue().size());
     }
+
+    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
+        assertEquals(x, y);
+        assertEquals(y, x);
+        assertEquals(x.isEmpty(), y.isEmpty());
+        assertEquals(x.size(), y.size());
+        if (x instanceof List) {
+            assertEquals(x.toString(), y.toString());
+        }
+        if (x instanceof List || x instanceof Set) {
+            assertEquals(x.hashCode(), y.hashCode());
+        }
+        if (x instanceof List || x instanceof Deque) {
+            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
+            assertTrue(Arrays.equals(x.toArray(new Object[0]),
+                                     y.toArray(new Object[0])));
+        }
+    }
+
+    /**
+     * A weaker form of assertCollectionsEquals which does not insist
+     * that the two collections satisfy Object#equals(Object), since
+     * they may use identity semantics as Deques do.
+     */
+    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
+        if (x instanceof List || x instanceof Set)
+            assertCollectionsEquals(x, y);
+        else {
+            assertEquals(x.isEmpty(), y.isEmpty());
+            assertEquals(x.size(), y.size());
+            assertEquals(new HashSet(x), new HashSet(y));
+            if (x instanceof Deque) {
+                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
+                assertTrue(Arrays.equals(x.toArray(new Object[0]),
+                                         y.toArray(new Object[0])));
+            }
+        }
+    }
 }
diff --git a/test/jdk/java/util/concurrent/tck/LinkedListTest.java b/test/jdk/java/util/concurrent/tck/LinkedListTest.java
index 66dd8c02c7a..80eab3bb1d4 100644
--- a/test/jdk/java/util/concurrent/tck/LinkedListTest.java
+++ b/test/jdk/java/util/concurrent/tck/LinkedListTest.java
@@ -37,7 +37,9 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.concurrent.ThreadLocalRandom;
 
 import junit.framework.Test;
 
@@ -49,14 +51,19 @@ public static void main(String[] args) {
     public static Test suite() {
         class Implementation implements CollectionImplementation {
             public Class<?> klazz() { return LinkedList.class; }
-            public Collection emptyCollection() { return new LinkedList(); }
+            public List emptyCollection() { return new LinkedList(); }
             public Object makeElement(int i) { return i; }
             public boolean isConcurrent() { return false; }
             public boolean permitsNulls() { return true; }
         }
         class SubListImplementation extends Implementation {
-            public Collection emptyCollection() {
-                return new LinkedList().subList(0, 0);
+            public List emptyCollection() {
+                List list = super.emptyCollection();
+                ThreadLocalRandom rnd = ThreadLocalRandom.current();
+                if (rnd.nextBoolean())
+                    list.add(makeElement(rnd.nextInt()));
+                int i = rnd.nextInt(list.size() + 1);
+                return list.subList(i, i);
             }
         }
         return newTestSuite(
diff --git a/test/jdk/java/util/concurrent/tck/VectorTest.java b/test/jdk/java/util/concurrent/tck/VectorTest.java
index 1878a78cc93..dfc6c88c795 100644
--- a/test/jdk/java/util/concurrent/tck/VectorTest.java
+++ b/test/jdk/java/util/concurrent/tck/VectorTest.java
@@ -32,8 +32,13 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Vector;
+import java.util.concurrent.ThreadLocalRandom;
 
 import junit.framework.Test;
 
@@ -52,7 +57,12 @@ class Implementation implements CollectionImplementation {
         }
         class SubListImplementation extends Implementation {
             public List emptyCollection() {
-                return super.emptyCollection().subList(0, 0);
+                List list = super.emptyCollection();
+                ThreadLocalRandom rnd = ThreadLocalRandom.current();
+                if (rnd.nextBoolean())
+                    list.add(makeElement(rnd.nextInt()));
+                int i = rnd.nextInt(list.size() + 1);
+                return list.subList(i, i);
             }
         }
         return newTestSuite(
@@ -61,6 +71,393 @@ public List emptyCollection() {
                 CollectionTest.testSuite(new SubListImplementation()));
     }
 
+    static Vector<Integer> populatedList(int n) {
+        Vector<Integer> list = new Vector<>();
+        assertTrue(list.isEmpty());
+        for (int i = 0; i < n; i++)
+            list.add(i);
+        assertEquals(n <= 0, list.isEmpty());
+        assertEquals(n, list.size());
+        return list;
+    }
+
+    /**
+     * addAll adds each element from the given collection, including duplicates
+     */
+    public void testAddAll() {
+        List list = populatedList(3);
+        assertTrue(list.addAll(Arrays.asList(three, four, five)));
+        assertEquals(6, list.size());
+        assertTrue(list.addAll(Arrays.asList(three, four, five)));
+        assertEquals(9, list.size());
+    }
+
+    /**
+     * clear removes all elements from the list
+     */
+    public void testClear() {
+        List list = populatedList(SIZE);
+        list.clear();
+        assertEquals(0, list.size());
+    }
+
+    /**
+     * Cloned list is equal
+     */
+    public void testClone() {
+        Vector l1 = populatedList(SIZE);
+        Vector l2 = (Vector)(l1.clone());
+        assertEquals(l1, l2);
+        l1.clear();
+        assertFalse(l1.equals(l2));
+    }
+
+    /**
+     * contains is true for added elements
+     */
+    public void testContains() {
+        List list = populatedList(3);
+        assertTrue(list.contains(one));
+        assertFalse(list.contains(five));
+    }
+
+    /**
+     * adding at an index places it in the indicated index
+     */
+    public void testAddIndex() {
+        List list = populatedList(3);
+        list.add(0, m1);
+        assertEquals(4, list.size());
+        assertEquals(m1, list.get(0));
+        assertEquals(zero, list.get(1));
+
+        list.add(2, m2);
+        assertEquals(5, list.size());
+        assertEquals(m2, list.get(2));
+        assertEquals(two, list.get(4));
+    }
+
+    /**
+     * lists with same elements are equal and have same hashCode
+     */
+    public void testEquals() {
+        List a = populatedList(3);
+        List b = populatedList(3);
+        assertTrue(a.equals(b));
+        assertTrue(b.equals(a));
+        assertTrue(a.containsAll(b));
+        assertTrue(b.containsAll(a));
+        assertEquals(a.hashCode(), b.hashCode());
+        a.add(m1);
+        assertFalse(a.equals(b));
+        assertFalse(b.equals(a));
+        assertTrue(a.containsAll(b));
+        assertFalse(b.containsAll(a));
+        b.add(m1);
+        assertTrue(a.equals(b));
+        assertTrue(b.equals(a));
+        assertTrue(a.containsAll(b));
+        assertTrue(b.containsAll(a));
+        assertEquals(a.hashCode(), b.hashCode());
+
+        assertFalse(a.equals(null));
+    }
+
+    /**
+     * containsAll returns true for collections with subset of elements
+     */
+    public void testContainsAll() {
+        List list = populatedList(3);
+        assertTrue(list.containsAll(Arrays.asList()));
+        assertTrue(list.containsAll(Arrays.asList(one)));
+        assertTrue(list.containsAll(Arrays.asList(one, two)));
+        assertFalse(list.containsAll(Arrays.asList(one, two, six)));
+        assertFalse(list.containsAll(Arrays.asList(six)));
+
+        try {
+            list.containsAll(null);
+            shouldThrow();
+        } catch (NullPointerException success) {}
+    }
+
+    /**
+     * get returns the value at the given index
+     */
+    public void testGet() {
+        List list = populatedList(3);
+        assertEquals(0, list.get(0));
+    }
+
+    /**
+     * indexOf(Object) returns the index of the first occurrence of the
+     * specified element in this list, or -1 if this list does not
+     * contain the element
+     */
+    public void testIndexOf() {
+        List list = populatedList(3);
+        assertEquals(-1, list.indexOf(-42));
+        int size = list.size();
+        for (int i = 0; i < size; i++) {
+            assertEquals(i, list.indexOf(i));
+            assertEquals(i, list.subList(0, size).indexOf(i));
+            assertEquals(i, list.subList(0, i + 1).indexOf(i));
+            assertEquals(-1, list.subList(0, i).indexOf(i));
+            assertEquals(0, list.subList(i, size).indexOf(i));
+            assertEquals(-1, list.subList(i + 1, size).indexOf(i));
+        }
+
+        list.add(1);
+        assertEquals(1, list.indexOf(1));
+        assertEquals(1, list.subList(0, size + 1).indexOf(1));
+        assertEquals(0, list.subList(1, size + 1).indexOf(1));
+        assertEquals(size - 2, list.subList(2, size + 1).indexOf(1));
+        assertEquals(0, list.subList(size, size + 1).indexOf(1));
+        assertEquals(-1, list.subList(size + 1, size + 1).indexOf(1));
+    }
+
+    /**
+     * indexOf(E, int) returns the index of the first occurrence of the
+     * specified element in this list, searching forwards from index,
+     * or returns -1 if the element is not found
+     */
+    public void testIndexOf2() {
+        Vector list = populatedList(3);
+        int size = list.size();
+        assertEquals(-1, list.indexOf(-42, 0));
+
+        // we might expect IOOBE, but spec says otherwise
+        assertEquals(-1, list.indexOf(0, size));
+        assertEquals(-1, list.indexOf(0, Integer.MAX_VALUE));
+
+        assertThrows(
+            IndexOutOfBoundsException.class,
+            () -> list.indexOf(0, -1),
+            () -> list.indexOf(0, Integer.MIN_VALUE));
+
+        for (int i = 0; i < size; i++) {
+            assertEquals(i, list.indexOf(i, 0));
+            assertEquals(i, list.indexOf(i, i));
+            assertEquals(-1, list.indexOf(i, i + 1));
+        }
+
+        list.add(1);
+        assertEquals(1, list.indexOf(1, 0));
+        assertEquals(1, list.indexOf(1, 1));
+        assertEquals(size, list.indexOf(1, 2));
+        assertEquals(size, list.indexOf(1, size));
+    }
+
+    /**
+     * isEmpty returns true when empty, else false
+     */
+    public void testIsEmpty() {
+        List empty = new Vector();
+        assertTrue(empty.isEmpty());
+        assertTrue(empty.subList(0, 0).isEmpty());
+
+        List full = populatedList(SIZE);
+        assertFalse(full.isEmpty());
+        assertTrue(full.subList(0, 0).isEmpty());
+        assertTrue(full.subList(SIZE, SIZE).isEmpty());
+    }
+
+    /**
+     * iterator of empty collection has no elements
+     */
+    public void testEmptyIterator() {
+        Collection c = new Vector();
+        assertIteratorExhausted(c.iterator());
+    }
+
+    /**
+     * lastIndexOf(Object) returns the index of the last occurrence of
+     * the specified element in this list, or -1 if this list does not
+     * contain the element
+     */
+    public void testLastIndexOf1() {
+        List list = populatedList(3);
+        assertEquals(-1, list.lastIndexOf(-42));
+        int size = list.size();
+        for (int i = 0; i < size; i++) {
+            assertEquals(i, list.lastIndexOf(i));
+            assertEquals(i, list.subList(0, size).lastIndexOf(i));
+            assertEquals(i, list.subList(0, i + 1).lastIndexOf(i));
+            assertEquals(-1, list.subList(0, i).lastIndexOf(i));
+            assertEquals(0, list.subList(i, size).lastIndexOf(i));
+            assertEquals(-1, list.subList(i + 1, size).lastIndexOf(i));
+        }
+
+        list.add(1);
+        assertEquals(size, list.lastIndexOf(1));
+        assertEquals(size, list.subList(0, size + 1).lastIndexOf(1));
+        assertEquals(1, list.subList(0, size).lastIndexOf(1));
+        assertEquals(0, list.subList(1, 2).lastIndexOf(1));
+        assertEquals(-1, list.subList(0, 1).indexOf(1));
+    }
+
+    /**
+     * lastIndexOf(E, int) returns the index of the last occurrence of the
+     * specified element in this list, searching backwards from index, or
+     * returns -1 if the element is not found
+     */
+    public void testLastIndexOf2() {
+        Vector list = populatedList(3);
+
+        // we might expect IOOBE, but spec says otherwise
+        assertEquals(-1, list.lastIndexOf(0, -1));
+
+        int size = list.size();
+        assertThrows(
+            IndexOutOfBoundsException.class,
+            () -> list.lastIndexOf(0, size),
+            () -> list.lastIndexOf(0, Integer.MAX_VALUE));
+
+        for (int i = 0; i < size; i++) {
+            assertEquals(i, list.lastIndexOf(i, i));
+            assertEquals(list.indexOf(i), list.lastIndexOf(i, i));
+            if (i > 0)
+                assertEquals(-1, list.lastIndexOf(i, i - 1));
+        }
+        list.add(one);
+        list.add(three);
+        assertEquals(1, list.lastIndexOf(one, 1));
+        assertEquals(1, list.lastIndexOf(one, 2));
+        assertEquals(3, list.lastIndexOf(one, 3));
+        assertEquals(3, list.lastIndexOf(one, 4));
+        assertEquals(-1, list.lastIndexOf(three, 3));
+    }
+
+    /**
+     * size returns the number of elements
+     */
+    public void testSize() {
+        List empty = new Vector();
+        assertEquals(0, empty.size());
+        assertEquals(0, empty.subList(0, 0).size());
+
+        List full = populatedList(SIZE);
+        assertEquals(SIZE, full.size());
+        assertEquals(0, full.subList(0, 0).size());
+        assertEquals(0, full.subList(SIZE, SIZE).size());
+    }
+
+    /**
+     * sublists contains elements at indexes offset from their base
+     */
+    public void testSubList() {
+        List a = populatedList(10);
+        assertTrue(a.subList(1,1).isEmpty());
+        for (int j = 0; j < 9; ++j) {
+            for (int i = j ; i < 10; ++i) {
+                List b = a.subList(j,i);
+                for (int k = j; k < i; ++k) {
+                    assertEquals(new Integer(k), b.get(k-j));
+                }
+            }
+        }
+
+        List s = a.subList(2, 5);
+        assertEquals(3, s.size());
+        s.set(2, m1);
+        assertEquals(a.get(4), m1);
+        s.clear();
+        assertEquals(7, a.size());
+
+        assertThrows(
+            IndexOutOfBoundsException.class,
+            () -> s.get(0),
+            () -> s.set(0, 42));
+    }
+
+    /**
+     * toArray throws an ArrayStoreException when the given array
+     * can not store the objects inside the list
+     */
+    public void testToArray_ArrayStoreException() {
+        List list = new Vector();
+        // Integers are not auto-converted to Longs
+        list.add(86);
+        list.add(99);
+        assertThrows(
+            ArrayStoreException.class,
+            () -> list.toArray(new Long[0]),
+            () -> list.toArray(new Long[5]));
+    }
+
+    void testIndexOutOfBoundsException(List list) {
+        int size = list.size();
+        assertThrows(
+            IndexOutOfBoundsException.class,
+            () -> list.get(-1),
+            () -> list.get(size),
+            () -> list.set(-1, "qwerty"),
+            () -> list.set(size, "qwerty"),
+            () -> list.add(-1, "qwerty"),
+            () -> list.add(size + 1, "qwerty"),
+            () -> list.remove(-1),
+            () -> list.remove(size),
+            () -> list.addAll(-1, Collections.emptyList()),
+            () -> list.addAll(size + 1, Collections.emptyList()),
+            () -> list.listIterator(-1),
+            () -> list.listIterator(size + 1),
+            () -> list.subList(-1, size),
+            () -> list.subList(0, size + 1));
+
+        // Conversely, operations that must not throw
+        list.addAll(0, Collections.emptyList());
+        list.addAll(size, Collections.emptyList());
+        list.add(0, "qwerty");
+        list.add(list.size(), "qwerty");
+        list.get(0);
+        list.get(list.size() - 1);
+        list.set(0, "azerty");
+        list.set(list.size() - 1, "azerty");
+        list.listIterator(0);
+        list.listIterator(list.size());
+        list.subList(0, list.size());
+        list.remove(list.size() - 1);
+    }
+
+    /**
+     * IndexOutOfBoundsException is thrown when specified
+     */
+    public void testIndexOutOfBoundsException() {
+        ThreadLocalRandom rnd = ThreadLocalRandom.current();
+        List x = populatedList(rnd.nextInt(5));
+        testIndexOutOfBoundsException(x);
+
+        int start = rnd.nextInt(x.size() + 1);
+        int end = rnd.nextInt(start, x.size() + 1);
+
+        // Vector#subList spec deviates slightly from List#subList spec
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> x.subList(start, start - 1));
+
+        List subList = x.subList(start, end);
+        testIndexOutOfBoundsException(x);
+    }
+
+    /**
+     * a deserialized/reserialized list equals original
+     */
+    public void testSerialization() throws Exception {
+        List x = populatedList(SIZE);
+        List y = serialClone(x);
+
+        assertNotSame(x, y);
+        assertEquals(x.size(), y.size());
+        assertEquals(x.toString(), y.toString());
+        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
+        assertEquals(x, y);
+        assertEquals(y, x);
+        while (!x.isEmpty()) {
+            assertFalse(y.isEmpty());
+            assertEquals(x.remove(0), y.remove(0));
+        }
+        assertTrue(y.isEmpty());
+    }
+
     /**
      * tests for setSize()
      */

From 2e5767b374a2aedf7e4351bfefc8e19bb49d5238 Mon Sep 17 00:00:00 2001
From: dl <unknown>
Date: Tue, 10 Apr 2018 11:37:18 -0700
Subject: [PATCH 123/196] 8197531: Miscellaneous changes imported from jsr166
 CVS 2018-04 Reviewed-by: martin, psandoz

---
 .../share/classes/java/util/ArrayDeque.java   |   8 +-
 .../util/concurrent/CompletableFuture.java    |   2 +-
 .../util/concurrent/ConcurrentHashMap.java    |   2 +-
 .../concurrent/ConcurrentLinkedDeque.java     |   2 +-
 .../concurrent/ConcurrentLinkedQueue.java     |   2 +-
 .../concurrent/ConcurrentSkipListMap.java     |   2 +-
 .../util/concurrent/CountedCompleter.java     |   2 +-
 .../java/util/concurrent/Exchanger.java       |   2 +-
 .../java/util/concurrent/ForkJoinTask.java    |   2 +-
 .../java/util/concurrent/FutureTask.java      |   2 +-
 .../util/concurrent/LinkedTransferQueue.java  |   2 +-
 .../classes/java/util/concurrent/Phaser.java  |   2 +-
 .../concurrent/PriorityBlockingQueue.java     |   2 +-
 .../util/concurrent/SubmissionPublisher.java  |   6 +-
 .../util/concurrent/SynchronousQueue.java     |   8 +-
 .../util/concurrent/atomic/AtomicBoolean.java |   2 +-
 .../atomic/AtomicMarkableReference.java       |   2 +-
 .../concurrent/atomic/AtomicReference.java    |   2 +-
 .../atomic/AtomicStampedReference.java        |   2 +-
 .../util/concurrent/atomic/Striped64.java     |   6 +-
 .../locks/AbstractQueuedLongSynchronizer.java |   2 +-
 .../locks/AbstractQueuedSynchronizer.java     |   4 +-
 .../util/concurrent/locks/StampedLock.java    |   2 +-
 .../ConcurrentHashMap/WhiteBox.java           | 155 ++++++++++++++++++
 .../ConcurrentLinkedQueue/WhiteBox.java       |   1 +
 .../Executors/PrivilegedCallables.java        |   3 +-
 .../LinkedTransferQueue/WhiteBox.java         |   1 +
 27 files changed, 194 insertions(+), 34 deletions(-)
 create mode 100644 test/jdk/java/util/concurrent/ConcurrentHashMap/WhiteBox.java

diff --git a/src/java.base/share/classes/java/util/ArrayDeque.java b/src/java.base/share/classes/java/util/ArrayDeque.java
index f9dbf3fa6da..f4307f680c2 100644
--- a/src/java.base/share/classes/java/util/ArrayDeque.java
+++ b/src/java.base/share/classes/java/util/ArrayDeque.java
@@ -208,7 +208,7 @@ public ArrayDeque(int numElements) {
      */
     public ArrayDeque(Collection<? extends E> c) {
         this(c.size());
-        addAll(c);
+        copyElements(c);
     }
 
     /**
@@ -322,10 +322,14 @@ public boolean addAll(Collection<? extends E> c) {
         final int s, needed;
         if ((needed = (s = size()) + c.size() + 1 - elements.length) > 0)
             grow(needed);
-        c.forEach(this::addLast);
+        copyElements(c);
         return size() > s;
     }
 
+    private void copyElements(Collection<? extends E> c) {
+        c.forEach(this::addLast);
+    }
+
     /**
      * Inserts the specified element at the front of this deque.
      *
diff --git a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
index 66266827260..4c8e9b159fc 100644
--- a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
+++ b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
@@ -2883,7 +2883,7 @@ static final class MinimalStage<T> extends CompletableFuture<T> {
             STACK = l.findVarHandle(CompletableFuture.class, "stack", Completion.class);
             NEXT = l.findVarHandle(Completion.class, "next", Completion.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to
diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
index 35672a7f172..0a0ac3eef5f 100644
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
@@ -6383,7 +6383,7 @@ public final void compute() {
         ABASE = U.arrayBaseOffset(Node[].class);
         int scale = U.arrayIndexScale(Node[].class);
         if ((scale & (scale - 1)) != 0)
-            throw new Error("array index scale not a power of two");
+            throw new ExceptionInInitializerError("array index scale not a power of two");
         ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
 
         // Reduce the risk of rare disastrous classloading in first call to
diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
index 0d7a0ebb159..91ddabde3cc 100644
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
@@ -1671,7 +1671,7 @@ public void forEach(Consumer<? super E> action) {
             NEXT = l.findVarHandle(Node.class, "next", Node.class);
             ITEM = l.findVarHandle(Node.class, "item", Object.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
index 701806e848e..eac8ee7d113 100644
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
@@ -1069,7 +1069,7 @@ public void forEach(Consumer<? super E> action) {
             ITEM = l.findVarHandle(Node.class, "item", Object.class);
             NEXT = l.findVarHandle(Node.class, "next", Node.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
index 822dde81df3..8b179db6932 100644
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
@@ -3412,7 +3412,7 @@ final EntrySpliterator<K,V> entrySpliterator() {
             VAL = l.findVarHandle(Node.class, "val", Object.class);
             RIGHT = l.findVarHandle(Index.class, "right", Index.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java b/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
index 9321ccfbfb0..a91d12dfea0 100644
--- a/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
+++ b/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
@@ -775,7 +775,7 @@ protected void setRawResult(T t) { }
             PENDING = l.findVarHandle(CountedCompleter.class, "pending", int.class);
 
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/Exchanger.java b/src/java.base/share/classes/java/util/concurrent/Exchanger.java
index e7baf4d5a9f..925bf0d2071 100644
--- a/src/java.base/share/classes/java/util/concurrent/Exchanger.java
+++ b/src/java.base/share/classes/java/util/concurrent/Exchanger.java
@@ -641,7 +641,7 @@ public V exchange(V x, long timeout, TimeUnit unit)
             MATCH = l.findVarHandle(Node.class, "match", Object.class);
             AA = MethodHandles.arrayElementVarHandle(Node[].class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
index e4e3aa8f934..b388992dad5 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
@@ -1540,7 +1540,7 @@ private void readObject(java.io.ObjectInputStream s)
             MethodHandles.Lookup l = MethodHandles.lookup();
             STATUS = l.findVarHandle(ForkJoinTask.class, "status", int.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/FutureTask.java b/src/java.base/share/classes/java/util/concurrent/FutureTask.java
index ec644a7aaae..e913ef32a2d 100644
--- a/src/java.base/share/classes/java/util/concurrent/FutureTask.java
+++ b/src/java.base/share/classes/java/util/concurrent/FutureTask.java
@@ -526,7 +526,7 @@ public String toString() {
             RUNNER = l.findVarHandle(FutureTask.class, "runner", Thread.class);
             WAITERS = l.findVarHandle(FutureTask.class, "waiters", WaitNode.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to
diff --git a/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java b/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
index 5522f7b401b..06d04e22e6c 100644
--- a/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
@@ -1739,7 +1739,7 @@ public void forEach(Consumer<? super E> action) {
             NEXT = l.findVarHandle(Node.class, "next", Node.class);
             WAITER = l.findVarHandle(Node.class, "waiter", Thread.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to
diff --git a/src/java.base/share/classes/java/util/concurrent/Phaser.java b/src/java.base/share/classes/java/util/concurrent/Phaser.java
index 4af4b8b6da2..d878e45c353 100644
--- a/src/java.base/share/classes/java/util/concurrent/Phaser.java
+++ b/src/java.base/share/classes/java/util/concurrent/Phaser.java
@@ -1137,7 +1137,7 @@ public boolean block() {
             MethodHandles.Lookup l = MethodHandles.lookup();
             STATE = l.findVarHandle(Phaser.class, "state", long.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to
diff --git a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
index 388c75d36fd..8a362274749 100644
--- a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
@@ -1014,7 +1014,7 @@ public Spliterator<E> spliterator() {
                                                  "allocationSpinLock",
                                                  int.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
index 8fd33c69d32..9efb01d1a0d 100644
--- a/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
+++ b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
@@ -1096,7 +1096,7 @@ final int offer(T item, boolean unowned) {
             if (cap > 0) {
                 boolean added;
                 if (n >= cap && cap < maxCapacity) // resize
-                    added = growAndoffer(item, a, t);
+                    added = growAndOffer(item, a, t);
                 else if (n >= cap || unowned)      // need volatile CAS
                     added = QA.compareAndSet(a, i, null, item);
                 else {                             // can use release mode
@@ -1115,7 +1115,7 @@ else if (n >= cap || unowned)      // need volatile CAS
          * Tries to expand buffer and add item, returning true on
          * success. Currently fails only if out of memory.
          */
-        final boolean growAndoffer(T item, Object[] a, int t) {
+        final boolean growAndOffer(T item, Object[] a, int t) {
             int cap = 0, newCap = 0;
             Object[] newArray = null;
             if (a != null && (cap = a.length) > 0 && (newCap = cap << 1) > 0) {
@@ -1466,7 +1466,7 @@ else if (timed)
                                          long.class);
                 QA = MethodHandles.arrayElementVarHandle(Object[].class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
 
             // Reduce the risk of rare disastrous classloading in first call to
diff --git a/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java b/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
index 7f9c7375495..8de28b87987 100644
--- a/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
+++ b/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
@@ -293,7 +293,7 @@ boolean isCancelled() {
                     SMATCH = l.findVarHandle(SNode.class, "match", SNode.class);
                     SNEXT = l.findVarHandle(SNode.class, "next", SNode.class);
                 } catch (ReflectiveOperationException e) {
-                    throw new Error(e);
+                    throw new ExceptionInInitializerError(e);
                 }
             }
         }
@@ -516,7 +516,7 @@ void clean(SNode s) {
                 MethodHandles.Lookup l = MethodHandles.lookup();
                 SHEAD = l.findVarHandle(TransferStack.class, "head", SNode.class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
         }
     }
@@ -583,7 +583,7 @@ boolean isOffList() {
                     QITEM = l.findVarHandle(QNode.class, "item", Object.class);
                     QNEXT = l.findVarHandle(QNode.class, "next", QNode.class);
                 } catch (ReflectiveOperationException e) {
-                    throw new Error(e);
+                    throw new ExceptionInInitializerError(e);
                 }
             }
         }
@@ -830,7 +830,7 @@ void clean(QNode pred, QNode s) {
                 QCLEANME = l.findVarHandle(TransferQueue.class, "cleanMe",
                                            QNode.class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
         }
     }
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
index 1284e00afb7..9e2acf5535c 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
@@ -56,7 +56,7 @@ public class AtomicBoolean implements java.io.Serializable {
             MethodHandles.Lookup l = MethodHandles.lookup();
             VALUE = l.findVarHandle(AtomicBoolean.class, "value", int.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
index 367808c7192..51ea84c55ae 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
@@ -199,7 +199,7 @@ public boolean attemptMark(V expectedReference, boolean newMark) {
             PAIR = l.findVarHandle(AtomicMarkableReference.class, "pair",
                                    Pair.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
index db1d483b5ae..70832ff4720 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
@@ -56,7 +56,7 @@ public class AtomicReference<V> implements java.io.Serializable {
             MethodHandles.Lookup l = MethodHandles.lookup();
             VALUE = l.findVarHandle(AtomicReference.class, "value", Object.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
index f031fe81d81..47b7c7ba2ec 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
@@ -199,7 +199,7 @@ public boolean attemptStamp(V expectedReference, int newStamp) {
             PAIR = l.findVarHandle(AtomicStampedReference.class, "pair",
                                    Pair.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java b/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
index ddb1e53a3d0..9c21fa36e5a 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
@@ -144,7 +144,7 @@ final long getAndSet(long val) {
                 MethodHandles.Lookup l = MethodHandles.lookup();
                 VALUE = l.findVarHandle(Cell.class, "value", long.class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
         }
     }
@@ -396,13 +396,13 @@ public MethodHandles.Lookup run() {
                             try {
                                 return MethodHandles.privateLookupIn(Thread.class, MethodHandles.lookup());
                             } catch (ReflectiveOperationException e) {
-                                throw new Error(e);
+                                throw new ExceptionInInitializerError(e);
                             }
                         }});
             THREAD_PROBE = l.findVarHandle(Thread.class,
                     "threadLocalRandomProbe", int.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
index e7aae9ce86f..5ed57718eed 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
@@ -1830,7 +1830,7 @@ protected final Collection<Thread> getWaitingThreads() {
             HEAD = l.findVarHandle(AbstractQueuedLongSynchronizer.class, "head", Node.class);
             TAIL = l.findVarHandle(AbstractQueuedLongSynchronizer.class, "tail", Node.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
index ce701cf0bb4..4ecfff00f86 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
@@ -555,7 +555,7 @@ final void setPrevRelaxed(Node p) {
                 THREAD = l.findVarHandle(Node.class, "thread", Thread.class);
                 WAITSTATUS = l.findVarHandle(Node.class, "waitStatus", int.class);
             } catch (ReflectiveOperationException e) {
-                throw new Error(e);
+                throw new ExceptionInInitializerError(e);
             }
         }
     }
@@ -2308,7 +2308,7 @@ protected final Collection<Thread> getWaitingThreads() {
             HEAD = l.findVarHandle(AbstractQueuedSynchronizer.class, "head", Node.class);
             TAIL = l.findVarHandle(AbstractQueuedSynchronizer.class, "tail", Node.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java b/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
index 36a8c5a9849..c06847fc267 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
@@ -1614,7 +1614,7 @@ private long cancelWaiter(WNode node, WNode group, boolean interrupted) {
             WNEXT = l.findVarHandle(WNode.class, "next", WNode.class);
             WCOWAIT = l.findVarHandle(WNode.class, "cowait", WNode.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 }
diff --git a/test/jdk/java/util/concurrent/ConcurrentHashMap/WhiteBox.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/WhiteBox.java
new file mode 100644
index 00000000000..e460e835da7
--- /dev/null
+++ b/test/jdk/java/util/concurrent/ConcurrentHashMap/WhiteBox.java
@@ -0,0 +1,155 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Martin Buchholz with assistance from members of JCP
+ * JSR-166 Expert Group and released to the public domain, as
+ * explained at http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/*
+ * @test
+ * @modules java.base/java.util.concurrent:open
+ * @run testng WhiteBox
+ * @summary White box tests of implementation details
+ */
+
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
+
+@Test
+public class WhiteBox {
+    final ThreadLocalRandom rnd = ThreadLocalRandom.current();
+    final VarHandle TABLE, NEXTTABLE, SIZECTL;
+
+    WhiteBox() throws ReflectiveOperationException {
+        Class<?> mClass = ConcurrentHashMap.class;
+        String nodeClassName = mClass.getName() + "$Node";
+        Class<?> nodeClass = Class.forName(nodeClassName);
+        Class<?> nodeArrayClass = Class.forName("[L" + nodeClassName + ";");
+        MethodHandles.Lookup lookup
+            = MethodHandles.privateLookupIn(mClass, MethodHandles.lookup());
+        TABLE = lookup.findVarHandle(mClass, "table", nodeArrayClass);
+        NEXTTABLE = lookup.findVarHandle(mClass, "nextTable", nodeArrayClass);
+        SIZECTL = lookup.findVarHandle(mClass, "sizeCtl", int.class);
+    }
+
+    Object[] table(ConcurrentHashMap m) { return (Object[]) TABLE.getVolatile(m); }
+    Object[] nextTable(ConcurrentHashMap m) { return (Object[]) NEXTTABLE.getVolatile(m); }
+    int sizeCtl(ConcurrentHashMap m) { return (int) SIZECTL.getVolatile(m); }
+
+    @Test
+    public void defaultConstructor() {
+        ConcurrentHashMap m = new ConcurrentHashMap();
+        assertNull(table(m));
+        assertEquals(sizeCtl(m), 0);
+        assertResizeNotInProgress(m);
+    }
+
+    @Test
+    public void shouldNotResizeWhenInitialCapacityProvided() {
+        int initialCapacity = rnd.nextInt(1, 100);
+        Object[] initialTable = null;
+        ConcurrentHashMap m = new ConcurrentHashMap(initialCapacity);
+
+        // table is lazily initialized
+        assertNull(table(m));
+        int expectedInitialTableLength = sizeCtl(m);
+
+        assertInvariants(m);
+        for (int i = 0; i < initialCapacity; i++) {
+            m.put(i * 100 + rnd.nextInt(100), i);
+            if (i == 0)
+                initialTable = table(m);
+            else
+                assertSame(table(m), initialTable);
+            assertInvariants(m);
+        }
+        assertEquals(initialTable.length, expectedInitialTableLength);
+    }
+
+    byte[] serialBytes(Object o) {
+        try {
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(bos);
+            oos.writeObject(o);
+            oos.flush();
+            oos.close();
+            return bos.toByteArray();
+        } catch (Exception fail) {
+            throw new AssertionError(fail);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    <T> T serialClone(T o) {
+        try {
+            ObjectInputStream ois = new ObjectInputStream
+                (new ByteArrayInputStream(serialBytes(o)));
+            T clone = (T) ois.readObject();
+            assertNotSame(o, clone);
+            assertSame(o.getClass(), clone.getClass());
+            return clone;
+        } catch (Exception fail) {
+            throw new AssertionError(fail);
+        }
+    }
+
+    @Test
+    public void testSerialization() {
+        assertInvariants(serialClone(new ConcurrentHashMap()));
+
+        ConcurrentHashMap m = new ConcurrentHashMap(rnd.nextInt(100));
+        m.put(1, 1);
+        ConcurrentHashMap clone = serialClone(m);
+        assertInvariants(clone);
+        assertNotSame(table(m), table(clone));
+        assertEquals(m, clone);
+        assertResizeNotInProgress(m);
+        assertResizeNotInProgress(clone);
+    }
+
+    /** Checks conditions which should always be true. */
+    void assertInvariants(ConcurrentHashMap m) {
+        if (!m.isEmpty())
+            assertNotNull(table(m));
+    }
+
+    void assertResizeNotInProgress(ConcurrentHashMap m) {
+        assertTrue(sizeCtl(m) >= 0);
+        assertNull(nextTable(m));
+    }
+}
diff --git a/test/jdk/java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java b/test/jdk/java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java
index 225bfb0297a..63fd29a8a9a 100644
--- a/test/jdk/java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java
+++ b/test/jdk/java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java
@@ -338,6 +338,7 @@ <T> T serialClone(T o) {
         }
     }
 
+    @Test
     public void testSerialization() {
         ConcurrentLinkedQueue q = serialClone(new ConcurrentLinkedQueue());
         assertInvariants(q);
diff --git a/test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java b/test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java
index 9119a20328f..d5a47f2877e 100644
--- a/test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java
+++ b/test/jdk/java/util/concurrent/Executors/PrivilegedCallables.java
@@ -101,8 +101,7 @@ void test(String[] args) {
         final Policy policy = new Policy();
         Policy.setPolicy(policy);
         policy.setPermissions(new RuntimePermission("getClassLoader"),
-                              new RuntimePermission("setContextClassLoader"),
-                              new RuntimePermission("stopThread"));
+                              new RuntimePermission("setContextClassLoader"));
         System.setSecurityManager(new SecurityManager());
 
         testPrivileged();
diff --git a/test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java b/test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java
index a7b30b95e3a..e1e4607813d 100644
--- a/test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java
+++ b/test/jdk/java/util/concurrent/LinkedTransferQueue/WhiteBox.java
@@ -361,6 +361,7 @@ <T> T serialClone(T o) {
         }
     }
 
+    @Test
     public void testSerialization() {
         LinkedTransferQueue q = serialClone(new LinkedTransferQueue());
         assertInvariants(q);

From 5bcb2301e8e92db2797e9378ee0104fdcfe4c65a Mon Sep 17 00:00:00 2001
From: ccheung <unknown>
Date: Tue, 10 Apr 2018 11:43:40 -0700
Subject: [PATCH 124/196] 8194812: Extend class-data sharing to support the
 module path 8199360: Rework the support for the 'ignored' module options in
 CDS Reviewed-by: jiangli, lfoltan, iklam, mseledtsov

---
 .../jtreg/runtime/appcds/JarBuilder.java      |  36 +++-
 .../jtreg/runtime/appcds/TestCommon.java      |  19 +-
 .../CheckUnsupportedDumpingOptions.java       |  37 +---
 .../appcds/jigsaw/JigsawOptionsCombo.java     |  45 +++--
 .../jigsaw/PatchModule/AppClassInCP.java      |   8 +-
 .../jigsaw/PatchModule/CustomPackage.java     |   5 +-
 .../PatchModule/MismatchedPatchModule.java    |  52 +----
 .../appcds/jigsaw/PatchModule/PatchDir.java   |   6 +-
 .../jigsaw/PatchModule/PatchJavaBase.java     |   3 +-
 .../appcds/jigsaw/PatchModule/Simple.java     |   7 +-
 .../PatchModule/SubClassOfPatchedClass.java   |   7 +-
 .../appcds/jigsaw/PatchModule/TwoJars.java    |   5 +-
 .../classpathtests/BootAppendTests.java       |  71 +++----
 .../EmptyClassInBootClassPath.java            |   6 +-
 .../jigsaw/limitmods/LimitModsHelper.java     |  23 ++-
 .../jigsaw/limitmods/LimitModsTests.java      |  10 +-
 .../appcds/jigsaw/modulepath/AddModules.java  | 137 +++++++++++++
 .../appcds/jigsaw/modulepath/AddOpens.java    | 110 +++++++++++
 .../appcds/jigsaw/modulepath/AddReads.java    | 143 ++++++++++++++
 .../jigsaw/modulepath/ExportModule.java       | 164 +++++++++++++++
 .../jigsaw/modulepath/JvmtiAddPath.java       | 156 +++++++++++++++
 .../jigsaw/modulepath/MainModuleOnly.java     | 177 +++++++++++++++++
 .../jigsaw/modulepath/ModulePathAndCP.java    | 186 ++++++++++++++++++
 .../src/com.greetings/com/greetings/Main.java |  31 +++
 .../src/com.greetings/module-info.java        |  27 +++
 .../src/com.hello/com/hello/Main.java         |  31 +++
 .../modulepath/src/com.hello/module-info.java |  27 +++
 .../src/com.nomodule/com/nomodule/Main.java   |  31 +++
 .../com.norequires/com/norequires/Main.java   |  31 +++
 .../src/com.norequires/module-info.java       |  25 +++
 .../src/com.simple/com/simple/Main.java       |  39 ++++
 .../src/com.simple/module-info.java           |  26 +++
 .../modulepath/src/org.astro/module-info.java |  27 +++
 .../src/org.astro/org/astro/World.java        |  30 +++
 .../runtime/appcds/test-classes/JvmtiApp.java |  41 ++--
 .../modules/PatchModule/PatchModuleCDS.java   |  11 +-
 test/lib/jdk/test/lib/cds/CDSTestUtils.java   |  25 ++-
 37 files changed, 1625 insertions(+), 190 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddModules.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddOpens.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/JvmtiAddPath.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/MainModuleOnly.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/module-info.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/module-info.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/module-info.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/module-info.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/module-info.java
 create mode 100644 test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java

diff --git a/test/hotspot/jtreg/runtime/appcds/JarBuilder.java b/test/hotspot/jtreg/runtime/appcds/JarBuilder.java
index bb3921e7281..d96b6efb8be 100644
--- a/test/hotspot/jtreg/runtime/appcds/JarBuilder.java
+++ b/test/hotspot/jtreg/runtime/appcds/JarBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -32,9 +32,11 @@
  */
 
 import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import sun.tools.jar.Main;
 
@@ -145,6 +147,21 @@ private static void addClassArgs(ArrayList<String> args, String jarclassDir,
         }
     }
 
+    public static void createModularJar(String jarPath,
+                                      String classesDir,
+                                      String mainClass) throws Exception {
+        ArrayList<String> argList = new ArrayList<String>();
+        argList.add("--create");
+        argList.add("--file=" + jarPath);
+        if (mainClass != null) {
+            argList.add("--main-class=" + mainClass);
+        }
+        argList.add("-C");
+        argList.add(classesDir);
+        argList.add(".");
+        createJar(argList);
+    }
+
     private static void createJar(ArrayList<String> args) {
         if (DEBUG) printIterable("createJar args: ", args);
 
@@ -190,6 +207,23 @@ public static void compile(String dstPath, String source, String... extraArgs) t
         output.shouldHaveExitValue(0);
     }
 
+    public static void compileModule(Path src,
+                                     Path dest,
+                                     String modulePathArg // arg to --module-path
+                                     ) throws Exception {
+        boolean compiled = false;
+        if (modulePathArg == null) {
+            compiled = CompilerUtils.compile(src, dest);
+        } else {
+            compiled = CompilerUtils.compile(src, dest,
+                                           "--module-path", modulePathArg);
+        }
+        if (!compiled) {
+            throw new RuntimeException("module did not compile");
+        }
+    }
+
+
     public static void signJar() throws Exception {
         String keyTool = JDKToolFinder.getJDKTool("keytool");
         String jarSigner = JDKToolFinder.getJDKTool("jarsigner");
diff --git a/test/hotspot/jtreg/runtime/appcds/TestCommon.java b/test/hotspot/jtreg/runtime/appcds/TestCommon.java
index 2c2cdb6db55..bee1e4a9c0a 100644
--- a/test/hotspot/jtreg/runtime/appcds/TestCommon.java
+++ b/test/hotspot/jtreg/runtime/appcds/TestCommon.java
@@ -200,13 +200,18 @@ public static Result run(String... suffix) throws Exception {
         return new Result(opts, runWithArchive(opts));
     }
 
-
     public static OutputAnalyzer exec(String appJar, String... suffix) throws Exception {
         AppCDSOptions opts = (new AppCDSOptions()).setAppJar(appJar);
         opts.addSuffix(suffix);
         return runWithArchive(opts);
     }
 
+    public static Result runWithModules(String prefix[], String upgrademodulepath, String modulepath,
+                                            String mid, String... testClassArgs) throws Exception {
+        AppCDSOptions opts = makeModuleOptions(prefix, upgrademodulepath, modulepath,
+                                               mid, testClassArgs);
+        return new Result(opts, runWithArchive(opts));
+    }
 
     public static OutputAnalyzer execAuto(String... suffix) throws Exception {
         AppCDSOptions opts = (new AppCDSOptions());
@@ -220,10 +225,9 @@ public static OutputAnalyzer execOff(String... suffix) throws Exception {
         return runWithArchive(opts);
     }
 
-    public static OutputAnalyzer execModule(String prefix[], String upgrademodulepath, String modulepath,
-                                            String mid, String... testClassArgs)
-        throws Exception {
 
+    private static AppCDSOptions makeModuleOptions(String prefix[], String upgrademodulepath, String modulepath,
+                                            String mid, String testClassArgs[]) {
         AppCDSOptions opts = (new AppCDSOptions());
 
         opts.addPrefix(prefix);
@@ -234,7 +238,14 @@ public static OutputAnalyzer execModule(String prefix[], String upgrademodulepat
                            "-p", modulepath, "-m", mid);
         }
         opts.addSuffix(testClassArgs);
+        return opts;
+    }
 
+    public static OutputAnalyzer execModule(String prefix[], String upgrademodulepath, String modulepath,
+                                            String mid, String... testClassArgs)
+        throws Exception {
+        AppCDSOptions opts = makeModuleOptions(prefix, upgrademodulepath, modulepath,
+                                               mid, testClassArgs);
         return runWithArchive(opts);
     }
 
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/CheckUnsupportedDumpingOptions.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/CheckUnsupportedDumpingOptions.java
index 111c690dcad..3c15773611a 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/CheckUnsupportedDumpingOptions.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/CheckUnsupportedDumpingOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -40,20 +40,15 @@
 
 public class CheckUnsupportedDumpingOptions {
     private static final String[] jigsawOptions = {
-        "-m",
         "--limit-modules",
-        "--module-path",
         "--upgrade-module-path",
         "--patch-module"
     };
     private static final String[] optionValues = {
         "mymod",
-        "mymod",
-        "mydir",
         ".",
         "java.naming=javax.naming.spi.NamingManger"
     };
-    private static final int infoIdx = 1;
 
     public static void main(String[] args) throws Exception {
         String source = "package javax.naming.spi; "                +
@@ -71,31 +66,11 @@ public static void main(String[] args) throws Exception {
         String appClasses[] = {"Hello"};
         for (int i = 0; i < jigsawOptions.length; i++) {
             OutputAnalyzer output;
-            if (i == 5) {
-                // --patch-module
-                output = TestCommon.dump(appJar, appClasses, "-Xlog:cds,cds+hashtables",
-                                         jigsawOptions[i] + optionValues[i] + appJar);
-            } else {
-                output = TestCommon.dump(appJar, appClasses, "-Xlog:cds,cds+hashtables",
-                                         jigsawOptions[i], optionValues[i]);
-            }
-            if (i < infoIdx) {
-                output.shouldContain("Cannot use the following option " +
-                    "when dumping the shared archive: " + jigsawOptions[i])
-                      .shouldHaveExitValue(1);
-            } else {
-                output.shouldContain("Info: the " + jigsawOptions[i] +
-                    " option is ignored when dumping the shared archive");
-                if (optionValues[i].equals("mymod")) {
-                      // java will throw FindException for a module
-                      // which cannot be found during init_phase2() of vm init
-                      output.shouldHaveExitValue(1)
-                            .shouldContain("java.lang.module.FindException: Module mymod not found");
-                } else {
-                      output.shouldHaveExitValue(0);
-                }
-            }
+            output = TestCommon.dump(appJar, appClasses, "-Xlog:cds,cds+hashtables",
+                                     jigsawOptions[i], optionValues[i]);
+            output.shouldContain("Cannot use the following option " +
+                "when dumping the shared archive: " + jigsawOptions[i])
+                  .shouldHaveExitValue(1);
         }
     }
 }
-
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/JigsawOptionsCombo.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/JigsawOptionsCombo.java
index 05da79d88cd..c7d397fc3be 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/JigsawOptionsCombo.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/JigsawOptionsCombo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -69,8 +69,7 @@ public static void main(String[] args) throws Exception {
     private ArrayList<TestCase> testCaseTable = new ArrayList<TestCase>();
 
     public static String infoDuringDump(String option) {
-        return "Info: the " + option +
-            " option is ignored when dumping the shared archive";
+        return "Cannot use the following option when dumping the shared archive: " + option;
     }
 
     public void runTests() throws Exception {
@@ -78,7 +77,7 @@ public void runTests() throws Exception {
         testCaseTable.add(new TestCase(
             "basic: Basic dump and execute, to verify the test plumbing works",
             "", "", 0,
-            "", "", 0) );
+            "", "", 0, true) );
 
         String bcpArg = "-Xbootclasspath/a:" +
         TestCommon.getTestJar("hello_more.jar");
@@ -86,51 +85,50 @@ public void runTests() throws Exception {
         testCaseTable.add(new TestCase(
             "Xbootclasspath/a: is OK for both dump and run time",
             bcpArg, "", 0,
-            bcpArg, "", 0) );
+            bcpArg, "", 0, true) );
 
         testCaseTable.add(new TestCase(
             "module-path-01: --module-path is ignored for dump time",
-            "--module-path mods",
-            infoDuringDump("--module-path"), 0,
-            null, null, 0) );
+            "--module-path mods", "", 0,
+            null, null, 0, true) );
 
         testCaseTable.add(new TestCase(
             "module-path-02: --module-path is ok for run time",
             "", "", 0,
-            "--module-path mods", "", 0) );
+            "--module-path mods", "", 0, true) );
 
         testCaseTable.add(new TestCase(
             "add-modules-01: --add-modules is ok at dump time",
             "--add-modules java.management",
             "", 0,
-            null, null, 0) );
+            null, null, 0, true) );
 
         testCaseTable.add(new TestCase(
             "add-modules-02: --add-modules is ok at run time",
             "", "", 0,
-            "--add-modules java.management", "", 0) );
+            "--add-modules java.management", "", 0, true) );
 
         testCaseTable.add(new TestCase(
             "limit-modules-01: --limit-modules is ignored at dump time",
             "--limit-modules java.base",
-            infoDuringDump("--limit-modules"), 0,
-            null, null, 0) );
+            infoDuringDump("--limit-modules"), 1,
+            null, null, 0, true) );
 
         testCaseTable.add(new TestCase(
             "limit-modules-02: --limit-modules is ok at run time",
             "", "", 0,
-            "--limit-modules java.base", "", 0) );
+            "--limit-modules java.base", "", 0, false) );
 
         testCaseTable.add(new TestCase(
             "upgrade-module-path-01: --upgrade-module-path is ignored at dump time",
             "--upgrade-module-path mods",
-            infoDuringDump("--upgrade-module-path"), 0,
-            null, null, 0) );
+            infoDuringDump("--upgrade-module-path"), 1,
+            null, null, 0, true) );
 
         testCaseTable.add(new TestCase(
             "-upgrade-module-path-module-path-02: --upgrade-module-path is ok at run time",
             "", "", 0,
-            "--upgrade-module-path mods", "", 0) );
+            "--upgrade-module-path mods", "", 0, false) );
 
         for (TestCase tc : testCaseTable) tc.execute();
     }
@@ -145,6 +143,7 @@ public class TestCase {
         String runTimeArgs;
         String runTimeExpectedOutput;
         int    runTimeExpectedExitValue;
+        boolean sharingOn;
 
         private String appJar = TestCommon.getTestJar("hello.jar");
         private String appClasses[] = {"Hello"};
@@ -152,7 +151,8 @@ public class TestCase {
 
         public TestCase(String description,
             String dumpTimeArgs, String dumpTimeExpectedOutput, int dumpTimeExpectedExitValue,
-            String runTimeArgs, String runTimeExpectedOutput, int runTimeExpectedExitValue) {
+            String runTimeArgs, String runTimeExpectedOutput, int runTimeExpectedExitValue,
+            boolean sharingOn) {
 
             this.description = description;
             this.dumpTimeArgs = dumpTimeArgs;
@@ -161,6 +161,7 @@ public TestCase(String description,
             this.runTimeArgs = runTimeArgs;
             this.runTimeExpectedOutput = runTimeExpectedOutput;
             this.runTimeExpectedExitValue = runTimeExpectedExitValue;
+            this.sharingOn = sharingOn;
         }
 
 
@@ -183,7 +184,13 @@ public void execute() throws Exception {
                 OutputAnalyzer execOutput = TestCommon.exec(appJar, getRunOptions());
 
                 if (runTimeExpectedExitValue == 0) {
-                    TestCommon.checkExec(execOutput, runTimeExpectedOutput, "Hello World");
+                    if (sharingOn) {
+                        TestCommon.checkExec(execOutput, runTimeExpectedOutput, "Hello World");
+                    } else {
+                        execOutput.shouldHaveExitValue(0)
+                                  .shouldContain(runTimeExpectedOutput)
+                                  .shouldContain("Hello World");
+                    }
                 } else {
                     execOutput.shouldMatch(dumpTimeExpectedOutput);
                     execOutput.shouldHaveExitValue(dumpTimeExpectedExitValue);
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java
index 702c678c2dc..c621b94fbd6 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/AppClassInCP.java
@@ -86,7 +86,8 @@ public static void main(String args[]) throws Throwable {
                 "--patch-module=java.naming=" + moduleJar,
                 "-Xlog:class+load",
                 "PatchMain", "javax.naming.spi.NamingManager", "mypackage.Hello");
-        TestCommon.checkDump(output, "Loading classes to share");
+        output.shouldHaveExitValue(1)
+              .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         String classPath = appJar + File.pathSeparator + classDir;
         System.out.println("classPath: " + classPath);
@@ -96,9 +97,6 @@ public static void main(String args[]) throws Throwable {
             "--patch-module=java.naming=" + moduleJar,
             "-Xlog:class+load",
             "PatchMain", "javax.naming.spi.NamingManager", "mypackage.Hello")
-          .assertNormalExit(
-            "I pass!",
-            "Hello!",
-            "Hello source: shared objects file");
+            .assertSilentlyDisabledCDS(0, "I pass!", "Hello!");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/CustomPackage.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/CustomPackage.java
index 83b15fb3098..1bc8a0f1dd1 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/CustomPackage.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/CustomPackage.java
@@ -70,7 +70,8 @@ public static void main(String args[]) throws Throwable {
                 "-Xlog:class+load",
                 "-Xlog:class+path=info",
                 "PatchMain", "javax.naming.myspi.NamingManager");
-        TestCommon.checkDump(output, "Preload Warning: Cannot find javax/naming/myspi/NamingManager");
+        output.shouldHaveExitValue(1)
+              .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         TestCommon.run(
             "-XX:+UnlockDiagnosticVMOptions",
@@ -78,6 +79,6 @@ public static void main(String args[]) throws Throwable {
             "-Xlog:class+load",
             "-Xlog:class+path=info",
             "PatchMain", "javax.naming.myspi.NamingManager")
-          .assertNormalExit("I pass!");
+            .assertSilentlyDisabledCDS(0, "I pass!");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/MismatchedPatchModule.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/MismatchedPatchModule.java
index 01cd4146727..d34385c0e85 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/MismatchedPatchModule.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/MismatchedPatchModule.java
@@ -62,61 +62,21 @@ public static void main(String args[]) throws Throwable {
         JarBuilder.build("javanaming", "javax/naming/spi/NamingManager");
         moduleJar = TestCommon.getTestJar("javanaming.jar");
 
-        // Case 1: --patch-module specified for dump time and run time
+        // Case 1: --patch-module specified for dump time
         System.out.println("Case 1: --patch-module specified for dump time and run time");
         OutputAnalyzer output =
             TestCommon.dump(null,
                 TestCommon.list("javax/naming/spi/NamingManager"),
                 "--patch-module=java.naming=" + moduleJar,
                 "PatchMain", "javax.naming.spi.NamingManager");
-        TestCommon.checkDump(output, "Loading classes to share");
+        output.shouldHaveExitValue(1)
+              .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
-        // javax.naming.spi.NamingManager is not patched at runtime
-        TestCommon.run(
-            "-XX:+UnlockDiagnosticVMOptions",
-            "--patch-module=java.naming2=" + moduleJar,
-            "-Xlog:class+path=info",
-            "PatchMain", "javax.naming.spi.NamingManager")
-          .assertNormalExit(o -> o.shouldNotContain("I pass!"));
-
-        // Case 2: --patch-module specified for dump time but not for run time
-        System.out.println("Case 2: --patch-module specified for dump time but not for run time");
+        // Case 2: --patch-module specified for run time but not for dump time
+        System.out.println("Case 2: --patch-module specified for run time but not for dump time");
         output =
             TestCommon.dump(null,
                 TestCommon.list("javax/naming/spi/NamingManager"),
-                "--patch-module=java.naming=" + moduleJar,
-                "PatchMain", "javax.naming.spi.NamingManager");
-        TestCommon.checkDump(output, "Loading classes to share");
-
-        // javax.naming.spi.NamingManager is not patched at runtime
-        TestCommon.run(
-            "-XX:+UnlockDiagnosticVMOptions",
-            "-Xlog:class+path=info",
-            "PatchMain", "javax.naming.spi.NamingManager")
-          .assertNormalExit(o -> o.shouldNotContain("I pass!"));
-
-        // Case 3: --patch-module specified for run time but not for dump time
-        System.out.println("Case 3: --patch-module specified for run time but not for dump time");
-        output =
-            TestCommon.dump(null,
-                TestCommon.list("javax/naming/spi/NamingManager"),
-                "PatchMain", "javax.naming.spi.NamingManager");
-        TestCommon.checkDump(output, "Loading classes to share");
-
-        // javax.naming.spi.NamingManager is patched at runtime
-        TestCommon.run(
-            "-XX:+UnlockDiagnosticVMOptions",
-            "--patch-module=java.naming=" + moduleJar,
-            "-Xlog:class+path=info",
-            "PatchMain", "javax.naming.spi.NamingManager")
-          .assertNormalExit("I pass!");
-
-        // Case 4: mismatched --patch-module entry counts between dump time and run time
-        System.out.println("Case 4: mismatched --patch-module entry counts between dump time and run time");
-        output =
-            TestCommon.dump(null,
-                TestCommon.list("javax/naming/spi/NamingManager"),
-                "--patch-module=java.naming=" + moduleJar,
                 "PatchMain", "javax.naming.spi.NamingManager");
         TestCommon.checkDump(output, "Loading classes to share");
 
@@ -127,6 +87,6 @@ public static void main(String args[]) throws Throwable {
             "--patch-module=java.naming2=" + moduleJar,
             "-Xlog:class+path=info",
             "PatchMain", "javax.naming.spi.NamingManager")
-          .assertNormalExit("I pass!");
+            .assertSilentlyDisabledCDS(0, "I pass!");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchDir.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchDir.java
index 2765363fb22..50478b2066d 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchDir.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchDir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -67,7 +67,7 @@ public static void main(String args[]) throws Throwable {
             "--patch-module=java.naming=" + moduleJar,
             "-Xlog:class+load",
             "PatchMain", "javax.naming.spi.NamingManager")
-            .shouldContain("Loading classes to share")
-            .shouldHaveExitValue(0);
+            .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module")
+            .shouldHaveExitValue(1);
     }
 }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchJavaBase.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchJavaBase.java
index 7dac826406d..2737a79373a 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchJavaBase.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/PatchJavaBase.java
@@ -62,7 +62,8 @@ public static void main(String args[]) throws Throwable {
             TestCommon.dump(null, null,
                 "--patch-module=java.base=" + moduleJar,
                 "PatchMain", "java.lang.NewClass");
-        TestCommon.checkDump(output, "Loading classes to share");
+        output.shouldHaveExitValue(1)
+              .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         TestCommon.run(
             "-XX:+UnlockDiagnosticVMOptions",
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/Simple.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/Simple.java
index 3c685ef04d9..b929e2a24d1 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/Simple.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/Simple.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -68,7 +68,8 @@ public static void main(String args[]) throws Throwable {
                 "-Xlog:class+load",
                 "-Xlog:class+path=info",
                 "PatchMain", "javax.naming.spi.NamingManager");
-        TestCommon.checkDump(output, "Loading classes to share");
+        output.shouldHaveExitValue(1)
+              .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         TestCommon.run(
             "-XX:+UnlockDiagnosticVMOptions",
@@ -76,6 +77,6 @@ public static void main(String args[]) throws Throwable {
             "-Xlog:class+load",
             "-Xlog:class+path=info",
             "PatchMain", "javax.naming.spi.NamingManager")
-          .assertNormalExit("I pass!");
+            .assertSilentlyDisabledCDS(0, "I pass!");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java
index b5c773867d6..a7e82196437 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java
@@ -88,7 +88,8 @@ public static void main(String args[]) throws Throwable {
                 "--patch-module=java.naming=" + moduleJar,
                 "-Xlog:class+load",
                 "PatchMain", "javax.naming.Reference", "mypackage.MyReference");
-        TestCommon.checkDump(output, "Loading classes to share");
+        output.shouldHaveExitValue(1)
+              .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         String classPath = appJar + File.pathSeparator + classDir;
         System.out.println("classPath: " + classPath);
@@ -98,8 +99,6 @@ public static void main(String args[]) throws Throwable {
             "--patch-module=java.naming=" + moduleJar,
             "-Xlog:class+load",
             "PatchMain", "javax.naming.Reference", "mypackage.MyReference")
-          .assertNormalExit(
-            "I pass!",
-            "MyReference source: file:");
+            .assertSilentlyDisabledCDS(0, "MyReference source: file:", "I pass!");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java
index 680fbd4a875..fde8d19c24b 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java
@@ -87,7 +87,8 @@ public static void main(String args[]) throws Throwable {
                 "-Xlog:class+load",
                 "-Xlog:class+path=info",
                 "PatchMain", "javax.naming.spi.NamingManager");
-        TestCommon.checkDump(output, "Loading classes to share");
+        output.shouldHaveExitValue(1)
+              .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         TestCommon.run(
             "-XX:+UnlockDiagnosticVMOptions",
@@ -95,6 +96,6 @@ public static void main(String args[]) throws Throwable {
             "-Xlog:class+load",
             "-Xlog:class+path=info",
             "PatchMain", "javax.naming.spi.NamingManager")
-          .assertNormalExit("I pass");
+            .assertSilentlyDisabledCDS(0, "I pass!");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java
index c36152d4b48..453efd7237b 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -145,29 +145,32 @@ public static void testBootAppendModuleClassWithAppCDS() throws Exception {
     // Test #3: A class in excluded package defined in boot module
     //     - should be loaded from the -Xbootclasspath/a by the boot classloader
     public static void testBootAppendExcludedModuleClassWithoutAppCDS() throws Exception {
-        CDSOptions opts = (new CDSOptions())
-            .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-cp", appJar,
-                       "--limit-modules", "java.base")
-            .setArchiveName(testArchiveName)
-            .addSuffix(MAIN_CLASS, "Test #3", BOOT_APPEND_MODULE_CLASS, "true", "BOOT");
-
-        CDSTestUtils.runWithArchiveAndCheck(opts);
+        TestCommon.run(
+            "-Xbootclasspath/a:" + bootAppendJar, "-cp", appJar,
+            "-Xlog:class+load=info",
+            "--limit-modules", "java.base",
+            MAIN_CLASS, "Test #3", BOOT_APPEND_MODULE_CLASS, "true", "BOOT")
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldMatch(".class.load. sun.nio.cs.ext.MyClass source:.*bootAppend.jar");
+            });
     }
 
     // Test #4: A shared class in excluded package that's archived from
     //          -Xbootclasspath/a
-    //     - should be loaded from the archive by the bootstrap classloader
+    //     - should be loaded from the jar since AppCDS will be disabled with
+    //       the --limit-modules option
     public static void testBootAppendExcludedModuleClassWithAppCDS() throws Exception {
-        OutputAnalyzer output = TestCommon.exec(
-            appJar,
-            "-Xbootclasspath/a:" + bootAppendJar,
+        TestCommon.run(
+            "-cp", appJar, "-Xbootclasspath/a:" + bootAppendJar,
+            "-Xlog:class+load=info",
             "--limit-modules", "java.base",
-            "-XX:+TraceClassLoading",
             MAIN_CLASS,
-            "Test #4", BOOT_APPEND_MODULE_CLASS, "true", "BOOT");
-        TestCommon.checkExec(output);
-        if (!TestCommon.isUnableToMap(output))
-            output.shouldContain("[class,load] sun.nio.cs.ext.MyClass source: shared objects file");
+            "Test #4", BOOT_APPEND_MODULE_CLASS, "true", "BOOT")
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldMatch(".class.load. sun.nio.cs.ext.MyClass source:.*bootAppend.jar");
+            });
     }
 
 
@@ -229,28 +232,28 @@ public static void testBootAppendAppModuleClassWithAppCDS() throws Exception {
     public static void testBootAppendAppExcludeModuleClassWithoutAppCDS()
         throws Exception {
 
-        CDSOptions opts = (new CDSOptions())
-            .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-cp", appJar,
-                       "--limit-modules", "java.base")
-            .setArchiveName(testArchiveName)
-            .addSuffix(MAIN_CLASS, "Test #9", APP_MODULE_CLASS, "true", "BOOT");
-
-        CDSTestUtils.runWithArchiveAndCheck(opts);
+        TestCommon.run(
+            "-Xbootclasspath/a:" + bootAppendJar, "-cp", appJar,
+            "-Xlog:class+load=info",
+            "--limit-modules", "java.base",
+            MAIN_CLASS, "Test #9", APP_MODULE_CLASS, "true", "BOOT")
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldMatch(".class.load. com.sun.tools.javac.Main2 source:.*bootAppend.jar");
+            });
     }
 
     // Test #10: A shared class in excluded package defined in jimage app module
     //    - should be loaded from the -Xbootclasspath/a with AppCDS
     public static void testBootAppendAppExcludeModuleClassAppCDS() throws Exception {
-        OutputAnalyzer output = TestCommon.exec(
-            appJar,
-            "-Xbootclasspath/a:" + bootAppendJar,
-            "-XX:+TraceClassLoading",
+        TestCommon.run(
+            "-cp", appJar, "-Xbootclasspath/a:" + bootAppendJar,
+            "-Xlog:class+load=info",
             "--limit-modules", "java.base",
-            MAIN_CLASS,
-            "Test #10", APP_MODULE_CLASS, "true", "BOOT");
-        TestCommon.checkExec(output);
-
-        if (!TestCommon.isUnableToMap(output))
-            output.shouldContain("[class,load] com.sun.tools.javac.Main2 source: shared objects file");
+            MAIN_CLASS, "Test #10", APP_MODULE_CLASS, "true", "BOOT")
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldMatch(".class.load. com.sun.tools.javac.Main2 source:.*bootAppend.jar");
+            });
     }
 }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java
index 57939979c02..ce0319dd517 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java
@@ -89,13 +89,15 @@ public static void main(String[] args) throws Exception {
         argsList.add("useAppLoader");
         opts = new String[argsList.size()];
         opts = argsList.toArray(opts);
-        TestCommon.run(opts).assertNormalExit(EXPECTED_EXCEPTION);
+        TestCommon.run(opts)
+            .assertSilentlyDisabledCDS(0, EXPECTED_EXCEPTION);
 
         // case 4: load class in bootclasspath using boot loader with '--limit-modules java.base'
         argsList.remove(argsList.size() - 1);
         argsList.add("useBootLoader");
         opts = new String[argsList.size()];
         opts = argsList.toArray(opts);
-        TestCommon.run(opts).assertNormalExit(EXPECTED_EXCEPTION);
+        TestCommon.run(opts)
+            .assertSilentlyDisabledCDS(0, EXPECTED_EXCEPTION);
     }
 }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsHelper.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsHelper.java
index cb30412bae4..41ba077077b 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsHelper.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -65,11 +65,22 @@ public static void main(String[] args) throws Exception {
                 // Make sure we got the expected defining ClassLoader
                 testLoader(clazz, expectedLoaders[i]);
 
-                // Make sure the class is in the shared space
-                if (!wb.isSharedClass(clazz)) {
-                    throw new RuntimeException(clazz.getName() +
-                        ".class should be in the shared space. " +
-                         "loader=" + clazz.getClassLoader() + " module=" + clazz.getModule().getName());
+                // Make sure the class is not in the shared space
+                // because CDS is disabled with --limit-modules during run time.
+                if (excludeModIdx != -1) {
+                    if (wb.isSharedClass(clazz)) {
+                        throw new RuntimeException(clazz.getName() +
+                            ".class should not be in the shared space. " +
+                             "loader=" + clazz.getClassLoader() + " module=" + clazz.getModule().getName());
+                    }
+                } else {
+                    // class should be in the shared space if --limit-modules
+                    // isn't specified during run time
+                    if (!wb.isSharedClass(clazz)) {
+                        throw new RuntimeException(clazz.getName() +
+                            ".class should be in the shared space. " +
+                             "loader=" + clazz.getClassLoader() + " module=" + clazz.getModule().getName());
+                    }
                 }
             }
             clazz = null;
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java
index 3dbaad0bf08..d8aacdfaf9a 100644
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -150,14 +150,14 @@ public void runTestLimitMods() throws Exception {
                     }
                 }
             }
-            output = TestCommon.exec(
-                appJar + File.pathSeparator + helperJar,
+            TestCommon.run(
+                "-cp", appJar + File.pathSeparator + helperJar,
                 "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", bootClassPath,
                 "--limit-modules", limitMods,
                 "LimitModsHelper",
                 BOOT_ARCHIVE_CLASS, PLATFORM_ARCHIVE_CLASS, APP_ARCHIVE_CLASS,
-                Integer.toString(excludeModIdx)); // last 4 args passed to test
-            TestCommon.checkExec(output);
+                Integer.toString(excludeModIdx)) // last 4 args passed to test
+                .assertSilentlyDisabledCDS(0);
             limitMods = null;
         }
     }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddModules.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddModules.java
new file mode 100644
index 00000000000..0fbc5bdf3d8
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddModules.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2018, 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
+ * @requires vm.cds
+ * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
+ *          jdk.jlink
+ * @run main AddModules
+ * @summary sanity test the --add-modules option
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+public class AddModules {
+
+    private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
+
+    private static final String TEST_SRC = System.getProperty("test.src");
+
+    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    // the module name of the test module
+    private static final String MAIN_MODULE1 = "com.greetings";
+    private static final String MAIN_MODULE2 = "com.hello";
+    private static final String SUB_MODULE = "org.astro";
+
+    // the module main class
+    private static final String MAIN_CLASS1 = "com.greetings.Main";
+    private static final String MAIN_CLASS2 = "com.hello.Main";
+    private static final String APP_CLASS = "org.astro.World";
+
+    private static Path moduleDir = null;
+    private static Path subJar = null;
+    private static Path mainJar1 = null;
+    private static Path mainJar2 = null;
+
+    public static void buildTestModule() throws Exception {
+
+        // javac -d mods/$TESTMODULE src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(SUB_MODULE),
+                                 MODS_DIR.resolve(SUB_MODULE),
+                                 null);
+
+        // javac -d mods/$TESTMODULE --module-path MOD_DIR src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(MAIN_MODULE1),
+                                 MODS_DIR.resolve(MAIN_MODULE1),
+                                 MODS_DIR.toString());
+
+        JarBuilder.compileModule(SRC_DIR.resolve(MAIN_MODULE2),
+                                 MODS_DIR.resolve(MAIN_MODULE2),
+                                 MODS_DIR.toString());
+
+        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
+        subJar = moduleDir.resolve(SUB_MODULE + ".jar");
+        String classes = MODS_DIR.resolve(SUB_MODULE).toString();
+        JarBuilder.createModularJar(subJar.toString(), classes, null);
+
+        mainJar1 = moduleDir.resolve(MAIN_MODULE1 + ".jar");
+        classes = MODS_DIR.resolve(MAIN_MODULE1).toString();
+        JarBuilder.createModularJar(mainJar1.toString(), classes, MAIN_CLASS1);
+
+        mainJar2 = moduleDir.resolve(MAIN_MODULE2 + ".jar");
+        classes = MODS_DIR.resolve(MAIN_MODULE2).toString();
+        JarBuilder.createModularJar(mainJar2.toString(), classes, MAIN_CLASS2);
+
+    }
+
+    public static void main(String... args) throws Exception {
+        // compile the modules and create the modular jar files
+        buildTestModule();
+        String appClasses[] = {MAIN_CLASS1, MAIN_CLASS2, APP_CLASS};
+        // create an archive with the classes in the modules built in the
+        // previous step
+        OutputAnalyzer output = TestCommon.createArchive(
+                                        null, appClasses,
+                                        "--module-path", moduleDir.toString(),
+                                        "--add-modules",
+                                        MAIN_MODULE1 + "," + MAIN_MODULE2);
+        TestCommon.checkDump(output);
+        String prefix[] = {"-cp", "\"\"", "-Xlog:class+load=trace"};
+
+        // run the com.greetings module with the archive with the --module-path
+        // the same as the one during dump time.
+        // The classes should be loaded from the archive.
+        TestCommon.runWithModules(prefix,
+                                  null, // --upgrade-module-path
+                                  moduleDir.toString(), // --module-path
+                                  MAIN_MODULE1) // -m
+            .assertNormalExit(out -> {
+                out.shouldContain("[class,load] com.greetings.Main source: shared objects file")
+                   .shouldContain("[class,load] org.astro.World source: shared objects file");
+            });
+
+        // run the com.hello module with the archive with the --module-path
+        // the same as the one during dump time.
+        // The classes should be loaded from the archive.
+        TestCommon.runWithModules(prefix,
+                                  null, // --upgrade-module-path
+                                  moduleDir.toString(), // --module-path
+                                  MAIN_MODULE2) // -m
+            .assertNormalExit(out -> {
+                out.shouldContain("[class,load] com.hello.Main source: shared objects file")
+                   .shouldContain("[class,load] org.astro.World source: shared objects file");
+            });
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddOpens.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddOpens.java
new file mode 100644
index 00000000000..260794e4402
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddOpens.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2018, 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
+ * @requires vm.cds
+ * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
+ *          jdk.jlink
+ * @run main AddOpens
+ * @summary sanity test the --add-opens option
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+public class AddOpens {
+
+    private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
+
+    private static final String TEST_SRC = System.getProperty("test.src");
+
+    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    // the module name of the test module
+    private static final String TEST_MODULE1 = "com.simple";
+
+    // the module main class
+    private static final String MAIN_CLASS = "com.simple.Main";
+
+    private static Path moduleDir = null;
+    private static Path moduleDir2 = null;
+    private static Path destJar = null;
+
+    public static void buildTestModule() throws Exception {
+
+        // javac -d mods/$TESTMODULE --module-path MOD_DIR src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(TEST_MODULE1),
+                                 MODS_DIR.resolve(TEST_MODULE1),
+                                 MODS_DIR.toString());
+
+        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
+        moduleDir2 = Files.createTempDirectory(USER_DIR, "mlib2");
+
+        Path srcJar = moduleDir.resolve(TEST_MODULE1 + ".jar");
+        destJar = moduleDir2.resolve(TEST_MODULE1 + ".jar");
+        String classes = MODS_DIR.resolve(TEST_MODULE1).toString();
+        JarBuilder.createModularJar(srcJar.toString(), classes, MAIN_CLASS);
+        Files.copy(srcJar, destJar);
+
+    }
+
+    public static void main(String... args) throws Exception {
+        // compile the modules and create the modular jar files
+        buildTestModule();
+        String appClasses[] = {MAIN_CLASS};
+        // create an archive with both -cp and --module-path in the command line.
+        // Only the class in the modular jar in the --module-path will be archived;
+        // the class in the modular jar in the -cp won't be archived.
+        OutputAnalyzer output = TestCommon.createArchive(
+                                        destJar.toString(), appClasses,
+                                        "-Xlog:class+load=trace", "-XX:+PrintSystemDictionaryAtExit",
+                                        "--module-path", moduleDir.toString(),
+                                        "-m", TEST_MODULE1);
+        TestCommon.checkDump(output);
+
+        // run with the archive using the same command line as in dump time
+        // plus the "--add-opens java.base/java.lang=com.simple" option.
+        // The main class should be loaded from the archive.
+        // The setaccessible(true) on the ClassLoader.defineClass method should
+        // be successful.
+        TestCommon.run( "-Xlog:class+load=trace",
+                        "-cp", destJar.toString(),
+                        "--add-opens", "java.base/java.lang=" + TEST_MODULE1,
+                        "--module-path", moduleDir.toString(),
+                        "-m", TEST_MODULE1, "with_add_opens")
+            .assertNormalExit(
+                "[class,load] com.simple.Main source: shared objects file",
+                "method.setAccessible succeeded!");
+
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java
new file mode 100644
index 00000000000..06bb1410742
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2018, 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
+ * @requires vm.cds
+ * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
+ *          jdk.jlink
+ * @run main AddReads
+ * @summary sanity test the --add-reads option
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.Asserts;
+
+public class AddReads {
+
+    private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
+
+    private static final String TEST_SRC = System.getProperty("test.src");
+
+    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    // the module name of the test module
+    private static final String MAIN_MODULE = "com.norequires";
+    private static final String SUB_MODULE = "org.astro";
+
+    // the module main class
+    private static final String MAIN_CLASS = "com.norequires.Main";
+    private static final String APP_CLASS = "org.astro.World";
+
+    private static Path moduleDir = null;
+    private static Path subJar = null;
+    private static Path mainJar = null;
+
+    public static void buildTestModule() throws Exception {
+
+        // javac -d mods/$TESTMODULE src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(SUB_MODULE),
+                                       MODS_DIR.resolve(SUB_MODULE),
+                                       null);
+
+        Asserts.assertTrue(CompilerUtils
+            .compile(SRC_DIR.resolve(MAIN_MODULE),
+                     MODS_DIR.resolve(MAIN_MODULE),
+                     "-cp", MODS_DIR.resolve(SUB_MODULE).toString(),
+                     "--add-reads", "com.norequires=ALL-UNNAMED"));
+
+        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
+        subJar = moduleDir.resolve(SUB_MODULE + ".jar");
+        String classes = MODS_DIR.resolve(SUB_MODULE).toString();
+        JarBuilder.createModularJar(subJar.toString(), classes, null);
+
+        mainJar = moduleDir.resolve(MAIN_MODULE + ".jar");
+        classes = MODS_DIR.resolve(MAIN_MODULE).toString();
+        JarBuilder.createModularJar(mainJar.toString(), classes, MAIN_CLASS);
+    }
+
+    public static void main(String... args) throws Exception {
+        // compile the modules and create the modular jar files
+        buildTestModule();
+        String appClasses[] = {MAIN_CLASS, APP_CLASS};
+        // create an archive with the classes in the modules built in the
+        // previous step
+        OutputAnalyzer output = TestCommon.createArchive(
+                                        null, appClasses,
+                                        "--module-path", moduleDir.toString(),
+                                        "--add-modules", SUB_MODULE,
+                                        "--add-reads", "com.norequires=org.astro",
+                                        "-m", MAIN_MODULE);
+        TestCommon.checkDump(output);
+        String prefix[] = {"-cp", "\"\"", "-Xlog:class+load=trace",
+                           "--add-modules", SUB_MODULE,
+                           "--add-reads", "com.norequires=org.astro"};
+
+        // run the com.norequires module with the archive with the same args
+        // used during dump time.
+        // The classes should be loaded from the archive.
+        TestCommon.runWithModules(prefix,
+                                  null, // --upgrade-module-path
+                                  moduleDir.toString(), // --module-path
+                                  MAIN_MODULE) // -m
+            .assertNormalExit(out -> {
+                out.shouldContain("[class,load] com.norequires.Main source: shared objects file")
+                   .shouldContain("[class,load] org.astro.World source: shared objects file");
+            });
+
+        // create an archive with -cp pointing to the jar file containing the
+        // org.astro module and --module-path pointing to the main module
+        output = TestCommon.createArchive(
+                                        subJar.toString(), appClasses,
+                                        "--module-path", moduleDir.toString(),
+                                        "--add-modules", SUB_MODULE,
+                                        "--add-reads", "com.norequires=org.astro",
+                                        "-m", MAIN_MODULE);
+        TestCommon.checkDump(output);
+        // run the com.norequires module with the archive with the sub-module
+        // in the -cp and with -add-reads=com.norequires=ALL-UNNAMED
+        // The main class should be loaded from the archive.
+        // The org.astro.World should be loaded from the jar.
+        String prefix2[] = {"-cp", subJar.toString(), "-Xlog:class+load=trace",
+                           "--add-reads", "com.norequires=ALL-UNNAMED"};
+        TestCommon.runWithModules(prefix2,
+                                  null, // --upgrade-module-path
+                                  moduleDir.toString(), // --module-path
+                                  MAIN_MODULE) // -m
+            .assertNormalExit(out -> {
+                out.shouldContain("[class,load] com.norequires.Main source: shared objects file")
+                   .shouldMatch(".class.load. org.astro.World source:.*org.astro.jar");
+            });
+
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java
new file mode 100644
index 00000000000..e26d1c53b5e
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2018, 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
+ * @requires vm.cds
+ * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
+ *          jdk.jlink
+ * @run main ExportModule
+ * @summary Tests involve exporting a module from the module path to a jar in the -cp.
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.test.lib.compiler.CompilerUtils;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.Asserts;
+
+public class ExportModule {
+
+    private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
+
+    private static final String TEST_SRC = System.getProperty("test.src");
+
+    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    // the module name of the test module
+    private static final String TEST_MODULE1 = "com.greetings";
+    private static final String TEST_MODULE2 = "org.astro";
+
+    // unnamed module package name
+    private static final String PKG_NAME = "com.nomodule";
+
+    // the module main class
+    private static final String MAIN_CLASS = "com.greetings.Main";
+    private static final String APP_CLASS = "org.astro.World";
+
+    // unnamed module main class
+    private static final String UNNAMED_MAIN = "com.nomodule.Main";
+
+    private static Path moduleDir = null;
+    private static Path moduleDir2 = null;
+    private static Path appJar = null;
+    private static Path appJar2 = null;
+
+    public static void buildTestModule() throws Exception {
+
+        // javac -d mods/$TESTMODULE src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(TEST_MODULE2),
+                                 MODS_DIR.resolve(TEST_MODULE2),
+                                 null);
+
+        // javac -d mods/$TESTMODULE --module-path MOD_DIR src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(TEST_MODULE1),
+                                 MODS_DIR.resolve(TEST_MODULE1),
+                                 MODS_DIR.toString());
+
+        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
+        Path jar = moduleDir.resolve(TEST_MODULE2 + ".jar");
+        String classes = MODS_DIR.resolve(TEST_MODULE2).toString();
+        JarBuilder.createModularJar(jar.toString(), classes, null);
+
+        moduleDir2 = Files.createTempDirectory(USER_DIR, "mlib2");
+        appJar = moduleDir2.resolve(TEST_MODULE1 + ".jar");
+        classes = MODS_DIR.resolve(TEST_MODULE1).toString();
+        JarBuilder.createModularJar(appJar.toString(), classes, MAIN_CLASS);
+
+        // build a non-modular jar containing the main class which
+        // requires the org.astro package
+        boolean compiled
+            = CompilerUtils.compile(SRC_DIR.resolve(PKG_NAME),
+                                    MODS_DIR.resolve(PKG_NAME),
+                                    "--module-path", MODS_DIR.toString(),
+                                    "--add-modules", TEST_MODULE2,
+                                    "--add-exports", "org.astro/org.astro=ALL-UNNAMED");
+        Asserts.assertTrue(compiled, "test package did not compile");
+
+        appJar2 = moduleDir2.resolve(PKG_NAME + ".jar");
+        classes = MODS_DIR.resolve(PKG_NAME).toString();
+        JarBuilder.createModularJar(appJar2.toString(), classes, null);
+    }
+
+    public static void main(String... args) throws Exception {
+        // compile the modules and create the modular jar files
+        buildTestModule();
+        String appClasses[] = {MAIN_CLASS, APP_CLASS};
+        // create an archive with the class in the org.astro module built in the
+        // previous step and the main class from the modular jar in the -cp
+        // note: the main class is in the modular jar in the -cp which requires
+        // the module in the --module-path
+        OutputAnalyzer output = TestCommon.createArchive(
+                                        appJar.toString(), appClasses,
+                                        "-Xlog:class+load=trace", "-XX:+PrintSystemDictionaryAtExit",
+                                        "--module-path", moduleDir.toString(),
+                                        "--add-modules", TEST_MODULE2, MAIN_CLASS);
+        TestCommon.checkDump(output);
+
+        // run it using the archive
+        // both the main class and the class from the org.astro module should
+        // be loaded from the archive
+        TestCommon.run("-Xlog:class+load=trace",
+                              "-cp", appJar.toString(),
+                              "--module-path", moduleDir.toString(),
+                              "--add-modules", TEST_MODULE2, MAIN_CLASS)
+            .assertNormalExit(
+                "[class,load] org.astro.World source: shared objects file",
+                "[class,load] com.greetings.Main source: shared objects file");
+
+        String appClasses2[] = {UNNAMED_MAIN, APP_CLASS};
+        // create an archive with the main class from a non-modular jar in the
+        // -cp and the class from the org.astro module
+        // note: the org.astro package needs to be exported to "ALL-UNNAMED"
+        // module since the jar in the -cp is a non-modular jar and thus it is
+        // unnmaed.
+        output = TestCommon.createArchive(
+                                        appJar2.toString(), appClasses2,
+                                        "-Xlog:class+load=trace", "-XX:+PrintSystemDictionaryAtExit",
+                                        "--module-path", moduleDir.toString(),
+                                        "--add-modules", TEST_MODULE2,
+                                        "--add-exports", "org.astro/org.astro=ALL-UNNAMED",
+                                        UNNAMED_MAIN);
+        TestCommon.checkDump(output);
+
+        // both the main class and the class from the org.astro module should
+        // be loaded from the archive
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", appJar2.toString(),
+                       "--module-path", moduleDir.toString(),
+                       "--add-modules", TEST_MODULE2,
+                       "--add-exports", "org.astro/org.astro=ALL-UNNAMED",
+                       UNNAMED_MAIN)
+            .assertNormalExit(
+                "[class,load] org.astro.World source: shared objects file",
+                "[class,load] com.nomodule.Main source: shared objects file");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/JvmtiAddPath.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/JvmtiAddPath.java
new file mode 100644
index 00000000000..87e1993268a
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/JvmtiAddPath.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary JvmtiEnv::AddToBootstrapClassLoaderSearch and JvmtiEnv::AddToSystemClassLoaderSearch should disable AppCDS
+ * @requires vm.cds
+ * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ *          jdk.jartool/sun.tools.jar
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * @compile ../../test-classes/JvmtiApp.java
+ * @run main JvmtiAddPath
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import jdk.test.lib.process.OutputAnalyzer;
+import sun.hotspot.WhiteBox;
+
+public class JvmtiAddPath {
+    static String use_whitebox_jar;
+    static String[] no_extra_matches = {};
+    static String[] check_appcds_enabled = {
+        "[class,load] ExtraClass source: shared object"
+    };
+    static String[] check_appcds_disabled = {
+        "[class,load] ExtraClass source: file:"
+    };
+
+    private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
+
+    private static final String TEST_SRC = System.getProperty("test.src");
+
+    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    // the module name of the test module
+    private static final String TEST_MODULE1 = "com.simple";
+
+    // the module main class
+    private static final String MAIN_CLASS = "com.simple.Main";
+
+    private static Path moduleDir = null;
+    private static Path mainJar = null;
+
+    public static void buildTestModule() throws Exception {
+
+        // javac -d mods/$TESTMODULE --module-path MOD_DIR src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(TEST_MODULE1),
+                                 MODS_DIR.resolve(TEST_MODULE1),
+                                 MODS_DIR.toString());
+
+        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
+
+        mainJar = moduleDir.resolve(TEST_MODULE1 + ".jar");
+        String classes = MODS_DIR.resolve(TEST_MODULE1).toString();
+        JarBuilder.createModularJar(mainJar.toString(), classes, MAIN_CLASS);
+    }
+
+    static void run(String cp, String... args) throws Exception {
+        run(no_extra_matches, cp, args);
+    }
+
+    static void run(String[] extra_matches, String cp, String... args) throws Exception {
+        String[] opts = {"-cp", cp, "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", use_whitebox_jar};
+        opts = TestCommon.concat(opts, args);
+        TestCommon.run(opts).assertNormalExit(extra_matches);
+    }
+
+    public static void main(String[] args) throws Exception {
+        buildTestModule();
+        JarBuilder.build("jvmti_app", "JvmtiApp", "ExtraClass");
+        JarBuilder.build(true, "WhiteBox", "sun/hotspot/WhiteBox");
+
+        // In all the test cases below, appJar does not contain Hello.class. Instead, we
+        // append JAR file(s) that contain Hello.class to the boot classpath, the app
+        // classpath, or both, and verify that Hello.class is loaded by the expected ClassLoader.
+        String appJar = TestCommon.getTestJar("jvmti_app.jar");         // contains JvmtiApp.class
+        String addappJar = mainJar.toString();  // contains Main.class
+        String addbootJar = mainJar.toString(); // contains Main.class
+        String twoAppJars = appJar + File.pathSeparator + addappJar;
+        String modulePath = "--module-path=" + moduleDir.toString();
+        String wbJar = TestCommon.getTestJar("WhiteBox.jar");
+        use_whitebox_jar = "-Xbootclasspath/a:" + wbJar;
+
+        OutputAnalyzer output = TestCommon.createArchive(
+                                    appJar,
+                                    TestCommon.list("JvmtiApp", "ExtraClass", MAIN_CLASS),
+                                    use_whitebox_jar,
+                                    "-Xlog:class+load=trace",
+                                    modulePath);
+        TestCommon.checkDump(output);
+
+        System.out.println("Test case 1: not adding module path - Hello.class should not be found");
+        run(check_appcds_enabled, appJar,
+            "-Xlog:class+load", "JvmtiApp", "noadd", MAIN_CLASS); // appcds should be enabled
+
+        System.out.println("Test case 2: add to boot classpath only - should find Hello.class in boot loader");
+        run(check_appcds_disabled, appJar,
+            "-Xlog:class+load=trace",
+            modulePath,
+            "JvmtiApp", "bootonly", addbootJar, MAIN_CLASS); // appcds should be disabled
+
+        System.out.println("Test case 3: add to app classpath only - should find Hello.class in app loader");
+        run(appJar, modulePath,
+            "JvmtiApp", "apponly", addappJar, MAIN_CLASS);
+
+        System.out.println("Test case 4: add to boot and app paths - should find Hello.class in boot loader");
+        run(appJar, modulePath,
+            "JvmtiApp", "appandboot", addbootJar, addappJar, MAIN_CLASS);
+
+        System.out.println("Test case 5: add to app using -cp, but add to boot using JVMTI - should find Hello.class in boot loader");
+        run(appJar, modulePath,
+            "JvmtiApp", "bootonly", addappJar, MAIN_CLASS);
+
+        System.out.println("Test case 6: add to app using AppCDS, but add to boot using JVMTI - should find Hello.class in boot loader");
+        output = TestCommon.createArchive(
+                     appJar, TestCommon.list("JvmtiApp", "ExtraClass"),
+                     use_whitebox_jar,
+                     "-Xlog:class+load=trace",
+                     modulePath);
+        TestCommon.checkDump(output);
+        run(twoAppJars, modulePath,
+            "JvmtiApp", "bootonly", addappJar, MAIN_CLASS);
+
+        System.out.println("Test case 7: add to app using AppCDS, no JVMTI calls - should find Hello.class in app loader");
+        run(twoAppJars, modulePath,
+            "JvmtiApp", "noadd-appcds", MAIN_CLASS);
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/MainModuleOnly.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/MainModuleOnly.java
new file mode 100644
index 00000000000..3809b9459ef
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/MainModuleOnly.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2018, 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
+ * @requires vm.cds
+ * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
+ *          jdk.jlink
+ * @run main MainModuleOnly
+ * @summary Test some scenarios with a main modular jar specified in the --module-path and -cp options in the command line.
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+public class MainModuleOnly {
+
+    private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
+
+    private static final String TEST_SRC = System.getProperty("test.src");
+
+    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    // the module name of the test module
+    private static final String TEST_MODULE1 = "com.simple";
+
+    // the module main class
+    private static final String MAIN_CLASS = "com.simple.Main";
+
+    private static Path moduleDir = null;
+    private static Path moduleDir2 = null;
+    private static Path destJar = null;
+
+    public static void buildTestModule() throws Exception {
+
+        // javac -d mods/$TESTMODULE --module-path MOD_DIR src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(TEST_MODULE1),
+                                 MODS_DIR.resolve(TEST_MODULE1),
+                                 MODS_DIR.toString());
+
+
+        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
+        moduleDir2 = Files.createTempDirectory(USER_DIR, "mlib2");
+
+        Path srcJar = moduleDir.resolve(TEST_MODULE1 + ".jar");
+        destJar = moduleDir2.resolve(TEST_MODULE1 + ".jar");
+        String classes = MODS_DIR.resolve(TEST_MODULE1).toString();
+        JarBuilder.createModularJar(srcJar.toString(), classes, MAIN_CLASS);
+        Files.copy(srcJar, destJar);
+
+    }
+
+    public static void main(String... args) throws Exception {
+        // compile the modules and create the modular jar files
+        buildTestModule();
+        String appClasses[] = {MAIN_CLASS};
+        // create an archive with both -cp and --module-path in the command line.
+        // Only the class in the modular jar in the --module-path will be archived;
+        // the class in the modular jar in the -cp won't be archived.
+        OutputAnalyzer output = TestCommon.createArchive(
+                                        destJar.toString(), appClasses,
+                                        "-Xlog:class+load=trace", "-XX:+PrintSystemDictionaryAtExit",
+                                        "--module-path", moduleDir.toString(),
+                                        "-m", TEST_MODULE1);
+        TestCommon.checkDump(output);
+
+        // run with the archive using the same command line as in dump time.
+        // The main class should be loaded from the archive.
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", destJar.toString(),
+                       "--module-path", moduleDir.toString(),
+                       "-m", TEST_MODULE1)
+            .assertNormalExit("[class,load] com.simple.Main source: shared objects file");
+
+        // run with the archive with the main class name inserted before the -m.
+        // The main class name will be picked up before the module name. So the
+        // main class should be loaded from the jar in the -cp.
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", destJar.toString(),
+                       "--module-path", moduleDir.toString(),
+                       MAIN_CLASS, "-m", TEST_MODULE1)
+            .assertNormalExit(out ->
+                out.shouldMatch(".class.load. com.simple.Main source:.*com.simple.jar"));
+
+        // run with the archive with exploded module. Since during dump time, we
+        // only archive classes from the modular jar in the --module-path, the
+        // main class should be loaded from the exploded module directory.
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", destJar.toString(),
+                       "--module-path", MODS_DIR.toString(),
+                       "-m", TEST_MODULE1 + "/" + MAIN_CLASS)
+            .assertNormalExit(out -> {
+                out.shouldMatch(".class.load. com.simple.Main source:.*com.simple")
+                   .shouldContain(MODS_DIR.toString());
+            });
+
+        // run with the archive with the --upgrade-module-path option.
+        // CDS will be disabled with this options and the main class will be
+        // loaded from the modular jar.
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", destJar.toString(),
+                       "--upgrade-module-path", moduleDir.toString(),
+                       "--module-path", moduleDir.toString(),
+                       "-m", TEST_MODULE1)
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldMatch("CDS is disabled when the.*option is specified")
+                   .shouldMatch(".class.load. com.simple.Main source:.*com.simple.jar");
+            });
+        // run with the archive with the --limit-modules option.
+        // CDS will be disabled with this options and the main class will be
+        // loaded from the modular jar.
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", destJar.toString(),
+                       "--limit-modules", "java.base," + TEST_MODULE1,
+                       "--module-path", moduleDir.toString(),
+                       "-m", TEST_MODULE1)
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldMatch("CDS is disabled when the.*option is specified")
+                   .shouldMatch(".class.load. com.simple.Main source:.*com.simple.jar");
+            });
+        // run with the archive with the --patch-module option.
+        // CDS will be disabled with this options and the main class will be
+        // loaded from the modular jar.
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", destJar.toString(),
+                       "--patch-module", TEST_MODULE1 + "=" + MODS_DIR.toString(),
+                       "--module-path", moduleDir.toString(),
+                       "-m", TEST_MODULE1)
+            .assertSilentlyDisabledCDS(out -> {
+                out.shouldHaveExitValue(0)
+                   .shouldMatch("CDS is disabled when the.*option is specified")
+                   .shouldMatch(".class.load. com.simple.Main source:.*com.simple.jar");
+            });
+        // modify the timestamp of the jar file
+        (new File(destJar.toString())).setLastModified(System.currentTimeMillis() + 2000);
+        // run with the archive and the jar with modified timestamp.
+        // It should fail due to timestamp of the jar doesn't match the one
+        // used during dump time.
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", destJar.toString(),
+                       "--module-path", moduleDir.toString(),
+                       "-m", TEST_MODULE1)
+            .assertAbnormalExit(
+                "A jar/jimage file is not the one used while building the shared archive file:");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java
new file mode 100644
index 00000000000..6fd7af4b350
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2018, 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
+ * @requires vm.cds
+ * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
+ *          jdk.jlink
+ * @run main ModulePathAndCP
+ * @summary 2 sets of tests: one with only --module-path in the command line;
+ *          another with both -cp and --module-path in the command line.
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+public class ModulePathAndCP {
+
+    private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
+
+    private static final String TEST_SRC = System.getProperty("test.src");
+
+    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    // the module name of the test module
+    private static final String MAIN_MODULE = "com.greetings";
+    private static final String APP_MODULE = "org.astro";
+
+    // the module main class
+    private static final String MAIN_CLASS = "com.greetings.Main";
+    private static final String APP_CLASS = "org.astro.World";
+
+    private static Path moduleDir = null;
+    private static Path moduleDir2 = null;
+    private static Path subJar = null;
+    private static Path mainJar = null;
+    private static Path destJar = null;
+
+    public static void buildTestModule() throws Exception {
+
+        // javac -d mods/$TESTMODULE src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(APP_MODULE),
+                                 MODS_DIR.resolve(APP_MODULE),
+                                 null);
+
+        // javac -d mods/$TESTMODULE --module-path MOD_DIR src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(MAIN_MODULE),
+                                 MODS_DIR.resolve(MAIN_MODULE),
+                                 MODS_DIR.toString());
+
+        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
+        moduleDir2 = Files.createTempDirectory(USER_DIR, "mlib2");
+        subJar = moduleDir.resolve(APP_MODULE + ".jar");
+        destJar = moduleDir2.resolve(APP_MODULE + ".jar");
+        String classes = MODS_DIR.resolve(APP_MODULE).toString();
+        JarBuilder.createModularJar(subJar.toString(), classes, null);
+        Files.copy(subJar, destJar);
+
+        mainJar = moduleDir.resolve(MAIN_MODULE + ".jar");
+        Path mainJar2 = moduleDir2.resolve(MAIN_MODULE + ".jar");
+        classes = MODS_DIR.resolve(MAIN_MODULE).toString();
+        JarBuilder.createModularJar(mainJar.toString(), classes, MAIN_CLASS);
+        Files.copy(mainJar, mainJar2);
+
+    }
+
+    public static void main(String... args) throws Exception {
+        // compile the modules and create the modular jar files
+        buildTestModule();
+        String appClasses[] = {MAIN_CLASS, APP_CLASS};
+        // create an archive with the classes in the modules built in the
+        // previous step
+        OutputAnalyzer output = TestCommon.createArchive(
+                                        null, appClasses,
+                                        "--module-path", moduleDir.toString(),
+                                        "-m", MAIN_MODULE);
+        TestCommon.checkDump(output);
+        String prefix[] = {"-cp", "\"\"", "-Xlog:class+load=trace"};
+
+        // run with the archive with the --module-path the same as the one during
+        // dump time. The classes should be loaded from the archive.
+        TestCommon.runWithModules(prefix,
+                                  null, // --upgrade-module-path
+                                  moduleDir.toString(), // --module-path
+                                  MAIN_MODULE) // -m
+            .assertNormalExit(out -> {
+                out.shouldContain("[class,load] com.greetings.Main source: shared objects file")
+                   .shouldContain("[class,load] org.astro.World source: shared objects file");
+            });
+
+        // run with the archive with the --module-path different from the one during
+        // dump time. The classes should be loaded from the jar files.
+        TestCommon.runWithModules(prefix,
+                                  null, // --upgrade-module-path
+                                  moduleDir2.toString(), // --module-path
+                                  MAIN_MODULE) // -m
+            .assertNormalExit(out -> {
+                out.shouldMatch(".class.load. com.greetings.Main source:.*com.greetings.jar")
+                   .shouldMatch(".class.load. org.astro.World source:.*org.astro.jar");
+            });
+
+        // create an archive with modular jar files in both -cp and --module-path
+        String jars = subJar.toString() + System.getProperty("path.separator") +
+                      mainJar.toString();
+        output = TestCommon.createArchive( jars, appClasses,
+                                           "-Xlog:class+load=trace", "-XX:+PrintSystemDictionaryAtExit",
+                                           "--module-path", moduleDir.toString(),
+                                           "-m", MAIN_MODULE);
+        TestCommon.checkDump(output);
+
+        // run with archive with the main class name specified before
+        // the module name with the -m option. Since the -m option was specified
+        // during dump time, the classes in the jar files after the -cp won't be
+        // archived. Therefore, the classes won't be loaded from the archive but
+        // will be loaded from the jar files.
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", jars,
+                       "--module-path", moduleDir.toString(),
+                       MAIN_CLASS, "-m", MAIN_MODULE)
+            .assertNormalExit(out -> {
+                out.shouldMatch(".class.load. com.greetings.Main source:.*com.greetings.jar")
+                   .shouldMatch(".class.load. org.astro.World source:.*org.astro.jar");
+            });
+
+        // similar to the above case but without the main class name. The classes
+        // should be loaded from the archive.
+        TestCommon.run("-Xlog:class+load=trace",
+                       "-cp", jars,
+                       "--module-path", moduleDir.toString(),
+                       "-m", MAIN_MODULE)
+            .assertNormalExit(
+              "[class,load] com.greetings.Main source: shared objects file",
+              "[class,load] org.astro.World source: shared objects file");
+
+        // create an archive with two modular jars in the --module-path
+        output = TestCommon.createArchive(
+                                        null, appClasses,
+                                        "--module-path", jars,
+                                        "-m", MAIN_MODULE);
+        TestCommon.checkDump(output);
+
+        // run with the above archive but with the modular jar containing the
+        // org.astro module in a different location.
+        // The org.astro.World class should be loaded from the jar.
+        // The Main class should still be loaded from the archive.
+        jars = destJar.toString() + System.getProperty("path.separator") +
+                      mainJar.toString();
+        TestCommon.runWithModules(prefix,
+                                  null, // --upgrade-module-path
+                                  jars, // --module-path
+                                  MAIN_MODULE) // -m
+            .assertNormalExit(out -> {
+                out.shouldContain("[class,load] com.greetings.Main source: shared objects file")
+                   .shouldMatch(".class.load. org.astro.World source:.*org.astro.jar");
+            });
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java
new file mode 100644
index 00000000000..ccaa3b7684d
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/com/greetings/Main.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+package com.greetings;
+import org.astro.World;
+public class Main {
+    public static void main(String[] args) {
+        System.out.format("Greetings %s!\n", World.name());
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/module-info.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/module-info.java
new file mode 100644
index 00000000000..93345c7ea8f
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.greetings/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+module com.greetings {
+    requires org.astro;
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java
new file mode 100644
index 00000000000..69f79a9d3ad
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/com/hello/Main.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+package com.hello;
+import org.astro.World;
+public class Main {
+    public static void main(String[] args) {
+        System.out.format("Hello %s!\n", World.name());
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/module-info.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/module-info.java
new file mode 100644
index 00000000000..46c92f104e8
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.hello/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+module com.hello {
+    requires org.astro;
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java
new file mode 100644
index 00000000000..79f2c7001de
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.nomodule/com/nomodule/Main.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+package com.nomodule;
+import org.astro.World;
+public class Main {
+    public static void main(String[] args) {
+        System.out.format("Greetings %s!\n", World.name());
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java
new file mode 100644
index 00000000000..4c3ae500939
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/com/norequires/Main.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+package com.norequires;
+import org.astro.World;
+public class Main {
+    public static void main(String[] args) {
+        System.out.format("Hello %s!\n", World.name());
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/module-info.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/module-info.java
new file mode 100644
index 00000000000..194026c0ca3
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.norequires/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+module com.norequires { }
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java
new file mode 100644
index 00000000000..06b6e352ec1
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/com/simple/Main.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+package com.simple;
+
+import java.lang.reflect.Method;
+
+public class Main {
+    public static void main(String[] args) throws Exception {
+        System.out.println("Hello World!");
+        if (args.length > 0 && args[0].equals("with_add_opens")) {
+            Method method = ClassLoader.class.getDeclaredMethod("defineClass",
+                byte[].class, int.class, int.class);
+            method.setAccessible(true);
+            System.out.println("method.setAccessible succeeded!");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/module-info.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/module-info.java
new file mode 100644
index 00000000000..dade1ee6399
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/com.simple/module-info.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+module com.simple {
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/module-info.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/module-info.java
new file mode 100644
index 00000000000..1faa33fd1e3
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+module org.astro {
+    exports org.astro;
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java
new file mode 100644
index 00000000000..43f02ba1bff
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/src/org.astro/org/astro/World.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+package org.astro;
+public class World {
+    public static String name() {
+        return "world";
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/appcds/test-classes/JvmtiApp.java b/test/hotspot/jtreg/runtime/appcds/test-classes/JvmtiApp.java
index e0c0ea55fb6..fda99bb94da 100644
--- a/test/hotspot/jtreg/runtime/appcds/test-classes/JvmtiApp.java
+++ b/test/hotspot/jtreg/runtime/appcds/test-classes/JvmtiApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -25,9 +25,9 @@
 import sun.hotspot.WhiteBox;
 
 public class JvmtiApp {
-    static Class forname() {
+    static Class forname(String cn) {
         try {
-            return Class.forName("Hello");
+            return Class.forName(cn);
         } catch (Throwable t) {
             return null;
         }
@@ -40,9 +40,14 @@ static void failed(String msg) {
 
     // See ../JvmtiAddPath.java for how the classpaths are configured.
     public static void main(String args[]) {
+        String cn = "Hello";
+        if (args.length >= 3) {
+            cn = args[args.length - 1];
+        }
+
         if (args[0].equals("noadd")) {
-            if (forname() != null) {
-                failed("Hello class was loaded unexpectedly");
+            if (forname(cn) != null) {
+                failed(cn + " class was loaded unexpectedly");
             }
             // We use -verbose:class to verify that Extra.class IS loaded by AppCDS if
             // the boot classpath HAS NOT been appended.
@@ -54,39 +59,41 @@ public static void main(String args[]) {
 
         if (args[0].equals("bootonly")) {
             wb.addToBootstrapClassLoaderSearch(args[1]);
-            Class cls = forname();
+            Class cls = forname(cn);
             if (cls == null) {
-                failed("Cannot find Hello class");
+                failed("Cannot find " + cn + " class");
             }
             if (cls.getClassLoader() != null) {
                 failed("Hello class not loaded by boot classloader");
             }
         } else if (args[0].equals("apponly")) {
             wb.addToSystemClassLoaderSearch(args[1]);
-            Class cls = forname();
+            Class cls = forname(cn);
             if (cls == null) {
-                failed("Cannot find Hello class");
+                failed("Cannot find " + cn + " class");
             }
             if (cls.getClassLoader() != JvmtiApp.class.getClassLoader()) {
-                failed("Hello class not loaded by app classloader");
+                failed(cn + " class not loaded by app classloader");
             }
         } else if (args[0].equals("noadd-appcds")) {
-            Class cls = forname();
+            cn = (args.length == 1) ? "Hello" : args[1];
+            Class cls = forname(cn);
             if (cls == null) {
-                failed("Cannot find Hello class");
+                failed("Cannot find " + cn + " class");
             }
             if (cls.getClassLoader() != JvmtiApp.class.getClassLoader()) {
-                failed("Hello class not loaded by app classloader");
+                failed(cn + " class not loaded by app classloader");
             }
         } else if (args[0].equals("appandboot")) {
             wb.addToBootstrapClassLoaderSearch(args[1]);
             wb.addToSystemClassLoaderSearch(args[2]);
-            Class cls = forname();
+            cn = (args.length == 3) ? "Hello" : args[3];
+            Class cls = forname(cn);
             if (cls == null) {
-                failed("Cannot find Hello class");
+                failed("Cannot find " + cn + " class");
             }
             if (cls.getClassLoader() != null) {
-                failed("Hello class not loaded by boot classloader");
+                failed(cn + " class not loaded by boot classloader");
             }
         } else {
             failed("unknown option " + args[0]);
@@ -102,4 +109,4 @@ public static void main(String args[]) {
 
 class ExtraClass {
     static void doit() {}
-}
\ No newline at end of file
+}
diff --git a/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleCDS.java b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleCDS.java
index 6b5d3c7e37c..200eb0b2cca 100644
--- a/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleCDS.java
+++ b/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleCDS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -50,7 +50,8 @@ public static void main(String args[]) throws Throwable {
             "-Xlog:class+path=info",
             "-version");
         new OutputAnalyzer(pb.start())
-            .shouldContain("ro  space:"); // Make sure archive got created.
+            // --patch-module is not supported during CDS dumping
+            .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         // Case 2: Test that directory in --patch-module is supported for CDS dumping
         // Create a class file in the module java.base.
@@ -73,7 +74,8 @@ public static void main(String args[]) throws Throwable {
             "-Xlog:class+path=info",
             "-version");
         new OutputAnalyzer(pb.start())
-            .shouldContain("ro  space:"); // Make sure archive got created.
+            // --patch-module is not supported during CDS dumping
+            .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         // Case 3a: Test CDS dumping with jar file in --patch-module
         BasicJarBuilder.build("javanaming", "javax/naming/spi/NamingManager");
@@ -87,7 +89,8 @@ public static void main(String args[]) throws Throwable {
             "-Xlog:class+path=info",
             "PatchModuleMain", "javax.naming.spi.NamingManager");
         new OutputAnalyzer(pb.start())
-            .shouldContain("ro  space:"); // Make sure archive got created.
+            // --patch-module is not supported during CDS dumping
+            .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module");
 
         // Case 3b: Test CDS run with jar file in --patch-module
         pb = ProcessTools.createJavaProcessBuilder(
diff --git a/test/lib/jdk/test/lib/cds/CDSTestUtils.java b/test/lib/jdk/test/lib/cds/CDSTestUtils.java
index 3677b71f685..d16944eb8b7 100644
--- a/test/lib/jdk/test/lib/cds/CDSTestUtils.java
+++ b/test/lib/jdk/test/lib/cds/CDSTestUtils.java
@@ -117,6 +117,7 @@ public static class Result {
         private final boolean hasMappingFailure;
         private final boolean hasAbnormalExit;
         private final boolean hasNormalExit;
+        private final String CDS_DISABLED = "warning: CDS is disabled when the";
 
         public Result(CDSOptions opts, OutputAnalyzer out) throws Exception {
             options = opts;
@@ -126,7 +127,9 @@ public Result(CDSOptions opts, OutputAnalyzer out) throws Exception {
             hasNormalExit     = (!hasMappingFailure) && (output.getExitValue() == 0);
 
             if (hasNormalExit) {
-                if ("on".equals(options.xShareMode) && output.getStderr().contains("java version")) {
+                if ("on".equals(options.xShareMode) &&
+                    output.getStderr().contains("java version") &&
+                    !output.getStderr().contains(CDS_DISABLED)) {
                     // "-showversion" is always passed in the command-line by the execXXX methods.
                     // During normal exit, we require that the VM to show that sharing was enabled.
                     output.shouldContain("sharing");
@@ -150,6 +153,26 @@ public Result assertAbnormalExit(Checker checker) throws Exception {
             return this;
         }
 
+        // When {--limit-modules, --patch-module, and/or --upgrade-module-path}
+        // are specified, CDS is silently disabled for both -Xshare:auto and -Xshare:on.
+        public Result assertSilentlyDisabledCDS(Checker checker) throws Exception {
+            if (hasMappingFailure) {
+                throw new RuntimeException("Unexpected mapping failure");
+            }
+            // this comes from a JVM warning message.
+            output.shouldContain(CDS_DISABLED);
+
+            checker.check(output);
+            return this;
+        }
+
+        public Result assertSilentlyDisabledCDS(int exitCode, String... matches) throws Exception {
+            return assertSilentlyDisabledCDS((out) -> {
+                out.shouldHaveExitValue(exitCode);
+                checkMatches(out, matches);
+                   });
+        }
+
         public Result ifNormalExit(Checker checker) throws Exception {
             if (hasNormalExit) {
                 checker.check(output);

From 9df29bca23915d6e6346d7c38c6925b62f51d3bd Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Tue, 10 Apr 2018 22:37:01 +0200
Subject: [PATCH 125/196] 8201267: Disable warnings for VS2017 to enable
 building Reviewed-by: ihse, tbell

---
 make/CreateJmods.gmk                          | 26 ++++++++++++++-----
 make/autoconf/toolchain_windows.m4            |  1 -
 make/common/NativeCompilation.gmk             | 22 +++++++++-------
 make/launcher/Launcher-jdk.pack.gmk           |  1 +
 make/lib/Awt2dLibraries.gmk                   |  2 +-
 make/lib/Lib-jdk.accessibility.gmk            |  2 ++
 make/lib/Lib-jdk.pack.gmk                     |  1 +
 .../share/native/libinstrument/Reentrancy.c   |  2 +-
 8 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index 9373499ace7..b1392711484 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -117,6 +117,17 @@ ifeq ($(MODULE), java.base)
           --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)'
     endif
   endif
+else # not java.base
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    # Only java.base needs to include the MSVC*_DLLs. Make sure no other module
+    # tries to include them (typically imported ones).
+    ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCR_DLL))), )
+      JMOD_FLAGS += --exclude '$(notdir $(MSVCR_DLL))'
+    endif
+    ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCP_DLL))), )
+      JMOD_FLAGS += --exclude '$(notdir $(MSVCP_DLL))'
+    endif
+  endif
 endif
 
 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.
@@ -133,18 +144,21 @@ ifeq ($(INTERIM_JMOD), true)
   DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS))
 endif
 
+JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}'
+
 # Create jmods in a temp dir and then move them into place to keep the
 # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.
 $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)
 	$(call LogWarn, Creating $(patsubst $(OUTPUTDIR)/%, %, $@))
 	$(call MakeDir, $(JMODS_DIR) $(JMODS_TEMPDIR))
 	$(RM) $@ $(JMODS_TEMPDIR)/$(notdir $@)
-	$(JMOD) create \
-            --module-version $(VERSION_SHORT) \
-            --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \
-            --module-path $(JMODS_DIR) \
-	    --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \
-	    $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@)
+	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/jmods/$(MODULE).jmod, \
+	    $(JMOD) create \
+	        --module-version $(VERSION_SHORT) \
+	        --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \
+	        --module-path $(JMODS_DIR) \
+	        $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@) \
+	)
 	$(MV) $(JMODS_TEMPDIR)/$(notdir $@) $@
 
 TARGETS += $(JMODS_DIR)/$(MODULE).jmod
diff --git a/make/autoconf/toolchain_windows.m4 b/make/autoconf/toolchain_windows.m4
index 1adcc148cca..ea193b0b5eb 100644
--- a/make/autoconf/toolchain_windows.m4
+++ b/make/autoconf/toolchain_windows.m4
@@ -522,7 +522,6 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL],
     if $ECHO "$MSVC_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
       AC_MSG_RESULT([ok])
       MSVC_DLL="$POSSIBLE_MSVC_DLL"
-      BASIC_FIXUP_PATH(MSVC_DLL)
       AC_MSG_CHECKING([for $DLL_NAME])
       AC_MSG_RESULT([$MSVC_DLL])
     else
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index 9533493fd5c..daf56073d1d 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -905,20 +905,22 @@ define SetupNativeCompilationBody
 
       $1_IMPORT_LIBRARY := $$($1_OBJECT_DIR)/$$($1_NAME).lib
       $1_EXTRA_LDFLAGS += "-implib:$$($1_IMPORT_LIBRARY)"
-      # To properly trigger downstream dependants of the import library, just as
-      # for debug files, we must have a recipe in the rule. To avoid rerunning
-      # the recipe every time have it touch the target. If an import library
-      # file is deleted by something external, explicitly delete the target to
-      # trigger a rebuild of both.
-      ifneq ($$(wildcard $$($1_IMPORT_LIBRARY)), $$($1_IMPORT_LIBRARY))
-        $$(call LogDebug, Deleting $$($1_BASENAME) because import library is missing)
-        $$(shell $(RM) $$($1_TARGET))
-      endif
-      $$($1_IMPORT_LIBRARY): $$($1_TARGET)
+      ifeq ($$($1_TYPE), LIBRARY)
+        # To properly trigger downstream dependants of the import library, just as
+        # for debug files, we must have a recipe in the rule. To avoid rerunning
+        # the recipe every time have it touch the target. If an import library
+        # file is deleted by something external, explicitly delete the target to
+        # trigger a rebuild of both.
+        ifneq ($$(wildcard $$($1_IMPORT_LIBRARY)), $$($1_IMPORT_LIBRARY))
+          $$(call LogDebug, Deleting $$($1_BASENAME) because import library is missing)
+          $$(shell $(RM) $$($1_TARGET))
+        endif
+        $$($1_IMPORT_LIBRARY): $$($1_TARGET)
 		$$(if $$(CORRECT_FUNCTION_IN_RECIPE_EVALUATION), \
 		  $$(if $$(wildcard $$@), , $$(error $$@ was not created for $$<)) \
 		)
 		$(TOUCH) $$@
+      endif
     endif
 
     $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk
index 1e7debfda32..c66bed0d4e5 100644
--- a/make/launcher/Launcher-jdk.pack.gmk
+++ b/make/launcher/Launcher-jdk.pack.gmk
@@ -88,6 +88,7 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \
     CFLAGS_solaris := -KPIC, \
     CFLAGS_macosx := -fPIC, \
     DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \
+    DISABLED_WARNINGS_microsoft := 4005, \
     LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
         $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index adc6c5826f8..f3205c1fcd8 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -543,7 +543,7 @@ else
       DISABLED_WARNINGS_solstudio := \
          E_STATEMENT_NOT_REACHED \
          E_END_OF_LOOP_CODE_NOT_REACHED, \
-      DISABLED_WARNINGS_microsoft := 4267 4244, \
+      DISABLED_WARNINGS_microsoft := 4267 4244 4312, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
   ))
diff --git a/make/lib/Lib-jdk.accessibility.gmk b/make/lib/Lib-jdk.accessibility.gmk
index 9e899e8a773..ea35ab39293 100644
--- a/make/lib/Lib-jdk.accessibility.gmk
+++ b/make/lib/Lib-jdk.accessibility.gmk
@@ -45,6 +45,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
         NAME := javaaccessbridge$1, \
         SRC := $(JAVA_AB_SRCDIR), \
         OPTIMIZATION := LOW, \
+        DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
         CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \
             $(addprefix -I,$(JAVA_AB_SRCDIR)) \
             -I$(ROOT_SRCDIR)/include/bridge \
@@ -69,6 +70,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
         NAME := windowsaccessbridge$1, \
         SRC := $(WIN_AB_SRCDIR), \
         OPTIMIZATION := LOW, \
+        DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
         CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT $(ACCESSBRIDGE_CFLAGS) \
             $(addprefix -I,$(WIN_AB_SRCDIR)) \
             -I$(ROOT_SRCDIR)/include/bridge \
diff --git a/make/lib/Lib-jdk.pack.gmk b/make/lib/Lib-jdk.pack.gmk
index 9884818852c..35fe7a41d4d 100644
--- a/make/lib/Lib-jdk.pack.gmk
+++ b/make/lib/Lib-jdk.pack.gmk
@@ -40,6 +40,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
         $(LIBJAVA_HEADER_FLAGS), \
     CFLAGS_release := -DPRODUCT, \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
+    DISABLED_WARNINGS_microsoft := 4005, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \
diff --git a/src/java.instrument/share/native/libinstrument/Reentrancy.c b/src/java.instrument/share/native/libinstrument/Reentrancy.c
index 8cb69172bf7..2d923e23848 100644
--- a/src/java.instrument/share/native/libinstrument/Reentrancy.c
+++ b/src/java.instrument/share/native/libinstrument/Reentrancy.c
@@ -90,7 +90,7 @@ assertTLSValue( jvmtiEnv *      jvmtienv,
                 jthread         thread,
                 const void *    expected) {
     jvmtiError  error;
-    void *      test = (void *) 0x99999999UL;
+    void *      test = (void *) 0x99999999ULL;
 
     /* now check if we do a fetch we get what we wrote */
     error = (*jvmtienv)->GetThreadLocalStorage(

From 96a14f2634a35bdb7374c79fcb2e6187c79bb84c Mon Sep 17 00:00:00 2001
From: anazarov <unknown>
Date: Tue, 10 Apr 2018 14:16:13 -0700
Subject: [PATCH 126/196] 8178867:
 tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java failed to clean up
 files Reviewed-by: alanb, jjg, psandoz

---
 .../JLinkMultiReleaseJarTest.java             | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/test/jdk/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java b/test/jdk/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java
index c3c75783976..aafec448206 100644
--- a/test/jdk/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java
+++ b/test/jdk/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java
@@ -52,7 +52,9 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 import java.util.jar.JarFile;
 import java.util.spi.ToolProvider;
@@ -134,14 +136,15 @@ public void initialize() throws IOException {
     }
 
     private void javac(Path source, Path destination, String srcpath) throws IOException {
-        String[] args = Stream.concat(
-                Stream.of("-d", destination.toString(), "--module-source-path", srcpath),
-                Files.walk(source)
-                        .map(Path::toString)
-                        .filter(s -> s.endsWith(".java"))
-        ).toArray(String[]::new);
-        int rc = JAVAC_TOOL.run(System.out, System.err, args);
-        Assert.assertEquals(rc, 0);
+        var args = Stream.of("-d", destination.toString(), "--module-source-path", srcpath);
+        try (Stream<Path> pathStream = Files.walk(source)) {
+            args = Stream.concat(args,
+                    pathStream.map(Path::toString)
+                              .filter(s -> s.endsWith(".java")));
+
+            int rc = JAVAC_TOOL.run(System.out, System.err, args.toArray(String[]::new));
+            Assert.assertEquals(rc, 0);
+        }
     }
 
     @Test
@@ -149,7 +152,7 @@ public void basicTest() throws Throwable {
         if (ignoreTest()) return;
 
         // use jlink to build image from multi-release jar
-       jlink("m1.jar", "myimage");
+        jlink("m1.jar", "myimage");
 
         // validate image
         Path jimage = userdir.resolve("myimage").resolve("lib").resolve("modules");

From 244118025ea33b99c00cec5e43d53984b1e42f36 Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Tue, 10 Apr 2018 23:32:54 +0200
Subject: [PATCH 127/196] 8201320: Allow PrintFailureReports to be turned off
 Reviewed-by: erikj

---
 make/Init.gmk              |  11 +-
 make/InitSupport.gmk       | 216 ++++++++++++++++++++++---------------
 make/autoconf/basics.m4    |  18 ++++
 make/autoconf/configure.ac |   1 +
 make/autoconf/spec.gmk.in  |   1 +
 5 files changed, 158 insertions(+), 89 deletions(-)

diff --git a/make/Init.gmk b/make/Init.gmk
index 5027dd68af9..6de559e2c60 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2018, 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
@@ -226,6 +226,15 @@ else # HAS_SPEC=true
   # Parse COMPARE_BUILD (for makefile development)
   $(eval $(call ParseCompareBuild))
 
+  # If no LOG= was given on command line, but we have a non-standard default
+  # value, use that instead and re-parse log level.
+  ifeq ($(LOG), )
+    ifneq ($(DEFAULT_LOG), )
+      override LOG := $(DEFAULT_LOG)
+      $(eval $(call ParseLogLevel))
+    endif
+  endif
+
   ifeq ($(LOG_NOFILE), true)
     # Disable build log if LOG=[level,]nofile was given
     override BUILD_LOG_PIPE :=
diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk
index c63941f47ca..37bb7ebdd2f 100644
--- a/make/InitSupport.gmk
+++ b/make/InitSupport.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, 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
@@ -131,73 +131,6 @@ ifeq ($(HAS_SPEC),)
     endif
   endef
 
-  # Look for a given option in the LOG variable, and if found, set a variable
-  # and remove the option from the LOG variable
-  # $1: The option to look for
-  # $2: The option to set to "true" if the option is found
-  define ParseLogOption
-    ifneq ($$(findstring $1, $$(LOG)),)
-      $2 := true
-      # COMMA is defined in spec.gmk, but that is not included yet
-      COMMA := ,
-      # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
-      LOG_STRIPPED := $$(subst $1,, $$(subst $$(COMMA)$(strip $1),, $$(LOG)))
-      # We might have ended up with a leading comma. Remove it. Need override
-      # since LOG is set from the command line.
-      override LOG := $$(strip $$(patsubst $$(COMMA)%, %, $$(LOG_STRIPPED)))
-    endif
-  endef
-
-  define ParseLogLevel
-    # Catch old-style VERBOSE= command lines.
-    ifneq ($$(origin VERBOSE), undefined)
-      $$(info Error: VERBOSE is deprecated. Use LOG=<warn|info|debug|trace> instead.)
-      $$(error Cannot continue)
-    endif
-
-    # Setup logging according to LOG
-
-    # If the "nofile" argument is given, act on it and strip it away
-    $$(eval $$(call ParseLogOption, nofile, LOG_NOFILE))
-
-    # If the "cmdline" argument is given, act on it and strip it away
-    $$(eval $$(call ParseLogOption, cmdlines, LOG_CMDLINES))
-
-    # If the "profile-to-log" argument is given, write shell times in build log
-    $$(eval $$(call ParseLogOption, profile-to-log, LOG_PROFILE_TIMES_LOG))
-
-    # If the "profile" argument is given, write shell times in separate log file
-    # IMPORTANT: $(ParseLogOption profile-to-log) should go first. Otherwise
-    # parsing of 'LOG=debug,profile-to-log,nofile' ends up in the following error:
-    # Error: LOG contains unknown option or log level: debug-to-log.
-    $$(eval $$(call ParseLogOption, profile, LOG_PROFILE_TIMES_FILE))
-
-    # Treat LOG=profile-to-log as if it were LOG=profile,profile-to-log
-    LOG_PROFILE_TIMES_FILE := $$(firstword $$(LOG_PROFILE_TIMES_FILE) $$(LOG_PROFILE_TIMES_LOG))
-
-    LOG_LEVEL := $$(LOG)
-
-    ifeq ($$(LOG_LEVEL),)
-      # Set LOG to "warn" as default if not set
-      LOG_LEVEL := warn
-    endif
-
-    ifeq ($$(LOG_LEVEL), warn)
-      MAKE_LOG_FLAGS := -s
-    else ifeq ($$(LOG_LEVEL), info)
-      MAKE_LOG_FLAGS := -s
-    else ifeq ($$(LOG_LEVEL), debug)
-      MAKE_LOG_FLAGS :=
-    else ifeq ($$(LOG_LEVEL), trace)
-      MAKE_LOG_FLAGS :=
-    else
-      $$(info Error: LOG contains unknown option or log level: $$(LOG).)
-      $$(info LOG can be <level>[,<opt>[...]] where <opt> is nofile | cmdlines | profile | profile-to-log)
-      $$(info and <level> is warn | info | debug | trace)
-      $$(error Cannot continue)
-    endif
-  endef
-
   define ParseConfAndSpec
     ifneq ($$(origin SPEC), undefined)
       # We have been given a SPEC, check that it works out properly
@@ -477,30 +410,38 @@ else # $(HAS_SPEC)=true
   endef
 
   define PrintFailureReports
-	$(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log), \
-	  $(PRINTF) "\n=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \
-	  $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log)), \
-	      $(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" $(NEWLINE) \
-	      ($(GREP) -v -e "^Note: including file:" <  $(logfile) || true) | $(HEAD) -n 12 $(NEWLINE) \
-	      if test `$(WC) -l < $(logfile)` -gt 12; then \
-	        $(ECHO) "   ... (rest of output omitted)" ; \
-	      fi $(NEWLINE) \
+	$(if $(filter none, $(LOG_REPORT)), , \
+	  $(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log), \
+	    $(PRINTF) "\n=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \
+	    $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log)), \
+	        $(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" $(NEWLINE) \
+	        $(if $(filter all, $(LOG_REPORT)), \
+	          $(GREP) -v -e "^Note: including file:" <  $(logfile) || true $(NEWLINE) \
+	        , \
+	          ($(GREP) -v -e "^Note: including file:" <  $(logfile) || true) | $(HEAD) -n 12 $(NEWLINE) \
+	          if test `$(WC) -l < $(logfile)` -gt 12; then \
+	            $(ECHO) "   ... (rest of output omitted)" ; \
+	          fi $(NEWLINE) \
+	        ) \
+	    ) \
+	    $(PRINTF) "\n* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs.\n" $(NEWLINE) \
+	    $(PRINTF) "=== End of repeated output ===\n" \
 	  ) \
-	  $(PRINTF) "\n* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs.\n" $(NEWLINE) \
-	  $(PRINTF) "=== End of repeated output ===\n" \
 	)
   endef
 
   define PrintBuildLogFailures
-	if $(GREP) -q "recipe for target .* failed" $(BUILD_LOG) 2> /dev/null; then  \
-	  $(PRINTF) "\n=== Make failed targets repeated here ===\n" ; \
-	  $(GREP) "recipe for target .* failed" $(BUILD_LOG) ; \
-	  $(PRINTF) "=== End of repeated output ===\n" ; \
-	  $(PRINTF) "\nHint: Try searching the build log for the name of the first failed target.\n" ; \
-	else \
-	  $(PRINTF) "\nNo indication of failed target found.\n" ; \
-	  $(PRINTF) "Hint: Try searching the build log for '] Error'.\n" ; \
-	fi
+	$(if $(filter none, $(LOG_REPORT)), , \
+	  if $(GREP) -q "recipe for target .* failed" $(BUILD_LOG) 2> /dev/null; then  \
+	    $(PRINTF) "\n=== Make failed targets repeated here ===\n" ; \
+	    $(GREP) "recipe for target .* failed" $(BUILD_LOG) ; \
+	    $(PRINTF) "=== End of repeated output ===\n" ; \
+	    $(PRINTF) "\nHint: Try searching the build log for the name of the first failed target.\n" ; \
+	  else \
+	    $(PRINTF) "\nNo indication of failed target found.\n" ; \
+	    $(PRINTF) "Hint: Try searching the build log for '] Error'.\n" ; \
+	  fi \
+	)
   endef
 
   define RotateLogFiles
@@ -583,8 +524,107 @@ else # $(HAS_SPEC)=true
 
 endif # HAS_SPEC
 
+# Look for a given option in the LOG variable, and if found, set a variable
+# and remove the option from the LOG variable
+# $1: The option to look for
+# $2: The variable to set to "true" if the option is found
+define ParseLogOption
+  ifneq ($$(findstring $1, $$(LOG)),)
+    override $2 := true
+    # COMMA is defined in spec.gmk, but that is not included yet
+    COMMA := ,
+    # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
+    LOG_STRIPPED := $$(subst $1,, $$(subst $$(COMMA)$$(strip $1),, $$(LOG)))
+    # We might have ended up with a leading comma. Remove it. Need override
+    # since LOG is set from the command line.
+    override LOG := $$(strip $$(patsubst $$(COMMA)%, %, $$(LOG_STRIPPED)))
+  endif
+endef
+
+# Look for a given option with an assignment in the LOG variable, and if found,
+# set a variable to that value and remove the option from the LOG variable
+# $1: The option to look for
+# $2: The variable to set to the value of the option, if found
+define ParseLogValue
+  ifneq ($$(findstring $1=, $$(LOG)),)
+    # Make words of out comma-separated list and find the one with opt=val
+    value := $$(strip $$(subst $$(strip $1)=,, $$(filter $$(strip $1)=%, $$(subst $$(COMMA), , $$(LOG)))))
+    override $2 := $$(value)
+    # COMMA is defined in spec.gmk, but that is not included yet
+    COMMA := ,
+    # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
+    LOG_STRIPPED := $$(subst $$(strip $1)=$$(value),, \
+        $$(subst $$(COMMA)$$(strip $1)=$$(value),, $$(LOG)))
+    # We might have ended up with a leading comma. Remove it. Need override
+    # since LOG is set from the command line.
+    override LOG := $$(strip $$(patsubst $$(COMMA)%, %, $$(LOG_STRIPPED)))
+  endif
+endef
+
+
+define ParseLogLevel
+  # Catch old-style VERBOSE= command lines.
+  ifneq ($$(origin VERBOSE), undefined)
+    $$(info Error: VERBOSE is deprecated. Use LOG=<warn|info|debug|trace> instead.)
+    $$(error Cannot continue)
+  endif
+
+  # Setup logging according to LOG
+
+  # If "nofile" is present, do not log to a file
+  $$(eval $$(call ParseLogOption, nofile, LOG_NOFILE))
+
+  # If "cmdline" is present, print all executes "important" command lines.
+  $$(eval $$(call ParseLogOption, cmdlines, LOG_CMDLINES))
+
+  # If "report" is present, use non-standard reporting options at build failure.
+  $$(eval $$(call ParseLogValue, report, LOG_REPORT))
+  ifneq ($$(LOG_REPORT), )
+    ifeq ($$(filter $$(LOG_REPORT), none all default), )
+      $$(info Error: LOG=report has invalid value: $$(LOG_REPORT).)
+      $$(info Valid values: LOG=report=<none>|<all>|<default>)
+      $$(error Cannot continue)
+    endif
+  endif
+
+  # If "profile-to-log" is present, write shell times in build log
+  $$(eval $$(call ParseLogOption, profile-to-log, LOG_PROFILE_TIMES_LOG))
+
+  # If "profile" is present, write shell times in separate log file
+  # IMPORTANT: $(ParseLogOption profile-to-log) should go first. Otherwise
+  # parsing of 'LOG=debug,profile-to-log,nofile' ends up in the following error:
+  # Error: LOG contains unknown option or log level: debug-to-log.
+  $$(eval $$(call ParseLogOption, profile, LOG_PROFILE_TIMES_FILE))
+
+  # Treat LOG=profile-to-log as if it were LOG=profile,profile-to-log
+  LOG_PROFILE_TIMES_FILE := $$(firstword $$(LOG_PROFILE_TIMES_FILE) $$(LOG_PROFILE_TIMES_LOG))
+
+  override LOG_LEVEL := $$(LOG)
+
+  ifeq ($$(LOG_LEVEL),)
+    # Set LOG to "warn" as default if not set
+    override LOG_LEVEL := warn
+  endif
+
+  ifeq ($$(LOG_LEVEL), warn)
+    override MAKE_LOG_FLAGS := -s
+  else ifeq ($$(LOG_LEVEL), info)
+    override MAKE_LOG_FLAGS := -s
+  else ifeq ($$(LOG_LEVEL), debug)
+    override MAKE_LOG_FLAGS :=
+  else ifeq ($$(LOG_LEVEL), trace)
+    override MAKE_LOG_FLAGS :=
+  else
+    $$(info Error: LOG contains unknown option or log level: $$(LOG).)
+    $$(info LOG can be <level>[,<opt>[...]] where <opt> is nofile | cmdlines | profile | profile-to-log)
+    $$(info and <level> is warn | info | debug | trace)
+    $$(error Cannot continue)
+  endif
+endef
+
 MAKE_LOG_VARS = $(foreach v, \
-    LOG_LEVEL LOG_NOFILE LOG_CMDLINES LOG_PROFILE_TIMES_LOG LOG_PROFILE_TIMES_FILE, \
+    LOG_LEVEL LOG_NOFILE LOG_CMDLINES LOG_REPORT LOG_PROFILE_TIMES_LOG \
+    LOG_PROFILE_TIMES_FILE, \
     $v=$($v) \
 )
 
diff --git a/make/autoconf/basics.m4 b/make/autoconf/basics.m4
index c8877c92ecb..de2c26607cd 100644
--- a/make/autoconf/basics.m4
+++ b/make/autoconf/basics.m4
@@ -1260,6 +1260,24 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_MAKE_TARGET],
   AC_SUBST(DEFAULT_MAKE_TARGET)
 ])
 
+# Setup the default value for LOG=
+#
+AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_LOG],
+[
+  AC_ARG_WITH(log, [AS_HELP_STRING([--with-log],
+      [[default vaue for make LOG argument [warn]]])])
+  AC_MSG_CHECKING([for default LOG value])
+  if test "x$with_log" = x; then
+    DEFAULT_LOG=""
+  else
+    # Syntax for valid LOG options is a bit too complex for it to be worth
+    # implementing a test for correctness in configure. Just accept it.
+    DEFAULT_LOG=$with_log
+  fi
+  AC_MSG_RESULT([$DEFAULT_LOG])
+  AC_SUBST(DEFAULT_LOG)
+])
+
 # Code to run after AC_OUTPUT
 AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
 [
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index bfa3de31957..62178677837 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -120,6 +120,7 @@ PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION
 
 # Misc basic settings
 BASIC_SETUP_DEFAULT_MAKE_TARGET
+BASIC_SETUP_DEFAULT_LOG
 
 ###############################################################################
 #
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index d8934e7da18..59524a0a737 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -332,6 +332,7 @@ TEST_JOBS?=@TEST_JOBS@
 
 # Default make target
 DEFAULT_MAKE_TARGET:=@DEFAULT_MAKE_TARGET@
+DEFAULT_LOG:=@DEFAULT_LOG@
 
 FREETYPE_TO_USE:=@FREETYPE_TO_USE@
 FREETYPE_LIBS:=@FREETYPE_LIBS@

From a35ed22e44219e9a2494b5e2a9afabf3698ecbee Mon Sep 17 00:00:00 2001
From: jjg <unknown>
Date: Tue, 10 Apr 2018 15:05:10 -0700
Subject: [PATCH 128/196] 8201396: fix broken links generated by javadoc doclet
 Reviewed-by: ksrini

---
 .../formats/html/ModuleFrameWriter.java       |  6 +-
 .../formats/html/ModuleIndexFrameWriter.java  |  1 -
 .../html/ModulePackageIndexFrameWriter.java   | 16 +++-
 .../doclets/toolkit/util/DocPath.java         |  4 -
 .../doclets/toolkit/util/DocPaths.java        |  2 +
 .../doclet/testModuleDirs/TestModuleDirs.java | 73 ++++++++++++++-----
 6 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java
index c67e1fae16c..8ed2efe4c36 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java
@@ -40,6 +40,7 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 
 /**
@@ -100,8 +101,11 @@ public static void generate(HtmlConfiguration configuration, ModuleElement modul
         HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
                 ? HtmlTree.MAIN()
                 : body;
+        DocPath moduleSummary = configuration.useModuleDirectories
+                ? DocPaths.DOT_DOT.resolve(configuration.docPaths.moduleSummary(moduleElement))
+                : configuration.docPaths.moduleSummary(moduleElement);
         Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, HtmlStyle.bar,
-                mdlgen.links.createLink(configuration.docPaths.moduleSummary(moduleElement), mdlLabel, "", "classFrame"));
+                mdlgen.links.createLink(moduleSummary, mdlLabel, "", "classFrame"));
         htmlTree.addContent(heading);
         HtmlTree div = new HtmlTree(HtmlTag.DIV);
         div.setStyle(HtmlStyle.indexContainer);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java
index bdb6063d5b5..be331fe0522 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java
@@ -36,7 +36,6 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
 import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java
index 077febff8bf..0f5d989496f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java
@@ -37,7 +37,6 @@
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Links;
 import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
 import jdk.javadoc.internal.doclets.toolkit.Content;
@@ -189,7 +188,10 @@ protected void addModulesList(Content body) {
      * @param ul the Content object to which the all classes link should be added
      */
     protected void addAllClassesLink(Content ul) {
-        Content linkContent = links.createLink(DocPaths.ALLCLASSES_FRAME,
+        DocPath allClassesFrame = configuration.useModuleDirectories
+                ? DocPaths.DOT_DOT.resolve(DocPaths.ALLCLASSES_FRAME)
+                : DocPaths.ALLCLASSES_FRAME;
+        Content linkContent = links.createLink(allClassesFrame,
                 contents.allClassesLabel, "", "packageFrame");
         Content li = HtmlTree.LI(linkContent);
         ul.addContent(li);
@@ -202,7 +204,10 @@ protected void addAllClassesLink(Content ul) {
      * @param ul the Content object to which the all packages link should be added
      */
     protected void addAllPackagesLink(Content ul) {
-        Content linkContent = links.createLink(DocPaths.OVERVIEW_FRAME,
+        DocPath overviewFrame = configuration.useModuleDirectories
+                ? DocPaths.DOT_DOT.resolve(DocPaths.OVERVIEW_FRAME)
+                : DocPaths.OVERVIEW_FRAME;
+        Content linkContent = links.createLink(overviewFrame,
                 contents.allPackagesLabel, "", "packageListFrame");
         Content li = HtmlTree.LI(linkContent);
         ul.addContent(li);
@@ -215,7 +220,10 @@ protected void addAllPackagesLink(Content ul) {
      * @param ul the Content object to which the all modules link should be added
      */
     protected void addAllModulesLink(Content ul) {
-        Content linkContent = links.createLink(DocPaths.MODULE_OVERVIEW_FRAME,
+        DocPath moduleOverviewFrame = configuration.useModuleDirectories
+                ? DocPaths.DOT_DOT.resolve(DocPaths.MODULE_OVERVIEW_FRAME)
+                : DocPaths.MODULE_OVERVIEW_FRAME;
+        Content linkContent = links.createLink(moduleOverviewFrame,
                 contents.allModulesLabel, "", "packageListFrame");
         Content li = HtmlTree.LI(linkContent);
         ul.addContent(li);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPath.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPath.java
index ad675e2f3ef..28fc36f18d9 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPath.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPath.java
@@ -30,10 +30,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.lang.model.element.ModuleElement;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-
 /**
  * Abstraction for immutable relative paths.
  * Paths always use '/' as a separator, and never begin or end with '/'.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
index 3618a6d0a30..19305d15048 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
@@ -49,6 +49,8 @@ public DocPaths(Utils utils, boolean useModuleDirectories) {
         moduleSeparator = useModuleDirectories ? "/module-" : "-";
     }
 
+    public static final DocPath DOT_DOT = DocPath.create("..");
+
     /** The name of the file for all classes, without using frames, when --no-frames is specified. */
     public static final DocPath ALLCLASSES = DocPath.create("allclasses.html");
 
diff --git a/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java b/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java
index 8c8995cf1a2..c9d502643d2 100644
--- a/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java
+++ b/test/langtools/jdk/javadoc/doclet/testModuleDirs/TestModuleDirs.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8195795
+ * @bug 8195795 8201396
  * @summary test the use of module directories in output,
  *          and the --no-module-directories option
  * @modules jdk.javadoc/jdk.javadoc.internal.api
@@ -71,46 +71,85 @@ public void testNoModules(Path base) throws IOException {
     @Test
     public void testNoModuleDirs(Path base) throws IOException {
         Path src = base.resolve("src");
-        new ModuleBuilder(tb, "m")
-                .classes("package p; public class A {}")
-                .exports("p")
+        new ModuleBuilder(tb, "ma")
+                .classes("package pa; public class A {}")
+                .exports("pa")
+                .write(src);
+        new ModuleBuilder(tb, "mb")
+                .classes("package pb; public class B {}")
+                .exports("pb")
                 .write(src);
 
         javadoc("-d", base.resolve("api").toString(),
                 "-quiet",
                 "--module-source-path", src.toString(),
                 "--no-module-directories",
-                "--module", "m");
+                "--module", "ma,mb");
 
         checkExit(Exit.OK);
         checkFiles(true,
-                "m-summary.html",
-                "p/package-summary.html");
+                "ma-frame.html",
+                "ma-summary.html",
+                "pa/package-summary.html");
         checkFiles(false,
-                "m/module-summary.html",
-                "m/p/package-summary.html");
+                "ma/module-frame.html",
+                "ma/module-summary.html",
+                "ma/pa/package-summary.html");
+        checkOutput("ma-frame.html", true,
+                "<ul>\n"
+                + "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>\n"
+                + "<li><a href=\"overview-frame.html\" target=\"packageListFrame\">All&nbsp;Packages</a></li>\n"
+                + "<li><a href=\"module-overview-frame.html\" target=\"packageListFrame\">All&nbsp;Modules</a></li>\n"
+                + "</ul>\n");
+        checkOutput("ma-summary.html", true,
+                "<ul class=\"navList\" id=\"allclasses_navbar_top\">\n"
+                + "<li><a href=\"allclasses-noframe.html\">All&nbsp;Classes</a></li>\n"
+                + "</ul>\n");
+        checkOutput("pa/package-summary.html", true,
+                "<li><a href=\"../deprecated-list.html\">Deprecated</a></li>\n"
+                + "<li><a href=\"../index-all.html\">Index</a></li>");
+
     }
 
     @Test
     public void testModuleDirs(Path base) throws IOException {
         Path src = base.resolve("src");
-        new ModuleBuilder(tb, "m")
-                .classes("package p; public class A {}")
-                .exports("p")
+        new ModuleBuilder(tb, "ma")
+                .classes("package pa; public class A {}")
+                .exports("pa")
+                .write(src);
+        new ModuleBuilder(tb, "mb")
+                .classes("package pb; public class B {}")
+                .exports("pb")
                 .write(src);
 
         javadoc("-d", base.resolve("api").toString(),
                 "-quiet",
                 "--module-source-path", src.toString(),
-                "--module", "m");
+                "--module", "ma,mb");
 
         checkExit(Exit.OK);
         checkFiles(false,
-                "m-summary.html",
-                "p/package-summary.html");
+                "ma-frame.html",
+                "ma-summary.html",
+                "pa/package-summary.html");
         checkFiles(true,
-                "m/module-summary.html",
-                "m/p/package-summary.html");
+                "ma/module-frame.html",
+                "ma/module-summary.html",
+                "ma/pa/package-summary.html");
+        checkOutput("ma/module-frame.html", true,
+                "<ul>\n"
+                + "<li><a href=\"../allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>\n"
+                + "<li><a href=\"../overview-frame.html\" target=\"packageListFrame\">All&nbsp;Packages</a></li>\n"
+                + "<li><a href=\"../module-overview-frame.html\" target=\"packageListFrame\">All&nbsp;Modules</a></li>\n"
+                + "</ul>\n");
+        checkOutput("ma/module-summary.html", true,
+                "<ul class=\"navList\" id=\"allclasses_navbar_top\">\n"
+                + "<li><a href=\"../allclasses-noframe.html\">All&nbsp;Classes</a></li>\n"
+                + "</ul>\n");
+        checkOutput("ma/pa/package-summary.html", true,
+                "<li><a href=\"../../deprecated-list.html\">Deprecated</a></li>\n"
+                + "<li><a href=\"../../index-all.html\">Index</a></li>");
     }
 }
 

From 8be460d744e4d1acc82606b1cc27db70f63f9e4e Mon Sep 17 00:00:00 2001
From: amenkov <unknown>
Date: Tue, 10 Apr 2018 15:33:11 -0700
Subject: [PATCH 129/196] 8200195:
 serviceability/jvmti/FieldAccessWatch/FieldAccessWatch.java crashes with
 "assert(thread->thread_state() == _thread_in_native) failed: coming from
 wrong thread state" Reviewed-by: sspitsyn, cjplummer

---
 .../FieldAccessWatch/libFieldAccessWatch.c    | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/jvmti/FieldAccessWatch/libFieldAccessWatch.c b/test/hotspot/jtreg/serviceability/jvmti/FieldAccessWatch/libFieldAccessWatch.c
index e3b6da7015c..fdc28961e89 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/FieldAccessWatch/libFieldAccessWatch.c
+++ b/test/hotspot/jtreg/serviceability/jvmti/FieldAccessWatch/libFieldAccessWatch.c
@@ -35,7 +35,6 @@ extern "C" {
 static jvmtiEnv *jvmti = NULL;
 
 // valid while a test is executed
-static JNIEnv *javaEnv = NULL;
 static jobject testResultObject = NULL;
 static jclass testResultClass = NULL;
 
@@ -46,7 +45,8 @@ static void reportError(const char *msg, int err) {
 
 
 // logs the notification and updates currentTestResult
-static void handleNotification(jmethodID method,
+static void handleNotification(JNIEnv *jni_env,
+    jmethodID method,
     jfieldID field,
     jclass field_klass,
     int modified,
@@ -92,21 +92,21 @@ static void handleNotification(jmethodID method,
         csig, mname, mgensig, modified ? "modified" : "accessed", name, (int)location);
 
     // set TestResult
-    if (javaEnv != NULL && testResultObject != NULL && testResultClass != NULL) {
+    if (testResultObject != NULL && testResultClass != NULL) {
         jfieldID fieldID;
         // field names in TestResult are "<field_name>_access"/"<field_name>_modify"
         char *fieldName = (char *)malloc(strlen(name) + 16);
         strcpy(fieldName, name);
         strcat(fieldName, modified ? "_modify" : "_access");
 
-        fieldID = (*javaEnv)->GetFieldID(javaEnv, testResultClass, fieldName, "Z");
+        fieldID = (*jni_env)->GetFieldID(jni_env, testResultClass, fieldName, "Z");
         if (fieldID != NULL) {
-            (*javaEnv)->SetBooleanField(javaEnv, testResultObject, fieldID, JNI_TRUE);
+            (*jni_env)->SetBooleanField(jni_env, testResultObject, fieldID, JNI_TRUE);
         } else {
             // the field is not interesting for the test
         }
         // clear any possible exception
-        (*javaEnv)->ExceptionClear(javaEnv);
+        (*jni_env)->ExceptionClear(jni_env);
 
         free(fieldName);
     }
@@ -179,7 +179,7 @@ onFieldAccess(jvmtiEnv *jvmti_env,
             jobject object,
             jfieldID field)
 {
-    handleNotification(method, field, field_klass, 0, location);
+    handleNotification(jni_env, method, field, field_klass, 0, location);
 }
 
 
@@ -195,7 +195,7 @@ onFieldModification(jvmtiEnv *jvmti_env,
             char signature_type,
             jvalue new_value)
 {
-    handleNotification(method, field, field_klass, 1, location);
+    handleNotification(jni_env, method, field, field_klass, 1, location);
 
     if (signature_type == 'L') {
         jobject newObject = new_value.l;
@@ -282,9 +282,8 @@ Java_FieldAccessWatch_initWatchers(JNIEnv *env, jclass thisClass, jclass cls, jo
 JNIEXPORT jboolean JNICALL
 Java_FieldAccessWatch_startTest(JNIEnv *env, jclass thisClass, jobject testResults)
 {
-    javaEnv = env;
-    testResultObject = (*javaEnv)->NewGlobalRef(javaEnv, testResults);
-    testResultClass = (jclass)(*javaEnv)->NewGlobalRef(javaEnv, (*javaEnv)->GetObjectClass(javaEnv, testResultObject));
+    testResultObject = (*env)->NewGlobalRef(env, testResults);
+    testResultClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, testResultObject));
 
     return JNI_TRUE;
 }

From 1fb771245a683fefb54b5cb7fdfbd532a8008ea0 Mon Sep 17 00:00:00 2001
From: mli <unknown>
Date: Wed, 11 Apr 2018 09:08:43 +0800
Subject: [PATCH 130/196] 8188897: java/rmi/registry/reexport/Reexport.java
 failed with Port already in use Reviewed-by: rriggs, darcy

---
 .../java/rmi/registry/reexport/Reexport.java  | 114 +++++++-----------
 1 file changed, 41 insertions(+), 73 deletions(-)

diff --git a/test/jdk/java/rmi/registry/reexport/Reexport.java b/test/jdk/java/rmi/registry/reexport/Reexport.java
index 47320afaf48..760baf6ac45 100644
--- a/test/jdk/java/rmi/registry/reexport/Reexport.java
+++ b/test/jdk/java/rmi/registry/reexport/Reexport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -29,79 +29,70 @@
  *          java.rmi/sun.rmi.server
  *          java.rmi/sun.rmi.transport
  *          java.rmi/sun.rmi.transport.tcp
- * @build TestLibrary RegistryVM RegistryRunner
+ * @build TestLibrary
  * @run main/othervm Reexport
  */
 
 /*
- * If a VM could not create an RMI registry because another registry
- * usually in another process, was using the registry port, the next
+ * If a VM could not create an RMI registry because the registry port
+ * was already occupied by this or other processes, the next
  * time the VM tried to create a registry (after the other registry
  * was brought down) the attempt would fail.  The second try to create
  * a registry would fail because the registry ObjID would still be in
  * use when it should never have been allocated.
  *
- * The test creates this conflict using Runtime.exec and ensures that
- * a registry can still be created after the conflict is resolved.
+ * The test creates this conflict starting a dummy tcp server and ensures
+ * that a registry can still be created after the conflict is resolved.
  */
 
-import java.io.*;
-import java.rmi.*;
-import java.rmi.registry.*;
-import java.rmi.server.*;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.channels.ServerSocketChannel;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
 
 public class Reexport {
-    static public void main(String[] argv) {
-
-        Registry reg = null;
-        try {
-            System.err.println("\nregression test for 4120329\n");
-
-            // establish the registry (we hope)
-            makeRegistry();
-
-            // Get a handle to the registry
-            System.err.println("Creating duplicate registry, this should fail...");
-            reg = createReg(true);
-
-            // Kill the first registry.
-            System.err.println("Bringing down the first registry");
-            try {
-                killRegistry();
-            } catch (Exception foo) {
+    static public void main(String[] argv) throws IOException {
+
+        for (int loop = 0; loop < 10; loop++) {
+            System.err.println("\nat loop: " + loop);
+            int port = -1;
+            try (ServerSocketChannel server = ServerSocketChannel.open();) {
+                server.bind(null);
+                InetSocketAddress addr = (InetSocketAddress)server.getLocalAddress();
+                port = addr.getPort();
+
+                System.err.println("Creating duplicate registry, this should fail...");
+                createReg(port, true);
             }
-
-            // start another registry now that the first is gone; this should work
-            System.err.println("Trying again to start our own " +
-                               "registry... this should work");
-
-            reg = createReg(false);
-
-            if (reg == null) {
-                TestLibrary.bomb("Could not create registry on second try");
+            try {
+                if (createReg(port, false) == null) {
+                    TestLibrary.bomb("Could not create registry on second try");
+                }
+                System.err.println("Test passed");
+                return;
+            } catch (Exception e) {
+                String err = e.getMessage();
+                if (err.contains("Address already in use")
+                        || err.contains("Port already in use")) {
+                    continue;
+                }
+                TestLibrary.bomb(e);
             }
-
-            System.err.println("Test passed");
-
-        } catch (Exception e) {
-            TestLibrary.bomb(e);
-        } finally {
-            // dont leave the registry around to affect other tests.
-            killRegistry();
-            reg = null;
         }
+        TestLibrary.bomb("Test failed");
     }
 
-    static Registry createReg(boolean remoteOk) {
+    static Registry createReg(int port, boolean expectException) {
         Registry reg = null;
 
         try {
             reg = LocateRegistry.createRegistry(port);
-            if (remoteOk) {
-                TestLibrary.bomb("Remote registry is up, an Exception is expected!");
+            if (expectException) {
+                TestLibrary.bomb("Registry is up, an Exception is expected!");
             }
         } catch (Throwable e) {
-            if (remoteOk) {
+            if (expectException) {
                 System.err.println("EXPECTING PORT IN USE EXCEPTION:");
                 System.err.println(e.getMessage());
                 e.printStackTrace();
@@ -111,27 +102,4 @@ static Registry createReg(boolean remoteOk) {
         }
         return reg;
     }
-
-    public static void makeRegistry() {
-        try {
-            subreg = RegistryVM.createRegistryVM();
-            subreg.start();
-            port = subreg.getPort();
-            System.out.println("Starting registry on port " + port);
-        } catch (IOException e) {
-            // one of these is summarily dropped, can't remember which one
-            System.out.println ("Test setup failed - cannot run rmiregistry");
-            TestLibrary.bomb("Test setup failed - cannot run test", e);
-        }
-    }
-
-    private static RegistryVM subreg = null;
-    private static int port = -1;
-
-    public static void killRegistry() {
-        if (subreg != null) {
-            subreg.cleanup();
-            subreg = null;
-        }
-    }
 }

From af23f4eae802c0402b3a951460cfedbebb845049 Mon Sep 17 00:00:00 2001
From: amjiang <unknown>
Date: Tue, 10 Apr 2018 18:16:12 -0700
Subject: [PATCH 131/196] 8190333:
 sun/security/ssl/X509KeyManager/PreferredKey.java failed with "Failed to get
 the preferable key aliases" Reviewed-by: mullan

---
 test/jdk/ProblemList.txt              |   1 -
 test/jdk/javax/net/ssl/etc/README     |  15 +++++++--------
 test/jdk/javax/net/ssl/etc/keystore   | Bin 4038 -> 4080 bytes
 test/jdk/javax/net/ssl/etc/truststore | Bin 2207 -> 2250 bytes
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 94c3610b7b3..3179d3430f6 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -590,7 +590,6 @@ javax/net/ssl/DTLS/RespondToRetransmit.java                     8169086 macosx-x
 
 sun/security/krb5/auto/UnboundSSL.java                          8180265 windows-all
 sun/security/provider/KeyStore/DKSTest.sh                       8180266 windows-all
-sun/security/ssl/X509KeyManager/PreferredKey.java               8190333 generic-all
 
 ############################################################################
 
diff --git a/test/jdk/javax/net/ssl/etc/README b/test/jdk/javax/net/ssl/etc/README
index 0ac6a844a86..119c619992d 100644
--- a/test/jdk/javax/net/ssl/etc/README
+++ b/test/jdk/javax/net/ssl/etc/README
@@ -62,22 +62,21 @@ it can be used for version 1 X.509 certificate) keytool command:
 
 Alias name: dummydsa
 --------------------
-Creation date: Mar 11, 2007
+Creation date: Mar 29, 2018
 Entry type: PrivateKeyEntry
 Certificate chain length: 1
 Certificate[1]:
 Owner: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
 Issuer: CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US
-Serial number: 45f3a314
-Valid from: Sun Mar 11 06:35:00 UTC 2007 until: Wed Mar 08 06:35:00 UTC 2017
-Certificate fingerprints:
-Signature algorithm name: SHA1withDSA
-Version: 1
+Serial number: 324d85f0
+Valid from: Thu Mar 29 16:06:34 PDT 2018 until: Tue Mar 28 16:06:34 PDT 2028
+Signature algorithm name: SHA256withDSA
+Version: 3
 
 This can be generated using hacked (update the keytool source code so that
 it can be used for version 1 X.509 certificate) keytool command:
-% keytool -genkeypair -alias dummy -keyalg DSA -keysize 1024 \
-  -sigalg SHA1withDSA \
+% keytool -genkeypair -alias dummydsa -keyalg DSA -keysize 1024 \
+  -sigalg SHA256withDSA \
   -dname "CN=dummy.example.com, OU=Dummy, O=Dummy, L=Cupertino, ST=CA, C=US" \
   -validity 3652 -keypass passphrase -keystore keystore -storepass passphrase
 
diff --git a/test/jdk/javax/net/ssl/etc/keystore b/test/jdk/javax/net/ssl/etc/keystore
index 4062e1798c56b1bbd8840466fb04c4b6d46dfae6..871a8538e17f1ea6d1009591a236a451bf6df0d6 100644
GIT binary patch
delta 793
zcmV+!1Lpk3AMhWL9e-kU14f7d00ECMf&q&#4h9M<1_1;CDgqG!0R;dAf&q8Q$Ng}i
zZskXCkI^%qM$=U+J^v_7%#85&Fm<L|yH~DG13QVKx_2RVrUju_cmz5St<I7*t8bWf
zit<1R>*FF|0qfMuiFwl}WDL!V0KReS#-A^|h<>Akco?ka%ztm(7jaN#jXUEY8`H(x
z<prPQRt6A35z!By-#^EKENVopwWXPW=36eQms2l#=VBM}e%#8?OfNCycQPI<k63Yr
zDo1`)o`-fE0AA2_jc9=!tX<k1|5vtmxr2^(tn)|2d!8{b{45NYJ_e@kB)7L<cH=KK
z#{RT+72NHjvVUzM!sgLP3EO*8MlQE(P?34-MW6H=VW`!4(d>t)5tt#`=kl${A}uny
zaN;mDGIqI<Xb7AWTX>q_F<@k1<<mV&3Ea{kMGl`>QEAO<vPln^wl3+Z`i}kv(-^AV
z+jYQyo;u0G3U0QDuJjt_ED>WM880k9Fh-L}(*OpP-AX?dD0~+7$AO!4zPd0k?Oi)b
z$UOT)Ykp9jmjD0&0RRP9E;TSY0009xFoFX#FoFW`paTK{0s;gwO@;6<4F(BdhDZTr
z0|WyClimSx95FaBGcq|cGcYzYG+Gx8GB_|ZGB`3bFg7zZT9e=bZ3BV<x3k;=G68>t
z00M!44dq(-Wa5MUs$oa=O|skg{Qi9^v_IC9%X}iWaB9K#4q+8a@l^Y)#2;|f(<|Qy
z3`i#FFS-#lJ{K_AOEU3|d;-)SZ^j|^VxKjTQWq_%Fr7>zw;sIvfN~O9{{~Fv%2Q&^
znrJdtvuuhTDq?LdhzkVy`*mDK#GQZ6YUhe7*rOpZA21yT163Uk1QrAo+;Tgtk#iE6
z+hfB}WZT+C&1S2SFbxI?V1`HmWdj5Q0tEmAF90ws0u(TY6CxDS`M1rkN6}(abjWXl
z^|=BRFMub)@M#AqbVrBbtZb~}`|I_g00001019MvZEbmFV`Ot-00040xf!$Q1j-5&
X3vDLCThoG?Ay7iq;_1sVuLmi7fH6-#

delta 732
zcmV<20wewKAI2Y$9e)u&wF!m*00EFNf&q*$4h9M<1_1;CDgqG!0R;dAf&qA-tW}Xr
zd&Hw<y3N`i8m#f&O*2;VRcS0MDR|R3Nnns&l$dgXxs<zDTY1_F(@b)hL{lcBQGneR
zRYd?_XY3>~Lf@o`c|*G#l=UY%DfXM?eS6~05w{C4BoneBrGL4pz2m234x<gM;9`-A
zHODa-C%TM!zZ9%s1R4hwprCJ#mt$u?R9X1`F&>d)H9V03Bx-}%XQ-;lm3VgTr+BTz
zsP=ee+l($vH2&taQ%*Hb+o-p3W)K}q#6>TT@fF)E4`dEj-kFLTegQ;R1vYTvO+X&z
zCp?{-bXU%v2Y<B=%zkB2Qn--AMb602ah^lN0rfu?evhv^1lK}c1Ue22@7~E6bG+{A
z4#01}3T<5CBmuzwLiRTich(M&U(~np|0FY2`I2_=B6leFp{{ozjgUZ^yUqU?8fE(y
zb1TG7V577acW1qhCbQM2I=AP+yG^R>xx*Z-@Rpmaz(&CZS~z@iZ{{{AJdK%o(61MB
z@S(W|{8y7{gH!+j00966SS~d%IRF3y4KRWO2{3{J#{vXJ^P?0n3kC-&hDgph1Oo*C
zlf4BPll}o%8!$I8GchqRHZwIaFj^N4F*h(XFgP$aGc_<UlW_uY0l2f`0x|)Ag#ZG9
zfdJxL+(!tjM@C%F%G^WuNshRfWIH{u=tho+Ae`5k9(=0^gnB(f8G-*`|5l?)js9fL
zApFi$=De`OGAX-lBQybP0vJ%A{gz^nFjASURbU;@_B1UVAfNb=1Q5ux(pbfQ<leFr
zMi!LiB1@L6bW&(Ao&74o4>Alz1wCCnnM}$s3kC-&hDgph1Oo*C11|tDECLj5PlHka
z3BO<9lh2PqsNkk$b3~8=6d+U_l<^+TtEV*pt_X$8v9)e1g0uVt;0hFZnrnox--E6K
O{Pu%=NzVao`3u?*A2xdc

diff --git a/test/jdk/javax/net/ssl/etc/truststore b/test/jdk/javax/net/ssl/etc/truststore
index 12da39e66a5d19aefdaa23c0810aa2dcb673c381..b2d1cc0adb0bcb59410d628a286ab01b65085138 100644
GIT binary patch
delta 381
zcmbO)cuH`BtU*$V;B`3$)(AaQ14{-5W($KRW)p)ZrVk64nHZUvSd4sIKN#?`aVE5R
zFs3rIFf&bbE0Qs^FfcZ<G%_|YGd775=QRRxEuh?q9=Xg-jN3Q6Fd8w|w=gg@Ht;@;
z`kC^m`R}Sk_iw(NZvXi6uU2b|{k6%bYm~MYWF7p@mniD>G357}Bk~1TE^FWC;PFs<
zslQ9m#7^Acrnk|@-WsMWa{0#;za`B#oe(6hyUJj$kMef8J--`@gd+d5`8+!noOE_p
zhEe$DoGw|dq+Hz&ZkC_FOJm%Q%&k9{^}I{##$rVSc>`HC=1^Ha7BLo)J4M!OCKe0L
zyq$bFAm#Qgx3g)hC!%<fm4R8G!9a&e#Gp-BN#xSc?Pu4yUrY)vIg#J=btjXEeuMg<
z51H&5CGPDH*W|2u^!xSKg$xV~OblEprMbD4smUqDi3|*kAv@(Z2QXW+icCvZuIqZW
T;;i!Cg(e@DADXky{OJM!&DD`V

delta 325
zcmX>lIA3srthS*2R?WE#tPy&q29^vA%)ACo%$x>IOvjm6Tt6=sG2mun*J|@PXTieE
z$}m}gO=4ntgtURVfw7^Xftj(XfkBiwuOX0YU;*Jy=4X?fm>$a9#JFR#H=_|_eJcY~
zV<W?(=sWHltKHpV&Y!yD{N1x}$BYzf+YK+=`Z^TmT%Rddvznu&%GOD;@qfbqu*F`z
z|5DB={5co$Y|n<nMw+{Gl}#A4nIr<{|DBf9ZxA$dO=yDb`EMq=G79s5Ok@!_vH4QO
z(Yh!1Hi@{2O?j&1J#9@%P=>+Wzgh?Rjd)yHZDVa_`kX@X2eUqdfew>Mu77jjf6o2!
z4<?`QcU<vcS!%J%1SS!M5Sb|-<<72NZpyHZqxJO0t$Er_n^TzsSw)UD?!Tch=`-^N
QCZ&kI6IN|Gd3v2U0JS`M-T(jq


From 2c610ca3eac7a976ef27abbf7e494413dc0b93f9 Mon Sep 17 00:00:00 2001
From: xiaofeya <unknown>
Date: Tue, 10 Apr 2018 20:04:32 -0700
Subject: [PATCH 132/196] 8201348: ProblemList update for bugid associated with
 SSLSocketParametersTest.sh Reviewed-by: lancea

---
 test/jdk/ProblemList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 3179d3430f6..79677fae85b 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -777,7 +777,7 @@ com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java                   8169942 linux-i5
 
 com/sun/jndi/ldap/LdapTimeoutTest.java                          8151678 linux-all
 
-javax/rmi/ssl/SSLSocketParametersTest.sh                        8194663 generic-all
+javax/rmi/ssl/SSLSocketParametersTest.sh                        8162906 generic-all
 
 ############################################################################
 

From 337abbd6d6d907846b9ed9c7cfe4ef62613ce2be Mon Sep 17 00:00:00 2001
From: clanger <unknown>
Date: Wed, 11 Apr 2018 09:47:41 +0200
Subject: [PATCH 133/196] 8201247: Various cleanups in the attach framework
 Reviewed-by: goetz, cjplummer

---
 .../sun/tools/attach/VirtualMachineImpl.java  |  10 +-
 .../aix/native/libattach/VirtualMachineImpl.c |  67 ++------
 .../sun/tools/attach/VirtualMachineImpl.java  |   8 +-
 .../native/libattach/VirtualMachineImpl.c     | 146 ++----------------
 .../sun/tools/attach/VirtualMachineImpl.java  |   5 +-
 .../native/libattach/VirtualMachineImpl.c     |  35 ++---
 .../sun/tools/attach/VirtualMachineImpl.java  |   4 +-
 .../native/libattach/VirtualMachineImpl.c     |  29 ++--
 .../native/libattach/VirtualMachineImpl.c     |  17 +-
 9 files changed, 80 insertions(+), 241 deletions(-)

diff --git a/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
index d860048cd16..aba13752d80 100644
--- a/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, SAP SE. 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
@@ -34,8 +34,6 @@
 import java.io.IOException;
 import java.io.File;
 
-// Based on linux/classes/sun/tools/attach/VirtualMachineImpl.java.
-
 /*
  * Aix implementation of HotSpotVirtualMachine
  */
@@ -140,7 +138,7 @@ public void detach() throws IOException {
      * Execute the given command in the target VM.
      */
     InputStream execute(String cmd, Object ... args) throws AgentLoadException, IOException {
-        assert args.length <= 3;            // includes null
+        assert args.length <= 3;                // includes null
 
         // did we detach?
         synchronized (this) {
@@ -261,7 +259,7 @@ public void close() throws IOException {
         }
     }
 
-    // On Solaris/Linux/Aix a simple handshake is used to start the attach mechanism
+    // On Aix a simple handshake is used to start the attach mechanism
     // if not already started. The client creates a .attach_pid<pid> file in the
     // target VM's working directory (or temp directory), and the SIGQUIT handler
     // checks for the file.
diff --git a/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c
index 6acecf96e9b..705ec9a06ed 100644
--- a/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, SAP SE. 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
@@ -24,27 +24,18 @@
  * questions.
  */
 
-#include "jni.h"
 #include "jni_util.h"
-#include "jvm.h"
 
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h>
-#include <signal.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/un.h>
-
-/*
- * Based on 'LinuxVirtualMachine.c'. Non-relevant code has been removed and all
- * occurrences of the string "Linux" have been replaced by "Aix".
- */
 
 #include "sun_tools_attach_VirtualMachineImpl.h"
 
@@ -67,15 +58,6 @@ JNIEXPORT jint JNICALL Java_sun_tools_attach_VirtualMachineImpl_socket
     if (fd == -1) {
         JNU_ThrowIOExceptionWithLastError(env, "socket");
     }
-    /* added time out values */
-    else {
-        struct timeval tv;
-        tv.tv_sec = 2 * 60;
-        tv.tv_usec = 0;
-
-        setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char*)&tv, sizeof(tv));
-        setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char*)&tv, sizeof(tv));
-    }
     return (jint)fd;
 }
 
@@ -125,23 +107,6 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_connect
     }
 }
 
-
-/*
- * Structure and callback function used to send a QUIT signal to all
- * children of a given process
- */
-typedef struct {
-    pid_t ppid;
-} SendQuitContext;
-
-static void SendQuitCallback(const pid_t pid, void* user_data) {
-    SendQuitContext* context = (SendQuitContext*)user_data;
-    pid_t parent = getParent(pid);
-    if (parent == context->ppid) {
-        kill(pid, SIGQUIT);
-    }
-}
-
 /*
  * Class:     sun_tools_attach_VirtualMachineImpl
  * Method:    sendQuitTo
@@ -169,7 +134,7 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
         struct stat64 sb;
         uid_t uid, gid;
         int res;
-        /* added missing initialization of the stat64 buffer */
+
         memset(&sb, 0, sizeof(struct stat64));
 
         /*
@@ -189,21 +154,21 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
             char msg[100];
             jboolean isError = JNI_FALSE;
             if (sb.st_uid != uid) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
                 isError = JNI_TRUE;
             } else if (sb.st_gid != gid) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
                 isError = JNI_TRUE;
             } else if ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file should only be readable and writable by the owner but has 0%03o access", sb.st_mode & 0777);
                 isError = JNI_TRUE;
             }
             if (isError) {
                 char buf[256];
-                jio_snprintf(buf, sizeof(buf)-1, "well-known file %s is not secure: %s", p, msg);
+                snprintf(buf, sizeof(buf), "well-known file %s is not secure: %s", p, msg);
                 JNU_ThrowIOException(env, buf);
             }
         } else {
@@ -229,11 +194,7 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_close
   (JNIEnv *env, jclass cls, jint fd)
 {
     int res;
-    /* Fixed deadlock when this call of close by the client is not seen by the attach server
-     * which has accepted the (very short) connection already and is waiting for the request. But read don't get a byte,
-     * because the close is lost without shutdown.
-     */
-    shutdown(fd, 2);
+    shutdown(fd, SHUT_RDWR);
     RESTARTABLE(close(fd), res);
 }
 
diff --git a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
index 5579d108fab..fa5ad22b5b9 100644
--- a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -105,7 +105,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
             } finally {
                 f.delete();
             }
-      }
+        }
 
         // Check that the file owner/permission to avoid attaching to
         // bogus process
@@ -274,7 +274,7 @@ private File findSocketFile(int pid, int ns_pid) {
         return new File(root, ".java_pid" + ns_pid);
     }
 
-    // On Solaris/Linux a simple handshake is used to start the attach mechanism
+    // On Linux a simple handshake is used to start the attach mechanism
     // if not already started. The client creates a .attach_pid<pid> file in the
     // target VM's working directory (or temp directory), and the SIGQUIT handler
     // checks for the file.
@@ -356,8 +356,6 @@ private int getNamespacePid(int pid) throws AttachNotSupportedException, IOExcep
 
     //-- native methods
 
-    static native void sendQuitToChildrenOf(int pid) throws IOException;
-
     static native void sendQuitTo(int pid) throws IOException;
 
     static native void checkPermissions(String path) throws IOException;
diff --git a/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c
index 85d355a1e6a..a6cdf0a67ea 100644
--- a/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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,23 +23,18 @@
  * questions.
  */
 
-#include "jni.h"
 #include "jni_util.h"
-#include "jvm.h"
 
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h>
-#include <signal.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/un.h>
 
 #include "sun_tools_attach_VirtualMachineImpl.h"
 
@@ -54,85 +49,6 @@
  */
 DEF_STATIC_JNI_OnLoad
 
-/*
- * Defines a callback that is invoked for each process
- */
-typedef void (*ProcessCallback)(const pid_t pid, void* user_data);
-
-/*
- * Invokes the callback function for each process
- */
-static void forEachProcess(ProcessCallback f, void* user_data) {
-    DIR* dir;
-    struct dirent* ptr;
-
-    /*
-     * To locate the children we scan /proc looking for files that have a
-     * position integer as a filename.
-     */
-    if ((dir = opendir("/proc")) == NULL) {
-        return;
-    }
-    while ((ptr = readdir(dir)) != NULL) {
-        pid_t pid;
-
-        /* skip current/parent directories */
-        if (strcmp(ptr->d_name, ".") == 0 || strcmp(ptr->d_name, "..") == 0) {
-            continue;
-        }
-
-        /* skip files that aren't numbers */
-        pid = (pid_t)atoi(ptr->d_name);
-        if ((int)pid <= 0) {
-            continue;
-        }
-
-        /* invoke the callback */
-        (*f)(pid, user_data);
-    }
-    closedir(dir);
-}
-
-
-/*
- * Returns the parent pid of a given pid, or -1 if not found
- */
-static pid_t getParent(pid_t pid) {
-    char state;
-    FILE* fp;
-    char stat[2048];
-    int statlen;
-    char fn[32];
-    int i, p;
-    char* s;
-
-    /*
-     * try to open /proc/%d/stat
-     */
-    sprintf(fn, "/proc/%d/stat", pid);
-    fp = fopen(fn, "r");
-    if (fp == NULL) {
-        return -1;
-    }
-
-    /*
-     * The format is: pid (command) state ppid ...
-     * As the command could be anything we must find the right most
-     * ")" and then skip the white spaces that follow it.
-     */
-    statlen = fread(stat, 1, 2047, fp);
-    stat[statlen] = '\0';
-    fclose(fp);
-    s = strrchr(stat, ')');
-    if (s == NULL) {
-        return -1;
-    }
-    do s++; while (isspace(*s));
-    i = sscanf(s, "%c %d", &state, &p);
-    return (pid_t)p;
-}
-
-
 /*
  * Class:     sun_tools_attach_VirtualMachineImpl
  * Method:    socket
@@ -194,39 +110,6 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_connect
     }
 }
 
-/*
- * Structure and callback function used to send a QUIT signal to all
- * children of a given process
- */
-typedef struct {
-    pid_t ppid;
-} SendQuitContext;
-
-static void SendQuitCallback(const pid_t pid, void* user_data) {
-    SendQuitContext* context = (SendQuitContext*)user_data;
-    pid_t parent = getParent(pid);
-    if (parent == context->ppid) {
-        kill(pid, SIGQUIT);
-    }
-}
-
-/*
- * Class:     sun_tools_attach_VirtualMachineImpl
- * Method:    sendQuitToChildrenOf
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_sendQuitToChildrenOf
-  (JNIEnv *env, jclass cls, jint pid)
-{
-    SendQuitContext context;
-    context.ppid = (pid_t)pid;
-
-    /*
-     * Iterate over all children of 'pid' and send a QUIT signal to each.
-     */
-    forEachProcess(SendQuitCallback, (void*)&context);
-}
-
 /*
  * Class:     sun_tools_attach_VirtualMachineImpl
  * Method:    sendQuitTo
@@ -255,6 +138,8 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
         uid_t uid, gid;
         int res;
 
+        memset(&sb, 0, sizeof(struct stat64));
+
         /*
          * Check that the path is owned by the effective uid/gid of this
          * process. Also check that group/other access is not allowed.
@@ -272,21 +157,21 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
             char msg[100];
             jboolean isError = JNI_FALSE;
             if (sb.st_uid != uid) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
                 isError = JNI_TRUE;
             } else if (sb.st_gid != gid) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
                 isError = JNI_TRUE;
             } else if ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file should only be readable and writable by the owner but has 0%03o access", sb.st_mode & 0777);
                 isError = JNI_TRUE;
             }
             if (isError) {
                 char buf[256];
-                jio_snprintf(buf, sizeof(buf)-1, "well-known file %s is not secure: %s", p, msg);
+                snprintf(buf, sizeof(buf), "well-known file %s is not secure: %s", p, msg);
                 JNU_ThrowIOException(env, buf);
             }
         } else {
@@ -312,6 +197,7 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_close
   (JNIEnv *env, jclass cls, jint fd)
 {
     int res;
+    shutdown(fd, SHUT_RDWR);
     RESTARTABLE(close(fd), res);
 }
 
@@ -366,8 +252,8 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_write
 
         RESTARTABLE(write(fd, buf, len), n);
         if (n > 0) {
-           off += n;
-           remaining -= n;
+            off += n;
+            remaining -= n;
         } else {
             JNU_ThrowIOExceptionWithLastError(env, "write");
             return;
diff --git a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
index 5d866f57c43..0ca39214e4d 100644
--- a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -281,8 +281,7 @@ private void writeString(int fd, String s) throws IOException {
     }
 
     private File createAttachFile(int pid) throws IOException {
-        String fn = ".attach_pid" + pid;
-        File f = new File(tmpdir, fn);
+        File f = new File(tmpdir, ".attach_pid" + pid);
         createAttachFile0(f.getPath());
         return f;
     }
diff --git a/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
index 42c4a256601..02a214691b0 100644
--- a/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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,24 +23,20 @@
  * questions.
  */
 
-#include "jni.h"
 #include "jni_util.h"
-#include "jvm.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/syslimits.h>
+#include <sys/types.h>
 #include <sys/un.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "sun_tools_attach_VirtualMachineImpl.h"
 
@@ -144,6 +140,8 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
         uid_t uid, gid;
         int res;
 
+        memset(&sb, 0, sizeof(struct stat));
+
         /*
          * Check that the path is owned by the effective uid/gid of this
          * process. Also check that group/other access is not allowed.
@@ -161,21 +159,21 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
             char msg[100];
             jboolean isError = JNI_FALSE;
             if (sb.st_uid != uid) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
                 isError = JNI_TRUE;
             } else if (sb.st_gid != gid) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
                 isError = JNI_TRUE;
             } else if ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file should only be readable and writable by the owner but has 0%03o access", sb.st_mode & 0777);
                 isError = JNI_TRUE;
             }
             if (isError) {
                 char buf[256];
-                jio_snprintf(buf, sizeof(buf)-1, "well-known file %s is not secure: %s", p, msg);
+                snprintf(buf, sizeof(buf), "well-known file %s is not secure: %s", p, msg);
                 JNU_ThrowIOException(env, buf);
             }
         } else {
@@ -201,6 +199,7 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_close
   (JNIEnv *env, jclass cls, jint fd)
 {
     int res;
+    shutdown(fd, SHUT_RDWR);
     RESTARTABLE(close(fd), res);
 }
 
@@ -255,8 +254,8 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_write
 
         RESTARTABLE(write(fd, buf, len), n);
         if (n > 0) {
-           off += n;
-           remaining -= n;
+            off += n;
+            remaining -= n;
         } else {
             JNU_ThrowIOExceptionWithLastError(env, "write");
             return;
diff --git a/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java
index bd76097f079..62ebf4c8585 100644
--- a/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -225,7 +225,7 @@ private int openDoor(int pid) throws IOException {
         return fd;
     }
 
-    // On Solaris/Linux a simple handshake is used to start the attach mechanism
+    // On Solaris a simple handshake is used to start the attach mechanism
     // if not already started. The client creates a .attach_pid<pid> file in the
     // target VM's working directory (or temporary directory), and the SIGQUIT
     // handler checks for the file.
diff --git a/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
index f72bdeb3833..67164a517bd 100644
--- a/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
@@ -22,20 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#include <sys/types.h>
+
+#include "jni_util.h"
+
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <door.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-#include <string.h>
-#include <fcntl.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <limits.h>
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "sun_tools_attach_VirtualMachineImpl.h"
 
@@ -105,6 +104,8 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
         uid_t uid, gid;
         int res;
 
+        memset(&sb, 0, sizeof(struct stat64));
+
         /*
          * Check that the path is owned by the effective uid/gid of this
          * process. Also check that group/other access is not allowed.
@@ -122,21 +123,21 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
             char msg[100];
             jboolean isError = JNI_FALSE;
             if (sb.st_uid != uid) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
                 isError = JNI_TRUE;
             } else if (sb.st_gid != gid) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
                 isError = JNI_TRUE;
             } else if ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) {
-                jio_snprintf(msg, sizeof(msg)-1,
+                snprintf(msg, sizeof(msg),
                     "file should only be readable and writable by the owner but has 0%03o access", sb.st_mode & 0777);
                 isError = JNI_TRUE;
             }
             if (isError) {
                 char buf[256];
-                jio_snprintf(buf, sizeof(buf)-1, "well-known file %s is not secure: %s", p, msg);
+                snprintf(buf, sizeof(buf), "well-known file %s is not secure: %s", p, msg);
                 JNU_ThrowIOException(env, buf);
             }
         } else {
diff --git a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
index d7bdcc12fcb..ea89e42f8b5 100644
--- a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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,16 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
+#include "jni_util.h"
+
 #include <windows.h>
 #include <Sddl.h>
 #include <string.h>
 
-#include "jni.h"
-#include "jni_util.h"
-
 #include "sun_tools_attach_VirtualMachineImpl.h"
 
-
 /* kernel32 */
 typedef HINSTANCE (WINAPI* GetModuleHandleFunc) (LPCTSTR);
 typedef FARPROC (WINAPI* GetProcAddressFunc)(HMODULE, LPCSTR);
@@ -303,9 +302,7 @@ JNIEXPORT jlong JNICALL Java_sun_tools_attach_VirtualMachineImpl_createPipe
     LocalFree(sa.lpSecurityDescriptor);
 
     if (hPipe == INVALID_HANDLE_VALUE) {
-        char msg[256];
-        _snprintf(msg, sizeof(msg), "CreateNamedPipe failed: %d", GetLastError());
-        JNU_ThrowIOExceptionWithLastError(env, msg);
+        JNU_ThrowIOExceptionWithLastError(env, "CreateNamedPipe failed");
     }
     return (jlong)hPipe;
 }
@@ -318,7 +315,7 @@ JNIEXPORT jlong JNICALL Java_sun_tools_attach_VirtualMachineImpl_createPipe
 JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_closePipe
   (JNIEnv *env, jclass cls, jlong hPipe)
 {
-    CloseHandle( (HANDLE)hPipe );
+    CloseHandle((HANDLE)hPipe);
 }
 
 /*
@@ -430,7 +427,7 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
             if ((*env)->ExceptionOccurred(env)) return;
         }
     }
-    for (i=argsLen; i<MAX_ARGS; i++) {
+    for (i = argsLen; i < MAX_ARGS; i++) {
         data.arg[i][0] = '\0';
     }
 

From 6a6f7b0d16089201cfeb9d0ae1381589881883f4 Mon Sep 17 00:00:00 2001
From: michaelm <unknown>
Date: Wed, 11 Apr 2018 10:19:37 +0100
Subject: [PATCH 134/196] 8196775: java/net/Socket/asyncClose/Race.java failed
 intermittently on Windows with ConnectException: Connection refused
 Reviewed-by: dfuchs

---
 test/jdk/java/net/Socket/asyncClose/Race.java | 57 ++++++++++---------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/test/jdk/java/net/Socket/asyncClose/Race.java b/test/jdk/java/net/Socket/asyncClose/Race.java
index 5a9585682f1..3a7b7affeec 100644
--- a/test/jdk/java/net/Socket/asyncClose/Race.java
+++ b/test/jdk/java/net/Socket/asyncClose/Race.java
@@ -30,6 +30,7 @@
 import java.io.InputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.ConnectException;
 import java.net.SocketException;
 import java.util.concurrent.Phaser;
 
@@ -43,33 +44,37 @@ public static void main(String[] args) throws Exception {
             final int port = ss.getLocalPort();
             final Phaser phaser = new Phaser(THREADS + 1);
             for (int i=0; i<100; i++) {
-                final Socket s = new Socket("localhost", port);
-                s.setSoLinger(false, 0);
-                try (Socket sa = ss.accept()) {
-                    sa.setSoLinger(false, 0);
-                    final InputStream is = s.getInputStream();
-                    Thread[] threads = new Thread[THREADS];
-                    for (int j=0; j<THREADS; j++) {
-                        threads[j] = new Thread() {
-                        public void run() {
-                            try {
-                                phaser.arriveAndAwaitAdvance();
-                                while (is.read() != -1)
-                                    Thread.sleep(50);
-                            } catch (Exception x) {
-                                if (!(x instanceof SocketException
-                                      && x.getMessage().equalsIgnoreCase("socket closed")))
-                                    x.printStackTrace();
-                                // ok, expect Socket closed
-                            }
-                        }};
+                try {
+                    final Socket s = new Socket("localhost", port);
+                    s.setSoLinger(false, 0);
+                    try (Socket sa = ss.accept()) {
+                        sa.setSoLinger(false, 0);
+                        final InputStream is = s.getInputStream();
+                        Thread[] threads = new Thread[THREADS];
+                        for (int j=0; j<THREADS; j++) {
+                            threads[j] = new Thread() {
+                            public void run() {
+                                try {
+                                    phaser.arriveAndAwaitAdvance();
+                                    while (is.read() != -1)
+                                        Thread.sleep(50);
+                                } catch (Exception x) {
+                                    if (!(x instanceof SocketException
+                                          && x.getMessage().equalsIgnoreCase("socket closed")))
+                                        x.printStackTrace();
+                                    // ok, expect Socket closed
+                                }
+                            }};
+                        }
+                        for (int j=0; j<100; j++)
+                            threads[j].start();
+                        phaser.arriveAndAwaitAdvance();
+                        s.close();
+                        for (int j=0; j<100; j++)
+                            threads[j].join();
                     }
-                    for (int j=0; j<100; j++)
-                        threads[j].start();
-                    phaser.arriveAndAwaitAdvance();
-                    s.close();
-                    for (int j=0; j<100; j++)
-                        threads[j].join();
+                } catch (ConnectException e) {
+                    System.err.println("Exception " + e + " Port: " + port);
                 }
             }
         }

From 647d8bb333d907de700a85081e5fcd8e5c2450c4 Mon Sep 17 00:00:00 2001
From: eosterlund <unknown>
Date: Wed, 11 Apr 2018 16:07:42 +0200
Subject: [PATCH 135/196] 8199417: Modularize interpreter GC barriers
 Reviewed-by: coleenp, rkennke

---
 make/hotspot/lib/JvmOverrideFiles.gmk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
index 96260e765ef..3f98d85176b 100644
--- a/make/hotspot/lib/JvmOverrideFiles.gmk
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk
@@ -34,6 +34,7 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
   BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
   BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
   BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
+  BUILD_LIBJVM_cardTableBarrierSetAssembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
   BUILD_LIBJVM_interp_masm_x86.cpp_CXXFLAGS := -Wno-uninitialized
 endif
 

From 8e3b2d84f2a7cc7bb920213d24312fea1f107769 Mon Sep 17 00:00:00 2001
From: goetz <unknown>
Date: Wed, 11 Apr 2018 14:49:06 +0200
Subject: [PATCH 136/196] 8201430: [TESTBUG] Remove script from runtime/6626217
 Reviewed-by: dholmes, mdoerr

---
 test/hotspot/jtreg/TEST.groups                |   2 +-
 .../jtreg/runtime/6626217/Loader2.java        |   4 +-
 .../jtreg/runtime/6626217/Test6626217.sh      |  75 ----------
 .../jtreg/runtime/6626217/bug_21227.java      | 130 ++++++++++--------
 .../many_loader.java}                         |  28 ++--
 ...many_loader1.java.foo => many_loader.java} |  36 ++---
 6 files changed, 111 insertions(+), 164 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/6626217/Test6626217.sh
 rename test/hotspot/jtreg/runtime/6626217/{many_loader2.java.foo => impl2/many_loader.java} (61%)
 rename test/hotspot/jtreg/runtime/6626217/{many_loader1.java.foo => many_loader.java} (51%)

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index 666ad5f9751..9406782a18a 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -177,7 +177,7 @@ tier1_gc_gcbasher = \
 
 tier1_runtime = \
   runtime/ \
- -runtime/6626217/Test6626217.sh \
+ -runtime/6626217/bug_21227.java \
  -runtime/7100935 \
  -runtime/7158988/FieldMonitor.java \
  -runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java \
diff --git a/test/hotspot/jtreg/runtime/6626217/Loader2.java b/test/hotspot/jtreg/runtime/6626217/Loader2.java
index 66ba84933ae..a759923575b 100644
--- a/test/hotspot/jtreg/runtime/6626217/Loader2.java
+++ b/test/hotspot/jtreg/runtime/6626217/Loader2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -36,7 +36,7 @@ protected Class findClass2(String name) throws ClassNotFoundException {
     print("Fetching the implementation of "+name);
     int old = _recur;
     try {
-      FileInputStream fi = new FileInputStream(name+".impl2");
+      FileInputStream fi = new FileInputStream(name+".class");
       byte result[] = new byte[fi.available()];
       fi.read(result);
 
diff --git a/test/hotspot/jtreg/runtime/6626217/Test6626217.sh b/test/hotspot/jtreg/runtime/6626217/Test6626217.sh
deleted file mode 100644
index a697191293a..00000000000
--- a/test/hotspot/jtreg/runtime/6626217/Test6626217.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-# 
-#  Copyright (c) 1998, 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 @(#)Test6626217.sh
-# @bug 6626217
-# @summary Loader-constraint table allows arrays instead of only the base-classes
-# @run shell Test6626217.sh
-#
-## some tests require path to find test source dir
-if [ "${TESTSRC}" = "" ]
-then
-  TESTSRC=${PWD}
-  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
-fi
-echo "TESTSRC=${TESTSRC}"
-## Adding common setup Variables for running shell tests.
-. ${TESTSRC}/../../test_env.sh
-
-JAVA=${TESTJAVA}${FS}bin${FS}java
-JAVAC=${COMPILEJAVA}${FS}bin${FS}javac
-
-# Current directory is scratch directory, copy all the test source there
-# (for the subsequent moves to work).
-${CP} ${TESTSRC}${FS}* ${THIS_DIR}
-
-# A Clean Compile: this line will probably fail within jtreg as have a clean dir:
-${RM} -f *.class *.impl many_loader.java
-
-# Make sure that the compilation steps occurs in the future as not to allow fast systems
-# to copy and compile bug_21227.java so fast as to make the class and java have the same
-# time stamp, which later on would make the compilation step of many_loader.java fail
-sleep 2
-
-# Compile all the usual suspects, including the default 'many_loader'
-${CP} many_loader1.java.foo many_loader.java
-${JAVAC} ${TESTJAVACOPTS} -Xlint *.java
-
-# Rename the class files, so the custom loader (and not the system loader) will find it
-${MV} from_loader2.class from_loader2.impl2
-
-# Compile the next version of 'many_loader'
-${MV} many_loader.class many_loader.impl1
-${CP} many_loader2.java.foo many_loader.java
-${JAVAC} ${TESTJAVACOPTS} -Xlint many_loader.java
-
-# Rename the class file, so the custom loader (and not the system loader) will find it
-${MV} many_loader.class many_loader.impl2
-${MV} many_loader.impl1 many_loader.class
-${RM} many_loader.java
-
-${JAVA} ${TESTOPTS} -Xverify -Xint -cp . bug_21227 >test.out 2>&1
-grep "loader constraint" test.out
-exit $?
-
diff --git a/test/hotspot/jtreg/runtime/6626217/bug_21227.java b/test/hotspot/jtreg/runtime/6626217/bug_21227.java
index da4e190877b..9a0899923b2 100644
--- a/test/hotspot/jtreg/runtime/6626217/bug_21227.java
+++ b/test/hotspot/jtreg/runtime/6626217/bug_21227.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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,63 +22,85 @@
  *
  */
 
+/**
+ * @test
+ * @bug 6626217
+ * @summary Loader-constraint table allows arrays instead of only the base-classes
+ * @library /test/lib
+ * @compile bug_21227.java from_loader2.java
+ * @run driver ClassFileInstaller from_loader2
+ * @compile impl2/many_loader.java
+ * @run driver ClassFileInstaller many_loader
+ * @compile many_loader.java
+ * @run main/othervm -Xverify -Xint bug_21227
+ */
+
 import java.lang.reflect.*;
 import java.security.*;
 
 abstract public class bug_21227 {
 
-  // Jam anything you want in here, it will be cast to a You_Have_Been_P0wned
-  public static Object _p0wnee;
-
-  public static void main(String argv[]) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
-    System.out.println("Warmup");
-
-    // Make a Class 'many_loader' under the default loader
-    bug_21227 bug = new many_loader();
-
-    // Some classes under a new Loader, LOADER2, including another version of 'many_loader'
-    ClassLoader LOADER2 = new Loader2();
-    Class clazz2 = LOADER2.loadClass("from_loader2");
-    IFace iface = (IFace)clazz2.newInstance();
-
-    // Set the victim, a String of length 6
-    String s = "victim";
-    _p0wnee = s;
-
-    // Go cast '_p0wnee' to type You_Have_Been_P0wned
-    many_loader[] x2 = bug.make(iface);
-
-    many_loader b = x2[0];
-
-    // Make it clear that the runtime type many_loader (what we get from the
-    // array X2) varies from the static type of many_loader.
-    Class cl1 = b.getClass();
-    ClassLoader ld1 = cl1.getClassLoader();
-    Class cl2 = many_loader.class;
-    ClassLoader ld2 = cl2.getClassLoader();
-    System.out.println("bug.make()  "+ld1+":"+cl1);
-    System.out.println("many_loader "+ld2+":"+cl2);
-
-    // Read the victims guts out
-    You_Have_Been_P0wned q = b._p0wnee;
-    System.out.println("q._a = 0x"+Integer.toHexString(q._a));
-    System.out.println("q._b = 0x"+Integer.toHexString(q._b));
-    System.out.println("q._c = 0x"+Integer.toHexString(q._c));
-    System.out.println("q._d = 0x"+Integer.toHexString(q._d));
-
-    System.out.println("I will now crash the VM:");
-    // On 32-bit HotSpot Java6 this sets the victim String length shorter, then crashes the VM
-    //q._c = 3;
-    q._a = -1;
-
-    System.out.println(s);
-
-  }
-
-  // I need to compile (hence call in a loop) a function which returns a value
-  // loaded from classloader other than the system one.  The point of this
-  // call is to give me an abstract 'hook' into a function loaded with a
-  // foreign loader.
-  public abstract many_loader[] make( IFace iface ); // abstract factory
+    // Jam anything you want in here, it will be cast to a You_Have_Been_P0wned.
+    public static Object _p0wnee;
+
+    public static void main(String argv[]) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+        try {
+            System.out.println("Warmup");
+
+            // Make a Class 'many_loader' under the default loader.
+            bug_21227 bug = new many_loader();
+
+            // Some classes under a new Loader, LOADER2, including another version of 'many_loader'.
+            ClassLoader LOADER2 = new Loader2();
+            Class clazz2 = LOADER2.loadClass("from_loader2");
+            IFace iface = (IFace)clazz2.newInstance();
+
+            // Set the victim, a String of length 6.
+            String s = "victim";
+            _p0wnee = s;
+
+            // Go cast '_p0wnee' to type You_Have_Been_P0wned.
+            many_loader[] x2 = bug.make(iface);
+
+            many_loader b = x2[0];
+
+            // Make it clear that the runtime type many_loader (what we get from the
+            // array X2) varies from the static type of many_loader.
+            Class cl1 = b.getClass();
+            ClassLoader ld1 = cl1.getClassLoader();
+            Class cl2 = many_loader.class;
+            ClassLoader ld2 = cl2.getClassLoader();
+            System.out.println("bug.make()  "+ld1+":"+cl1);
+            System.out.println("many_loader "+ld2+":"+cl2);
+
+            // Read the victims guts out.
+            You_Have_Been_P0wned q = b._p0wnee;
+            System.out.println("q._a = 0x"+Integer.toHexString(q._a));
+            System.out.println("q._b = 0x"+Integer.toHexString(q._b));
+            System.out.println("q._c = 0x"+Integer.toHexString(q._c));
+            System.out.println("q._d = 0x"+Integer.toHexString(q._d));
+
+            System.out.println("I will now crash the VM:");
+            // On 32-bit HotSpot Java6 this sets the victim String length shorter, then crashes the VM.
+            //q._c = 3;
+            q._a = -1;
+
+            System.out.println(s);
+            throw new RuntimeException("Expected LinkageError was not thrown.");
+        } catch (LinkageError e) {
+            String errorMsg = e.getMessage();
+            if (!errorMsg.contains("loader constraint")) {
+                throw new RuntimeException("Error message of LinkageError does not contain \"loader constraint\":" +
+                                           errorMsg);
+            }
+            System.out.println("Passed with message: " + errorMsg);
+        }
+    }
+
+    // I need to compile (hence call in a loop) a function which returns a value
+    // loaded from classloader other than the system one.  The point of this
+    // call is to give me an abstract 'hook' into a function loaded with a
+    // foreign loader.
+    public abstract many_loader[] make(IFace iface); // abstract factory
 }
 
diff --git a/test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo b/test/hotspot/jtreg/runtime/6626217/impl2/many_loader.java
similarity index 61%
rename from test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo
rename to test/hotspot/jtreg/runtime/6626217/impl2/many_loader.java
index 3eb836b8525..987cd197567 100644
--- a/test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo
+++ b/test/hotspot/jtreg/runtime/6626217/impl2/many_loader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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,21 +23,21 @@
  */
 
 // A simple class to extend an abstract class and get loaded with different
-// loaders.  This class is loaded via LOADER2.  A similar named class will
+// loaders. This class is loaded via LOADER2. A similar named class will
 // be loaded via LOADER1.
 public class many_loader extends bug_21227 {
-  final Object _ref_to_be_p0wned;
+    final Object _ref_to_be_p0wned;
 
-  many_loader() {
-    _ref_to_be_p0wned = bug_21227._p0wnee;
-    System.out.println("Gonna hack this thing: " + _ref_to_be_p0wned.toString() );
-  }
+    many_loader() {
+        _ref_to_be_p0wned = bug_21227._p0wnee;
+        System.out.println("Gonna hack this thing: " + _ref_to_be_p0wned.toString() );
+    }
 
-  // I need to compile (hence call in a loop) a function which returns a value
-  // loaded from classloader other than the system one.  The point of this
-  // call is to give me an abstract 'hook' into a function loaded with a
-  // foreign loader.
-  public many_loader[] make( IFace iface ) { 
-    throw new Error("do not call me");
-  }
+    // I need to compile (hence call in a loop) a function which returns a value
+    // loaded from classloader other than the system one. The point of this
+    // call is to give me an abstract 'hook' into a function loaded with a
+    // foreign loader.
+    public many_loader[] make(IFace iface) {
+        throw new Error("do not call me");
+    }
 }
diff --git a/test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo b/test/hotspot/jtreg/runtime/6626217/many_loader.java
similarity index 51%
rename from test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo
rename to test/hotspot/jtreg/runtime/6626217/many_loader.java
index 11ab818db6c..7bc4659fa88 100644
--- a/test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo
+++ b/test/hotspot/jtreg/runtime/6626217/many_loader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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,25 +23,25 @@
  */
 
 // A simple class to extend an abstract class and get loaded with different
-// loaders.  This class is loaded via LOADER1.  A similar named class will
+// loaders. This class is loaded via LOADER1. A similar named class will
 // be loaded via LOADER2.
 public class many_loader extends bug_21227 {
-  public You_Have_Been_P0wned _p0wnee;
+    public You_Have_Been_P0wned _p0wnee;
 
-  // I need to compile (hence call in a loop) a function which returns a value
-  // loaded from classloader other than the system one.  The point of this
-  // call is to give me an abstract 'hook' into a function loaded with a
-  // foreign loader.
+    // I need to compile (hence call in a loop) a function which returns a value
+    // loaded from classloader other than the system one. The point of this
+    // call is to give me an abstract 'hook' into a function loaded with a
+    // foreign loader.
 
-  // The original 'make(boolean)' returns a bug_21227.  The VM will inject a
-  // synthetic method to up-cast the returned 'from_loader1' into a
-  // 'bug_21227'.
-  public many_loader[] make( IFace iface ) { 
-    // This function needs to return a value known to be loaded from LOADER2.
-    // Since I need to use a yet different loader, I need to make an unknown
-    // foreign call.  In this case I'll be using an interface to make the
-    // unknown call, with but a single implementor so the compiler can do the
-    // upcast statically.
-    return iface==null ? null : iface.gen(); 
-  }
+    // The original 'make(boolean)' returns a bug_21227. The VM will inject a
+    // synthetic method to up-cast the returned 'from_loader1' into a
+    // 'bug_21227'.
+    public many_loader[] make(IFace iface) {
+        // This function needs to return a value known to be loaded from LOADER2.
+        // Since I need to use a yet different loader, I need to make an unknown
+        // foreign call. In this case I'll be using an interface to make the
+        // unknown call, with but a single implementor so the compiler can do the
+        // upcast statically.
+        return iface==null ? null : iface.gen();
+    }
 }

From 7a9e0c23586294e3c85b731ee9196ece673f9790 Mon Sep 17 00:00:00 2001
From: Ben Walsh <ben_walsh@uk.ibm.com>
Date: Wed, 11 Apr 2018 15:53:15 +0100
Subject: [PATCH 137/196] Prevent use of Hotspot VM only testing APIs in JTReg

---
 test/jdk/TEST.ROOT | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index 474c2d7be0b..346cca74d3c 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -1,3 +1,21 @@
+# ===========================================================================
+# (c) Copyright IBM Corp. 2018 All Rights Reserved
+# ===========================================================================
+# 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, see <http://www.gnu.org/licenses/>.
+# ===========================================================================
+
+
 # This file identifies the root of the test-suite hierarchy.
 # It also contains test-suite configuration information.
 
@@ -29,14 +47,14 @@ groups=TEST.groups
 # Source files for classes that will be used at the beginning of each test suite run,
 # to determine additional characteristics of the system for use with the @requires tag.
 # Note: compiled bootlibs code will be located in the folder 'bootClasses'
-requires.extraPropDefns = ../../test/jtreg-ext/requires/VMProps.java [../../closed/test/jtreg-ext/requires/VMPropsExt.java]
-requires.extraPropDefns.bootlibs = ../../test/lib/sun ../../test/lib/jdk/test/lib/Platform.java
-requires.extraPropDefns.vmOpts = -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:bootClasses
-requires.properties= \
-    sun.arch.data.model \
-    java.runtime.name \
-    vm.graal.enabled \
-    vm.cds
+#requires.extraPropDefns = ../../test/jtreg-ext/requires/VMProps.java [../../closed/test/jtreg-ext/requires/VMPropsExt.java]
+#requires.extraPropDefns.bootlibs = ../../test/lib/sun ../../test/lib/jdk/test/lib/Platform.java
+#requires.extraPropDefns.vmOpts = -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:bootClasses
+#requires.properties= \
+#    sun.arch.data.model \
+#    java.runtime.name \
+#    vm.graal.enabled \
+#    vm.cds
 
 # Minimum jtreg version
 requiredVersion=4.2 b12

From 8e5e93cdac449d3a8213d81f34558460aaa9e998 Mon Sep 17 00:00:00 2001
From: Ben Walsh <ben_walsh@uk.ibm.com>
Date: Wed, 11 Apr 2018 16:13:25 +0100
Subject: [PATCH 138/196] Remove make/common/Modules.gmk MODULES_DEPS_MAKEFILE
 patch

---
 make/common/Modules.gmk | 70 ++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 43 deletions(-)

diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 2be64f995c6..d9e9352e118 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -1,6 +1,4 @@
 #
-# (c) Copyright IBM Corp. 2014, 2017 All Rights Reserved
-#
 # Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -244,10 +242,7 @@ FindAllModuleInfos = \
     $(sort $(wildcard \
         $(foreach sub, $(SRC_SUBDIRS), \
           $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
-        $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC)))) \
-    $(wildcard \
-        $(foreach sub, $(SRC_SUBDIRS), \
-          $(patsubst %,%/$(strip $1)/$(sub)/module-info.java.extra, $(TOP_SRC_DIRS))))
+        $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC))))
 
 # Find module-info.java files in the specific source dir
 # Param 1 - Src dir to find module-info.java files in
@@ -312,48 +307,37 @@ MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk
 
 MODULE_INFOS := $(call FindAllModuleInfos, *)
 
-ifeq ($(TOOLCHAIN_TYPE),microsoft)
-  CPP_FLAGS_DEPS := -EP -nologo
-else ifeq ($(TOOLCHAIN_TYPE), xlc)
-  CPP_FLAGS_DEPS := -E
-else
-  CPP_FLAGS_DEPS := -P - <
-endif
-
 $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
     $(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps)
 	$(MKDIR) -p $(@D)
 	$(RM) $@
 	$(foreach m, $(MODULE_INFOS), \
-	 	    ( $(CPP) $(CPP_FLAGS_DEPS) $m | $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
-		          BEGIN        { printf("DEPS_%s +=", MODULE); \
-		                         if (MODULE != "java.base") printf(" java.base"); } \
-		          /./          { gsub(/\r/, ""); } \
-		          /\t/         { gsub(/\t/, " "); } \
-		          /  +/        { gsub(/  +/, " "); } \
-		          /^ /         { sub(/^ /, ""); } \
-		          /^requires / { sub(/requires /, " "); \
-		                         sub(/ transitive /, " "); \
-	                                 sub(/static /, " "); \
-		                         sub(/;/, ""); \
-		                         gsub(/ /, ""); \
-		                         printf(" %s", $$0) } \
-		          END          { printf("\n") }' && \
-		      $(CPP) $(CPP_FLAGS_DEPS) $m | $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
-		          BEGIN        { printf("TRANSITIVE_MODULES_%s +=", MODULE); \
-		                         if (MODULE != "java.base") printf(" java.base"); } \
-		          /./          { gsub(/\r/, ""); } \
-		          /\t/         { gsub(/\t/, " "); } \
-		          /  +/        { gsub(/  +/, " "); } \
-		          /^ /         { sub(/^ /, ""); } \
-		          /^requires transitive / { \
-		                         sub(/requires /, " "); \
-		                         sub(/ transitive /, " "); \
-	                                 sub(/static /, " "); \
-		                         sub(/;/, ""); \
-		                         gsub(/ /, ""); \
-		                         printf(" %s", $$0) } \
-		          END          { printf("\n") }' \
+	    ( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \
+	      $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
+	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
+	          /^ *requires/ { sub(/;/, ""); \
+	                          sub(/requires /, " "); \
+	                          sub(/ static /, " "); \
+	                          sub(/ transitive /, " "); \
+	                          sub(/\/\/.*/, ""); \
+	                          sub(/\/\*.*\*\//, ""); \
+	                          gsub(/^ +\*.*/, ""); \
+	                          gsub(/ /, ""); \
+	                          printf(" %s", $$0) } \
+	          END           { printf("\n") }' $m && \
+	      $(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \
+	      $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
+	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
+	          /^ *requires  *transitive/ { \
+	                          sub(/;/, ""); \
+	                          sub(/requires/, ""); \
+	                          sub(/transitive/, ""); \
+	                          sub(/\/\/.*/, ""); \
+	                          sub(/\/\*.*\*\//, ""); \
+	                          gsub(/^ +\*.*/, ""); \
+	                          gsub(/ /, ""); \
+	                          printf(" %s", $$0) } \
+	          END           { printf("\n") }' $m \
 	    ) >> $@ $(NEWLINE))
 
 -include $(MODULE_DEPS_MAKEFILE)

From 36a8b1be46dc7fd5b188244b965028300f66eedc Mon Sep 17 00:00:00 2001
From: naoto <unknown>
Date: Wed, 11 Apr 2018 09:14:47 -0700
Subject: [PATCH 139/196] 8189784: Parsing with Java 9 AKST timezone returns
 the SystemV variant of the timezone Reviewed-by: erikj, sherman

---
 make/gensrc/GensrcCLDR.gmk                    |   15 +-
 .../tools/cldrconverter/CLDRConverter.java    |   87 +-
 .../cldrconverter/MetaZonesParseHandler.java  |   30 +-
 .../SupplementalMetadataParseHandler.java     |   72 +
 .../classes/java/time/format/ZoneName.java    |  798 ----------
 .../java/time/format/ZoneName.java.template   |  249 +++
 .../format/TestZoneTextPrinterParser.java     |    8 +-
 .../time/test/java/time/format/ZoneName.java  | 1358 +++++++++--------
 8 files changed, 1201 insertions(+), 1416 deletions(-)
 create mode 100644 make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java
 delete mode 100644 src/java.base/share/classes/java/time/format/ZoneName.java
 create mode 100644 src/java.base/share/classes/java/time/format/ZoneName.java.template

diff --git a/make/gensrc/GensrcCLDR.gmk b/make/gensrc/GensrcCLDR.gmk
index 8ceb371d994..f7d3d700992 100644
--- a/make/gensrc/GensrcCLDR.gmk
+++ b/make/gensrc/GensrcCLDR.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2018, 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
@@ -34,19 +34,28 @@ CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleD
 
 CLDR_BASE_LOCALES := "en-US"
 
+ZONENAME_TEMPLATE := $(TOPDIR)/src/java.base/share/classes/java/time/format/ZoneName.java.template
+
 $(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
     $(wildcard $(CLDRSRCDIR)/common/main/en*.xml) \
     $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
+    $(ZONENAME_TEMPLATE) \
     $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(GENSRC_BASEDIR)
-	$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -baselocales $(CLDR_BASE_LOCALES) -basemodule -o $(GENSRC_BASEDIR)
+	$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \
+	    -baselocales $(CLDR_BASE_LOCALES) \
+	    -o $(GENSRC_BASEDIR) \
+	    -basemodule \
+	    -zntempfile $(ZONENAME_TEMPLATE)
 
 $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
     $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
     $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
     $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(GENSRC_DIR)
-	$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -baselocales $(CLDR_BASE_LOCALES) -o $(GENSRC_DIR)
+	$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \
+	    -baselocales $(CLDR_BASE_LOCALES) \
+	    -o $(GENSRC_DIR)
 
 GENSRC_JAVA_BASE += $(CLDR_BASEMETAINFO_FILE)
 GENSRC_JDK_LOCALEDATA += $(CLDR_METAINFO_FILE)
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
index 4eb0e0ace8e..ee40d07a61f 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -28,16 +28,15 @@
 import static build.tools.cldrconverter.Bundle.jreTimeZoneNames;
 import build.tools.cldrconverter.BundleGenerator.BundleType;
 import java.io.File;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.*;
+import java.time.*;
 import java.util.*;
 import java.util.ResourceBundle.Control;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import org.xml.sax.SAXNotRecognizedException;
@@ -56,12 +55,13 @@ public class CLDRConverter {
     static final String BCP47_LDML_DTD_SYSTEM_ID = "http://www.unicode.org/cldr/dtd/2.0/ldmlBCP47.dtd";
 
 
-    private static String CLDR_BASE = "../CLDR/21.0.1/";
+    private static String CLDR_BASE;
     static String LOCAL_LDML_DTD;
     static String LOCAL_SPPL_LDML_DTD;
     static String LOCAL_BCP47_LDML_DTD;
     private static String SOURCE_FILE_DIR;
     private static String SPPL_SOURCE_FILE;
+    private static String SPPL_META_SOURCE_FILE;
     private static String NUMBERING_SOURCE_FILE;
     private static String METAZONES_SOURCE_FILE;
     private static String LIKELYSUBTAGS_SOURCE_FILE;
@@ -85,6 +85,7 @@ public class CLDRConverter {
     static final String PARENT_LOCALE_PREFIX = "parentLocale.";
 
     private static SupplementDataParseHandler handlerSuppl;
+    private static SupplementalMetadataParseHandler handlerSupplMeta;
     private static LikelySubtagsParseHandler handlerLikelySubtags;
     static NumberingSystemsParseHandler handlerNumbering;
     static MetaZonesParseHandler handlerMetaZones;
@@ -100,6 +101,9 @@ public class CLDRConverter {
     private static final ResourceBundle.Control defCon =
         ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT);
 
+    private static final String[] AVAILABLE_TZIDS = TimeZone.getAvailableIDs();
+    private static String zoneNameTempFile;
+
     static enum DraftType {
         UNCONFIRMED,
         PROVISIONAL,
@@ -195,6 +199,10 @@ public static void main(String[] args) throws Exception {
                         verbose = true;
                         break;
 
+                    case "-zntempfile":
+                        zoneNameTempFile = args[++i];
+                        break;
+
                     case "-help":
                         usage();
                         System.exit(0);
@@ -221,6 +229,7 @@ public static void main(String[] args) throws Exception {
         NUMBERING_SOURCE_FILE = CLDR_BASE + "/supplemental/numberingSystems.xml";
         METAZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/metaZones.xml";
         TIMEZONE_SOURCE_FILE = CLDR_BASE + "/bcp47/timezone.xml";
+        SPPL_META_SOURCE_FILE = CLDR_BASE + "/supplemental/supplementalMetadata.xml";
 
         if (BASE_LOCALES.isEmpty()) {
             setupBaseLocales("en-US");
@@ -234,6 +243,11 @@ public static void main(String[] args) throws Exception {
 
         List<Bundle> bundles = readBundleList();
         convertBundles(bundles);
+
+        // Generate java.time.format.ZoneName.java
+        if (isBaseModule) {
+            generateZoneName();
+        }
     }
 
     private static void usage() {
@@ -246,7 +260,7 @@ private static void usage() {
                 + "\t-basemodule    generates bundles that go into java.base module%n"
                 + "\t-baselocales loc(,loc)*      locales that go into the base module%n"
                 + "\t-o dir         output directory (default: ./build/gensrc)%n"
-                + "\t-o dir         output directory (defaut: ./build/gensrc)%n"
+                + "\t-zntempfile    template file for java.time.format.ZoneName.java%n"
                 + "\t-utf8          use UTF-8 rather than \\uxxxx (for debug)%n");
     }
 
@@ -401,6 +415,11 @@ private static void parseSupplemental() throws Exception {
         // Parse likelySubtags
         handlerLikelySubtags = new LikelySubtagsParseHandler();
         parseLDMLFile(new File(LIKELYSUBTAGS_SOURCE_FILE), handlerLikelySubtags);
+
+        // Parse supplementalMetadata
+        // Currently only interested in deprecated time zone ids.
+        handlerSupplMeta = new SupplementalMetadataParseHandler();
+        parseLDMLFile(new File(SPPL_META_SOURCE_FILE), handlerSupplMeta);
     }
 
     // Parsers for data in "bcp47" directory
@@ -656,13 +675,16 @@ private static Map<String, Object> extractZoneNames(Map<String, Object> map, Str
             });
         }
 
-        for (String tzid : handlerMetaZones.keySet()) {
-            String tzKey = TIMEZONE_ID_PREFIX + tzid;
-            Object data = map.get(tzKey);
+        Arrays.stream(AVAILABLE_TZIDS).forEach(tzid -> {
+            // If the tzid is deprecated, get the data for the replacement id
+            String tzKey = Optional.ofNullable((String)handlerSupplMeta.get(tzid))
+                                   .orElse(tzid);
+            Object data = map.get(TIMEZONE_ID_PREFIX + tzKey);
+
             if (data instanceof String[]) {
                 names.put(tzid, data);
             } else {
-                String meta = handlerMetaZones.get(tzid);
+                String meta = handlerMetaZones.get(tzKey);
                 if (meta != null) {
                     String metaKey = METAZONE_ID_PREFIX + meta;
                     data = map.get(metaKey);
@@ -673,7 +695,8 @@ private static Map<String, Object> extractZoneNames(Map<String, Object> map, Str
                     }
                 }
             }
-        }
+        });
+
         return names;
     }
 
@@ -948,4 +971,44 @@ private static List<Locale> applyParentLocales(String baseName, List<Locale> can
 
         return candidates;
     }
+
+    private static void generateZoneName() throws Exception {
+        Files.createDirectories(Paths.get(DESTINATION_DIR, "java", "time", "format"));
+        Files.write(Paths.get(DESTINATION_DIR, "java", "time", "format", "ZoneName.java"),
+            Files.lines(Paths.get(zoneNameTempFile))
+                .flatMap(l -> {
+                    if (l.equals("%%%%ZIDMAP%%%%")) {
+                        return zidMapEntry();
+                    } else if (l.equals("%%%%MZONEMAP%%%%")) {
+                        return handlerMetaZones.mzoneMapEntry();
+                    } else if (l.equals("%%%%DEPRECATED%%%%")) {
+                        return handlerSupplMeta.deprecatedMap();
+                    } else {
+                        return Stream.of(l);
+                    }
+                })
+                .collect(Collectors.toList()),
+            StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+    }
+
+    private static Stream<String> zidMapEntry() {
+        Map<String, String> canonMap = new HashMap<>();
+        handlerTimeZone.getData().entrySet().stream()
+            .forEach(e -> {
+                String[] ids = ((String)e.getValue()).split("\\s");
+                for (int i = 1; i < ids.length; i++) {
+                    canonMap.put(ids[i], ids[0]);
+                }});
+        return ZoneId.getAvailableZoneIds().stream()
+                .map(id -> {
+                    String canonId = canonMap.getOrDefault(id, id);
+                    String meta = handlerMetaZones.get(canonId);
+                    String zone001 = handlerMetaZones.zidMap().get(meta);
+                    return zone001 == null ? "" :
+                            String.format("        \"%s\", \"%s\", \"%s\",",
+                                            id, meta, zone001);
+                })
+                .filter(s -> !s.isEmpty())
+                .sorted();
+    }
 }
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java
index 63eb3da20ff..e20296587a7 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/MetaZonesParseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -27,6 +27,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.*;
+import java.util.stream.*;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -34,6 +37,10 @@
 class MetaZonesParseHandler extends AbstractLDMLHandler<String> {
     private String tzid, metazone;
 
+    // for java.time.format.ZoneNames.java
+    private List<String> mzoneMapEntryList = new ArrayList<>();
+    private Map<String, String> zones = new HashMap<>();
+
     MetaZonesParseHandler() {
     }
 
@@ -64,6 +71,19 @@ public void startElement(String uri, String localName, String qName, Attributes
             pushIgnoredContainer(qName);
             break;
 
+        case "mapZone":
+            String territory = attributes.getValue("territory");
+            if (territory.equals("001")) {
+                zones.put(attributes.getValue("other"), attributes.getValue("type"));
+            } else {
+                mzoneMapEntryList.add(String.format("        \"%s\", \"%s\", \"%s\",",
+                    attributes.getValue("other"),
+                    territory,
+                    attributes.getValue("type")));
+            }
+            pushIgnoredContainer(qName);
+            break;
+
         case "version":
         case "generation":
             pushIgnoredContainer(qName);
@@ -89,4 +109,12 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
         }
         currentContainer = currentContainer.getParent();
     }
+
+    public Map<String, String> zidMap() {
+        return zones;
+    }
+
+    public Stream<String> mzoneMapEntry() {
+        return mzoneMapEntryList.stream();
+    }
 }
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java
new file mode 100644
index 00000000000..81149267ee9
--- /dev/null
+++ b/make/jdk/src/classes/build/tools/cldrconverter/SupplementalMetadataParseHandler.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2018, 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 build.tools.cldrconverter;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.stream.Stream;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * Handles parsing of files in Locale Data Markup Language for
+ * SupplementalMetadata.xml
+ */
+
+class SupplementalMetadataParseHandler extends AbstractLDMLHandler<Object> {
+    @Override
+    public InputSource resolveEntity(String publicID, String systemID) throws IOException, SAXException {
+        // avoid HTTP traffic to unicode.org
+        if (systemID.startsWith(CLDRConverter.SPPL_LDML_DTD_SYSTEM_ID)) {
+            return new InputSource((new File(CLDRConverter.LOCAL_SPPL_LDML_DTD)).toURI().toString());
+        }
+        return null;
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+        switch (qName) {
+        case "zoneAlias":
+            String reason = attributes.getValue("reason");
+            if ("deprecated".equals(reason)) {
+                put(attributes.getValue("type"), attributes.getValue("replacement"));
+            }
+            pushIgnoredContainer(qName);
+            break;
+        default:
+            // treat anything else as a container
+            pushContainer(qName, attributes);
+            break;
+        }
+    }
+
+    public Stream<String> deprecatedMap() {
+        return keySet().stream()
+                .map(k -> String.format("        \"%s\", \"%s\",", k, get(k)))
+                .sorted();
+    }
+}
diff --git a/src/java.base/share/classes/java/time/format/ZoneName.java b/src/java.base/share/classes/java/time/format/ZoneName.java
deleted file mode 100644
index 9f0a09bd579..00000000000
--- a/src/java.base/share/classes/java/time/format/ZoneName.java
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, 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.time.format;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * A helper class to map a zone name to metazone and back to the
- * appropriate zone id for the particular locale.
- * <p>
- * The zid<->metazone mappings are based on CLDR metaZones.xml.
- * The alias mappings are based on Link entries in tzdb data files.
- */
-class ZoneName {
-
-    public static String toZid(String zid, Locale locale) {
-        String mzone = zidToMzone.get(zid);
-        if (mzone == null && aliases.containsKey(zid)) {
-            zid = aliases.get(zid);
-            mzone = zidToMzone.get(zid);
-        }
-        if (mzone != null) {
-            Map<String, String> map = mzoneToZidL.get(mzone);
-            if (map != null && map.containsKey(locale.getCountry())) {
-                zid = map.get(locale.getCountry());
-            } else {
-                zid = mzoneToZid.get(mzone);
-            }
-        }
-        return toZid(zid);
-    }
-
-    public static String toZid(String zid) {
-        if (aliases.containsKey(zid)) {
-            return aliases.get(zid);
-        }
-        return zid;
-    }
-
-    private static final String[] zidMap = new String[] {
-        "Pacific/Rarotonga", "Cook", "Pacific/Rarotonga",
-        "Europe/Tirane", "Europe_Central", "Europe/Paris",
-        "America/Recife", "Brasilia", "America/Sao_Paulo",
-        "America/Argentina/San_Juan", "Argentina", "America/Buenos_Aires",
-        "Asia/Kolkata", "India", "Asia/Calcutta",
-        "America/Guayaquil", "Ecuador", "America/Guayaquil",
-        "Europe/Samara", "Moscow", "Europe/Moscow",
-        "Indian/Antananarivo", "Africa_Eastern", "Africa/Nairobi",
-        "America/Santa_Isabel", "America_Pacific", "America/Los_Angeles",
-        "America/Montserrat", "Atlantic", "America/Halifax",
-        "Pacific/Port_Moresby", "Papua_New_Guinea", "Pacific/Port_Moresby",
-        "Europe/Paris", "Europe_Central", "Europe/Paris",
-        "America/Argentina/Salta", "Argentina", "America/Buenos_Aires",
-        "Asia/Omsk", "Omsk", "Asia/Omsk",
-        "Africa/Ceuta", "Europe_Central", "Europe/Paris",
-        "America/Argentina/San_Luis", "Argentina_Western", "America/Argentina/San_Luis",
-        "America/Atikokan", "America_Eastern", "America/New_York",
-        "Asia/Vladivostok", "Vladivostok", "Asia/Vladivostok",
-        "America/Argentina/Jujuy", "Argentina", "America/Buenos_Aires",
-        "Asia/Almaty", "Kazakhstan_Eastern", "Asia/Almaty",
-        "Atlantic/Canary", "Europe_Western", "Atlantic/Canary",
-        "Asia/Bangkok", "Indochina", "Asia/Saigon",
-        "America/Caracas", "Venezuela", "America/Caracas",
-        "Australia/Hobart", "Australia_Eastern", "Australia/Sydney",
-        "America/Havana", "Cuba", "America/Havana",
-        "Africa/Malabo", "Africa_Western", "Africa/Lagos",
-        "Australia/Lord_Howe", "Lord_Howe", "Australia/Lord_Howe",
-        "Pacific/Fakaofo", "Tokelau", "Pacific/Fakaofo",
-        "America/Matamoros", "America_Central", "America/Chicago",
-        "America/Guadeloupe", "Atlantic", "America/Halifax",
-        "Europe/Helsinki", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Calcutta", "India", "Asia/Calcutta",
-        "Africa/Kinshasa", "Africa_Western", "Africa/Lagos",
-        "America/Miquelon", "Pierre_Miquelon", "America/Miquelon",
-        "Europe/Athens", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Novosibirsk", "Novosibirsk", "Asia/Novosibirsk",
-        "Indian/Cocos", "Cocos", "Indian/Cocos",
-        "Africa/Bujumbura", "Africa_Central", "Africa/Maputo",
-        "Europe/Mariehamn", "Europe_Eastern", "Europe/Bucharest",
-        "America/Winnipeg", "America_Central", "America/Chicago",
-        "America/Buenos_Aires", "Argentina", "America/Buenos_Aires",
-        "America/Yellowknife", "America_Mountain", "America/Denver",
-        "Pacific/Midway", "Samoa", "Pacific/Apia",
-        "Africa/Dar_es_Salaam", "Africa_Eastern", "Africa/Nairobi",
-        "Pacific/Tahiti", "Tahiti", "Pacific/Tahiti",
-        "Asia/Gaza", "Europe_Eastern", "Europe/Bucharest",
-        "Australia/Lindeman", "Australia_Eastern", "Australia/Sydney",
-        "Europe/Kaliningrad", "Europe_Eastern", "Europe/Bucharest",
-        "Europe/Bucharest", "Europe_Eastern", "Europe/Bucharest",
-        "America/Lower_Princes", "Atlantic", "America/Halifax",
-        "Pacific/Chuuk", "Truk", "Pacific/Truk",
-        "America/Anchorage", "Alaska", "America/Juneau",
-        "America/Rankin_Inlet", "America_Central", "America/Chicago",
-        "America/Marigot", "Atlantic", "America/Halifax",
-        "Africa/Juba", "Africa_Eastern", "Africa/Nairobi",
-        "Africa/Algiers", "Europe_Central", "Europe/Paris",
-        "Europe/Kiev", "Europe_Eastern", "Europe/Bucharest",
-        "America/Santarem", "Brasilia", "America/Sao_Paulo",
-        "Africa/Brazzaville", "Africa_Western", "Africa/Lagos",
-        "Asia/Choibalsan", "Choibalsan", "Asia/Choibalsan",
-        "Indian/Christmas", "Christmas", "Indian/Christmas",
-        "America/Nassau", "America_Eastern", "America/New_York",
-        "Africa/Tunis", "Europe_Central", "Europe/Paris",
-        "Pacific/Noumea", "New_Caledonia", "Pacific/Noumea",
-        "Africa/El_Aaiun", "Europe_Western", "Atlantic/Canary",
-        "Europe/Sarajevo", "Europe_Central", "Europe/Paris",
-        "America/Campo_Grande", "Amazon", "America/Manaus",
-        "America/Puerto_Rico", "Atlantic", "America/Halifax",
-        "Antarctica/Mawson", "Mawson", "Antarctica/Mawson",
-        "Pacific/Galapagos", "Galapagos", "Pacific/Galapagos",
-        "Asia/Tehran", "Iran", "Asia/Tehran",
-        "America/Port-au-Prince", "America_Eastern", "America/New_York",
-        "America/Scoresbysund", "Greenland_Eastern", "America/Scoresbysund",
-        "Africa/Harare", "Africa_Central", "Africa/Maputo",
-        "America/Dominica", "Atlantic", "America/Halifax",
-        "Europe/Chisinau", "Europe_Eastern", "Europe/Bucharest",
-        "America/Chihuahua", "America_Mountain", "America/Denver",
-        "America/La_Paz", "Bolivia", "America/La_Paz",
-        "Indian/Chagos", "Indian_Ocean", "Indian/Chagos",
-        "Australia/Broken_Hill", "Australia_Central", "Australia/Adelaide",
-        "America/Grenada", "Atlantic", "America/Halifax",
-        "America/North_Dakota/New_Salem", "America_Central", "America/Chicago",
-        "Pacific/Majuro", "Marshall_Islands", "Pacific/Majuro",
-        "Australia/Adelaide", "Australia_Central", "Australia/Adelaide",
-        "Europe/Warsaw", "Europe_Central", "Europe/Paris",
-        "Europe/Vienna", "Europe_Central", "Europe/Paris",
-        "Atlantic/Cape_Verde", "Cape_Verde", "Atlantic/Cape_Verde",
-        "America/Mendoza", "Argentina", "America/Buenos_Aires",
-        "Pacific/Gambier", "Gambier", "Pacific/Gambier",
-        "Europe/Istanbul", "Europe_Eastern", "Europe/Bucharest",
-        "America/Kentucky/Monticello", "America_Eastern", "America/New_York",
-        "America/Chicago", "America_Central", "America/Chicago",
-        "Asia/Ulaanbaatar", "Mongolia", "Asia/Ulaanbaatar",
-        "Indian/Maldives", "Maldives", "Indian/Maldives",
-        "America/Mexico_City", "America_Central", "America/Chicago",
-        "Africa/Asmara", "Africa_Eastern", "Africa/Nairobi",
-        "Asia/Chongqing", "China", "Asia/Shanghai",
-        "America/Argentina/La_Rioja", "Argentina", "America/Buenos_Aires",
-        "America/Tijuana", "America_Pacific", "America/Los_Angeles",
-        "Asia/Harbin", "China", "Asia/Shanghai",
-        "Pacific/Honolulu", "Hawaii_Aleutian", "Pacific/Honolulu",
-        "Atlantic/Azores", "Azores", "Atlantic/Azores",
-        "Indian/Mayotte", "Africa_Eastern", "Africa/Nairobi",
-        "America/Guatemala", "America_Central", "America/Chicago",
-        "America/Indianapolis", "America_Eastern", "America/New_York",
-        "America/Halifax", "Atlantic", "America/Halifax",
-        "America/Resolute", "America_Central", "America/Chicago",
-        "Europe/London", "GMT", "Atlantic/Reykjavik",
-        "America/Hermosillo", "America_Mountain", "America/Denver",
-        "Atlantic/Madeira", "Europe_Western", "Atlantic/Canary",
-        "Europe/Zagreb", "Europe_Central", "Europe/Paris",
-        "America/Boa_Vista", "Amazon", "America/Manaus",
-        "America/Regina", "America_Central", "America/Chicago",
-        "America/Cordoba", "Argentina", "America/Buenos_Aires",
-        "America/Shiprock", "America_Mountain", "America/Denver",
-        "Europe/Luxembourg", "Europe_Central", "Europe/Paris",
-        "America/Cancun", "America_Central", "America/Chicago",
-        "Pacific/Enderbury", "Phoenix_Islands", "Pacific/Enderbury",
-        "Africa/Bissau", "GMT", "Atlantic/Reykjavik",
-        "Antarctica/Vostok", "Vostok", "Antarctica/Vostok",
-        "Pacific/Apia", "Samoa", "Pacific/Apia",
-        "Australia/Perth", "Australia_Western", "Australia/Perth",
-        "America/Juneau", "Alaska", "America/Juneau",
-        "Africa/Mbabane", "Africa_Southern", "Africa/Johannesburg",
-        "Pacific/Niue", "Niue", "Pacific/Niue",
-        "Europe/Zurich", "Europe_Central", "Europe/Paris",
-        "America/Rio_Branco", "Amazon", "America/Manaus",
-        "Africa/Ndjamena", "Africa_Western", "Africa/Lagos",
-        "Asia/Macau", "China", "Asia/Shanghai",
-        "America/Lima", "Peru", "America/Lima",
-        "Africa/Windhoek", "Africa_Central", "Africa/Maputo",
-        "America/Sitka", "Alaska", "America/Juneau",
-        "America/Mazatlan", "America_Mountain", "America/Denver",
-        "Asia/Saigon", "Indochina", "Asia/Saigon",
-        "Asia/Kamchatka", "Magadan", "Asia/Magadan",
-        "America/Menominee", "America_Central", "America/Chicago",
-        "America/Belize", "America_Central", "America/Chicago",
-        "America/Sao_Paulo", "Brasilia", "America/Sao_Paulo",
-        "America/Barbados", "Atlantic", "America/Halifax",
-        "America/Porto_Velho", "Amazon", "America/Manaus",
-        "America/Costa_Rica", "America_Central", "America/Chicago",
-        "Europe/Monaco", "Europe_Central", "Europe/Paris",
-        "Europe/Riga", "Europe_Eastern", "Europe/Bucharest",
-        "Europe/Vatican", "Europe_Central", "Europe/Paris",
-        "Europe/Madrid", "Europe_Central", "Europe/Paris",
-        "Africa/Dakar", "GMT", "Atlantic/Reykjavik",
-        "Asia/Damascus", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Hong_Kong", "Hong_Kong", "Asia/Hong_Kong",
-        "America/Adak", "Hawaii_Aleutian", "Pacific/Honolulu",
-        "Europe/Vilnius", "Europe_Eastern", "Europe/Bucharest",
-        "America/Indiana/Indianapolis", "America_Eastern", "America/New_York",
-        "Africa/Freetown", "GMT", "Atlantic/Reykjavik",
-        "Atlantic/Reykjavik", "GMT", "Atlantic/Reykjavik",
-        "Asia/Ho_Chi_Minh", "Indochina", "Asia/Saigon",
-        "America/St_Kitts", "Atlantic", "America/Halifax",
-        "America/Martinique", "Atlantic", "America/Halifax",
-        "America/Thule", "Atlantic", "America/Halifax",
-        "America/Asuncion", "Paraguay", "America/Asuncion",
-        "Africa/Luanda", "Africa_Western", "Africa/Lagos",
-        "America/Monterrey", "America_Central", "America/Chicago",
-        "Pacific/Fiji", "Fiji", "Pacific/Fiji",
-        "Africa/Banjul", "GMT", "Atlantic/Reykjavik",
-        "America/Grand_Turk", "America_Eastern", "America/New_York",
-        "Pacific/Pitcairn", "Pitcairn", "Pacific/Pitcairn",
-        "America/Montevideo", "Uruguay", "America/Montevideo",
-        "America/Bahia_Banderas", "America_Central", "America/Chicago",
-        "America/Cayman", "America_Eastern", "America/New_York",
-        "Pacific/Norfolk", "Norfolk", "Pacific/Norfolk",
-        "Africa/Ouagadougou", "GMT", "Atlantic/Reykjavik",
-        "America/Maceio", "Brasilia", "America/Sao_Paulo",
-        "Pacific/Guam", "Chamorro", "Pacific/Saipan",
-        "Africa/Monrovia", "GMT", "Atlantic/Reykjavik",
-        "Africa/Bamako", "GMT", "Atlantic/Reykjavik",
-        "Asia/Colombo", "India", "Asia/Calcutta",
-        "Asia/Urumqi", "China", "Asia/Shanghai",
-        "Asia/Kabul", "Afghanistan", "Asia/Kabul",
-        "America/Yakutat", "Alaska", "America/Juneau",
-        "America/Phoenix", "America_Mountain", "America/Denver",
-        "Asia/Nicosia", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Phnom_Penh", "Indochina", "Asia/Saigon",
-        "America/Rainy_River", "America_Central", "America/Chicago",
-        "Europe/Uzhgorod", "Europe_Eastern", "Europe/Bucharest",
-        "Pacific/Saipan", "Chamorro", "Pacific/Saipan",
-        "America/St_Vincent", "Atlantic", "America/Halifax",
-        "Europe/Rome", "Europe_Central", "Europe/Paris",
-        "America/Nome", "Alaska", "America/Juneau",
-        "Africa/Mogadishu", "Africa_Eastern", "Africa/Nairobi",
-        "Europe/Zaporozhye", "Europe_Eastern", "Europe/Bucharest",
-        "Pacific/Funafuti", "Tuvalu", "Pacific/Funafuti",
-        "Atlantic/South_Georgia", "South_Georgia", "Atlantic/South_Georgia",
-        "Europe/Skopje", "Europe_Central", "Europe/Paris",
-        "Asia/Yekaterinburg", "Yekaterinburg", "Asia/Yekaterinburg",
-        "Australia/Melbourne", "Australia_Eastern", "Australia/Sydney",
-        "America/Argentina/Cordoba", "Argentina", "America/Buenos_Aires",
-        "Africa/Kigali", "Africa_Central", "Africa/Maputo",
-        "Africa/Blantyre", "Africa_Central", "Africa/Maputo",
-        "Africa/Tripoli", "Europe_Eastern", "Europe/Bucharest",
-        "Africa/Gaborone", "Africa_Central", "Africa/Maputo",
-        "Asia/Kuching", "Malaysia", "Asia/Kuching",
-        "Pacific/Nauru", "Nauru", "Pacific/Nauru",
-        "America/Aruba", "Atlantic", "America/Halifax",
-        "America/Antigua", "Atlantic", "America/Halifax",
-        "Europe/Volgograd", "Volgograd", "Europe/Volgograd",
-        "Africa/Djibouti", "Africa_Eastern", "Africa/Nairobi",
-        "America/Catamarca", "Argentina", "America/Buenos_Aires",
-        "Asia/Manila", "Philippines", "Asia/Manila",
-        "Pacific/Kiritimati", "Line_Islands", "Pacific/Kiritimati",
-        "Asia/Shanghai", "China", "Asia/Shanghai",
-        "Pacific/Truk", "Truk", "Pacific/Truk",
-        "Pacific/Tarawa", "Gilbert_Islands", "Pacific/Tarawa",
-        "Africa/Conakry", "GMT", "Atlantic/Reykjavik",
-        "Asia/Bishkek", "Kyrgystan", "Asia/Bishkek",
-        "Europe/Gibraltar", "Europe_Central", "Europe/Paris",
-        "Asia/Rangoon", "Myanmar", "Asia/Rangoon",
-        "Asia/Baku", "Azerbaijan", "Asia/Baku",
-        "America/Santiago", "Chile", "America/Santiago",
-        "America/El_Salvador", "America_Central", "America/Chicago",
-        "America/Noronha", "Noronha", "America/Noronha",
-        "America/St_Thomas", "Atlantic", "America/Halifax",
-        "Atlantic/St_Helena", "GMT", "Atlantic/Reykjavik",
-        "Asia/Krasnoyarsk", "Krasnoyarsk", "Asia/Krasnoyarsk",
-        "America/Vancouver", "America_Pacific", "America/Los_Angeles",
-        "Europe/Belgrade", "Europe_Central", "Europe/Paris",
-        "America/St_Barthelemy", "Atlantic", "America/Halifax",
-        "Asia/Pontianak", "Indonesia_Western", "Asia/Jakarta",
-        "Africa/Lusaka", "Africa_Central", "Africa/Maputo",
-        "America/Godthab", "Greenland_Western", "America/Godthab",
-        "Asia/Dhaka", "Bangladesh", "Asia/Dhaka",
-        "Asia/Dubai", "Gulf", "Asia/Dubai",
-        "Europe/Moscow", "Moscow", "Europe/Moscow",
-        "America/Louisville", "America_Eastern", "America/New_York",
-        "Australia/Darwin", "Australia_Central", "Australia/Adelaide",
-        "America/Santo_Domingo", "Atlantic", "America/Halifax",
-        "America/Argentina/Ushuaia", "Argentina", "America/Buenos_Aires",
-        "America/Tegucigalpa", "America_Central", "America/Chicago",
-        "Asia/Aden", "Arabian", "Asia/Riyadh",
-        "America/Inuvik", "America_Mountain", "America/Denver",
-        "Asia/Beirut", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Qatar", "Arabian", "Asia/Riyadh",
-        "Europe/Oslo", "Europe_Central", "Europe/Paris",
-        "Asia/Anadyr", "Magadan", "Asia/Magadan",
-        "Pacific/Palau", "Palau", "Pacific/Palau",
-        "Arctic/Longyearbyen", "Europe_Central", "Europe/Paris",
-        "America/Anguilla", "Atlantic", "America/Halifax",
-        "Asia/Aqtau", "Kazakhstan_Western", "Asia/Aqtobe",
-        "Asia/Yerevan", "Armenia", "Asia/Yerevan",
-        "Africa/Lagos", "Africa_Western", "Africa/Lagos",
-        "America/Denver", "America_Mountain", "America/Denver",
-        "Antarctica/Palmer", "Chile", "America/Santiago",
-        "Europe/Stockholm", "Europe_Central", "Europe/Paris",
-        "America/Bahia", "Brasilia", "America/Sao_Paulo",
-        "America/Danmarkshavn", "GMT", "Atlantic/Reykjavik",
-        "Indian/Mauritius", "Mauritius", "Indian/Mauritius",
-        "Pacific/Chatham", "Chatham", "Pacific/Chatham",
-        "Europe/Prague", "Europe_Central", "Europe/Paris",
-        "America/Blanc-Sablon", "Atlantic", "America/Halifax",
-        "America/Bogota", "Colombia", "America/Bogota",
-        "America/Managua", "America_Central", "America/Chicago",
-        "Pacific/Auckland", "New_Zealand", "Pacific/Auckland",
-        "Atlantic/Faroe", "Europe_Western", "Atlantic/Canary",
-        "America/Cambridge_Bay", "America_Mountain", "America/Denver",
-        "America/Los_Angeles", "America_Pacific", "America/Los_Angeles",
-        "Africa/Khartoum", "Africa_Central", "Africa/Maputo",
-        "Europe/Simferopol", "Europe_Eastern", "Europe/Bucharest",
-        "Australia/Currie", "Australia_Eastern", "Australia/Sydney",
-        "Europe/Guernsey", "GMT", "Atlantic/Reykjavik",
-        "Asia/Thimphu", "Bhutan", "Asia/Thimphu",
-        "America/Eirunepe", "Amazon", "America/Manaus",
-        "Africa/Nairobi", "Africa_Eastern", "Africa/Nairobi",
-        "Asia/Yakutsk", "Yakutsk", "Asia/Yakutsk",
-        "Asia/Yangon", "Myanmar", "Asia/Rangoon",
-        "America/Goose_Bay", "Atlantic", "America/Halifax",
-        "Africa/Maseru", "Africa_Southern", "Africa/Johannesburg",
-        "America/Swift_Current", "America_Central", "America/Chicago",
-        "America/Guyana", "Guyana", "America/Guyana",
-        "Asia/Tokyo", "Japan", "Asia/Tokyo",
-        "Indian/Kerguelen", "French_Southern", "Indian/Kerguelen",
-        "America/Belem", "Brasilia", "America/Sao_Paulo",
-        "Pacific/Wallis", "Wallis", "Pacific/Wallis",
-        "America/Whitehorse", "America_Pacific", "America/Los_Angeles",
-        "America/North_Dakota/Beulah", "America_Central", "America/Chicago",
-        "Asia/Jerusalem", "Israel", "Asia/Jerusalem",
-        "Antarctica/Syowa", "Syowa", "Antarctica/Syowa",
-        "America/Thunder_Bay", "America_Eastern", "America/New_York",
-        "Asia/Brunei", "Brunei", "Asia/Brunei",
-        "America/Metlakatla", "America_Pacific", "America/Los_Angeles",
-        "Asia/Dushanbe", "Tajikistan", "Asia/Dushanbe",
-        "Pacific/Kosrae", "Kosrae", "Pacific/Kosrae",
-        "America/Coral_Harbour", "America_Eastern", "America/New_York",
-        "America/Tortola", "Atlantic", "America/Halifax",
-        "Asia/Karachi", "Pakistan", "Asia/Karachi",
-        "Indian/Reunion", "Reunion", "Indian/Reunion",
-        "America/Detroit", "America_Eastern", "America/New_York",
-        "Australia/Eucla", "Australia_CentralWestern", "Australia/Eucla",
-        "Asia/Seoul", "Korea", "Asia/Seoul",
-        "Asia/Singapore", "Singapore", "Asia/Singapore",
-        "Africa/Casablanca", "Europe_Western", "Atlantic/Canary",
-        "Asia/Dili", "East_Timor", "Asia/Dili",
-        "America/Indiana/Vincennes", "America_Eastern", "America/New_York",
-        "Europe/Dublin", "GMT", "Atlantic/Reykjavik",
-        "America/St_Johns", "Newfoundland", "America/St_Johns",
-        "Antarctica/Macquarie", "Macquarie", "Antarctica/Macquarie",
-        "America/Port_of_Spain", "Atlantic", "America/Halifax",
-        "Europe/Budapest", "Europe_Central", "Europe/Paris",
-        "America/Fortaleza", "Brasilia", "America/Sao_Paulo",
-        "Australia/Brisbane", "Australia_Eastern", "Australia/Sydney",
-        "Atlantic/Bermuda", "Atlantic", "America/Halifax",
-        "Asia/Amman", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Tashkent", "Uzbekistan", "Asia/Tashkent",
-        "Antarctica/DumontDUrville", "DumontDUrville", "Antarctica/DumontDUrville",
-        "Antarctica/Casey", "Australia_Western", "Australia/Perth",
-        "Asia/Vientiane", "Indochina", "Asia/Saigon",
-        "Pacific/Johnston", "Hawaii_Aleutian", "Pacific/Honolulu",
-        "America/Jamaica", "America_Eastern", "America/New_York",
-        "Africa/Addis_Ababa", "Africa_Eastern", "Africa/Nairobi",
-        "Pacific/Ponape", "Ponape", "Pacific/Ponape",
-        "Europe/Jersey", "GMT", "Atlantic/Reykjavik",
-        "Africa/Lome", "GMT", "Atlantic/Reykjavik",
-        "America/Manaus", "Amazon", "America/Manaus",
-        "Africa/Niamey", "Africa_Western", "Africa/Lagos",
-        "Asia/Kashgar", "China", "Asia/Shanghai",
-        "Pacific/Tongatapu", "Tonga", "Pacific/Tongatapu",
-        "Europe/Minsk", "Europe_Eastern", "Europe/Bucharest",
-        "America/Edmonton", "America_Mountain", "America/Denver",
-        "Asia/Baghdad", "Arabian", "Asia/Riyadh",
-        "Asia/Kathmandu", "Nepal", "Asia/Katmandu",
-        "America/Ojinaga", "America_Mountain", "America/Denver",
-        "Africa/Abidjan", "GMT", "Atlantic/Reykjavik",
-        "America/Indiana/Winamac", "America_Eastern", "America/New_York",
-        "Asia/Qyzylorda", "Kazakhstan_Eastern", "Asia/Almaty",
-        "Australia/Sydney", "Australia_Eastern", "Australia/Sydney",
-        "Asia/Ashgabat", "Turkmenistan", "Asia/Ashgabat",
-        "Europe/Amsterdam", "Europe_Central", "Europe/Paris",
-        "America/Dawson_Creek", "America_Mountain", "America/Denver",
-        "Africa/Cairo", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Pyongyang", "Korea", "Asia/Seoul",
-        "Africa/Kampala", "Africa_Eastern", "Africa/Nairobi",
-        "America/Araguaina", "Brasilia", "America/Sao_Paulo",
-        "Asia/Novokuznetsk", "Novosibirsk", "Asia/Novosibirsk",
-        "Pacific/Kwajalein", "Marshall_Islands", "Pacific/Majuro",
-        "Africa/Lubumbashi", "Africa_Central", "Africa/Maputo",
-        "Asia/Sakhalin", "Sakhalin", "Asia/Sakhalin",
-        "America/Indiana/Vevay", "America_Eastern", "America/New_York",
-        "Africa/Maputo", "Africa_Central", "Africa/Maputo",
-        "Atlantic/Faeroe", "Europe_Western", "Atlantic/Canary",
-        "America/North_Dakota/Center", "America_Central", "America/Chicago",
-        "Pacific/Wake", "Wake", "Pacific/Wake",
-        "Pacific/Pago_Pago", "Samoa", "Pacific/Apia",
-        "America/Moncton", "Atlantic", "America/Halifax",
-        "Africa/Sao_Tome", "Africa_Western", "Africa/Lagos",
-        "America/Glace_Bay", "Atlantic", "America/Halifax",
-        "Asia/Jakarta", "Indonesia_Western", "Asia/Jakarta",
-        "Africa/Asmera", "Africa_Eastern", "Africa/Nairobi",
-        "Europe/Lisbon", "Europe_Western", "Atlantic/Canary",
-        "America/Dawson", "America_Pacific", "America/Los_Angeles",
-        "America/Cayenne", "French_Guiana", "America/Cayenne",
-        "Asia/Bahrain", "Arabian", "Asia/Riyadh",
-        "Europe/Malta", "Europe_Central", "Europe/Paris",
-        "America/Indiana/Tell_City", "America_Central", "America/Chicago",
-        "America/Indiana/Petersburg", "America_Eastern", "America/New_York",
-        "Antarctica/Rothera", "Rothera", "Antarctica/Rothera",
-        "Asia/Aqtobe", "Kazakhstan_Western", "Asia/Aqtobe",
-        "Europe/Vaduz", "Europe_Central", "Europe/Paris",
-        "America/Indiana/Marengo", "America_Eastern", "America/New_York",
-        "Europe/Brussels", "Europe_Central", "Europe/Paris",
-        "Europe/Andorra", "Europe_Central", "Europe/Paris",
-        "America/Indiana/Knox", "America_Central", "America/Chicago",
-        "Pacific/Easter", "Easter", "Pacific/Easter",
-        "America/Argentina/Rio_Gallegos", "Argentina", "America/Buenos_Aires",
-        "Asia/Oral", "Kazakhstan_Western", "Asia/Aqtobe",
-        "Europe/Copenhagen", "Europe_Central", "Europe/Paris",
-        "Africa/Johannesburg", "Africa_Southern", "Africa/Johannesburg",
-        "Pacific/Pohnpei", "Ponape", "Pacific/Ponape",
-        "America/Argentina/Tucuman", "Argentina", "America/Buenos_Aires",
-        "America/Toronto", "America_Eastern", "America/New_York",
-        "Asia/Makassar", "Indonesia_Central", "Asia/Makassar",
-        "Europe/Berlin", "Europe_Central", "Europe/Paris",
-        "America/Argentina/Mendoza", "Argentina", "America/Buenos_Aires",
-        "America/Cuiaba", "Amazon", "America/Manaus",
-        "America/Creston", "America_Mountain", "America/Denver",
-        "Asia/Samarkand", "Uzbekistan", "Asia/Tashkent",
-        "Asia/Hovd", "Hovd", "Asia/Hovd",
-        "Europe/Bratislava", "Europe_Central", "Europe/Paris",
-        "Africa/Accra", "GMT", "Atlantic/Reykjavik",
-        "Africa/Douala", "Africa_Western", "Africa/Lagos",
-        "Africa/Nouakchott", "GMT", "Atlantic/Reykjavik",
-        "Europe/Sofia", "Europe_Eastern", "Europe/Bucharest",
-        "Antarctica/Davis", "Davis", "Antarctica/Davis",
-        "Antarctica/McMurdo", "New_Zealand", "Pacific/Auckland",
-        "Europe/San_Marino", "Europe_Central", "Europe/Paris",
-        "Africa/Porto-Novo", "Africa_Western", "Africa/Lagos",
-        "Asia/Jayapura", "Indonesia_Eastern", "Asia/Jayapura",
-        "America/St_Lucia", "Atlantic", "America/Halifax",
-        "America/Nipigon", "America_Eastern", "America/New_York",
-        "America/Argentina/Catamarca", "Argentina", "America/Buenos_Aires",
-        "Europe/Isle_of_Man", "GMT", "Atlantic/Reykjavik",
-        "America/Kentucky/Louisville", "America_Eastern", "America/New_York",
-        "America/Merida", "America_Central", "America/Chicago",
-        "Pacific/Marquesas", "Marquesas", "Pacific/Marquesas",
-        "Asia/Magadan", "Magadan", "Asia/Magadan",
-        "Africa/Libreville", "Africa_Western", "Africa/Lagos",
-        "Pacific/Efate", "Vanuatu", "Pacific/Efate",
-        "Asia/Kuala_Lumpur", "Malaysia", "Asia/Kuching",
-        "America/Iqaluit", "America_Eastern", "America/New_York",
-        "Indian/Comoro", "Africa_Eastern", "Africa/Nairobi",
-        "America/Panama", "America_Eastern", "America/New_York",
-        "Asia/Hebron", "Europe_Eastern", "Europe/Bucharest",
-        "America/Jujuy", "Argentina", "America/Buenos_Aires",
-        "America/Pangnirtung", "America_Eastern", "America/New_York",
-        "Asia/Tbilisi", "Georgia", "Asia/Tbilisi",
-        "Europe/Podgorica", "Europe_Central", "Europe/Paris",
-        "America/Boise", "America_Mountain", "America/Denver",
-        "Asia/Muscat", "Gulf", "Asia/Dubai",
-        "Indian/Mahe", "Seychelles", "Indian/Mahe",
-        "America/Montreal", "America_Eastern", "America/New_York",
-        "Africa/Bangui", "Africa_Western", "Africa/Lagos",
-        "America/Curacao", "Atlantic", "America/Halifax",
-        "Asia/Taipei", "Taipei", "Asia/Taipei",
-        "Europe/Ljubljana", "Europe_Central", "Europe/Paris",
-        "Atlantic/Stanley", "Falkland", "Atlantic/Stanley",
-        "Pacific/Guadalcanal", "Solomon", "Pacific/Guadalcanal",
-        "Asia/Kuwait", "Arabian", "Asia/Riyadh",
-        "Asia/Riyadh", "Arabian", "Asia/Riyadh",
-        "Europe/Tallinn", "Europe_Eastern", "Europe/Bucharest",
-        "America/New_York", "America_Eastern", "America/New_York",
-        "America/Paramaribo", "Suriname", "America/Paramaribo",
-        "America/Argentina/Buenos_Aires", "Argentina", "America/Buenos_Aires",
-        "Asia/Irkutsk", "Irkutsk", "Asia/Irkutsk",
-        "Asia/Katmandu", "Nepal", "Asia/Katmandu",
-        "America/Kralendijk", "Atlantic", "America/Halifax",
-    };
-    private static final String[] mzoneMap = new String[] {
-        "GMT", "ML", "Africa/Bamako",
-        "GMT", "IE", "Europe/Dublin",
-        "GMT", "SN", "Africa/Dakar",
-        "GMT", "GH", "Africa/Accra",
-        "GMT", "CI", "Africa/Abidjan",
-        "GMT", "BF", "Africa/Ouagadougou",
-        "GMT", "MR", "Africa/Nouakchott",
-        "GMT", "GM", "Africa/Banjul",
-        "GMT", "SL", "Africa/Freetown",
-        "GMT", "GN", "Africa/Conakry",
-        "GMT", "SH", "Atlantic/St_Helena",
-        "GMT", "GB", "Europe/London",
-        "GMT", "LR", "Africa/Monrovia",
-        "GMT", "TG", "Africa/Lome",
-        "Africa_Western", "ST", "Africa/Sao_Tome",
-        "Africa_Western", "CF", "Africa/Bangui",
-        "Africa_Western", "NE", "Africa/Niamey",
-        "Africa_Western", "CM", "Africa/Douala",
-        "Africa_Western", "CD", "Africa/Kinshasa",
-        "Africa_Western", "CG", "Africa/Brazzaville",
-        "Africa_Western", "GA", "Africa/Libreville",
-        "Africa_Western", "TD", "Africa/Ndjamena",
-        "Africa_Western", "AO", "Africa/Luanda",
-        "Africa_Western", "GQ", "Africa/Malabo",
-        "Africa_Eastern", "YT", "Indian/Mayotte",
-        "Africa_Eastern", "UG", "Africa/Kampala",
-        "Africa_Eastern", "ET", "Africa/Addis_Ababa",
-        "Africa_Eastern", "MG", "Indian/Antananarivo",
-        "Africa_Eastern", "TZ", "Africa/Dar_es_Salaam",
-        "Africa_Eastern", "SO", "Africa/Mogadishu",
-        "Africa_Eastern", "ER", "Africa/Asmera",
-        "Africa_Eastern", "KM", "Indian/Comoro",
-        "Africa_Eastern", "DJ", "Africa/Djibouti",
-        "Europe_Central", "GI", "Europe/Gibraltar",
-        "Europe_Central", "DK", "Europe/Copenhagen",
-        "Europe_Central", "SE", "Europe/Stockholm",
-        "Europe_Central", "CH", "Europe/Zurich",
-        "Europe_Central", "AL", "Europe/Tirane",
-        "Europe_Central", "RS", "Europe/Belgrade",
-        "Europe_Central", "HU", "Europe/Budapest",
-        "Europe_Central", "MT", "Europe/Malta",
-        "Europe_Central", "PL", "Europe/Warsaw",
-        "Europe_Central", "ME", "Europe/Podgorica",
-        "Europe_Central", "ES", "Europe/Madrid",
-        "Europe_Central", "CZ", "Europe/Prague",
-        "Europe_Central", "IT", "Europe/Rome",
-        "Europe_Central", "SI", "Europe/Ljubljana",
-        "Europe_Central", "LI", "Europe/Vaduz",
-        "Europe_Central", "AT", "Europe/Vienna",
-        "Europe_Central", "VA", "Europe/Vatican",
-        "Europe_Central", "DE", "Europe/Berlin",
-        "Europe_Central", "NO", "Europe/Oslo",
-        "Europe_Central", "SK", "Europe/Bratislava",
-        "Europe_Central", "AD", "Europe/Andorra",
-        "Europe_Central", "SM", "Europe/San_Marino",
-        "Europe_Central", "MK", "Europe/Skopje",
-        "Europe_Central", "TN", "Africa/Tunis",
-        "Europe_Central", "HR", "Europe/Zagreb",
-        "Europe_Central", "NL", "Europe/Amsterdam",
-        "Europe_Central", "BE", "Europe/Brussels",
-        "Europe_Central", "MC", "Europe/Monaco",
-        "Europe_Central", "LU", "Europe/Luxembourg",
-        "Europe_Central", "BA", "Europe/Sarajevo",
-        "China", "MO", "Asia/Macau",
-        "America_Pacific", "MX", "America/Tijuana",
-        "America_Pacific", "CA", "America/Vancouver",
-        "Indochina", "LA", "Asia/Vientiane",
-        "Indochina", "KH", "Asia/Phnom_Penh",
-        "Indochina", "TH", "Asia/Bangkok",
-        "Korea", "KP", "Asia/Pyongyang",
-        "America_Mountain", "MX", "America/Hermosillo",
-        "America_Mountain", "CA", "America/Edmonton",
-        "Africa_Southern", "LS", "Africa/Maseru",
-        "Africa_Southern", "SZ", "Africa/Mbabane",
-        "Chile", "AQ", "Antarctica/Palmer",
-        "New_Zealand", "AQ", "Antarctica/McMurdo",
-        "Gulf", "OM", "Asia/Muscat",
-        "Europe_Western", "FO", "Atlantic/Faeroe",
-        "America_Eastern", "TC", "America/Grand_Turk",
-        "America_Eastern", "CA", "America/Toronto",
-        "America_Eastern", "BS", "America/Nassau",
-        "America_Eastern", "PA", "America/Panama",
-        "America_Eastern", "JM", "America/Jamaica",
-        "America_Eastern", "KY", "America/Cayman",
-        "Africa_Central", "BI", "Africa/Bujumbura",
-        "Africa_Central", "ZM", "Africa/Lusaka",
-        "Africa_Central", "ZW", "Africa/Harare",
-        "Africa_Central", "CD", "Africa/Lubumbashi",
-        "Africa_Central", "BW", "Africa/Gaborone",
-        "Africa_Central", "RW", "Africa/Kigali",
-        "Africa_Central", "MW", "Africa/Blantyre",
-        "America_Central", "MX", "America/Mexico_City",
-        "America_Central", "HN", "America/Tegucigalpa",
-        "America_Central", "CA", "America/Winnipeg",
-        "America_Central", "GT", "America/Guatemala",
-        "America_Central", "SV", "America/El_Salvador",
-        "America_Central", "CR", "America/Costa_Rica",
-        "America_Central", "BZ", "America/Belize",
-        "Atlantic", "MS", "America/Montserrat",
-        "Atlantic", "AG", "America/Antigua",
-        "Atlantic", "TT", "America/Port_of_Spain",
-        "Atlantic", "MQ", "America/Martinique",
-        "Atlantic", "DM", "America/Dominica",
-        "Atlantic", "KN", "America/St_Kitts",
-        "Atlantic", "BM", "Atlantic/Bermuda",
-        "Atlantic", "PR", "America/Puerto_Rico",
-        "Atlantic", "AW", "America/Aruba",
-        "Atlantic", "VG", "America/Tortola",
-        "Atlantic", "GD", "America/Grenada",
-        "Atlantic", "GL", "America/Thule",
-        "Atlantic", "BB", "America/Barbados",
-        "Atlantic", "BQ", "America/Kralendijk",
-        "Atlantic", "SX", "America/Lower_Princes",
-        "Atlantic", "VI", "America/St_Thomas",
-        "Atlantic", "MF", "America/Marigot",
-        "Atlantic", "AI", "America/Anguilla",
-        "Atlantic", "AN", "America/Curacao",
-        "Atlantic", "LC", "America/St_Lucia",
-        "Atlantic", "GP", "America/Guadeloupe",
-        "Atlantic", "VC", "America/St_Vincent",
-        "Arabian", "QA", "Asia/Qatar",
-        "Arabian", "YE", "Asia/Aden",
-        "Arabian", "KW", "Asia/Kuwait",
-        "Arabian", "BH", "Asia/Bahrain",
-        "Arabian", "IQ", "Asia/Baghdad",
-        "India", "LK", "Asia/Colombo",
-        "Europe_Eastern", "SY", "Asia/Damascus",
-        "Europe_Eastern", "BG", "Europe/Sofia",
-        "Europe_Eastern", "GR", "Europe/Athens",
-        "Europe_Eastern", "JO", "Asia/Amman",
-        "Europe_Eastern", "CY", "Asia/Nicosia",
-        "Europe_Eastern", "AX", "Europe/Mariehamn",
-        "Europe_Eastern", "LB", "Asia/Beirut",
-        "Europe_Eastern", "FI", "Europe/Helsinki",
-        "Europe_Eastern", "EG", "Africa/Cairo",
-        "Chamorro", "GU", "Pacific/Guam",
-    };
-    private static final String[] aliasMap = new String[] {
-        "Brazil/Acre", "America/Rio_Branco",
-        "US/Indiana-Starke", "America/Indiana/Knox",
-        "America/Atka", "America/Adak",
-        "America/St_Barthelemy", "America/Guadeloupe",
-        "Australia/North", "Australia/Darwin",
-        "Europe/Zagreb", "Europe/Belgrade",
-        "Etc/Universal", "Etc/UTC",
-        "NZ-CHAT", "Pacific/Chatham",
-        "Asia/Macao", "Asia/Macau",
-        "Pacific/Yap", "Pacific/Chuuk",
-        "Egypt", "Africa/Cairo",
-        "US/Central", "America/Chicago",
-        "Canada/Atlantic", "America/Halifax",
-        "Brazil/East", "America/Sao_Paulo",
-        "America/Cordoba", "America/Argentina/Cordoba",
-        "US/Hawaii", "Pacific/Honolulu",
-        "America/Louisville", "America/Kentucky/Louisville",
-        "America/Shiprock", "America/Denver",
-        "Australia/Canberra", "Australia/Sydney",
-        "Asia/Chungking", "Asia/Chongqing",
-        "Universal", "Etc/UTC",
-        "US/Alaska", "America/Anchorage",
-        "Asia/Ujung_Pandang", "Asia/Makassar",
-        "Japan", "Asia/Tokyo",
-        "Atlantic/Faeroe", "Atlantic/Faroe",
-        "Asia/Istanbul", "Europe/Istanbul",
-        "US/Pacific", "America/Los_Angeles",
-        "Mexico/General", "America/Mexico_City",
-        "Poland", "Europe/Warsaw",
-        "Africa/Asmera", "Africa/Asmara",
-        "Asia/Saigon", "Asia/Ho_Chi_Minh",
-        "US/Michigan", "America/Detroit",
-        "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca",
-        "W-SU", "Europe/Moscow",
-        "Australia/ACT", "Australia/Sydney",
-        "Asia/Calcutta", "Asia/Kolkata",
-        "Arctic/Longyearbyen", "Europe/Oslo",
-        "America/Knox_IN", "America/Indiana/Knox",
-        "ROC", "Asia/Taipei",
-        "Zulu", "Etc/UTC",
-        "Australia/Yancowinna", "Australia/Broken_Hill",
-        "Australia/West", "Australia/Perth",
-        "Singapore", "Asia/Singapore",
-        "Europe/Mariehamn", "Europe/Helsinki",
-        "ROK", "Asia/Seoul",
-        "America/Porto_Acre", "America/Rio_Branco",
-        "Etc/Zulu", "Etc/UTC",
-        "Canada/Yukon", "America/Whitehorse",
-        "Europe/Vatican", "Europe/Rome",
-        "Africa/Timbuktu", "Africa/Bamako",
-        "America/Buenos_Aires", "America/Argentina/Buenos_Aires",
-        "Canada/Pacific", "America/Vancouver",
-        "US/Pacific-New", "America/Los_Angeles",
-        "Mexico/BajaNorte", "America/Tijuana",
-        "Europe/Guernsey", "Europe/London",
-        "Asia/Tel_Aviv", "Asia/Jerusalem",
-        "Chile/Continental", "America/Santiago",
-        "Jamaica", "America/Jamaica",
-        "Mexico/BajaSur", "America/Mazatlan",
-        "Canada/Eastern", "America/Toronto",
-        "Australia/Tasmania", "Australia/Hobart",
-        "NZ", "Pacific/Auckland",
-        "America/Lower_Princes", "America/Curacao",
-        "GMT-", "Etc/GMT",
-        "America/Rosario", "America/Argentina/Cordoba",
-        "Libya", "Africa/Tripoli",
-        "Asia/Ashkhabad", "Asia/Ashgabat",
-        "Australia/NSW", "Australia/Sydney",
-        "America/Marigot", "America/Guadeloupe",
-        "Europe/Bratislava", "Europe/Prague",
-        "Portugal", "Europe/Lisbon",
-        "Etc/GMT-", "Etc/GMT",
-        "Europe/San_Marino", "Europe/Rome",
-        "Europe/Sarajevo", "Europe/Belgrade",
-        "Antarctica/South_Pole", "Antarctica/McMurdo",
-        "Canada/Central", "America/Winnipeg",
-        "Etc/GMT", "Etc/GMT",
-        "Europe/Isle_of_Man", "Europe/London",
-        "America/Fort_Wayne", "America/Indiana/Indianapolis",
-        "Eire", "Europe/Dublin",
-        "America/Coral_Harbour", "America/Atikokan",
-        "Europe/Nicosia", "Asia/Nicosia",
-        "US/Samoa", "Pacific/Pago_Pago",
-        "Hongkong", "Asia/Hong_Kong",
-        "Canada/Saskatchewan", "America/Regina",
-        "Asia/Thimbu", "Asia/Thimphu",
-        "Kwajalein", "Pacific/Kwajalein",
-        "GB", "Europe/London",
-        "Chile/EasterIsland", "Pacific/Easter",
-        "US/East-Indiana", "America/Indiana/Indianapolis",
-        "Australia/LHI", "Australia/Lord_Howe",
-        "Cuba", "America/Havana",
-        "America/Jujuy", "America/Argentina/Jujuy",
-        "US/Mountain", "America/Denver",
-        "Atlantic/Jan_Mayen", "Europe/Oslo",
-        "Europe/Tiraspol", "Europe/Chisinau",
-        "Europe/Podgorica", "Europe/Belgrade",
-        "US/Arizona", "America/Phoenix",
-        "Navajo", "America/Denver",
-        "Etc/Greenwich", "Etc/GMT",
-        "Canada/Mountain", "America/Edmonton",
-        "Iceland", "Atlantic/Reykjavik",
-        "Australia/Victoria", "Australia/Melbourne",
-        "Australia/South", "Australia/Adelaide",
-        "Brazil/West", "America/Manaus",
-        "Pacific/Ponape", "Pacific/Pohnpei",
-        "Europe/Ljubljana", "Europe/Belgrade",
-        "Europe/Jersey", "Europe/London",
-        "Australia/Queensland", "Australia/Brisbane",
-        "UTC", "Etc/UTC",
-        "Canada/Newfoundland", "America/St_Johns",
-        "Europe/Skopje", "Europe/Belgrade",
-        "PRC", "Asia/Shanghai",
-        "UCT", "Etc/UCT",
-        "America/Mendoza", "America/Argentina/Mendoza",
-        "Israel", "Asia/Jerusalem",
-        "US/Eastern", "America/New_York",
-        "Asia/Ulan_Bator", "Asia/Ulaanbaatar",
-        "Turkey", "Europe/Istanbul",
-        "GMT", "Etc/GMT",
-        "US/Aleutian", "America/Adak",
-        "Brazil/DeNoronha", "America/Noronha",
-        "GB-Eire", "Europe/London",
-        "Asia/Dacca", "Asia/Dhaka",
-        "America/Ensenada", "America/Tijuana",
-        "America/Catamarca", "America/Argentina/Catamarca",
-        "Iran", "Asia/Tehran",
-        "Greenwich", "Etc/GMT",
-        "Pacific/Truk", "Pacific/Chuuk",
-        "Pacific/Samoa", "Pacific/Pago_Pago",
-        "America/Virgin", "America/St_Thomas",
-        "Asia/Katmandu", "Asia/Kathmandu",
-        "America/Indianapolis", "America/Indiana/Indianapolis",
-        "Europe/Belfast", "Europe/London",
-        "America/Kralendijk", "America/Curacao",
-        "Asia/Rangoon", "Asia/Yangon",
-    };
-
-    private static final Map<String, String> zidToMzone = new HashMap<>();
-    private static final Map<String, String> mzoneToZid = new HashMap<>();
-    private static final Map<String, Map<String, String>> mzoneToZidL = new HashMap<>();
-    private static final Map<String, String> aliases = new HashMap<>();
-
-    static {
-        for (int i = 0; i < zidMap.length; i += 3) {
-            zidToMzone.put(zidMap[i], zidMap[i + 1]);
-            mzoneToZid.put(zidMap[i + 1], zidMap[i + 2]);
-        }
-
-        for (int i = 0; i < mzoneMap.length; i += 3) {
-            String mzone = mzoneMap[i];
-            Map<String, String> map = mzoneToZidL.get(mzone);
-            if (map == null) {
-                map = new HashMap<>();
-                mzoneToZidL.put(mzone, map);
-            }
-            map.put(mzoneMap[i + 1], mzoneMap[i + 2]);
-        }
-
-        for (int i = 0; i < aliasMap.length; i += 2) {
-            aliases.put(aliasMap[i], aliasMap[i + 1]);
-        }
-    }
-}
diff --git a/src/java.base/share/classes/java/time/format/ZoneName.java.template b/src/java.base/share/classes/java/time/format/ZoneName.java.template
new file mode 100644
index 00000000000..54e9d5b861f
--- /dev/null
+++ b/src/java.base/share/classes/java/time/format/ZoneName.java.template
@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 2013, 2018, 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.time.format;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * A helper class to map a zone name to metazone and back to the
+ * appropriate zone id for the particular locale.
+ * <p>
+ * The zid<->metazone mappings are based on CLDR metaZones.xml.
+ * The alias mappings are based on Link entries in tzdb data files and
+ * CLDR's supplementalMetadata.xml.
+ */
+class ZoneName {
+
+    public static String toZid(String zid, Locale locale) {
+        String mzone = zidToMzone.get(zid);
+        if (mzone == null && aliases.containsKey(zid)) {
+            zid = aliases.get(zid);
+            mzone = zidToMzone.get(zid);
+        }
+        if (mzone != null) {
+            Map<String, String> map = mzoneToZidL.get(mzone);
+            if (map != null && map.containsKey(locale.getCountry())) {
+                zid = map.get(locale.getCountry());
+            } else {
+                zid = mzoneToZid.get(mzone);
+            }
+        }
+        return toZid(zid);
+    }
+
+    public static String toZid(String zid) {
+        if (aliases.containsKey(zid)) {
+            return aliases.get(zid);
+        }
+        return zid;
+    }
+
+    private static final String[] zidMap = new String[] {
+        // From metaZones.xml
+%%%%ZIDMAP%%%%
+
+        // From tzdb
+        "Africa/Khartoum", "Africa_Central", "Africa/Maputo", // tzdata2017c
+        "Africa/Windhoek", "Africa_Central", "Africa/Maputo", // tzdata2017c
+        "Africa/Sao_Tome", "Africa_Western", "Africa/Lagos",  // tzdata2018c
+    };
+    private static final String[] mzoneMap = new String[] {
+        // From metaZones.xml
+%%%%MZONEMAP%%%%
+
+        // From tzdb
+        "Africa_Western", "ST", "Africa/Sao_Tome", // tzdata2018c
+    };
+    private static final String[] aliasMap = new String[] {
+        // From supplementalMetadata.xml
+%%%%DEPRECATED%%%%
+
+        // From tzdb
+        "Brazil/Acre", "America/Rio_Branco",
+        "US/Indiana-Starke", "America/Indiana/Knox",
+        "America/Atka", "America/Adak",
+        "America/St_Barthelemy", "America/Guadeloupe",
+        "Australia/North", "Australia/Darwin",
+        "Europe/Zagreb", "Europe/Belgrade",
+        "Etc/Universal", "Etc/UTC",
+        "NZ-CHAT", "Pacific/Chatham",
+        "Asia/Macao", "Asia/Macau",
+        "Pacific/Yap", "Pacific/Chuuk",
+        "Egypt", "Africa/Cairo",
+        "US/Central", "America/Chicago",
+        "Canada/Atlantic", "America/Halifax",
+        "Brazil/East", "America/Sao_Paulo",
+        "America/Cordoba", "America/Argentina/Cordoba",
+        "US/Hawaii", "Pacific/Honolulu",
+        "America/Louisville", "America/Kentucky/Louisville",
+        "America/Shiprock", "America/Denver",
+        "Australia/Canberra", "Australia/Sydney",
+        "Asia/Chungking", "Asia/Chongqing",
+        "Universal", "Etc/UTC",
+        "US/Alaska", "America/Anchorage",
+        "Asia/Ujung_Pandang", "Asia/Makassar",
+        "Japan", "Asia/Tokyo",
+        "Atlantic/Faeroe", "Atlantic/Faroe",
+        "Asia/Istanbul", "Europe/Istanbul",
+        "US/Pacific", "America/Los_Angeles",
+        "Mexico/General", "America/Mexico_City",
+        "Poland", "Europe/Warsaw",
+        "Africa/Asmera", "Africa/Asmara",
+        "Asia/Saigon", "Asia/Ho_Chi_Minh",
+        "US/Michigan", "America/Detroit",
+        "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca",
+        "W-SU", "Europe/Moscow",
+        "Australia/ACT", "Australia/Sydney",
+        "Asia/Calcutta", "Asia/Kolkata",
+        "Arctic/Longyearbyen", "Europe/Oslo",
+        "America/Knox_IN", "America/Indiana/Knox",
+        "ROC", "Asia/Taipei",
+        "Zulu", "Etc/UTC",
+        "Australia/Yancowinna", "Australia/Broken_Hill",
+        "Australia/West", "Australia/Perth",
+        "Singapore", "Asia/Singapore",
+        "Europe/Mariehamn", "Europe/Helsinki",
+        "ROK", "Asia/Seoul",
+        "America/Porto_Acre", "America/Rio_Branco",
+        "Etc/Zulu", "Etc/UTC",
+        "Canada/Yukon", "America/Whitehorse",
+        "Europe/Vatican", "Europe/Rome",
+        "Africa/Timbuktu", "Africa/Bamako",
+        "America/Buenos_Aires", "America/Argentina/Buenos_Aires",
+        "Canada/Pacific", "America/Vancouver",
+        "US/Pacific-New", "America/Los_Angeles",
+        "Mexico/BajaNorte", "America/Tijuana",
+        "Europe/Guernsey", "Europe/London",
+        "Asia/Tel_Aviv", "Asia/Jerusalem",
+        "Chile/Continental", "America/Santiago",
+        "Jamaica", "America/Jamaica",
+        "Mexico/BajaSur", "America/Mazatlan",
+        "Canada/Eastern", "America/Toronto",
+        "Australia/Tasmania", "Australia/Hobart",
+        "NZ", "Pacific/Auckland",
+        "America/Lower_Princes", "America/Curacao",
+        "GMT-", "Etc/GMT",
+        "America/Rosario", "America/Argentina/Cordoba",
+        "Libya", "Africa/Tripoli",
+        "Asia/Ashkhabad", "Asia/Ashgabat",
+        "Australia/NSW", "Australia/Sydney",
+        "America/Marigot", "America/Guadeloupe",
+        "Europe/Bratislava", "Europe/Prague",
+        "Portugal", "Europe/Lisbon",
+        "Etc/GMT-", "Etc/GMT",
+        "Europe/San_Marino", "Europe/Rome",
+        "Europe/Sarajevo", "Europe/Belgrade",
+        "Antarctica/South_Pole", "Antarctica/McMurdo",
+        "Canada/Central", "America/Winnipeg",
+        "Etc/GMT", "Etc/GMT",
+        "Europe/Isle_of_Man", "Europe/London",
+        "America/Fort_Wayne", "America/Indiana/Indianapolis",
+        "Eire", "Europe/Dublin",
+        "America/Coral_Harbour", "America/Atikokan",
+        "Europe/Nicosia", "Asia/Nicosia",
+        "US/Samoa", "Pacific/Pago_Pago",
+        "Hongkong", "Asia/Hong_Kong",
+        "Canada/Saskatchewan", "America/Regina",
+        "Asia/Thimbu", "Asia/Thimphu",
+        "Kwajalein", "Pacific/Kwajalein",
+        "GB", "Europe/London",
+        "Chile/EasterIsland", "Pacific/Easter",
+        "US/East-Indiana", "America/Indiana/Indianapolis",
+        "Australia/LHI", "Australia/Lord_Howe",
+        "Cuba", "America/Havana",
+        "America/Jujuy", "America/Argentina/Jujuy",
+        "US/Mountain", "America/Denver",
+        "Atlantic/Jan_Mayen", "Europe/Oslo",
+        "Europe/Tiraspol", "Europe/Chisinau",
+        "Europe/Podgorica", "Europe/Belgrade",
+        "US/Arizona", "America/Phoenix",
+        "Navajo", "America/Denver",
+        "Etc/Greenwich", "Etc/GMT",
+        "Canada/Mountain", "America/Edmonton",
+        "Iceland", "Atlantic/Reykjavik",
+        "Australia/Victoria", "Australia/Melbourne",
+        "Australia/South", "Australia/Adelaide",
+        "Brazil/West", "America/Manaus",
+        "Pacific/Ponape", "Pacific/Pohnpei",
+        "Europe/Ljubljana", "Europe/Belgrade",
+        "Europe/Jersey", "Europe/London",
+        "Australia/Queensland", "Australia/Brisbane",
+        "UTC", "Etc/UTC",
+        "Canada/Newfoundland", "America/St_Johns",
+        "Europe/Skopje", "Europe/Belgrade",
+        "PRC", "Asia/Shanghai",
+        "UCT", "Etc/UCT",
+        "America/Mendoza", "America/Argentina/Mendoza",
+        "Israel", "Asia/Jerusalem",
+        "US/Eastern", "America/New_York",
+        "Asia/Ulan_Bator", "Asia/Ulaanbaatar",
+        "Turkey", "Europe/Istanbul",
+        "GMT", "Etc/GMT",
+        "US/Aleutian", "America/Adak",
+        "Brazil/DeNoronha", "America/Noronha",
+        "GB-Eire", "Europe/London",
+        "Asia/Dacca", "Asia/Dhaka",
+        "America/Ensenada", "America/Tijuana",
+        "America/Catamarca", "America/Argentina/Catamarca",
+        "Iran", "Asia/Tehran",
+        "Greenwich", "Etc/GMT",
+        "Pacific/Truk", "Pacific/Chuuk",
+        "Pacific/Samoa", "Pacific/Pago_Pago",
+        "America/Virgin", "America/St_Thomas",
+        "Asia/Katmandu", "Asia/Kathmandu",
+        "America/Indianapolis", "America/Indiana/Indianapolis",
+        "Europe/Belfast", "Europe/London",
+        "America/Kralendijk", "America/Curacao",
+        "Asia/Rangoon", "Asia/Yangon",
+    };
+
+    private static final Map<String, String> zidToMzone = new HashMap<>();
+    private static final Map<String, String> mzoneToZid = new HashMap<>();
+    private static final Map<String, Map<String, String>> mzoneToZidL = new HashMap<>();
+    private static final Map<String, String> aliases = new HashMap<>();
+
+    static {
+        for (int i = 0; i < zidMap.length; i += 3) {
+            zidToMzone.put(zidMap[i], zidMap[i + 1]);
+            mzoneToZid.put(zidMap[i + 1], zidMap[i + 2]);
+        }
+
+        for (int i = 0; i < mzoneMap.length; i += 3) {
+            String mzone = mzoneMap[i];
+            Map<String, String> map = mzoneToZidL.get(mzone);
+            if (map == null) {
+                map = new HashMap<>();
+                mzoneToZidL.put(mzone, map);
+            }
+            map.put(mzoneMap[i + 1], mzoneMap[i + 2]);
+        }
+
+        for (int i = 0; i < aliasMap.length; i += 2) {
+            aliases.put(aliasMap[i], aliasMap[i + 1]);
+        }
+    }
+}
diff --git a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
index 9739ad6bdbe..dd3799ac8a7 100644
--- a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -49,7 +49,7 @@
 
 /*
  * @test
- * @bug 8081022 8151876 8166875
+ * @bug 8081022 8151876 8166875 8189784
  * @key randomness
  */
 
@@ -158,6 +158,10 @@ Object[][] data_preferredZones() {
             {"Australia/South",  "ACST",                  preferred_s, Locale.ENGLISH, TextStyle.SHORT},
             {"America/Chicago",  "CDT",                   none,        Locale.ENGLISH, TextStyle.SHORT},
             {"Asia/Shanghai",    "CDT",                   preferred_s, Locale.ENGLISH, TextStyle.SHORT},
+            {"America/Juneau",   "AKST",                  none,        Locale.ENGLISH, TextStyle.SHORT},
+            {"America/Juneau",   "AKDT",                  none,        Locale.ENGLISH, TextStyle.SHORT},
+            {"Pacific/Honolulu", "HST",                   none,        Locale.ENGLISH, TextStyle.SHORT},
+            {"America/Halifax",  "AST",                   none,        Locale.ENGLISH, TextStyle.SHORT},
        };
     }
 
diff --git a/test/jdk/java/time/test/java/time/format/ZoneName.java b/test/jdk/java/time/test/java/time/format/ZoneName.java
index a94f1466dea..27fcdee34f3 100644
--- a/test/jdk/java/time/test/java/time/format/ZoneName.java
+++ b/test/jdk/java/time/test/java/time/format/ZoneName.java
@@ -20,13 +20,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package test.java.time.format;
 
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
+/**
+ * A helper class to map a zone name to metazone and back to the
+ * appropriate zone id for the particular locale.
+ * <p>
+ * The zid<->metazone mappings are based on CLDR metaZones.xml.
+ * The alias mappings are based on Link entries in tzdb data files and
+ * CLDR's supplementalMetadata.xml.
+ */
 class ZoneName {
 
     public static String toZid(String zid, Locale locale) {
@@ -54,699 +61,850 @@ public static String toZid(String zid) {
     }
 
     private static final String[] zidMap = new String[] {
-        "Asia/Bangkok", "Indochina", "Asia/Saigon",
-        "Pacific/Pago_Pago", "Samoa", "Pacific/Apia",
-        "Africa/Blantyre", "Africa_Central", "Africa/Maputo",
-        "America/Argentina/San_Juan", "Argentina", "America/Buenos_Aires",
-        "America/Cancun", "America_Central", "America/Chicago",
-        "Pacific/Nauru", "Nauru", "Pacific/Nauru",
-        "America/Atikokan", "America_Eastern", "America/New_York",
+        // From metaZones.xml
+        "Africa/Abidjan", "GMT", "Atlantic/Reykjavik",
+        "Africa/Accra", "GMT", "Atlantic/Reykjavik",
+        "Africa/Addis_Ababa", "Africa_Eastern", "Africa/Nairobi",
+        "Africa/Algiers", "Europe_Central", "Europe/Paris",
         "Africa/Asmara", "Africa_Eastern", "Africa/Nairobi",
-        "Europe/Berlin", "Europe_Central", "Europe/Paris",
-        "Asia/Kolkata", "India", "Asia/Calcutta",
-        "Australia/Darwin", "Australia_Central", "Australia/Adelaide",
-        "America/Guayaquil", "Ecuador", "America/Guayaquil",
-        "Europe/Vienna", "Europe_Central", "Europe/Paris",
-        "Atlantic/St_Helena", "GMT", "Atlantic/Reykjavik",
-        "Europe/London", "GMT", "Atlantic/Reykjavik",
-        "Europe/Moscow", "Moscow", "Europe/Moscow",
-        "America/St_Vincent", "Atlantic", "America/Halifax",
-        "America/Bogota", "Colombia", "America/Bogota",
-        "America/Marigot", "Atlantic", "America/Halifax",
-        "Europe/Sarajevo", "Europe_Central", "Europe/Paris",
-        "America/Hermosillo", "America_Mountain", "America/Denver",
-        "America/Winnipeg", "America_Central", "America/Chicago",
-        "America/Rainy_River", "America_Central", "America/Chicago",
-        "Indian/Mahe", "Seychelles", "Indian/Mahe",
+        "Africa/Asmera", "Africa_Eastern", "Africa/Nairobi",
+        "Africa/Bamako", "GMT", "Atlantic/Reykjavik",
+        "Africa/Bangui", "Africa_Western", "Africa/Lagos",
+        "Africa/Banjul", "GMT", "Atlantic/Reykjavik",
+        "Africa/Bissau", "GMT", "Atlantic/Reykjavik",
+        "Africa/Blantyre", "Africa_Central", "Africa/Maputo",
+        "Africa/Brazzaville", "Africa_Western", "Africa/Lagos",
+        "Africa/Bujumbura", "Africa_Central", "Africa/Maputo",
+        "Africa/Cairo", "Europe_Eastern", "Europe/Bucharest",
+        "Africa/Casablanca", "Europe_Western", "Atlantic/Canary",
+        "Africa/Ceuta", "Europe_Central", "Europe/Paris",
+        "Africa/Conakry", "GMT", "Atlantic/Reykjavik",
+        "Africa/Dakar", "GMT", "Atlantic/Reykjavik",
+        "Africa/Dar_es_Salaam", "Africa_Eastern", "Africa/Nairobi",
+        "Africa/Djibouti", "Africa_Eastern", "Africa/Nairobi",
+        "Africa/Douala", "Africa_Western", "Africa/Lagos",
+        "Africa/El_Aaiun", "Europe_Western", "Atlantic/Canary",
         "Africa/Freetown", "GMT", "Atlantic/Reykjavik",
-        "America/Grand_Turk", "America_Eastern", "America/New_York",
-        "America/Argentina/Ushuaia", "Argentina", "America/Buenos_Aires",
-        "Atlantic/Azores", "Azores", "Atlantic/Azores",
-        "Asia/Harbin", "China", "Asia/Shanghai",
-        "America/Cuiaba", "Amazon", "America/Manaus",
-        "Asia/Bahrain", "Arabian", "Asia/Riyadh",
-        "Asia/Katmandu", "Nepal", "Asia/Katmandu",
-        "Pacific/Galapagos", "Galapagos", "Pacific/Galapagos",
-        "Asia/Brunei", "Brunei", "Asia/Brunei",
+        "Africa/Gaborone", "Africa_Central", "Africa/Maputo",
+        "Africa/Harare", "Africa_Central", "Africa/Maputo",
+        "Africa/Johannesburg", "Africa_Southern", "Africa/Johannesburg",
+        "Africa/Juba", "Africa_Eastern", "Africa/Nairobi",
+        "Africa/Kampala", "Africa_Eastern", "Africa/Nairobi",
+        "Africa/Khartoum", "Africa_Eastern", "Africa/Nairobi",
         "Africa/Kigali", "Africa_Central", "Africa/Maputo",
-        "Asia/Makassar", "Indonesia_Central", "Asia/Makassar",
-        "Africa/Maputo", "Africa_Central", "Africa/Maputo",
-        "Asia/Kamchatka", "Magadan", "Asia/Magadan",
-        "Atlantic/Faroe", "Europe_Western", "Atlantic/Canary",
-        "America/El_Salvador", "America_Central", "America/Chicago",
-        "Asia/Saigon", "Indochina", "Asia/Saigon",
         "Africa/Kinshasa", "Africa_Western", "Africa/Lagos",
-        "Europe/Oslo", "Europe_Central", "Europe/Paris",
-        "Asia/Hong_Kong", "Hong_Kong", "Asia/Hong_Kong",
-        "Pacific/Midway", "Samoa", "Pacific/Apia",
-        "Africa/Douala", "Africa_Western", "Africa/Lagos",
-        "Europe/San_Marino", "Europe_Central", "Europe/Paris",
-        "Pacific/Chuuk", "Truk", "Pacific/Truk",
-        "Africa/Gaborone", "Africa_Central", "Africa/Maputo",
-        "Africa/Tunis", "Europe_Central", "Europe/Paris",
-        "Africa/Khartoum", "Africa_Central", "Africa/Maputo",
-        "Europe/Isle_of_Man", "GMT", "Atlantic/Reykjavik",
-        "Europe/Skopje", "Europe_Central", "Europe/Paris",
-        "America/Merida", "America_Central", "America/Chicago",
-        "Antarctica/DumontDUrville", "DumontDUrville", "Antarctica/DumontDUrville",
-        "Atlantic/Reykjavik", "GMT", "Atlantic/Reykjavik",
-        "Indian/Mauritius", "Mauritius", "Indian/Mauritius",
+        "Africa/Lagos", "Africa_Western", "Africa/Lagos",
+        "Africa/Libreville", "Africa_Western", "Africa/Lagos",
+        "Africa/Lome", "GMT", "Atlantic/Reykjavik",
+        "Africa/Luanda", "Africa_Western", "Africa/Lagos",
+        "Africa/Lubumbashi", "Africa_Central", "Africa/Maputo",
+        "Africa/Lusaka", "Africa_Central", "Africa/Maputo",
         "Africa/Malabo", "Africa_Western", "Africa/Lagos",
-        "Africa/Juba", "Africa_Eastern", "Africa/Nairobi",
-        "America/Resolute", "America_Central", "America/Chicago",
-        "Africa/Abidjan", "GMT", "Atlantic/Reykjavik",
-        "Antarctica/McMurdo", "New_Zealand", "Pacific/Auckland",
-        "Asia/Thimphu", "Bhutan", "Asia/Thimphu",
-        "Europe/Zaporozhye", "Europe_Eastern", "Europe/Bucharest",
-        "Antarctica/Davis", "Davis", "Antarctica/Davis",
-        "Indian/Antananarivo", "Africa_Eastern", "Africa/Nairobi",
-        "Africa/Harare", "Africa_Central", "Africa/Maputo",
-        "Pacific/Marquesas", "Marquesas", "Pacific/Marquesas",
+        "Africa/Maputo", "Africa_Central", "Africa/Maputo",
+        "Africa/Maseru", "Africa_Southern", "Africa/Johannesburg",
+        "Africa/Mbabane", "Africa_Southern", "Africa/Johannesburg",
+        "Africa/Mogadishu", "Africa_Eastern", "Africa/Nairobi",
+        "Africa/Monrovia", "GMT", "Atlantic/Reykjavik",
+        "Africa/Nairobi", "Africa_Eastern", "Africa/Nairobi",
+        "Africa/Ndjamena", "Africa_Western", "Africa/Lagos",
+        "Africa/Niamey", "Africa_Western", "Africa/Lagos",
+        "Africa/Nouakchott", "GMT", "Atlantic/Reykjavik",
+        "Africa/Ouagadougou", "GMT", "Atlantic/Reykjavik",
+        "Africa/Porto-Novo", "Africa_Western", "Africa/Lagos",
+        "Africa/Sao_Tome", "GMT", "Atlantic/Reykjavik",
+        "Africa/Timbuktu", "GMT", "Atlantic/Reykjavik",
         "Africa/Tripoli", "Europe_Eastern", "Europe/Bucharest",
-        "America/North_Dakota/Beulah", "America_Central", "America/Chicago",
-        "America/Buenos_Aires", "Argentina", "America/Buenos_Aires",
-        "America/Tortola", "Atlantic", "America/Halifax",
-        "Asia/Kuwait", "Arabian", "Asia/Riyadh",
-        "Europe/Rome", "Europe_Central", "Europe/Paris",
-        "America/Eirunepe", "Amazon", "America/Manaus",
-        "Australia/Hobart", "Australia_Eastern", "Australia/Sydney",
-        "America/Thule", "Atlantic", "America/Halifax",
-        "Asia/Beirut", "Europe_Eastern", "Europe/Bucharest",
-        "America/Bahia_Banderas", "America_Central", "America/Chicago",
-        "Africa/Dar_es_Salaam", "Africa_Eastern", "Africa/Nairobi",
+        "Africa/Tunis", "Europe_Central", "Europe/Paris",
+        "Africa/Windhoek", "Africa_Western", "Africa/Lagos",
+        "America/Adak", "Hawaii_Aleutian", "Pacific/Honolulu",
+        "America/Anchorage", "Alaska", "America/Juneau",
+        "America/Anguilla", "Atlantic", "America/Halifax",
+        "America/Antigua", "Atlantic", "America/Halifax",
+        "America/Araguaina", "Brasilia", "America/Sao_Paulo",
+        "America/Argentina/Buenos_Aires", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/Catamarca", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/ComodRivadavia", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/Cordoba", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/Jujuy", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/La_Rioja", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/Mendoza", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/Rio_Gallegos", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/Salta", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/San_Juan", "Argentina", "America/Buenos_Aires",
+        "America/Argentina/San_Luis", "Argentina_Western", "America/Argentina/San_Luis",
         "America/Argentina/Tucuman", "Argentina", "America/Buenos_Aires",
-        "America/Paramaribo", "Suriname", "America/Paramaribo",
-        "Africa/Kampala", "Africa_Eastern", "Africa/Nairobi",
-        "Pacific/Port_Moresby", "Papua_New_Guinea", "Pacific/Port_Moresby",
-        "America/Mendoza", "Argentina", "America/Buenos_Aires",
-        "Asia/Dushanbe", "Tajikistan", "Asia/Dushanbe",
-        "Asia/Qyzylorda", "Kazakhstan_Eastern", "Asia/Almaty",
-        "Antarctica/Vostok", "Vostok", "Antarctica/Vostok",
-        "Pacific/Majuro", "Marshall_Islands", "Pacific/Majuro",
-        "Asia/Tehran", "Iran", "Asia/Tehran",
-        "Asia/Hovd", "Hovd", "Asia/Hovd",
-        "Antarctica/Rothera", "Rothera", "Antarctica/Rothera",
-        "Africa/Brazzaville", "Africa_Western", "Africa/Lagos",
-        "Europe/Tirane", "Europe_Central", "Europe/Paris",
-        "Asia/Urumqi", "China", "Asia/Shanghai",
-        "Asia/Krasnoyarsk", "Krasnoyarsk", "Asia/Krasnoyarsk",
-        "America/Tegucigalpa", "America_Central", "America/Chicago",
-        "Asia/Vientiane", "Indochina", "Asia/Saigon",
-        "Asia/Pontianak", "Indonesia_Western", "Asia/Jakarta",
+        "America/Argentina/Ushuaia", "Argentina", "America/Buenos_Aires",
+        "America/Aruba", "Atlantic", "America/Halifax",
+        "America/Asuncion", "Paraguay", "America/Asuncion",
+        "America/Atikokan", "America_Eastern", "America/New_York",
+        "America/Atka", "Hawaii_Aleutian", "Pacific/Honolulu",
         "America/Bahia", "Brasilia", "America/Sao_Paulo",
-        "Asia/Choibalsan", "Choibalsan", "Asia/Choibalsan",
-        "America/Regina", "America_Central", "America/Chicago",
-        "Africa/Cairo", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Irkutsk", "Irkutsk", "Asia/Irkutsk",
-        "Europe/Luxembourg", "Europe_Central", "Europe/Paris",
-        "America/St_Kitts", "Atlantic", "America/Halifax",
-        "America/Manaus", "Amazon", "America/Manaus",
-        "America/Noronha", "Noronha", "America/Noronha",
-        "Pacific/Gambier", "Gambier", "Pacific/Gambier",
-        "America/Edmonton", "America_Mountain", "America/Denver",
-        "Pacific/Palau", "Palau", "Pacific/Palau",
-        "America/Lower_Princes", "Atlantic", "America/Halifax",
-        "Africa/Ouagadougou", "GMT", "Atlantic/Reykjavik",
-        "Asia/Yerevan", "Armenia", "Asia/Yerevan",
-        "America/Montevideo", "Uruguay", "America/Montevideo",
-        "Europe/Minsk", "Europe_Eastern", "Europe/Bucharest",
-        "Europe/Amsterdam", "Europe_Central", "Europe/Paris",
-        "Pacific/Efate", "Vanuatu", "Pacific/Efate",
-        "Asia/Manila", "Philippines", "Asia/Manila",
-        "America/Dawson", "America_Pacific", "America/Los_Angeles",
-        "America/Argentina/Cordoba", "Argentina", "America/Buenos_Aires",
-        "Australia/Melbourne", "Australia_Eastern", "Australia/Sydney",
-        "Asia/Rangoon", "Myanmar", "Asia/Rangoon",
-        "America/Los_Angeles", "America_Pacific", "America/Los_Angeles",
-        "Africa/Casablanca", "Europe_Western", "Atlantic/Canary",
-        "Africa/Porto-Novo", "Africa_Western", "Africa/Lagos",
-        "Asia/Macau", "China", "Asia/Shanghai",
+        "America/Bahia_Banderas", "America_Central", "America/Chicago",
+        "America/Barbados", "Atlantic", "America/Halifax",
+        "America/Belem", "Brasilia", "America/Sao_Paulo",
+        "America/Belize", "America_Central", "America/Chicago",
+        "America/Blanc-Sablon", "Atlantic", "America/Halifax",
         "America/Boa_Vista", "Amazon", "America/Manaus",
-        "Europe/Guernsey", "GMT", "Atlantic/Reykjavik",
-        "Africa/Monrovia", "GMT", "Atlantic/Reykjavik",
-        "America/Godthab", "Greenland_Western", "America/Godthab",
-        "Africa/Ceuta", "Europe_Central", "Europe/Paris",
-        "Asia/Oral", "Kazakhstan_Western", "Asia/Aqtobe",
-        "America/Yakutat", "Alaska", "America/Juneau",
-        "Indian/Mayotte", "Africa_Eastern", "Africa/Nairobi",
-        "America/Denver", "America_Mountain", "America/Denver",
-        "America/New_York", "America_Eastern", "America/New_York",
-        "Pacific/Rarotonga", "Cook", "Pacific/Rarotonga",
-        "America/Louisville", "America_Eastern", "America/New_York",
-        "Africa/El_Aaiun", "Europe_Western", "Atlantic/Canary",
-        "Africa/Sao_Tome", "Africa_Western", "Africa/Lagos",
-        "Pacific/Fiji", "Fiji", "Pacific/Fiji",
-        "Asia/Damascus", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Ulaanbaatar", "Mongolia", "Asia/Ulaanbaatar",
-        "America/Cayman", "America_Eastern", "America/New_York",
-        "America/Tijuana", "America_Pacific", "America/Los_Angeles",
-        "Atlantic/Bermuda", "Atlantic", "America/Halifax",
-        "Australia/Sydney", "Australia_Eastern", "Australia/Sydney",
-        "Asia/Aden", "Arabian", "Asia/Riyadh",
-        "Australia/Eucla", "Australia_CentralWestern", "Australia/Eucla",
-        "America/Indiana/Petersburg", "America_Eastern", "America/New_York",
-        "America/Panama", "America_Eastern", "America/New_York",
-        "Europe/Istanbul", "Europe_Eastern", "Europe/Bucharest",
-        "America/Kralendijk", "Atlantic", "America/Halifax",
+        "America/Bogota", "Colombia", "America/Bogota",
+        "America/Boise", "America_Mountain", "America/Denver",
+        "America/Buenos_Aires", "Argentina", "America/Buenos_Aires",
+        "America/Cambridge_Bay", "America_Mountain", "America/Denver",
+        "America/Campo_Grande", "Amazon", "America/Manaus",
+        "America/Cancun", "America_Eastern", "America/New_York",
+        "America/Caracas", "Venezuela", "America/Caracas",
         "America/Catamarca", "Argentina", "America/Buenos_Aires",
-        "America/Nassau", "America_Eastern", "America/New_York",
-        "Europe/Paris", "Europe_Central", "Europe/Paris",
-        "Asia/Jakarta", "Indonesia_Western", "Asia/Jakarta",
-        "Australia/Lindeman", "Australia_Eastern", "Australia/Sydney",
-        "America/Sao_Paulo", "Brasilia", "America/Sao_Paulo",
-        "America/Juneau", "Alaska", "America/Juneau",
-        "America/Grenada", "Atlantic", "America/Halifax",
         "America/Cayenne", "French_Guiana", "America/Cayenne",
-        "Antarctica/Casey", "Australia_Western", "Australia/Perth",
-        "Africa/Algiers", "Europe_Central", "Europe/Paris",
-        "America/Miquelon", "Pierre_Miquelon", "America/Miquelon",
-        "Asia/Tokyo", "Japan", "Asia/Tokyo",
-        "Africa/Windhoek", "Africa_Central", "Africa/Maputo",
-        "Africa/Bujumbura", "Africa_Central", "Africa/Maputo",
-        "America/Guatemala", "America_Central", "America/Chicago",
-        "Africa/Dakar", "GMT", "Atlantic/Reykjavik",
-        "Asia/Bishkek", "Kyrgystan", "Asia/Bishkek",
-        "America/Guadeloupe", "Atlantic", "America/Halifax",
-        "Africa/Ndjamena", "Africa_Western", "Africa/Lagos",
-        "Europe/Simferopol", "Europe_Eastern", "Europe/Bucharest",
-        "America/Santa_Isabel", "America_Pacific", "America/Los_Angeles",
-        "Asia/Dubai", "Gulf", "Asia/Dubai",
-        "America/Maceio", "Brasilia", "America/Sao_Paulo",
-        "America/Anchorage", "Alaska", "America/Juneau",
-        "Australia/Currie", "Australia_Eastern", "Australia/Sydney",
-        "Africa/Djibouti", "Africa_Eastern", "Africa/Nairobi",
-        "Europe/Budapest", "Europe_Central", "Europe/Paris",
-        "America/Argentina/Salta", "Argentina", "America/Buenos_Aires",
-        "Asia/Calcutta", "India", "Asia/Calcutta",
-        "America/Indiana/Winamac", "America_Eastern", "America/New_York",
-        "Asia/Yekaterinburg", "Yekaterinburg", "Asia/Yekaterinburg",
-        "America/Santiago", "Chile", "America/Santiago",
-        "Asia/Aqtobe", "Kazakhstan_Western", "Asia/Aqtobe",
-        "Asia/Dili", "East_Timor", "Asia/Dili",
-        "America/Detroit", "America_Eastern", "America/New_York",
-        "Africa/Libreville", "Africa_Western", "Africa/Lagos",
-        "Pacific/Ponape", "Ponape", "Pacific/Ponape",
-        "Pacific/Wallis", "Wallis", "Pacific/Wallis",
-        "Asia/Vladivostok", "Vladivostok", "Asia/Vladivostok",
-        "Africa/Lubumbashi", "Africa_Central", "Africa/Maputo",
-        "Africa/Asmera", "Africa_Eastern", "Africa/Nairobi",
-        "Pacific/Guam", "Chamorro", "Pacific/Saipan",
+        "America/Cayman", "America_Eastern", "America/New_York",
         "America/Chicago", "America_Central", "America/Chicago",
-        "America/Swift_Current", "America_Central", "America/Chicago",
+        "America/Chihuahua", "Mexico_Pacific", "America/Mazatlan",
         "America/Coral_Harbour", "America_Eastern", "America/New_York",
-        "America/Cambridge_Bay", "America_Mountain", "America/Denver",
+        "America/Cordoba", "Argentina", "America/Buenos_Aires",
         "America/Costa_Rica", "America_Central", "America/Chicago",
+        "America/Creston", "America_Mountain", "America/Denver",
+        "America/Cuiaba", "Amazon", "America/Manaus",
         "America/Curacao", "Atlantic", "America/Halifax",
-        "America/Recife", "Brasilia", "America/Sao_Paulo",
-        "Africa/Bangui", "Africa_Western", "Africa/Lagos",
-        "America/Cordoba", "Argentina", "America/Buenos_Aires",
-        "Asia/Baghdad", "Arabian", "Asia/Riyadh",
-        "America/Shiprock", "America_Mountain", "America/Denver",
+        "America/Danmarkshavn", "GMT", "Atlantic/Reykjavik",
+        "America/Dawson", "America_Pacific", "America/Los_Angeles",
+        "America/Dawson_Creek", "America_Mountain", "America/Denver",
+        "America/Denver", "America_Mountain", "America/Denver",
+        "America/Detroit", "America_Eastern", "America/New_York",
+        "America/Dominica", "Atlantic", "America/Halifax",
+        "America/Edmonton", "America_Mountain", "America/Denver",
+        "America/Eirunepe", "Acre", "America/Rio_Branco",
+        "America/El_Salvador", "America_Central", "America/Chicago",
+        "America/Ensenada", "America_Pacific", "America/Los_Angeles",
+        "America/Fort_Nelson", "America_Mountain", "America/Denver",
+        "America/Fort_Wayne", "America_Eastern", "America/New_York",
+        "America/Fortaleza", "Brasilia", "America/Sao_Paulo",
         "America/Glace_Bay", "Atlantic", "America/Halifax",
-        "America/North_Dakota/Center", "America_Central", "America/Chicago",
-        "Europe/Stockholm", "Europe_Central", "Europe/Paris",
+        "America/Godthab", "Greenland_Western", "America/Godthab",
+        "America/Goose_Bay", "Atlantic", "America/Halifax",
+        "America/Grand_Turk", "Atlantic", "America/Halifax",
+        "America/Grenada", "Atlantic", "America/Halifax",
+        "America/Guadeloupe", "Atlantic", "America/Halifax",
+        "America/Guatemala", "America_Central", "America/Chicago",
+        "America/Guayaquil", "Ecuador", "America/Guayaquil",
+        "America/Guyana", "Guyana", "America/Guyana",
         "America/Halifax", "Atlantic", "America/Halifax",
-        "Atlantic/Canary", "Europe_Western", "Atlantic/Canary",
-        "Europe/Volgograd", "Volgograd", "Europe/Volgograd",
-        "America/Moncton", "Atlantic", "America/Halifax",
-        "Pacific/Tongatapu", "Tonga", "Pacific/Tongatapu",
-        "America/Argentina/Buenos_Aires", "Argentina", "America/Buenos_Aires",
-        "Asia/Samarkand", "Uzbekistan", "Asia/Tashkent",
-        "Pacific/Apia", "Samoa", "Pacific/Apia",
-        "America/Sitka", "Alaska", "America/Juneau",
-        "Europe/Warsaw", "Europe_Central", "Europe/Paris",
-        "Africa/Accra", "GMT", "Atlantic/Reykjavik",
-        "Europe/Bratislava", "Europe_Central", "Europe/Paris",
-        "Europe/Zurich", "Europe_Central", "Europe/Paris",
-        "Indian/Reunion", "Reunion", "Indian/Reunion",
-        "America/Mazatlan", "America_Mountain", "America/Denver",
-        "Pacific/Tarawa", "Gilbert_Islands", "Pacific/Tarawa",
+        "America/Havana", "Cuba", "America/Havana",
+        "America/Hermosillo", "Mexico_Pacific", "America/Mazatlan",
+        "America/Indiana/Indianapolis", "America_Eastern", "America/New_York",
         "America/Indiana/Knox", "America_Central", "America/Chicago",
-        "Asia/Tbilisi", "Georgia", "Asia/Tbilisi",
-        "Asia/Novosibirsk", "Novosibirsk", "Asia/Novosibirsk",
-        "Atlantic/Faeroe", "Europe_Western", "Atlantic/Canary",
-        "Africa/Bissau", "GMT", "Atlantic/Reykjavik",
-        "Asia/Amman", "Europe_Eastern", "Europe/Bucharest",
-        "Africa/Lagos", "Africa_Western", "Africa/Lagos",
-        "Africa/Banjul", "GMT", "Atlantic/Reykjavik",
-        "America/Araguaina", "Brasilia", "America/Sao_Paulo",
-        "America/Nipigon", "America_Eastern", "America/New_York",
-        "Europe/Vilnius", "Europe_Eastern", "Europe/Bucharest",
-        "America/Montserrat", "Atlantic", "America/Halifax",
-        "Asia/Baku", "Azerbaijan", "Asia/Baku",
-        "Africa/Lusaka", "Africa_Central", "Africa/Maputo",
-        "Europe/Uzhgorod", "Europe_Eastern", "Europe/Bucharest",
-        "America/Argentina/Rio_Gallegos", "Argentina", "America/Buenos_Aires",
-        "America/Blanc-Sablon", "Atlantic", "America/Halifax",
-        "Asia/Kabul", "Afghanistan", "Asia/Kabul",
-        "America/Jamaica", "America_Eastern", "America/New_York",
-        "Europe/Vatican", "Europe_Central", "Europe/Paris",
-        "Africa/Nouakchott", "GMT", "Atlantic/Reykjavik",
-        "Africa/Addis_Ababa", "Africa_Eastern", "Africa/Nairobi",
-        "Europe/Athens", "Europe_Eastern", "Europe/Bucharest",
-        "Atlantic/Madeira", "Europe_Western", "Atlantic/Canary",
-        "America/Thunder_Bay", "America_Eastern", "America/New_York",
-        "Europe/Brussels", "Europe_Central", "Europe/Paris",
-        "Africa/Luanda", "Africa_Western", "Africa/Lagos",
-        "Africa/Mogadishu", "Africa_Eastern", "Africa/Nairobi",
-        "America/Matamoros", "America_Central", "America/Chicago",
-        "Pacific/Norfolk", "Norfolk", "Pacific/Norfolk",
-        "America/Scoresbysund", "Greenland_Eastern", "America/Scoresbysund",
+        "America/Indiana/Marengo", "America_Eastern", "America/New_York",
+        "America/Indiana/Petersburg", "America_Eastern", "America/New_York",
+        "America/Indiana/Tell_City", "America_Central", "America/Chicago",
+        "America/Indiana/Vevay", "America_Eastern", "America/New_York",
+        "America/Indiana/Vincennes", "America_Eastern", "America/New_York",
+        "America/Indiana/Winamac", "America_Eastern", "America/New_York",
         "America/Indianapolis", "America_Eastern", "America/New_York",
-        "Pacific/Pitcairn", "Pitcairn", "Pacific/Pitcairn",
-        "Asia/Singapore", "Singapore", "Asia/Singapore",
-        "America/Port-au-Prince", "America_Eastern", "America/New_York",
-        "Pacific/Honolulu", "Hawaii_Aleutian", "Pacific/Honolulu",
-        "Antarctica/Syowa", "Syowa", "Antarctica/Syowa",
-        "Atlantic/Cape_Verde", "Cape_Verde", "Atlantic/Cape_Verde",
-        "America/Asuncion", "Paraguay", "America/Asuncion",
-        "America/Martinique", "Atlantic", "America/Halifax",
-        "Europe/Gibraltar", "Europe_Central", "Europe/Paris",
-        "Africa/Lome", "GMT", "Atlantic/Reykjavik",
-        "Australia/Lord_Howe", "Lord_Howe", "Australia/Lord_Howe",
-        "America/Argentina/La_Rioja", "Argentina", "America/Buenos_Aires",
-        "Europe/Jersey", "GMT", "Atlantic/Reykjavik",
+        "America/Inuvik", "America_Mountain", "America/Denver",
+        "America/Iqaluit", "America_Eastern", "America/New_York",
+        "America/Jamaica", "America_Eastern", "America/New_York",
+        "America/Jujuy", "Argentina", "America/Buenos_Aires",
+        "America/Juneau", "Alaska", "America/Juneau",
         "America/Kentucky/Louisville", "America_Eastern", "America/New_York",
+        "America/Kentucky/Monticello", "America_Eastern", "America/New_York",
+        "America/Knox_IN", "America_Central", "America/Chicago",
+        "America/Kralendijk", "Atlantic", "America/Halifax",
+        "America/La_Paz", "Bolivia", "America/La_Paz",
+        "America/Lima", "Peru", "America/Lima",
+        "America/Los_Angeles", "America_Pacific", "America/Los_Angeles",
+        "America/Louisville", "America_Eastern", "America/New_York",
+        "America/Lower_Princes", "Atlantic", "America/Halifax",
+        "America/Maceio", "Brasilia", "America/Sao_Paulo",
+        "America/Managua", "America_Central", "America/Chicago",
+        "America/Manaus", "Amazon", "America/Manaus",
+        "America/Marigot", "Atlantic", "America/Halifax",
+        "America/Martinique", "Atlantic", "America/Halifax",
+        "America/Matamoros", "America_Central", "America/Chicago",
+        "America/Mazatlan", "Mexico_Pacific", "America/Mazatlan",
+        "America/Mendoza", "Argentina", "America/Buenos_Aires",
+        "America/Menominee", "America_Central", "America/Chicago",
+        "America/Merida", "America_Central", "America/Chicago",
+        "America/Metlakatla", "Alaska", "America/Juneau",
+        "America/Mexico_City", "America_Central", "America/Chicago",
+        "America/Miquelon", "Pierre_Miquelon", "America/Miquelon",
+        "America/Moncton", "Atlantic", "America/Halifax",
         "America/Monterrey", "America_Central", "America/Chicago",
-        "Europe/Belgrade", "Europe_Central", "Europe/Paris",
-        "Asia/Gaza", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Ho_Chi_Minh", "Indochina", "Asia/Saigon",
-        "Europe/Prague", "Europe_Central", "Europe/Paris",
-        "Indian/Christmas", "Christmas", "Indian/Christmas",
-        "Pacific/Fakaofo", "Tokelau", "Pacific/Fakaofo",
-        "America/Dominica", "Atlantic", "America/Halifax",
+        "America/Montevideo", "Uruguay", "America/Montevideo",
+        "America/Montserrat", "Atlantic", "America/Halifax",
+        "America/Nassau", "America_Eastern", "America/New_York",
+        "America/New_York", "America_Eastern", "America/New_York",
+        "America/Nipigon", "America_Eastern", "America/New_York",
+        "America/Nome", "Alaska", "America/Juneau",
+        "America/Noronha", "Noronha", "America/Noronha",
+        "America/North_Dakota/Beulah", "America_Central", "America/Chicago",
+        "America/North_Dakota/Center", "America_Central", "America/Chicago",
+        "America/North_Dakota/New_Salem", "America_Central", "America/Chicago",
         "America/Ojinaga", "America_Mountain", "America/Denver",
-        "Asia/Colombo", "India", "Asia/Calcutta",
-        "Asia/Nicosia", "Europe_Eastern", "Europe/Bucharest",
-        "Europe/Copenhagen", "Europe_Central", "Europe/Paris",
-        "America/Creston", "America_Mountain", "America/Denver",
-        "Asia/Ashgabat", "Turkmenistan", "Asia/Ashgabat",
-        "Asia/Shanghai", "China", "Asia/Shanghai",
-        "Pacific/Easter", "Easter", "Pacific/Easter",
-        "Africa/Maseru", "Africa_Southern", "Africa/Johannesburg",
-        "America/La_Paz", "Bolivia", "America/La_Paz",
-        "Pacific/Truk", "Truk", "Pacific/Truk",
-        "America/Inuvik", "America_Mountain", "America/Denver",
-        "America/Belem", "Brasilia", "America/Sao_Paulo",
-        "Asia/Hebron", "Europe_Eastern", "Europe/Bucharest",
-        "Asia/Jerusalem", "Israel", "Asia/Jerusalem",
-        "America/Belize", "America_Central", "America/Chicago",
-        "America/Rio_Branco", "Amazon", "America/Manaus",
-        "America/Dawson_Creek", "America_Mountain", "America/Denver",
-        "America/Anguilla", "Atlantic", "America/Halifax",
+        "America/Panama", "America_Eastern", "America/New_York",
+        "America/Pangnirtung", "America_Eastern", "America/New_York",
+        "America/Paramaribo", "Suriname", "America/Paramaribo",
+        "America/Phoenix", "America_Mountain", "America/Denver",
+        "America/Port-au-Prince", "America_Eastern", "America/New_York",
         "America/Port_of_Spain", "Atlantic", "America/Halifax",
+        "America/Porto_Acre", "Acre", "America/Rio_Branco",
+        "America/Porto_Velho", "Amazon", "America/Manaus",
+        "America/Puerto_Rico", "Atlantic", "America/Halifax",
+        "America/Rainy_River", "America_Central", "America/Chicago",
+        "America/Rankin_Inlet", "America_Central", "America/Chicago",
+        "America/Recife", "Brasilia", "America/Sao_Paulo",
+        "America/Regina", "America_Central", "America/Chicago",
+        "America/Resolute", "America_Central", "America/Chicago",
+        "America/Rio_Branco", "Acre", "America/Rio_Branco",
+        "America/Rosario", "Argentina", "America/Buenos_Aires",
+        "America/Santa_Isabel", "Mexico_Northwest", "America/Santa_Isabel",
+        "America/Santarem", "Brasilia", "America/Sao_Paulo",
+        "America/Santiago", "Chile", "America/Santiago",
+        "America/Santo_Domingo", "Atlantic", "America/Halifax",
+        "America/Sao_Paulo", "Brasilia", "America/Sao_Paulo",
+        "America/Scoresbysund", "Greenland_Eastern", "America/Scoresbysund",
+        "America/Shiprock", "America_Mountain", "America/Denver",
+        "America/Sitka", "Alaska", "America/Juneau",
         "America/St_Barthelemy", "Atlantic", "America/Halifax",
-        "America/Indiana/Marengo", "America_Eastern", "America/New_York",
         "America/St_Johns", "Newfoundland", "America/St_Johns",
-        "Asia/Jayapura", "Indonesia_Eastern", "Asia/Jayapura",
-        "Europe/Riga", "Europe_Eastern", "Europe/Bucharest",
-        "America/Phoenix", "America_Mountain", "America/Denver",
-        "America/Boise", "America_Mountain", "America/Denver",
-        "Pacific/Kiritimati", "Line_Islands", "Pacific/Kiritimati",
-        "Africa/Johannesburg", "Africa_Southern", "Africa/Johannesburg",
-        "America/Pangnirtung", "America_Eastern", "America/New_York",
+        "America/St_Kitts", "Atlantic", "America/Halifax",
+        "America/St_Lucia", "Atlantic", "America/Halifax",
+        "America/St_Thomas", "Atlantic", "America/Halifax",
+        "America/St_Vincent", "Atlantic", "America/Halifax",
+        "America/Swift_Current", "America_Central", "America/Chicago",
+        "America/Tegucigalpa", "America_Central", "America/Chicago",
+        "America/Thule", "Atlantic", "America/Halifax",
+        "America/Thunder_Bay", "America_Eastern", "America/New_York",
+        "America/Tijuana", "America_Pacific", "America/Los_Angeles",
         "America/Toronto", "America_Eastern", "America/New_York",
-        "Australia/Brisbane", "Australia_Eastern", "Australia/Sydney",
-        "Asia/Aqtau", "Kazakhstan_Western", "Asia/Aqtobe",
+        "America/Tortola", "Atlantic", "America/Halifax",
         "America/Vancouver", "America_Pacific", "America/Los_Angeles",
-        "Africa/Mbabane", "Africa_Southern", "Africa/Johannesburg",
-        "Europe/Vaduz", "Europe_Central", "Europe/Paris",
-        "Asia/Karachi", "Pakistan", "Asia/Karachi",
-        "Asia/Riyadh", "Arabian", "Asia/Riyadh",
-        "Indian/Maldives", "Maldives", "Indian/Maldives",
-        "Asia/Anadyr", "Magadan", "Asia/Magadan",
-        "Europe/Helsinki", "Europe_Eastern", "Europe/Bucharest",
-        "America/Nome", "Alaska", "America/Juneau",
-        "Asia/Yakutsk", "Yakutsk", "Asia/Yakutsk",
-        "Asia/Yangon", "Myanmar", "Asia/Rangoon",
-        "Africa/Conakry", "GMT", "Atlantic/Reykjavik",
-        "Asia/Seoul", "Korea", "Asia/Seoul",
-        "America/Antigua", "Atlantic", "America/Halifax",
-        "Asia/Almaty", "Kazakhstan_Eastern", "Asia/Almaty",
-        "America/Fortaleza", "Brasilia", "America/Sao_Paulo",
-        "Pacific/Tahiti", "Tahiti", "Pacific/Tahiti",
-        "Asia/Kashgar", "China", "Asia/Shanghai",
+        "America/Virgin", "Atlantic", "America/Halifax",
         "America/Whitehorse", "America_Pacific", "America/Los_Angeles",
-        "Europe/Kaliningrad", "Europe_Eastern", "Europe/Bucharest",
-        "Pacific/Enderbury", "Phoenix_Islands", "Pacific/Enderbury",
-        "America/St_Lucia", "Atlantic", "America/Halifax",
-        "Atlantic/Stanley", "Falkland", "Atlantic/Stanley",
-        "Asia/Omsk", "Omsk", "Asia/Omsk",
-        "America/Menominee", "America_Central", "America/Chicago",
-        "Asia/Novokuznetsk", "Novosibirsk", "Asia/Novosibirsk",
-        "Asia/Sakhalin", "Sakhalin", "Asia/Sakhalin",
-        "Asia/Muscat", "Gulf", "Asia/Dubai",
-        "Pacific/Noumea", "New_Caledonia", "Pacific/Noumea",
-        "Asia/Phnom_Penh", "Indochina", "Asia/Saigon",
+        "America/Winnipeg", "America_Central", "America/Chicago",
+        "America/Yakutat", "Alaska", "America/Juneau",
+        "America/Yellowknife", "America_Mountain", "America/Denver",
+        "Antarctica/Casey", "Australia_Western", "Australia/Perth",
+        "Antarctica/Davis", "Davis", "Antarctica/Davis",
+        "Antarctica/DumontDUrville", "DumontDUrville", "Antarctica/DumontDUrville",
+        "Antarctica/Macquarie", "Macquarie", "Antarctica/Macquarie",
         "Antarctica/Mawson", "Mawson", "Antarctica/Mawson",
-        "Indian/Cocos", "Cocos", "Indian/Cocos",
-        "Europe/Tallinn", "Europe_Eastern", "Europe/Bucharest",
-        "Africa/Nairobi", "Africa_Eastern", "Africa/Nairobi",
-        "Europe/Ljubljana", "Europe_Central", "Europe/Paris",
-        "America/Montreal", "America_Eastern", "America/New_York",
-        "Asia/Kuala_Lumpur", "Malaysia", "Asia/Kuching",
-        "Asia/Magadan", "Magadan", "Asia/Magadan",
-        "Africa/Bamako", "GMT", "Atlantic/Reykjavik",
-        "Australia/Broken_Hill", "Australia_Central", "Australia/Adelaide",
-        "America/Indiana/Indianapolis", "America_Eastern", "America/New_York",
-        "Asia/Taipei", "Taipei", "Asia/Taipei",
-        "Europe/Samara", "Moscow", "Europe/Moscow",
-        "America/Indiana/Vevay", "America_Eastern", "America/New_York",
-        "Atlantic/South_Georgia", "South_Georgia", "Atlantic/South_Georgia",
-        "Pacific/Wake", "Wake", "Pacific/Wake",
-        "Asia/Tashkent", "Uzbekistan", "Asia/Tashkent",
-        "America/St_Thomas", "Atlantic", "America/Halifax",
-        "America/Argentina/San_Luis", "Argentina_Western", "America/Argentina/San_Luis",
+        "Antarctica/McMurdo", "New_Zealand", "Pacific/Auckland",
+        "Antarctica/Palmer", "Chile", "America/Santiago",
+        "Antarctica/Rothera", "Rothera", "Antarctica/Rothera",
+        "Antarctica/South_Pole", "New_Zealand", "Pacific/Auckland",
+        "Antarctica/Syowa", "Syowa", "Antarctica/Syowa",
+        "Antarctica/Troll", "GMT", "Atlantic/Reykjavik",
+        "Antarctica/Vostok", "Vostok", "Antarctica/Vostok",
         "Arctic/Longyearbyen", "Europe_Central", "Europe/Paris",
+        "Asia/Aden", "Arabian", "Asia/Riyadh",
+        "Asia/Almaty", "Kazakhstan_Eastern", "Asia/Almaty",
+        "Asia/Amman", "Europe_Eastern", "Europe/Bucharest",
+        "Asia/Anadyr", "Magadan", "Asia/Magadan",
+        "Asia/Aqtau", "Kazakhstan_Western", "Asia/Aqtobe",
+        "Asia/Aqtobe", "Kazakhstan_Western", "Asia/Aqtobe",
+        "Asia/Ashgabat", "Turkmenistan", "Asia/Ashgabat",
+        "Asia/Ashkhabad", "Turkmenistan", "Asia/Ashgabat",
+        "Asia/Baghdad", "Arabian", "Asia/Riyadh",
+        "Asia/Bahrain", "Arabian", "Asia/Riyadh",
+        "Asia/Baku", "Azerbaijan", "Asia/Baku",
+        "Asia/Bangkok", "Indochina", "Asia/Bangkok",
+        "Asia/Beirut", "Europe_Eastern", "Europe/Bucharest",
+        "Asia/Bishkek", "Kyrgystan", "Asia/Bishkek",
+        "Asia/Brunei", "Brunei", "Asia/Brunei",
+        "Asia/Calcutta", "India", "Asia/Calcutta",
+        "Asia/Chita", "Yakutsk", "Asia/Yakutsk",
+        "Asia/Choibalsan", "Choibalsan", "Asia/Choibalsan",
         "Asia/Chongqing", "China", "Asia/Shanghai",
-        "Europe/Monaco", "Europe_Central", "Europe/Paris",
-        "Asia/Qatar", "Arabian", "Asia/Riyadh",
-        "America/Chihuahua", "America_Mountain", "America/Denver",
-        "America/Havana", "Cuba", "America/Havana",
-        "Pacific/Auckland", "New_Zealand", "Pacific/Auckland",
-        "America/Jujuy", "Argentina", "America/Buenos_Aires",
-        "America/Goose_Bay", "Atlantic", "America/Halifax",
-        "Africa/Niamey", "Africa_Western", "Africa/Lagos",
-        "Asia/Kathmandu", "Nepal", "Asia/Katmandu",
-        "America/Caracas", "Venezuela", "America/Caracas",
-        "Indian/Comoro", "Africa_Eastern", "Africa/Nairobi",
-        "America/Argentina/Jujuy", "Argentina", "America/Buenos_Aires",
-        "America/Guyana", "Guyana", "America/Guyana",
-        "America/Indiana/Tell_City", "America_Central", "America/Chicago",
-        "America/Metlakatla", "America_Pacific", "America/Los_Angeles",
-        "Europe/Mariehamn", "Europe_Eastern", "Europe/Bucharest",
-        "Europe/Dublin", "GMT", "Atlantic/Reykjavik",
-        "Europe/Lisbon", "Europe_Western", "Atlantic/Canary",
-        "America/Puerto_Rico", "Atlantic", "America/Halifax",
-        "Asia/Pyongyang", "Korea", "Asia/Seoul",
-        "America/North_Dakota/New_Salem", "America_Central", "America/Chicago",
+        "Asia/Chungking", "China", "Asia/Shanghai",
+        "Asia/Colombo", "India", "Asia/Calcutta",
+        "Asia/Dacca", "Bangladesh", "Asia/Dhaka",
+        "Asia/Damascus", "Europe_Eastern", "Europe/Bucharest",
         "Asia/Dhaka", "Bangladesh", "Asia/Dhaka",
-        "America/Rankin_Inlet", "America_Central", "America/Chicago",
-        "America/Adak", "Hawaii_Aleutian", "Pacific/Honolulu",
-        "America/Campo_Grande", "Amazon", "America/Manaus",
-        "Europe/Chisinau", "Europe_Eastern", "Europe/Bucharest",
-        "Pacific/Saipan", "Chamorro", "Pacific/Saipan",
-        "Pacific/Niue", "Niue", "Pacific/Niue",
-        "Europe/Madrid", "Europe_Central", "Europe/Paris",
-        "Pacific/Kwajalein", "Marshall_Islands", "Pacific/Majuro",
-        "America/Porto_Velho", "Amazon", "America/Manaus",
-        "Indian/Kerguelen", "French_Southern", "Indian/Kerguelen",
-        "America/Santarem", "Brasilia", "America/Sao_Paulo",
+        "Asia/Dili", "East_Timor", "Asia/Dili",
+        "Asia/Dubai", "Gulf", "Asia/Dubai",
+        "Asia/Dushanbe", "Tajikistan", "Asia/Dushanbe",
+        "Asia/Gaza", "Europe_Eastern", "Europe/Bucharest",
+        "Asia/Harbin", "China", "Asia/Shanghai",
+        "Asia/Hebron", "Europe_Eastern", "Europe/Bucharest",
+        "Asia/Ho_Chi_Minh", "Indochina", "Asia/Bangkok",
+        "Asia/Hong_Kong", "Hong_Kong", "Asia/Hong_Kong",
+        "Asia/Hovd", "Hovd", "Asia/Hovd",
+        "Asia/Irkutsk", "Irkutsk", "Asia/Irkutsk",
+        "Asia/Istanbul", "Europe_Eastern", "Europe/Bucharest",
+        "Asia/Jakarta", "Indonesia_Western", "Asia/Jakarta",
+        "Asia/Jayapura", "Indonesia_Eastern", "Asia/Jayapura",
+        "Asia/Jerusalem", "Israel", "Asia/Jerusalem",
+        "Asia/Kabul", "Afghanistan", "Asia/Kabul",
+        "Asia/Kamchatka", "Kamchatka", "Asia/Kamchatka",
+        "Asia/Karachi", "Pakistan", "Asia/Karachi",
+        "Asia/Kashgar", "Urumqi", "Asia/Urumqi",
+        "Asia/Kathmandu", "Nepal", "Asia/Katmandu",
+        "Asia/Katmandu", "Nepal", "Asia/Katmandu",
+        "Asia/Khandyga", "Yakutsk", "Asia/Yakutsk",
+        "Asia/Kolkata", "India", "Asia/Calcutta",
+        "Asia/Krasnoyarsk", "Krasnoyarsk", "Asia/Krasnoyarsk",
+        "Asia/Kuala_Lumpur", "Malaysia", "Asia/Kuching",
         "Asia/Kuching", "Malaysia", "Asia/Kuching",
+        "Asia/Kuwait", "Arabian", "Asia/Riyadh",
+        "Asia/Macao", "China", "Asia/Shanghai",
+        "Asia/Macau", "China", "Asia/Shanghai",
+        "Asia/Magadan", "Magadan", "Asia/Magadan",
+        "Asia/Makassar", "Indonesia_Central", "Asia/Makassar",
+        "Asia/Manila", "Philippines", "Asia/Manila",
+        "Asia/Muscat", "Gulf", "Asia/Dubai",
+        "Asia/Nicosia", "Europe_Eastern", "Europe/Bucharest",
+        "Asia/Novokuznetsk", "Krasnoyarsk", "Asia/Krasnoyarsk",
+        "Asia/Novosibirsk", "Novosibirsk", "Asia/Novosibirsk",
+        "Asia/Omsk", "Omsk", "Asia/Omsk",
+        "Asia/Oral", "Kazakhstan_Western", "Asia/Aqtobe",
+        "Asia/Phnom_Penh", "Indochina", "Asia/Bangkok",
+        "Asia/Pontianak", "Indonesia_Western", "Asia/Jakarta",
+        "Asia/Pyongyang", "Pyongyang", "Asia/Pyongyang",
+        "Asia/Qatar", "Arabian", "Asia/Riyadh",
+        "Asia/Qyzylorda", "Kazakhstan_Eastern", "Asia/Almaty",
+        "Asia/Rangoon", "Myanmar", "Asia/Rangoon",
+        "Asia/Riyadh", "Arabian", "Asia/Riyadh",
+        "Asia/Saigon", "Indochina", "Asia/Bangkok",
+        "Asia/Sakhalin", "Sakhalin", "Asia/Sakhalin",
+        "Asia/Samarkand", "Uzbekistan", "Asia/Tashkent",
+        "Asia/Seoul", "Korea", "Asia/Seoul",
+        "Asia/Shanghai", "China", "Asia/Shanghai",
+        "Asia/Singapore", "Singapore", "Asia/Singapore",
+        "Asia/Srednekolymsk", "Singapore", "Asia/Singapore",
+        "Asia/Taipei", "Taipei", "Asia/Taipei",
+        "Asia/Tashkent", "Uzbekistan", "Asia/Tashkent",
+        "Asia/Tbilisi", "Georgia", "Asia/Tbilisi",
+        "Asia/Tehran", "Iran", "Asia/Tehran",
+        "Asia/Tel_Aviv", "Israel", "Asia/Jerusalem",
+        "Asia/Thimbu", "Bhutan", "Asia/Thimphu",
+        "Asia/Thimphu", "Bhutan", "Asia/Thimphu",
+        "Asia/Tokyo", "Japan", "Asia/Tokyo",
+        "Asia/Ujung_Pandang", "Indonesia_Central", "Asia/Makassar",
+        "Asia/Ulaanbaatar", "Mongolia", "Asia/Ulaanbaatar",
+        "Asia/Ulan_Bator", "Mongolia", "Asia/Ulaanbaatar",
+        "Asia/Urumqi", "Urumqi", "Asia/Urumqi",
+        "Asia/Ust-Nera", "Vladivostok", "Asia/Vladivostok",
+        "Asia/Vientiane", "Indochina", "Asia/Bangkok",
+        "Asia/Vladivostok", "Vladivostok", "Asia/Vladivostok",
+        "Asia/Yakutsk", "Yakutsk", "Asia/Yakutsk",
+        "Asia/Yekaterinburg", "Yekaterinburg", "Asia/Yekaterinburg",
+        "Asia/Yerevan", "Armenia", "Asia/Yerevan",
+        "Atlantic/Azores", "Azores", "Atlantic/Azores",
+        "Atlantic/Bermuda", "Atlantic", "America/Halifax",
+        "Atlantic/Canary", "Europe_Western", "Atlantic/Canary",
+        "Atlantic/Cape_Verde", "Cape_Verde", "Atlantic/Cape_Verde",
+        "Atlantic/Faeroe", "Europe_Western", "Atlantic/Canary",
+        "Atlantic/Faroe", "Europe_Western", "Atlantic/Canary",
+        "Atlantic/Jan_Mayen", "Europe_Central", "Europe/Paris",
+        "Atlantic/Madeira", "Europe_Western", "Atlantic/Canary",
+        "Atlantic/Reykjavik", "GMT", "Atlantic/Reykjavik",
+        "Atlantic/South_Georgia", "South_Georgia", "Atlantic/South_Georgia",
+        "Atlantic/St_Helena", "GMT", "Atlantic/Reykjavik",
+        "Atlantic/Stanley", "Falkland", "Atlantic/Stanley",
+        "Australia/ACT", "Australia_Eastern", "Australia/Sydney",
         "Australia/Adelaide", "Australia_Central", "Australia/Adelaide",
-        "Europe/Bucharest", "Europe_Eastern", "Europe/Bucharest",
+        "Australia/Brisbane", "Australia_Eastern", "Australia/Sydney",
+        "Australia/Broken_Hill", "Australia_Central", "Australia/Adelaide",
+        "Australia/Canberra", "Australia_Eastern", "Australia/Sydney",
+        "Australia/Currie", "Australia_Eastern", "Australia/Sydney",
+        "Australia/Darwin", "Australia_Central", "Australia/Adelaide",
+        "Australia/Eucla", "Australia_CentralWestern", "Australia/Eucla",
+        "Australia/Hobart", "Australia_Eastern", "Australia/Sydney",
+        "Australia/LHI", "Lord_Howe", "Australia/Lord_Howe",
+        "Australia/Lindeman", "Australia_Eastern", "Australia/Sydney",
+        "Australia/Lord_Howe", "Lord_Howe", "Australia/Lord_Howe",
+        "Australia/Melbourne", "Australia_Eastern", "Australia/Sydney",
+        "Australia/NSW", "Australia_Eastern", "Australia/Sydney",
+        "Australia/North", "Australia_Central", "Australia/Adelaide",
         "Australia/Perth", "Australia_Western", "Australia/Perth",
+        "Australia/Queensland", "Australia_Eastern", "Australia/Sydney",
+        "Australia/South", "Australia_Central", "Australia/Adelaide",
+        "Australia/Sydney", "Australia_Eastern", "Australia/Sydney",
+        "Australia/Tasmania", "Australia_Eastern", "Australia/Sydney",
+        "Australia/Victoria", "Australia_Eastern", "Australia/Sydney",
+        "Australia/West", "Australia_Western", "Australia/Perth",
+        "Australia/Yancowinna", "Australia_Central", "Australia/Adelaide",
+        "Brazil/Acre", "Acre", "America/Rio_Branco",
+        "Brazil/DeNoronha", "Noronha", "America/Noronha",
+        "Brazil/East", "Brasilia", "America/Sao_Paulo",
+        "Brazil/West", "Amazon", "America/Manaus",
+        "CST6CDT", "America_Central", "America/Chicago",
+        "Canada/Atlantic", "Atlantic", "America/Halifax",
+        "Canada/Central", "America_Central", "America/Chicago",
+        "Canada/East-Saskatchewan", "America_Central", "America/Chicago",
+        "Canada/Eastern", "America_Eastern", "America/New_York",
+        "Canada/Mountain", "America_Mountain", "America/Denver",
+        "Canada/Newfoundland", "Newfoundland", "America/St_Johns",
+        "Canada/Pacific", "America_Pacific", "America/Los_Angeles",
+        "Canada/Saskatchewan", "America_Central", "America/Chicago",
+        "Canada/Yukon", "America_Pacific", "America/Los_Angeles",
+        "Chile/Continental", "Chile", "America/Santiago",
+        "Chile/EasterIsland", "Easter", "Pacific/Easter",
+        "Cuba", "Cuba", "America/Havana",
+        "EST5EDT", "America_Eastern", "America/New_York",
+        "Egypt", "Europe_Eastern", "Europe/Bucharest",
+        "Eire", "GMT", "Atlantic/Reykjavik",
+        "Europe/Amsterdam", "Europe_Central", "Europe/Paris",
+        "Europe/Andorra", "Europe_Central", "Europe/Paris",
+        "Europe/Athens", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Belfast", "GMT", "Atlantic/Reykjavik",
+        "Europe/Belgrade", "Europe_Central", "Europe/Paris",
+        "Europe/Berlin", "Europe_Central", "Europe/Paris",
+        "Europe/Bratislava", "Europe_Central", "Europe/Paris",
+        "Europe/Brussels", "Europe_Central", "Europe/Paris",
+        "Europe/Bucharest", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Budapest", "Europe_Central", "Europe/Paris",
+        "Europe/Busingen", "Europe_Central", "Europe/Paris",
+        "Europe/Chisinau", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Copenhagen", "Europe_Central", "Europe/Paris",
+        "Europe/Dublin", "GMT", "Atlantic/Reykjavik",
+        "Europe/Gibraltar", "Europe_Central", "Europe/Paris",
+        "Europe/Guernsey", "GMT", "Atlantic/Reykjavik",
+        "Europe/Helsinki", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Isle_of_Man", "GMT", "Atlantic/Reykjavik",
+        "Europe/Istanbul", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Jersey", "GMT", "Atlantic/Reykjavik",
+        "Europe/Kaliningrad", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Kiev", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Lisbon", "Europe_Western", "Atlantic/Canary",
+        "Europe/Ljubljana", "Europe_Central", "Europe/Paris",
+        "Europe/London", "GMT", "Atlantic/Reykjavik",
+        "Europe/Luxembourg", "Europe_Central", "Europe/Paris",
+        "Europe/Madrid", "Europe_Central", "Europe/Paris",
+        "Europe/Malta", "Europe_Central", "Europe/Paris",
+        "Europe/Mariehamn", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Minsk", "Europe_Further_Eastern", "Europe/Minsk",
+        "Europe/Monaco", "Europe_Central", "Europe/Paris",
+        "Europe/Moscow", "Moscow", "Europe/Moscow",
+        "Europe/Nicosia", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Oslo", "Europe_Central", "Europe/Paris",
+        "Europe/Paris", "Europe_Central", "Europe/Paris",
+        "Europe/Podgorica", "Europe_Central", "Europe/Paris",
+        "Europe/Prague", "Europe_Central", "Europe/Paris",
+        "Europe/Riga", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Rome", "Europe_Central", "Europe/Paris",
+        "Europe/Samara", "Samara", "Europe/Samara",
+        "Europe/San_Marino", "Europe_Central", "Europe/Paris",
+        "Europe/Sarajevo", "Europe_Central", "Europe/Paris",
+        "Europe/Simferopol", "Moscow", "Europe/Moscow",
+        "Europe/Skopje", "Europe_Central", "Europe/Paris",
         "Europe/Sofia", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Stockholm", "Europe_Central", "Europe/Paris",
+        "Europe/Tallinn", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Tirane", "Europe_Central", "Europe/Paris",
+        "Europe/Tiraspol", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Uzhgorod", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Vaduz", "Europe_Central", "Europe/Paris",
+        "Europe/Vatican", "Europe_Central", "Europe/Paris",
+        "Europe/Vienna", "Europe_Central", "Europe/Paris",
+        "Europe/Vilnius", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Volgograd", "Moscow", "Europe/Moscow",
+        "Europe/Warsaw", "Europe_Central", "Europe/Paris",
+        "Europe/Zagreb", "Europe_Central", "Europe/Paris",
+        "Europe/Zaporozhye", "Europe_Eastern", "Europe/Bucharest",
+        "Europe/Zurich", "Europe_Central", "Europe/Paris",
+        "GB", "GMT", "Atlantic/Reykjavik",
+        "GB-Eire", "GMT", "Atlantic/Reykjavik",
+        "Hongkong", "Hong_Kong", "Asia/Hong_Kong",
+        "Iceland", "GMT", "Atlantic/Reykjavik",
+        "Indian/Antananarivo", "Africa_Eastern", "Africa/Nairobi",
         "Indian/Chagos", "Indian_Ocean", "Indian/Chagos",
-        "America/Yellowknife", "America_Mountain", "America/Denver",
-        "America/Managua", "America_Central", "America/Chicago",
-        "America/Iqaluit", "America_Eastern", "America/New_York",
-        "Pacific/Kosrae", "Kosrae", "Pacific/Kosrae",
-        "Pacific/Guadalcanal", "Solomon", "Pacific/Guadalcanal",
-        "America/Barbados", "Atlantic", "America/Halifax",
-        "America/Aruba", "Atlantic", "America/Halifax",
-        "Europe/Andorra", "Europe_Central", "Europe/Paris",
+        "Indian/Christmas", "Christmas", "Indian/Christmas",
+        "Indian/Cocos", "Cocos", "Indian/Cocos",
+        "Indian/Comoro", "Africa_Eastern", "Africa/Nairobi",
+        "Indian/Kerguelen", "French_Southern", "Indian/Kerguelen",
+        "Indian/Mahe", "Seychelles", "Indian/Mahe",
+        "Indian/Maldives", "Maldives", "Indian/Maldives",
+        "Indian/Mauritius", "Mauritius", "Indian/Mauritius",
+        "Indian/Mayotte", "Africa_Eastern", "Africa/Nairobi",
+        "Indian/Reunion", "Reunion", "Indian/Reunion",
+        "Iran", "Iran", "Asia/Tehran",
+        "Israel", "Israel", "Asia/Jerusalem",
+        "Jamaica", "America_Eastern", "America/New_York",
+        "Japan", "Japan", "Asia/Tokyo",
+        "Kwajalein", "Marshall_Islands", "Pacific/Majuro",
+        "Libya", "Europe_Eastern", "Europe/Bucharest",
+        "MST7MDT", "America_Mountain", "America/Denver",
+        "Mexico/BajaNorte", "America_Pacific", "America/Los_Angeles",
+        "Mexico/BajaSur", "Mexico_Pacific", "America/Mazatlan",
+        "Mexico/General", "America_Central", "America/Chicago",
+        "NZ", "New_Zealand", "Pacific/Auckland",
+        "NZ-CHAT", "Chatham", "Pacific/Chatham",
+        "Navajo", "America_Mountain", "America/Denver",
+        "PRC", "China", "Asia/Shanghai",
+        "PST8PDT", "America_Pacific", "America/Los_Angeles",
+        "Pacific/Apia", "Apia", "Pacific/Apia",
+        "Pacific/Auckland", "New_Zealand", "Pacific/Auckland",
+        "Pacific/Bougainville", "New_Zealand", "Pacific/Auckland",
         "Pacific/Chatham", "Chatham", "Pacific/Chatham",
-        "America/Santo_Domingo", "Atlantic", "America/Halifax",
-        "America/Indiana/Vincennes", "America_Eastern", "America/New_York",
-        "Europe/Kiev", "Europe_Eastern", "Europe/Bucharest",
+        "Pacific/Chuuk", "Truk", "Pacific/Truk",
+        "Pacific/Easter", "Easter", "Pacific/Easter",
+        "Pacific/Efate", "Vanuatu", "Pacific/Efate",
+        "Pacific/Enderbury", "Phoenix_Islands", "Pacific/Enderbury",
+        "Pacific/Fakaofo", "Tokelau", "Pacific/Fakaofo",
+        "Pacific/Fiji", "Fiji", "Pacific/Fiji",
         "Pacific/Funafuti", "Tuvalu", "Pacific/Funafuti",
-        "America/Mexico_City", "America_Central", "America/Chicago",
-        "America/Kentucky/Monticello", "America_Eastern", "America/New_York",
-        "America/Argentina/Catamarca", "Argentina", "America/Buenos_Aires",
+        "Pacific/Galapagos", "Galapagos", "Pacific/Galapagos",
+        "Pacific/Gambier", "Gambier", "Pacific/Gambier",
+        "Pacific/Guadalcanal", "Solomon", "Pacific/Guadalcanal",
+        "Pacific/Guam", "Chamorro", "Pacific/Saipan",
+        "Pacific/Honolulu", "Hawaii_Aleutian", "Pacific/Honolulu",
         "Pacific/Johnston", "Hawaii_Aleutian", "Pacific/Honolulu",
-        "Europe/Podgorica", "Europe_Central", "Europe/Paris",
-        "Europe/Zagreb", "Europe_Central", "Europe/Paris",
+        "Pacific/Kiritimati", "Line_Islands", "Pacific/Kiritimati",
+        "Pacific/Kosrae", "Kosrae", "Pacific/Kosrae",
+        "Pacific/Kwajalein", "Marshall_Islands", "Pacific/Majuro",
+        "Pacific/Majuro", "Marshall_Islands", "Pacific/Majuro",
+        "Pacific/Marquesas", "Marquesas", "Pacific/Marquesas",
+        "Pacific/Midway", "Samoa", "Pacific/Pago_Pago",
+        "Pacific/Nauru", "Nauru", "Pacific/Nauru",
+        "Pacific/Niue", "Niue", "Pacific/Niue",
+        "Pacific/Norfolk", "Norfolk", "Pacific/Norfolk",
+        "Pacific/Noumea", "New_Caledonia", "Pacific/Noumea",
+        "Pacific/Pago_Pago", "Samoa", "Pacific/Pago_Pago",
+        "Pacific/Palau", "Palau", "Pacific/Palau",
+        "Pacific/Pitcairn", "Pitcairn", "Pacific/Pitcairn",
         "Pacific/Pohnpei", "Ponape", "Pacific/Ponape",
-        "Antarctica/Palmer", "Chile", "America/Santiago",
-        "America/Argentina/Mendoza", "Argentina", "America/Buenos_Aires",
-        "America/Lima", "Peru", "America/Lima",
-        "Antarctica/Macquarie", "Macquarie", "Antarctica/Macquarie",
-        "Europe/Malta", "Europe_Central", "Europe/Paris",
-        "America/Danmarkshavn", "GMT", "Atlantic/Reykjavik",
+        "Pacific/Ponape", "Ponape", "Pacific/Ponape",
+        "Pacific/Port_Moresby", "Papua_New_Guinea", "Pacific/Port_Moresby",
+        "Pacific/Rarotonga", "Cook", "Pacific/Rarotonga",
+        "Pacific/Saipan", "Chamorro", "Pacific/Saipan",
+        "Pacific/Samoa", "Samoa", "Pacific/Pago_Pago",
+        "Pacific/Tahiti", "Tahiti", "Pacific/Tahiti",
+        "Pacific/Tarawa", "Gilbert_Islands", "Pacific/Tarawa",
+        "Pacific/Tongatapu", "Tonga", "Pacific/Tongatapu",
+        "Pacific/Truk", "Truk", "Pacific/Truk",
+        "Pacific/Wake", "Wake", "Pacific/Wake",
+        "Pacific/Wallis", "Wallis", "Pacific/Wallis",
+        "Pacific/Yap", "Truk", "Pacific/Truk",
+        "Poland", "Europe_Central", "Europe/Paris",
+        "Portugal", "Europe_Western", "Atlantic/Canary",
+        "ROK", "Korea", "Asia/Seoul",
+        "Singapore", "Singapore", "Asia/Singapore",
+        "Turkey", "Europe_Eastern", "Europe/Bucharest",
+        "US/Alaska", "Alaska", "America/Juneau",
+        "US/Aleutian", "Hawaii_Aleutian", "Pacific/Honolulu",
+        "US/Arizona", "America_Mountain", "America/Denver",
+        "US/Central", "America_Central", "America/Chicago",
+        "US/East-Indiana", "America_Eastern", "America/New_York",
+        "US/Eastern", "America_Eastern", "America/New_York",
+        "US/Hawaii", "Hawaii_Aleutian", "Pacific/Honolulu",
+        "US/Indiana-Starke", "America_Central", "America/Chicago",
+        "US/Michigan", "America_Eastern", "America/New_York",
+        "US/Mountain", "America_Mountain", "America/Denver",
+        "US/Pacific", "America_Pacific", "America/Los_Angeles",
+        "US/Pacific-New", "America_Pacific", "America/Los_Angeles",
+        "US/Samoa", "Samoa", "Pacific/Pago_Pago",
+        "W-SU", "Moscow", "Europe/Moscow",
+
+        // From tzdb
+        "Africa/Khartoum", "Africa_Central", "Africa/Maputo", // tzdata2017c
+        "Africa/Windhoek", "Africa_Central", "Africa/Maputo", // tzdata2017c
+        "Africa/Sao_Tome", "Africa_Western", "Africa/Lagos",  // tzdata2018c
     };
     private static final String[] mzoneMap = new String[] {
-        "America_Eastern", "TC", "America/Grand_Turk",
+        // From metaZones.xml
+        "Africa_Central", "BI", "Africa/Bujumbura",
+        "Africa_Central", "BW", "Africa/Gaborone",
+        "Africa_Central", "CD", "Africa/Lubumbashi",
+        "Africa_Central", "MW", "Africa/Blantyre",
+        "Africa_Central", "RW", "Africa/Kigali",
+        "Africa_Central", "ZM", "Africa/Lusaka",
+        "Africa_Central", "ZW", "Africa/Harare",
+        "Africa_Eastern", "DJ", "Africa/Djibouti",
+        "Africa_Eastern", "ER", "Africa/Asmera",
+        "Africa_Eastern", "ET", "Africa/Addis_Ababa",
+        "Africa_Eastern", "KM", "Indian/Comoro",
+        "Africa_Eastern", "MG", "Indian/Antananarivo",
+        "Africa_Eastern", "SO", "Africa/Mogadishu",
+        "Africa_Eastern", "TZ", "Africa/Dar_es_Salaam",
+        "Africa_Eastern", "UG", "Africa/Kampala",
+        "Africa_Eastern", "YT", "Indian/Mayotte",
+        "Africa_Southern", "LS", "Africa/Maseru",
+        "Africa_Southern", "SZ", "Africa/Mbabane",
+        "Africa_Western", "AO", "Africa/Luanda",
+        "Africa_Western", "BJ", "Africa/Porto-Novo",
+        "Africa_Western", "CD", "Africa/Kinshasa",
+        "Africa_Western", "CF", "Africa/Bangui",
+        "Africa_Western", "CG", "Africa/Brazzaville",
+        "Africa_Western", "CM", "Africa/Douala",
+        "Africa_Western", "GA", "Africa/Libreville",
+        "Africa_Western", "GQ", "Africa/Malabo",
+        "Africa_Western", "NE", "Africa/Niamey",
+        "Africa_Western", "TD", "Africa/Ndjamena",
+        "America_Central", "BZ", "America/Belize",
+        "America_Central", "CA", "America/Winnipeg",
+        "America_Central", "CR", "America/Costa_Rica",
+        "America_Central", "GT", "America/Guatemala",
+        "America_Central", "HN", "America/Tegucigalpa",
+        "America_Central", "MX", "America/Mexico_City",
+        "America_Central", "SV", "America/El_Salvador",
         "America_Eastern", "BS", "America/Nassau",
         "America_Eastern", "CA", "America/Toronto",
+        "America_Eastern", "HT", "America/Port-au-Prince",
+        "America_Eastern", "JM", "America/Jamaica",
         "America_Eastern", "KY", "America/Cayman",
         "America_Eastern", "PA", "America/Panama",
-        "America_Eastern", "JM", "America/Jamaica",
+        "America_Mountain", "CA", "America/Edmonton",
+        "America_Mountain", "MX", "America/Hermosillo",
         "America_Pacific", "CA", "America/Vancouver",
         "America_Pacific", "MX", "America/Tijuana",
-        "Europe_Western", "FO", "Atlantic/Faeroe",
-        "Arabian", "YE", "Asia/Aden",
         "Arabian", "BH", "Asia/Bahrain",
+        "Arabian", "IQ", "Asia/Baghdad",
         "Arabian", "KW", "Asia/Kuwait",
         "Arabian", "QA", "Asia/Qatar",
-        "Arabian", "IQ", "Asia/Baghdad",
-        "Korea", "KP", "Asia/Pyongyang",
-        "Africa_Central", "ZW", "Africa/Harare",
-        "Africa_Central", "ZM", "Africa/Lusaka",
-        "Africa_Central", "MW", "Africa/Blantyre",
-        "Africa_Central", "BW", "Africa/Gaborone",
-        "Africa_Central", "CD", "Africa/Lubumbashi",
-        "Africa_Central", "BI", "Africa/Bujumbura",
-        "Africa_Central", "RW", "Africa/Kigali",
-        "Africa_Western", "ST", "Africa/Sao_Tome",
-        "Africa_Western", "CF", "Africa/Bangui",
-        "Africa_Western", "AO", "Africa/Luanda",
-        "Africa_Western", "NE", "Africa/Niamey",
-        "Africa_Western", "CD", "Africa/Kinshasa",
-        "Africa_Western", "CM", "Africa/Douala",
-        "Africa_Western", "CG", "Africa/Brazzaville",
-        "Africa_Western", "GQ", "Africa/Malabo",
-        "Africa_Western", "TD", "Africa/Ndjamena",
-        "Africa_Western", "GA", "Africa/Libreville",
-        "Atlantic", "PR", "America/Puerto_Rico",
-        "Atlantic", "AN", "America/Curacao",
-        "Atlantic", "VI", "America/St_Thomas",
-        "Atlantic", "GP", "America/Guadeloupe",
-        "Atlantic", "TT", "America/Port_of_Spain",
+        "Arabian", "YE", "Asia/Aden",
         "Atlantic", "AG", "America/Antigua",
-        "Atlantic", "MF", "America/Marigot",
-        "Atlantic", "DM", "America/Dominica",
-        "Atlantic", "VG", "America/Tortola",
-        "Atlantic", "MQ", "America/Martinique",
-        "Atlantic", "GL", "America/Thule",
         "Atlantic", "AI", "America/Anguilla",
+        "Atlantic", "AN", "America/Curacao",
+        "Atlantic", "AW", "America/Aruba",
         "Atlantic", "BB", "America/Barbados",
         "Atlantic", "BM", "Atlantic/Bermuda",
         "Atlantic", "BQ", "America/Kralendijk",
+        "Atlantic", "DM", "America/Dominica",
+        "Atlantic", "GD", "America/Grenada",
+        "Atlantic", "GL", "America/Thule",
+        "Atlantic", "GP", "America/Guadeloupe",
+        "Atlantic", "KN", "America/St_Kitts",
         "Atlantic", "LC", "America/St_Lucia",
+        "Atlantic", "MF", "America/Marigot",
+        "Atlantic", "MQ", "America/Martinique",
         "Atlantic", "MS", "America/Montserrat",
+        "Atlantic", "PR", "America/Puerto_Rico",
         "Atlantic", "SX", "America/Lower_Princes",
-        "Atlantic", "GD", "America/Grenada",
+        "Atlantic", "TT", "America/Port_of_Spain",
         "Atlantic", "VC", "America/St_Vincent",
-        "Atlantic", "KN", "America/St_Kitts",
-        "Atlantic", "AW", "America/Aruba",
-        "GMT", "GM", "Africa/Banjul",
-        "GMT", "LR", "Africa/Monrovia",
-        "GMT", "ML", "Africa/Bamako",
-        "GMT", "SH", "Atlantic/St_Helena",
-        "GMT", "TG", "Africa/Lome",
-        "GMT", "GB", "Europe/London",
-        "GMT", "MR", "Africa/Nouakchott",
-        "GMT", "GN", "Africa/Conakry",
-        "GMT", "SL", "Africa/Freetown",
-        "GMT", "BF", "Africa/Ouagadougou",
-        "GMT", "SN", "Africa/Dakar",
-        "GMT", "CI", "Africa/Abidjan",
-        "GMT", "IE", "Europe/Dublin",
-        "GMT", "GH", "Africa/Accra",
-        "Chile", "AQ", "Antarctica/Palmer",
-        "America_Central", "CR", "America/Costa_Rica",
-        "America_Central", "HN", "America/Tegucigalpa",
-        "America_Central", "CA", "America/Winnipeg",
-        "America_Central", "SV", "America/El_Salvador",
-        "America_Central", "MX", "America/Mexico_City",
-        "America_Central", "BZ", "America/Belize",
-        "America_Central", "GT", "America/Guatemala",
-        "America_Mountain", "CA", "America/Edmonton",
-        "America_Mountain", "MX", "America/Hermosillo",
-        "New_Zealand", "AQ", "Antarctica/McMurdo",
-        "India", "LK", "Asia/Colombo",
-        "Gulf", "OM", "Asia/Muscat",
-        "China", "MO", "Asia/Macau",
-        "Africa_Eastern", "ER", "Africa/Asmera",
-        "Africa_Eastern", "TZ", "Africa/Dar_es_Salaam",
-        "Africa_Eastern", "SO", "Africa/Mogadishu",
-        "Africa_Eastern", "DJ", "Africa/Djibouti",
-        "Africa_Eastern", "MG", "Indian/Antananarivo",
-        "Africa_Eastern", "KM", "Indian/Comoro",
-        "Africa_Eastern", "UG", "Africa/Kampala",
-        "Africa_Eastern", "YT", "Indian/Mayotte",
-        "Africa_Eastern", "ET", "Africa/Addis_Ababa",
+        "Atlantic", "VG", "America/Tortola",
+        "Atlantic", "VI", "America/St_Thomas",
         "Chamorro", "GU", "Pacific/Guam",
-        "Africa_Southern", "LS", "Africa/Maseru",
-        "Africa_Southern", "SZ", "Africa/Mbabane",
-        "Indochina", "KH", "Asia/Phnom_Penh",
-        "Indochina", "TH", "Asia/Bangkok",
-        "Indochina", "LA", "Asia/Vientiane",
+        "Chile", "AQ", "Antarctica/Palmer",
+        "Europe_Central", "AD", "Europe/Andorra",
+        "Europe_Central", "AL", "Europe/Tirane",
         "Europe_Central", "AT", "Europe/Vienna",
-        "Europe_Central", "SK", "Europe/Bratislava",
         "Europe_Central", "BA", "Europe/Sarajevo",
-        "Europe_Central", "CZ", "Europe/Prague",
         "Europe_Central", "BE", "Europe/Brussels",
-        "Europe_Central", "RS", "Europe/Belgrade",
-        "Europe_Central", "SE", "Europe/Stockholm",
-        "Europe_Central", "MT", "Europe/Malta",
+        "Europe_Central", "CH", "Europe/Zurich",
+        "Europe_Central", "CZ", "Europe/Prague",
+        "Europe_Central", "DE", "Europe/Berlin",
+        "Europe_Central", "DK", "Europe/Copenhagen",
+        "Europe_Central", "ES", "Europe/Madrid",
+        "Europe_Central", "GI", "Europe/Gibraltar",
+        "Europe_Central", "HR", "Europe/Zagreb",
+        "Europe_Central", "HU", "Europe/Budapest",
         "Europe_Central", "IT", "Europe/Rome",
+        "Europe_Central", "LI", "Europe/Vaduz",
         "Europe_Central", "LU", "Europe/Luxembourg",
-        "Europe_Central", "HU", "Europe/Budapest",
-        "Europe_Central", "NO", "Europe/Oslo",
+        "Europe_Central", "MC", "Europe/Monaco",
         "Europe_Central", "ME", "Europe/Podgorica",
         "Europe_Central", "MK", "Europe/Skopje",
+        "Europe_Central", "MT", "Europe/Malta",
         "Europe_Central", "NL", "Europe/Amsterdam",
-        "Europe_Central", "LI", "Europe/Vaduz",
-        "Europe_Central", "PL", "Europe/Warsaw",
-        "Europe_Central", "ES", "Europe/Madrid",
-        "Europe_Central", "TN", "Africa/Tunis",
-        "Europe_Central", "SI", "Europe/Ljubljana",
-        "Europe_Central", "DE", "Europe/Berlin",
-        "Europe_Central", "GI", "Europe/Gibraltar",
-        "Europe_Central", "CH", "Europe/Zurich",
-        "Europe_Central", "MC", "Europe/Monaco",
-        "Europe_Central", "VA", "Europe/Vatican",
-        "Europe_Central", "HR", "Europe/Zagreb",
-        "Europe_Central", "AL", "Europe/Tirane",
-        "Europe_Central", "AD", "Europe/Andorra",
-        "Europe_Central", "DK", "Europe/Copenhagen",
+        "Europe_Central", "NO", "Europe/Oslo",
+        "Europe_Central", "PL", "Europe/Warsaw",
+        "Europe_Central", "RS", "Europe/Belgrade",
+        "Europe_Central", "SE", "Europe/Stockholm",
+        "Europe_Central", "SI", "Europe/Ljubljana",
+        "Europe_Central", "SK", "Europe/Bratislava",
         "Europe_Central", "SM", "Europe/San_Marino",
-        "Europe_Eastern", "SY", "Asia/Damascus",
-        "Europe_Eastern", "FI", "Europe/Helsinki",
+        "Europe_Central", "TN", "Africa/Tunis",
+        "Europe_Central", "VA", "Europe/Vatican",
+        "Europe_Central", "XK", "Europe/Belgrade",
         "Europe_Eastern", "AX", "Europe/Mariehamn",
         "Europe_Eastern", "BG", "Europe/Sofia",
+        "Europe_Eastern", "CY", "Asia/Nicosia",
         "Europe_Eastern", "EG", "Africa/Cairo",
-        "Europe_Eastern", "LB", "Asia/Beirut",
+        "Europe_Eastern", "FI", "Europe/Helsinki",
         "Europe_Eastern", "GR", "Europe/Athens",
         "Europe_Eastern", "JO", "Asia/Amman",
-        "Europe_Eastern", "CY", "Asia/Nicosia",
+        "Europe_Eastern", "LB", "Asia/Beirut",
+        "Europe_Eastern", "SY", "Asia/Damascus",
+        "Europe_Further_Eastern", "RU", "Europe/Kaliningrad",
+        "Europe_Western", "FO", "Atlantic/Faeroe",
+        "GMT", "BF", "Africa/Ouagadougou",
+        "GMT", "CI", "Africa/Abidjan",
+        "GMT", "GB", "Europe/London",
+        "GMT", "GH", "Africa/Accra",
+        "GMT", "GM", "Africa/Banjul",
+        "GMT", "GN", "Africa/Conakry",
+        "GMT", "IE", "Europe/Dublin",
+        "GMT", "ML", "Africa/Bamako",
+        "GMT", "MR", "Africa/Nouakchott",
+        "GMT", "SH", "Atlantic/St_Helena",
+        "GMT", "SL", "Africa/Freetown",
+        "GMT", "SN", "Africa/Dakar",
+        "GMT", "ST", "Africa/Sao_Tome",
+        "GMT", "TG", "Africa/Lome",
+        "Gulf", "OM", "Asia/Muscat",
+        "India", "LK", "Asia/Colombo",
+        "Indochina", "KH", "Asia/Phnom_Penh",
+        "Indochina", "LA", "Asia/Vientiane",
+        "Korea", "KP", "Asia/Pyongyang",
+        "New_Zealand", "AQ", "Antarctica/McMurdo",
+
+        // From tzdb
+        "Africa_Western", "ST", "Africa/Sao_Tome", // tzdata2018c
     };
     private static final String[] aliasMap = new String[] {
-        "Mexico/BajaNorte", "America/Tijuana",
-        "Antarctica/South_Pole", "Antarctica/McMurdo",
-        "US/Michigan", "America/Detroit",
-        "America/Porto_Acre", "America/Rio_Branco",
-        "US/Alaska", "America/Anchorage",
-        "Asia/Ujung_Pandang", "Asia/Makassar",
-        "Canada/Atlantic", "America/Halifax",
-        "W-SU", "Europe/Moscow",
-        "Kwajalein", "Pacific/Kwajalein",
-        "Europe/Bratislava", "Europe/Prague",
-        "Canada/Central", "America/Winnipeg",
-        "Canada/Mountain", "America/Edmonton",
-        "Iceland", "Atlantic/Reykjavik",
-        "Asia/Ulan_Bator", "Asia/Ulaanbaatar",
-        "UTC", "Etc/UTC",
-        "Europe/Guernsey", "Europe/London",
-        "Singapore", "Asia/Singapore",
-        "Atlantic/Faeroe", "Atlantic/Faroe",
-        "Greenwich", "Etc/GMT",
-        "America/Fort_Wayne", "America/Indiana/Indianapolis",
-        "Etc/Universal", "Etc/UTC",
-        "Chile/EasterIsland", "Pacific/Easter",
-        "Pacific/Samoa", "Pacific/Pago_Pago",
-        "Europe/Nicosia", "Asia/Nicosia",
-        "Etc/Zulu", "Etc/UTC",
-        "Asia/Ashkhabad", "Asia/Ashgabat",
-        "America/Louisville", "America/Kentucky/Louisville",
-        "Australia/North", "Australia/Darwin",
+        // From supplementalMetadata.xml
+        "Africa/Timbuktu", "Africa/Bamako",
+        "America/Montreal", "America/Toronto",
+        "America/Shiprock", "America/Denver",
+        "Antarctica/South_Pole", "Pacific/Auckland",
+        "Asia/Chongqing", "Asia/Shanghai",
+        "Asia/Harbin", "Asia/Shanghai",
+        "Asia/Kashgar", "Asia/Urumqi",
+        "Atlantic/Jan_Mayen", "Europe/Oslo",
+        "EST", "America/Indianapolis",
+        "Europe/Belfast", "Europe/London",
+        "HST", "Pacific/Honolulu",
+        "MST", "America/Phoenix",
+        "Pacific/Yap", "Pacific/Truk",
+        "SystemV/AST4", "America/Puerto_Rico",
+        "SystemV/AST4ADT", "America/Halifax",
+        "SystemV/CST6", "America/Regina",
+        "SystemV/CST6CDT", "America/Chicago",
+        "SystemV/EST5", "America/Indianapolis",
+        "SystemV/EST5EDT", "America/New_York",
+        "SystemV/HST10", "Pacific/Honolulu",
+        "SystemV/MST7", "America/Phoenix",
+        "SystemV/MST7MDT", "America/Denver",
+        "SystemV/PST8", "Pacific/Pitcairn",
+        "SystemV/PST8PDT", "America/Los_Angeles",
+        "SystemV/YST9", "Pacific/Gambier",
+        "SystemV/YST9YDT", "America/Anchorage",
+
+        // From tzdb
+        "Brazil/Acre", "America/Rio_Branco",
+        "US/Indiana-Starke", "America/Indiana/Knox",
         "America/Atka", "America/Adak",
-        "America/Marigot", "America/Guadeloupe",
-        "Brazil/DeNoronha", "America/Noronha",
-        "Turkey", "Europe/Istanbul",
-        "Zulu", "Etc/UTC",
-        "Europe/Vatican", "Europe/Rome",
-        "Israel", "Asia/Jerusalem",
-        "America/Rosario", "America/Argentina/Cordoba",
-        "Jamaica", "America/Jamaica",
-        "Asia/Katmandu", "Asia/Kathmandu",
-        "ROK", "Asia/Seoul",
+        "America/St_Barthelemy", "America/Guadeloupe",
+        "Australia/North", "Australia/Darwin",
+        "Europe/Zagreb", "Europe/Belgrade",
+        "Etc/Universal", "Etc/UTC",
+        "NZ-CHAT", "Pacific/Chatham",
         "Asia/Macao", "Asia/Macau",
-        "Australia/South", "Australia/Adelaide",
-        "US/Arizona", "America/Phoenix",
-        "Australia/Yancowinna", "Australia/Broken_Hill",
-        "Canada/Pacific", "America/Vancouver",
-        "Libya", "Africa/Tripoli",
+        "Pacific/Yap", "Pacific/Chuuk",
+        "Egypt", "Africa/Cairo",
+        "US/Central", "America/Chicago",
+        "Canada/Atlantic", "America/Halifax",
+        "Brazil/East", "America/Sao_Paulo",
+        "America/Cordoba", "America/Argentina/Cordoba",
+        "US/Hawaii", "Pacific/Honolulu",
+        "America/Louisville", "America/Kentucky/Louisville",
+        "America/Shiprock", "America/Denver",
+        "Australia/Canberra", "Australia/Sydney",
+        "Asia/Chungking", "Asia/Chongqing",
+        "Universal", "Etc/UTC",
+        "US/Alaska", "America/Anchorage",
+        "Asia/Ujung_Pandang", "Asia/Makassar",
         "Japan", "Asia/Tokyo",
-        "Arctic/Longyearbyen", "Europe/Oslo",
-        "Africa/Timbuktu", "Africa/Bamako",
-        "America/Indianapolis", "America/Indiana/Indianapolis",
-        "Etc/Greenwich", "Etc/GMT",
-        "Australia/ACT", "Australia/Sydney",
-        "GMT", "Etc/GMT",
-        "Mexico/BajaSur", "America/Mazatlan",
-        "Cuba", "America/Havana",
-        "Brazil/West", "America/Manaus",
-        "Asia/Saigon", "Asia/Ho_Chi_Minh",
-        "America/Jujuy", "America/Argentina/Jujuy",
-        "Australia/Victoria", "Australia/Melbourne",
-        "America/Catamarca", "America/Argentina/Catamarca",
-        "America/Ensenada", "America/Tijuana",
-        "Europe/San_Marino", "Europe/Rome",
-        "Europe/Isle_of_Man", "Europe/London",
+        "Atlantic/Faeroe", "Atlantic/Faroe",
+        "Asia/Istanbul", "Europe/Istanbul",
+        "US/Pacific", "America/Los_Angeles",
         "Mexico/General", "America/Mexico_City",
-        "US/Hawaii", "Pacific/Honolulu",
-        "Europe/Mariehamn", "Europe/Helsinki",
-        "US/Indiana-Starke", "America/Indiana/Knox",
-        "Australia/NSW", "Australia/Sydney",
-        "Australia/West", "Australia/Perth",
-        "Brazil/Acre", "America/Rio_Branco",
-        "Australia/Tasmania", "Australia/Hobart",
-        "Atlantic/Jan_Mayen", "Europe/Oslo",
-        "America/Buenos_Aires", "America/Argentina/Buenos_Aires",
-        "Europe/Jersey", "Europe/London",
-        "Brazil/East", "America/Sao_Paulo",
-        "America/Virgin", "America/St_Thomas",
-        "Navajo", "America/Denver",
-        "GB", "Europe/London",
         "Poland", "Europe/Warsaw",
-        "Pacific/Yap", "Pacific/Chuuk",
+        "Africa/Asmera", "Africa/Asmara",
+        "Asia/Saigon", "Asia/Ho_Chi_Minh",
+        "US/Michigan", "America/Detroit",
         "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca",
+        "W-SU", "Europe/Moscow",
+        "Australia/ACT", "Australia/Sydney",
         "Asia/Calcutta", "Asia/Kolkata",
-        "America/Mendoza", "America/Argentina/Mendoza",
-        "Universal", "Etc/UTC",
-        "Australia/Queensland", "Australia/Brisbane",
-        "Asia/Dacca", "Asia/Dhaka",
-        "US/Pacific", "America/Los_Angeles",
-        "Asia/Chungking", "Asia/Chongqing",
-        "Pacific/Truk", "Pacific/Chuuk",
+        "Arctic/Longyearbyen", "Europe/Oslo",
+        "America/Knox_IN", "America/Indiana/Knox",
         "ROC", "Asia/Taipei",
-        "US/Aleutian", "America/Adak",
-        "Pacific/Ponape", "Pacific/Pohnpei",
+        "Zulu", "Etc/UTC",
+        "Australia/Yancowinna", "Australia/Broken_Hill",
+        "Australia/West", "Australia/Perth",
+        "Singapore", "Asia/Singapore",
+        "Europe/Mariehamn", "Europe/Helsinki",
+        "ROK", "Asia/Seoul",
+        "America/Porto_Acre", "America/Rio_Branco",
+        "Etc/Zulu", "Etc/UTC",
         "Canada/Yukon", "America/Whitehorse",
-        "PRC", "Asia/Shanghai",
-        "Africa/Asmera", "Africa/Asmara",
-        "GB-Eire", "Europe/London",
-        "America/St_Barthelemy", "America/Guadeloupe",
-        "US/Central", "America/Chicago",
-        "Egypt", "Africa/Cairo",
+        "Europe/Vatican", "Europe/Rome",
+        "Africa/Timbuktu", "Africa/Bamako",
+        "America/Buenos_Aires", "America/Argentina/Buenos_Aires",
+        "Canada/Pacific", "America/Vancouver",
+        "US/Pacific-New", "America/Los_Angeles",
+        "Mexico/BajaNorte", "America/Tijuana",
+        "Europe/Guernsey", "Europe/London",
+        "Asia/Tel_Aviv", "Asia/Jerusalem",
         "Chile/Continental", "America/Santiago",
+        "Jamaica", "America/Jamaica",
+        "Mexico/BajaSur", "America/Mazatlan",
+        "Canada/Eastern", "America/Toronto",
+        "Australia/Tasmania", "Australia/Hobart",
+        "NZ", "Pacific/Auckland",
+        "America/Lower_Princes", "America/Curacao",
+        "GMT-", "Etc/GMT",
+        "America/Rosario", "America/Argentina/Cordoba",
+        "Libya", "Africa/Tripoli",
+        "Asia/Ashkhabad", "Asia/Ashgabat",
+        "Australia/NSW", "Australia/Sydney",
+        "America/Marigot", "America/Guadeloupe",
+        "Europe/Bratislava", "Europe/Prague",
         "Portugal", "Europe/Lisbon",
-        "Europe/Tiraspol", "Europe/Chisinau",
-        "America/Coral_Harbour", "America/Atikokan",
-        "Europe/Belfast", "Europe/London",
-        "America/Cordoba", "America/Argentina/Cordoba",
-        "America/Shiprock", "America/Denver",
-        "NZ-CHAT", "Pacific/Chatham",
+        "Etc/GMT-", "Etc/GMT",
+        "Europe/San_Marino", "Europe/Rome",
+        "Europe/Sarajevo", "Europe/Belgrade",
+        "Antarctica/South_Pole", "Antarctica/McMurdo",
+        "Canada/Central", "America/Winnipeg",
+        "Etc/GMT", "Etc/GMT",
+        "Europe/Isle_of_Man", "Europe/London",
+        "America/Fort_Wayne", "America/Indiana/Indianapolis",
         "Eire", "Europe/Dublin",
-        "US/East-Indiana", "America/Indiana/Indianapolis",
-        "Australia/Canberra", "Australia/Sydney",
-        "Canada/Newfoundland", "America/St_Johns",
-        "UCT", "Etc/UCT",
-        "Australia/LHI", "Australia/Lord_Howe",
-        "Iran", "Asia/Tehran",
-        "US/Eastern", "America/New_York",
-        "Canada/Eastern", "America/Toronto",
+        "America/Coral_Harbour", "America/Atikokan",
+        "Europe/Nicosia", "Asia/Nicosia",
         "US/Samoa", "Pacific/Pago_Pago",
-        "America/Knox_IN", "America/Indiana/Knox",
+        "Hongkong", "Asia/Hong_Kong",
         "Canada/Saskatchewan", "America/Regina",
         "Asia/Thimbu", "Asia/Thimphu",
+        "Kwajalein", "Pacific/Kwajalein",
+        "GB", "Europe/London",
+        "Chile/EasterIsland", "Pacific/Easter",
+        "US/East-Indiana", "America/Indiana/Indianapolis",
+        "Australia/LHI", "Australia/Lord_Howe",
+        "Cuba", "America/Havana",
+        "America/Jujuy", "America/Argentina/Jujuy",
         "US/Mountain", "America/Denver",
-        "NZ", "Pacific/Auckland",
-        "Asia/Tel_Aviv", "Asia/Jerusalem",
-        "Hongkong", "Asia/Hong_Kong",
+        "Atlantic/Jan_Mayen", "Europe/Oslo",
+        "Europe/Tiraspol", "Europe/Chisinau",
+        "Europe/Podgorica", "Europe/Belgrade",
+        "US/Arizona", "America/Phoenix",
+        "Navajo", "America/Denver",
+        "Etc/Greenwich", "Etc/GMT",
+        "Canada/Mountain", "America/Edmonton",
+        "Iceland", "Atlantic/Reykjavik",
+        "Australia/Victoria", "Australia/Melbourne",
+        "Australia/South", "Australia/Adelaide",
+        "Brazil/West", "America/Manaus",
+        "Pacific/Ponape", "Pacific/Pohnpei",
+        "Europe/Ljubljana", "Europe/Belgrade",
+        "Europe/Jersey", "Europe/London",
+        "Australia/Queensland", "Australia/Brisbane",
+        "UTC", "Etc/UTC",
+        "Canada/Newfoundland", "America/St_Johns",
+        "Europe/Skopje", "Europe/Belgrade",
+        "PRC", "Asia/Shanghai",
+        "UCT", "Etc/UCT",
+        "America/Mendoza", "America/Argentina/Mendoza",
+        "Israel", "Asia/Jerusalem",
+        "US/Eastern", "America/New_York",
+        "Asia/Ulan_Bator", "Asia/Ulaanbaatar",
+        "Turkey", "Europe/Istanbul",
+        "GMT", "Etc/GMT",
+        "US/Aleutian", "America/Adak",
+        "Brazil/DeNoronha", "America/Noronha",
+        "GB-Eire", "Europe/London",
+        "Asia/Dacca", "Asia/Dhaka",
+        "America/Ensenada", "America/Tijuana",
+        "America/Catamarca", "America/Argentina/Catamarca",
+        "Iran", "Asia/Tehran",
+        "Greenwich", "Etc/GMT",
+        "Pacific/Truk", "Pacific/Chuuk",
+        "Pacific/Samoa", "Pacific/Pago_Pago",
+        "America/Virgin", "America/St_Thomas",
+        "Asia/Katmandu", "Asia/Kathmandu",
+        "America/Indianapolis", "America/Indiana/Indianapolis",
+        "Europe/Belfast", "Europe/London",
+        "America/Kralendijk", "America/Curacao",
         "Asia/Rangoon", "Asia/Yangon",
     };
 

From b9764d8d1033dbd4f289cf8c37387faf81ee8296 Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Wed, 11 Apr 2018 18:45:08 +0200
Subject: [PATCH 140/196] 8201439: Enable linux-arm-vfp-hflt profile to be
 configured with jib again Reviewed-by: tbell

---
 make/conf/jib-profiles.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index d8167268d2a..5a0290bf429 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -497,8 +497,10 @@ var getJibProfilesProfiles = function (input, common, data) {
             configure_args: [
                 "--with-jvm-variants=minimal1,client",
                 "--with-x=" + input.get("devkit", "install_path") + "/arm-linux-gnueabihf/libc/usr/X11R6-PI",
+                "--with-fontconfig=" + input.get("devkit", "install_path") + "/arm-linux-gnueabihf/libc/usr/X11R6-PI",
                 "--openjdk-target=arm-linux-gnueabihf",
-                "--with-abi-profile=arm-vfp-hflt"
+                "--with-abi-profile=arm-vfp-hflt",
+                "--with-freetype=bundled"
             ],
         },
 

From f42f6737ecdde2cb4b273fdd17c41a05e992b269 Mon Sep 17 00:00:00 2001
From: psandoz <unknown>
Date: Wed, 11 Apr 2018 11:11:13 -0700
Subject: [PATCH 141/196] 8199875: Require first parameter type of a condy
 bootstrap to be Lookup Reviewed-by: jrose

---
 .../java/lang/invoke/ConstantBootstraps.java  |  12 ++
 .../java/lang/invoke/package-info.java        |  35 ++++--
 .../lang/invoke/condy/CondyBSMInvocation.java | 107 +++++++++++-------
 3 files changed, 101 insertions(+), 53 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
index f8db8990a90..871b87061a0 100644
--- a/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
+++ b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
@@ -49,6 +49,18 @@ static Object makeConstant(MethodHandle bootstrapMethod,
                                Object info,
                                // Caller information:
                                Class<?> callerClass) {
+        // Restrict bootstrap methods to those whose first parameter is Lookup
+        // The motivation here is, in the future, to possibly support BSMs
+        // that do not accept the meta-data of lookup/name/type, thereby
+        // allowing the co-opting of existing methods to be used as BSMs as
+        // long as the static arguments can be passed as method arguments
+        MethodType mt = bootstrapMethod.type();
+        if (mt.parameterCount() < 2 ||
+            !MethodHandles.Lookup.class.isAssignableFrom(mt.parameterType(0))) {
+            throw new BootstrapMethodError(
+                    "Invalid bootstrap method declared for resolving a dynamic constant: " + bootstrapMethod);
+        }
+
         // BSMI.invoke handles all type checking and exception translation.
         // If type is not a reference type, the JVM is expecting a boxed
         // version, and will manage unboxing on the other side.
diff --git a/src/java.base/share/classes/java/lang/invoke/package-info.java b/src/java.base/share/classes/java/lang/invoke/package-info.java
index 48c24f8a4cb..0aec94f2aa3 100644
--- a/src/java.base/share/classes/java/lang/invoke/package-info.java
+++ b/src/java.base/share/classes/java/lang/invoke/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -122,8 +122,11 @@
  * On success the call site then becomes permanently linked to the {@code invokedynamic}
  * instruction.
  * <p>
- * For a dynamically-computed constant, the result of the bootstrap method is cached
- * as the resolved constant value.
+ * For a dynamically-computed constant, the first parameter of the bootstrap
+ * method must be assignable to {@code MethodHandles.Lookup}. If this condition
+ * is not met, a {@code BootstrapMethodError} is thrown.
+ * On success the result of the bootstrap method is cached as the resolved
+ * constant value.
  * <p>
  * If an exception, {@code E} say, occurs during execution of the bootstrap method, then
  * resolution fails and terminates abnormally. {@code E} is rethrown if the type of
@@ -171,16 +174,25 @@
  * <h2>Types of bootstrap methods</h2>
  * For a dynamically-computed call site, the bootstrap method is invoked with parameter
  * types {@code MethodHandles.Lookup}, {@code String}, {@code MethodType}, and the types
- * of any static arguments; the return type is {@code CallSite}. For a
- * dynamically-computed constant, the bootstrap method is invoked with parameter types
+ * of any static arguments; the return type is {@code CallSite}.
+ * <p>
+ * For a dynamically-computed constant, the bootstrap method is invoked with parameter types
  * {@code MethodHandles.Lookup}, {@code String}, {@code Class}, and the types of any
  * static arguments; the return type is the type represented by the {@code Class}.
- *
+ * <p>
  * Because {@link java.lang.invoke.MethodHandle#invoke MethodHandle.invoke} allows for
- * adaptations between the invoked method type and the method handle's method type,
+ * adaptations between the invoked method type and the bootstrap method handle's method type,
  * there is flexibility in the declaration of the bootstrap method.
- * For example, the first argument could be {@code Object}
- * instead of {@code MethodHandles.Lookup}, and the return type
+ * For a dynamically-computed constant the first parameter type of the bootstrap method handle
+ * must be assignable to {@code MethodHandles.Lookup}, other than that constraint the same degree
+ * of flexibility applies to bootstrap methods of dynamically-computed call sites and
+ * dynamically-computed constants.
+ * Note: this constraint allows for the future possibility where the bootstrap method is
+ * invoked with just the parameter types of static arguments, thereby supporting a wider
+ * range of methods compatible with the static arguments (such as methods that don't declare
+ * or require the lookup, name, and type meta-data parameters).
+ * <p> For example, for dynamically-computed call site, a the first argument
+ * could be {@code Object} instead of {@code MethodHandles.Lookup}, and the return type
  * could also be {@code Object} instead of {@code CallSite}.
  * (Note that the types and number of the stacked arguments limit
  * the legal kinds of bootstrap methods to appropriately typed
@@ -227,7 +239,10 @@
  * {@code String} and {@code Integer} (or {@code int}), respectively.
  * The second-to-last example assumes that all extra arguments are of type
  * {@code String}.
- * The other examples work with all types of extra arguments.
+ * The other examples work with all types of extra arguments.  Note that all
+ * the examples except the second and third also work with dynamically-computed
+ * constants if the return type is changed to be compatible with the
+ * constant's declared type (such as {@code Object}, which is always compatible).
  * <p>
  * Since dynamically-computed constants can be provided as static arguments to bootstrap
  * methods, there are no limitations on the types of bootstrap arguments.
diff --git a/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java b/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
index 80ff8059f53..86a68049790 100644
--- a/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 8186046
+ * @bug 8186046 8199875
  * @summary Test basic invocation of bootstrap methods
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
@@ -40,8 +40,10 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.WrongMethodTypeException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import static java.lang.invoke.MethodType.methodType;
 
@@ -63,85 +65,85 @@ public void testNonexistent() throws Throwable {
         }
     }
 
+    static MethodHandle[] bsms(String bsmName) {
+        return Stream.of(CondyBSMInvocation.class.getDeclaredMethods()).
+                filter(m -> m.getName().equals(bsmName)).
+                map(m -> {
+                    try {
+                        return MethodHandles.lookup().unreflect(m);
+                    } catch (IllegalAccessException e) {
+                        throw new RuntimeException();
+                    }
+                }).toArray(MethodHandle[]::new);
+    }
+
+    public static Object shape_bsm() {
+        return "0";
+    }
+
+    public static Object shape_bsm(Object a1) {
+        return "0";
+    }
+
+    public static Object shape_bsm(Object... args) {
+        return "0";
+    }
+
+    public static Object shape_bsm(Object a1, Object a2) {
+        return "0";
+    }
 
-    public static Object _bsm() {
+    public static Object shape_bsm(Object a1, Object... args) {
         return "0";
     }
 
-    public static Object _bsm(Object a1) {
+    public static Object shape_bsm(Object a1, Object a2, Object a3) {
         return "0";
     }
 
-    // Note: when pull mode is supported for a BSM this test case
-    //       will fail and must be removed
-    public static Object _bsm(Object a1, Object a2) {
+    public static Object shape_bsm(MethodHandles.Lookup a1) {
         return "0";
     }
 
     @Test
-    public void testWrongArity() throws Throwable {
-        for (int i = 0; i < 3; i++) {
-            final int n = i;
-            MethodType mt = methodType(Object.class)
-                    .appendParameterTypes(Collections.nCopies(n, Object.class));
+    public void testWrongShape() throws Throwable {
+        for (MethodHandle bsm : bsms("shape_bsm")) {
             MethodHandle mh = InstructionHelper.ldcDynamicConstant(
                     L, "name", Object.class,
-                    "_bsm", mt,
-                    S -> IntStream.range(0, n).forEach(S::add)
+                    "shape_bsm", bsm.type(),
+                    S -> {}
             );
 
             try {
                 Object r = mh.invoke();
-                Assert.fail("BootstrapMethodError expected to be thrown for arrity " + n);
+                Assert.fail("BootstrapMethodError expected to be thrown for " + bsm);
             } catch (BootstrapMethodError e) {
-                Throwable t = e.getCause();
-                Assert.assertTrue(WrongMethodTypeException.class.isAssignableFrom(t.getClass()));
             }
         }
     }
 
 
-    public static Object _bsm(String[] ss) {
+    public static Object sig_bsm(MethodHandles.Lookup a1, String[] a2) {
         return "0";
     }
 
-    public static Object _bsm(String a1, String a2, String a3) {
+    public static Object sig_bsm(MethodHandles.Lookup a1, String a2, String a3) {
         return "0";
     }
 
     @Test
     public void testWrongSignature() throws Throwable {
-        {
-            MethodHandle mh = InstructionHelper.ldcDynamicConstant(
-                    L, "name", Object.class,
-                    "_bsm", methodType(Object.class, String[].class),
-                    S -> {}
-            );
-
-            try {
-                Object r = mh.invoke();
-                Assert.fail("BootstrapMethodError expected to be thrown");
-            }
-            catch (BootstrapMethodError e) {
-                Throwable t = e.getCause();
-                Assert.assertTrue(WrongMethodTypeException.class.isAssignableFrom(t.getClass()));
-            }
-        }
-
-        {
+        for (MethodHandle bsm : bsms("sig_bsm")) {
             MethodHandle mh = InstructionHelper.ldcDynamicConstant(
                     L, "name", Object.class,
-                    "_bsm", methodType(Object.class, String.class, String.class, String.class),
+                    "sig_bsm", bsm.type(),
                     S -> {}
             );
 
             try {
                 Object r = mh.invoke();
-                Assert.fail("BootstrapMethodError expected to be thrown");
-            }
-            catch (BootstrapMethodError e) {
-                Throwable t = e.getCause();
-                Assert.assertTrue(ClassCastException.class.isAssignableFrom(t.getClass()));
+                Assert.fail("BootstrapMethodError expected to be thrown for " + bsm);
+            } catch (BootstrapMethodError e) {
             }
         }
     }
@@ -193,6 +195,12 @@ public static Object bsm(MethodHandles.Lookup l, String name, Class<?> type,
         return "7";
     }
 
+    public static Object bsm(MethodHandles.Lookup l, Object... args) {
+        Object[] staticArgs = Arrays.copyOfRange(args, 2, args.length);
+        assertAll(staticArgs);
+        return Integer.toString(staticArgs.length);
+    }
+
     static void assertAll(Object... as) {
         for (int i = 0; i < as.length; i++) {
             Assert.assertEquals(as[i], i);
@@ -214,6 +222,19 @@ public void testArity() throws Throwable {
             Object r = mh.invoke();
             Assert.assertEquals(r, Integer.toString(n));
         }
+
+        {
+            MethodType mt = methodType(Object.class, MethodHandles.Lookup.class, Object[].class);
+            MethodHandle mh = InstructionHelper.ldcDynamicConstant(
+                    L, "name", Object.class,
+                    "bsm", mt,
+                    S -> IntStream.range(0, 9).forEach(S::add)
+            );
+
+            Object r = mh.invoke();
+            Assert.assertEquals(r, Integer.toString(9));
+
+        }
     }
 
     @Test

From 30a091887ce26093850fb3a52a0d2d6cb14d048f Mon Sep 17 00:00:00 2001
From: vromero <unknown>
Date: Wed, 11 Apr 2018 14:52:32 -0400
Subject: [PATCH 142/196] 8201440: javac should create unique
 DynamicMethodSymbols at LambdaToMethod Reviewed-by: mcimadamore
 Contributed-by: bsrbnd@gmail.com

---
 .../classes/com/sun/tools/javac/comp/LambdaToMethod.java  | 8 ++++++--
 .../share/classes/com/sun/tools/javac/jvm/Pool.java       | 6 +++---
 .../tools/javac/lambda/deduplication/Deduplication.java   | 6 ++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index bacd82972fd..8b4be83c2b3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -67,6 +67,7 @@
 import static com.sun.tools.javac.code.Kinds.Kind.*;
 import static com.sun.tools.javac.code.TypeTag.*;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
+import static com.sun.tools.javac.jvm.Pool.DynamicMethod;
 
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.type.TypeKind;
@@ -208,6 +209,8 @@ private class KlassInfo {
 
         private Map<DedupedLambda, DedupedLambda> dedupedLambdas;
 
+        private Map<DynamicMethod, DynamicMethodSymbol> dynMethSyms = new HashMap<>();
+
         /**
          * list of deserialization cases
          */
@@ -1200,9 +1203,10 @@ private JCExpression makeIndyCall(DiagnosticPosition pos, Type site, Name bsmNam
                                             (MethodSymbol)bsm,
                                             indyType,
                                             staticArgs.toArray());
-
             JCFieldAccess qualifier = make.Select(make.QualIdent(site.tsym), bsmName);
-            qualifier.sym = dynSym;
+            DynamicMethodSymbol existing = kInfo.dynMethSyms.putIfAbsent(
+                    new DynamicMethod(dynSym, types), dynSym);
+            qualifier.sym = existing != null ? existing : dynSym;
             qualifier.type = indyType.getReturnType();
 
             JCMethodInvocation proxyCall = make.Apply(List.nil(), qualifier, indyArgs);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java
index 39fba539659..1611b6946e6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -180,10 +180,10 @@ public int hashCode() {
         }
     }
 
-    static class DynamicMethod extends Method {
+    public static class DynamicMethod extends Method {
         public Object[] uniqueStaticArgs;
 
-        DynamicMethod(DynamicMethodSymbol m, Types types) {
+        public DynamicMethod(DynamicMethodSymbol m, Types types) {
             super(m, types);
             uniqueStaticArgs = getUniqueTypeArray(m.staticArgs, types);
         }
diff --git a/test/langtools/tools/javac/lambda/deduplication/Deduplication.java b/test/langtools/tools/javac/lambda/deduplication/Deduplication.java
index 7eb1335b985..74e6e0fa285 100644
--- a/test/langtools/tools/javac/lambda/deduplication/Deduplication.java
+++ b/test/langtools/tools/javac/lambda/deduplication/Deduplication.java
@@ -32,6 +32,12 @@ public class Deduplication {
     void group(Object... xs) {}
 
     void test() {
+
+        group(
+                (Runnable) () -> { ( (Runnable) () -> {} ).run(); },
+                (Runnable) () -> { ( (Runnable) () -> {} ).run(); }
+        );
+
         group((Function<String, Integer>) x -> x.hashCode());
         group((Function<Object, Integer>) x -> x.hashCode());
 

From 9743eb37a97fba6d1cd8a09b946de0e096d0f49e Mon Sep 17 00:00:00 2001
From: xyin <unknown>
Date: Thu, 12 Apr 2018 10:19:31 +0800
Subject: [PATCH 143/196] 8197418: Move java/util/RandomAccess/ tests into
 OpenJDK Reviewed-by: psandoz

---
 test/jdk/java/util/RandomAccess/Basic.java | 131 +++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 test/jdk/java/util/RandomAccess/Basic.java

diff --git a/test/jdk/java/util/RandomAccess/Basic.java b/test/jdk/java/util/RandomAccess/Basic.java
new file mode 100644
index 00000000000..9d710e1ba5d
--- /dev/null
+++ b/test/jdk/java/util/RandomAccess/Basic.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2000, 2018, 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
+ * @bug 4327164
+ * @summary Basic test for new RandomAccess interface
+ */
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+import java.util.RandomAccess;
+import java.util.Vector;
+
+public class Basic {
+    public static void main(String[] args) throws Exception {
+        List a0 = Arrays.asList(new String[] { "a", "b", "c" });
+        List a[] = { a0, new ArrayList(a0), new LinkedList(a0),
+                new Vector(a0) };
+
+        if (!(a[0] instanceof RandomAccess))
+            throw new Exception("Arrays.asList doesn't implement RandomAccess");
+        if (!(a[1] instanceof RandomAccess))
+            throw new Exception("ArrayList doesn't implement RandomAccess");
+        if (a[2] instanceof RandomAccess)
+            throw new Exception("LinkedList implements RandomAccess");
+        if (!(a[3] instanceof RandomAccess))
+            throw new Exception("Vector doesn't implement RandomAccess");
+
+        for (int i = 0; i < a.length; i++) {
+            List t = a[i];
+            List ut = Collections.unmodifiableList(t);
+            List st = Collections.synchronizedList(t);
+
+            boolean random = t instanceof RandomAccess;
+            if ((ut instanceof RandomAccess) != random)
+                throw new Exception(
+                        "Unmodifiable fails to preserve RandomAccess: " + i);
+            if ((st instanceof RandomAccess) != random)
+                throw new Exception(
+                        "Synchronized fails to preserve RandomAccess: " + i);
+
+            while (t.size() > 0) {
+                t = t.subList(0, t.size() - 1);
+                if ((t instanceof RandomAccess) != random)
+                    throw new Exception(
+                            "SubList fails to preserve RandomAccess: " + i
+                                    + ", " + t.size());
+
+                ut = ut.subList(0, ut.size() - 1);
+                if ((ut instanceof RandomAccess) != random)
+                    throw new Exception(
+                            "SubList(unmodifiable) fails to preserve RandomAccess: "
+                                    + i + ", " + ut.size());
+
+                st = st.subList(0, st.size() - 1);
+                if ((st instanceof RandomAccess) != random)
+                    throw new Exception(
+                            "SubList(synchronized) fails to preserve RandomAccess: "
+                                    + i + ", " + st.size());
+            }
+        }
+
+        // Test that shuffle works the same on random and sequential access
+        List al = new ArrayList();
+        for (int j = 0; j < 100; j++)
+            al.add(Integer.valueOf(2 * j));
+        List ll = new LinkedList(al);
+        Random r1 = new Random(666), r2 = new Random(666);
+        for (int i = 0; i < 100; i++) {
+            Collections.shuffle(al, r1);
+            Collections.shuffle(ll, r2);
+            if (!al.equals(ll))
+                throw new Exception("Shuffle failed: " + i);
+        }
+
+        // Test that fill works on random & sequential access
+        List gumbyParade = Collections.nCopies(100, "gumby");
+        Collections.fill(al, "gumby");
+        if (!al.equals(gumbyParade))
+            throw new Exception("ArrayList fill failed");
+        Collections.fill(ll, "gumby");
+        if (!ll.equals(gumbyParade))
+            throw new Exception("LinkedList fill failed");
+
+        // Test that copy works on random & sequential access
+        List pokeyParade = Collections.nCopies(100, "pokey");
+        Collections.copy(al, pokeyParade);
+        if (!al.equals(pokeyParade))
+            throw new Exception("ArrayList copy failed");
+        Collections.copy(ll, pokeyParade);
+        if (!ll.equals(pokeyParade))
+            throw new Exception("LinkedList copy failed");
+
+        // Test that binarySearch works the same on random & sequential access
+        al = new ArrayList();
+        for (int i = 0; i < 10000; i++)
+            al.add(Integer.valueOf(2 * i));
+        ll = new LinkedList(al);
+        for (int i = 0; i < 500; i++) {
+            Integer key = Integer.valueOf(r1.nextInt(20000));
+            if (Collections.binarySearch(al, key) != Collections
+                    .binarySearch(ll, key))
+                throw new Exception("Binary search failed: " + i);
+        }
+    }
+}

From 865ab161f9d66b45664e3eef2e0984d220f2f871 Mon Sep 17 00:00:00 2001
From: jlahoda <unknown>
Date: Thu, 12 Apr 2018 09:23:34 +0200
Subject: [PATCH 144/196] 8189765: Improve error reporting for compiling
 against package not visible due to modules Summary: When looking in other
 modules for an undefined Symbol, also look into the unnamed module.
 Reviewed-by: mcimadamore

---
 .../share/classes/com/sun/tools/javac/comp/Resolve.java   | 1 +
 .../tools/javac/modules/CompileModulePatchTest.java       | 2 +-
 .../tools/javac/modules/ConvenientAccessErrorsTest.java   | 8 ++++----
 .../tools/javac/modules/ModulesAndClassPathTest.java      | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index d07e4a86a96..374049f9515 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -2120,6 +2120,7 @@ private <S extends Symbol> Symbol lookupInvisibleSymbol(Env<AttrContext> env,
 
         Set<ModuleSymbol> recoverableModules = new HashSet<>(syms.getAllModules());
 
+        recoverableModules.add(syms.unnamedModule);
         recoverableModules.remove(env.toplevel.modle);
 
         for (ModuleSymbol ms : recoverableModules) {
diff --git a/test/langtools/tools/javac/modules/CompileModulePatchTest.java b/test/langtools/tools/javac/modules/CompileModulePatchTest.java
index 1ff40cdcc6c..bc86f74c705 100644
--- a/test/langtools/tools/javac/modules/CompileModulePatchTest.java
+++ b/test/langtools/tools/javac/modules/CompileModulePatchTest.java
@@ -252,7 +252,7 @@ public void testClassPath(Path base) throws Exception {
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expectedOut = Arrays.asList(
-                "Extra.java:1:76: compiler.err.doesnt.exist: p",
+                "Extra.java:1:75: compiler.err.package.not.visible: p, (compiler.misc.not.def.access.does.not.read.unnamed: p, java.compiler)",
                 "1 error"
         );
 
diff --git a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
index 3fed25a3ab5..56341d4abed 100644
--- a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
+++ b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8169197 8172668 8173117 8175007
+ * @bug 8169197 8172668 8173117 8175007 8189765
  * @summary Check convenient errors are produced for inaccessible classes.
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -199,7 +199,7 @@ public void testInaccessibleInExported(Path base) throws Exception {
             throw new Exception("expected output not found; actual: " + log);
     }
 
-//    @Test
+    @Test
     public void testInaccessibleUnnamedModule(Path base) throws Exception {
         Path jar = prepareTestJar(base, "package api; class Api { public static class Foo {} }");
 
@@ -224,8 +224,8 @@ public void testInaccessibleUnnamedModule(Path base) throws Exception {
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected = Arrays.asList(
-                "Test.java:1:38: compiler.err.not.def.access.package.cant.access: api.Api, api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)",
-                "Test.java:1:51: compiler.err.not.def.access.package.cant.access: api.Api, api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)",
+                "Test.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)",
+                "Test.java:1:48: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)",
                 "2 errors");
 
         if (!expected.equals(log))
diff --git a/test/langtools/tools/javac/modules/ModulesAndClassPathTest.java b/test/langtools/tools/javac/modules/ModulesAndClassPathTest.java
index e88aeadc93b..656aab9aef9 100644
--- a/test/langtools/tools/javac/modules/ModulesAndClassPathTest.java
+++ b/test/langtools/tools/javac/modules/ModulesAndClassPathTest.java
@@ -77,7 +77,7 @@ public void testModulesAndClassPath(Path base) throws Exception {
                                 .writeAll()
                                 .getOutputLines(Task.OutputKind.DIRECT);
 
-        List<String> expected = Arrays.asList("Impl.java:1:38: compiler.err.doesnt.exist: api",
+        List<String> expected = Arrays.asList("Impl.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m)",
                                               "1 error");
 
         if (!expected.equals(modLog)) {
@@ -129,7 +129,7 @@ public void testImplicitSourcePathModuleInfo(Path base) throws Exception {
                                 .writeAll()
                                 .getOutputLines(Task.OutputKind.DIRECT);
 
-        List<String> expected = Arrays.asList("Impl.java:1:38: compiler.err.doesnt.exist: api",
+        List<String> expected = Arrays.asList("Impl.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m)",
                                               "1 error");
 
         if (!expected.equals(modLog)) {
@@ -170,7 +170,7 @@ public void testModuleInfoFromOutput(Path base) throws Exception {
                                 .writeAll()
                                 .getOutputLines(Task.OutputKind.DIRECT);
 
-        List<String> expected = Arrays.asList("Impl.java:1:38: compiler.err.doesnt.exist: api",
+        List<String> expected = Arrays.asList("Impl.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m)",
                                               "1 error");
 
         if (!expected.equals(modLog)) {

From e690003f52cfc0d54e012e3664630c465f53f2b4 Mon Sep 17 00:00:00 2001
From: mcimadamore <unknown>
Date: Thu, 12 Apr 2018 13:55:20 +0100
Subject: [PATCH 145/196] 8199194: Add javac support for preview features
 Summary: Add support for preview features and related command line options.
 Reviewed-by: jjg

---
 .../com/sun/tools/javac/code/Lint.java        |   7 +-
 .../com/sun/tools/javac/code/Preview.java     | 204 ++++++++++++++++++
 .../com/sun/tools/javac/code/Source.java      |  10 +
 .../com/sun/tools/javac/jvm/ClassFile.java    |   2 +
 .../com/sun/tools/javac/jvm/ClassReader.java  |  14 ++
 .../com/sun/tools/javac/jvm/ClassWriter.java  |  12 +-
 .../com/sun/tools/javac/main/Arguments.java   |  14 ++
 .../sun/tools/javac/main/JavaCompiler.java    |   6 +
 .../com/sun/tools/javac/main/Option.java      |   2 +
 .../sun/tools/javac/parser/JavaTokenizer.java |  16 +-
 .../sun/tools/javac/parser/JavacParser.java   |  13 +-
 .../sun/tools/javac/parser/ParserFactory.java |   3 +
 .../tools/javac/parser/ScannerFactory.java    |   3 +
 .../tools/javac/resources/compiler.properties |  47 ++++
 .../tools/javac/resources/javac.properties    |  10 +
 .../tools/javac/diags/examples.not-yet.txt    |   2 +
 .../examples/PreviewFeatureDisabled.java      |  36 ++++
 .../PreviewFeatureDisabledPlural.java         |  34 +++
 .../diags/examples/PreviewFeatureUse.java     |  39 ++++
 .../javac/diags/examples/PreviewFilename.java |  35 +++
 .../examples/PreviewFilenameAdditional.java   |  38 ++++
 .../diags/examples/PreviewPlural/Bar.java     |  28 +++
 .../examples/PreviewPlural/PreviewPlural.java |  37 ++++
 .../examples/PreviewPluralAdditional/Bar.java |  33 +++
 .../PreviewPluralAdditional.java              |  38 ++++
 .../javac/preview/PreviewOptionTest.java      | 113 ++++++++++
 .../javac/preview/classReaderTest/Bar.java    |  28 +++
 .../javac/preview/classReaderTest/Client.java |  14 ++
 .../classReaderTest/Client.nopreview.out      |   2 +
 .../classReaderTest/Client.preview.out        |   4 +
 30 files changed, 838 insertions(+), 6 deletions(-)
 create mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewFeatureDisabled.java
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewFeatureDisabledPlural.java
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewFeatureUse.java
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewFilename.java
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewFilenameAdditional.java
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
 create mode 100644 test/langtools/tools/javac/preview/PreviewOptionTest.java
 create mode 100644 test/langtools/tools/javac/preview/classReaderTest/Bar.java
 create mode 100644 test/langtools/tools/javac/preview/classReaderTest/Client.java
 create mode 100644 test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out
 create mode 100644 test/langtools/tools/javac/preview/classReaderTest/Client.preview.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
index b0e981c4ff8..213abeb979b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
@@ -287,7 +287,12 @@ public enum LintCategory {
         /**
          * Warn about potentially unsafe vararg methods
          */
-        VARARGS("varargs");
+        VARARGS("varargs"),
+
+        /**
+         * Warn about use of preview features.
+         */
+        PREVIEW("preview");
 
         LintCategory(String option) {
             this(option, false);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
new file mode 100644
index 00000000000..84cff051fe4
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2018, 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 com.sun.tools.javac.code;
+
+import com.sun.tools.javac.code.Lint.LintCategory;
+import com.sun.tools.javac.code.Source.Feature;
+import com.sun.tools.javac.comp.Infer;
+import com.sun.tools.javac.jvm.Target;
+import com.sun.tools.javac.resources.CompilerProperties.Errors;
+import com.sun.tools.javac.resources.CompilerProperties.Warnings;
+import com.sun.tools.javac.util.Assert;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
+import com.sun.tools.javac.util.JCDiagnostic.Error;
+import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.MandatoryWarningHandler;
+import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.util.Options;
+
+import javax.tools.JavaFileObject;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.sun.tools.javac.main.Option.PREVIEW;
+
+/**
+ * Helper class to handle preview language features. This class maps certain language features
+ * (see {@link Feature} into 'preview' features; the mapping is completely ad-hoc, so as to allow
+ * for maximum flexibility, which allows to migrate preview feature into supported features with ease.
+ *
+ * This class acts as a centralized point against which usages of preview features are reported by
+ * clients (e.g. other javac classes). Internally, this class collects all such usages and generates
+ * diagnostics to inform the user of such usages. Such diagnostics can be enabled using the
+ * {@link LintCategory#PREVIEW} lint category, and are suppressible by usual means.
+ */
+public class Preview {
+
+    /** flag: are preview featutres enabled */
+    private final boolean enabled;
+
+    /** the diag handler to manage preview feature usage diagnostics */
+    private final MandatoryWarningHandler previewHandler;
+
+    /** test flag: should all features be considered as preview features? */
+    private final boolean forcePreview;
+
+    /** a mapping from classfile numbers to Java SE versions */
+    private final Map<Integer, Source> majorVersionToSource;
+
+
+    private final Lint lint;
+    private final Log log;
+
+    private static final Context.Key<Preview> previewKey = new Context.Key<>();
+
+    public static Preview instance(Context context) {
+        Preview instance = context.get(previewKey);
+        if (instance == null) {
+            instance = new Preview(context);
+        }
+        return instance;
+    }
+
+    Preview(Context context) {
+        context.put(previewKey, this);
+        Options options = Options.instance(context);
+        enabled = options.isSet(PREVIEW);
+        log = Log.instance(context);
+        lint = Lint.instance(context);
+        this.previewHandler =
+                new MandatoryWarningHandler(log, lint.isEnabled(LintCategory.PREVIEW), true, "preview", LintCategory.PREVIEW);
+        forcePreview = options.isSet("forcePreview");
+        majorVersionToSource = initMajorVersionToSourceMap();
+    }
+
+    private Map<Integer, Source> initMajorVersionToSourceMap() {
+        Map<Integer, Source> majorVersionToSource = new HashMap<>();
+        for (Target t : Target.values()) {
+            int major = t.majorVersion;
+            Source source = Source.lookup(t.name);
+            if (source != null) {
+                majorVersionToSource.put(major, source);
+            }
+        }
+        return majorVersionToSource;
+   }
+
+    /**
+     * Report usage of a preview feature. Usages reported through this method will affect the
+     * set of sourcefiles with dependencies on preview features.
+     * @param pos the position at which the preview feature was used.
+     * @param feature the preview feature used.
+     */
+    public void warnPreview(int pos, Feature feature) {
+        warnPreview(new SimpleDiagnosticPosition(pos), feature);
+    }
+
+    /**
+     * Report usage of a preview feature. Usages reported through this method will affect the
+     * set of sourcefiles with dependencies on preview features.
+     * @param pos the position at which the preview feature was used.
+     * @param feature the preview feature used.
+     */
+    public void warnPreview(DiagnosticPosition pos, Feature feature) {
+        Assert.check(isEnabled());
+        Assert.check(isPreview(feature));
+        if (!lint.isSuppressed(LintCategory.PREVIEW)) {
+            previewHandler.report(pos, feature.isPlural() ?
+                    Warnings.PreviewFeatureUsePlural(feature.nameFragment()) :
+                    Warnings.PreviewFeatureUse(feature.nameFragment()));
+        }
+    }
+
+    /**
+     * Report usage of a preview feature in classfile.
+     * @param classfile the name of the classfile with preview features enabled
+     * @param majorVersion the major version found in the classfile.
+     */
+    public void warnPreview(JavaFileObject classfile, int majorVersion) {
+        Assert.check(isEnabled());
+        if (!lint.isSuppressed(LintCategory.PREVIEW)) {
+            previewHandler.report(null,
+                    Warnings.PreviewFeatureUseClassfile(classfile, majorVersionToSource.get(majorVersion).name));
+        }
+    }
+
+    /**
+     * Are preview features enabled?
+     * @return true, if preview features are enabled.
+     */
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Is given feature a preview feature?
+     * @param feature the feature to be tested.
+     * @return true, if given feature is a preview feature.
+     */
+    public boolean isPreview(Feature feature) {
+        //Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
+        //When real preview features will be added, this method can be implemented to return 'true'
+        //for those selected features, and 'false' for all the others.
+        return forcePreview;
+    }
+
+    /**
+     * Generate an error key which captures the fact that a given preview feature could not be used
+     * due to the preview feature support being disabled.
+     * @param feature the feature for which the diagnostic has to be generated.
+     * @return the diagnostic.
+     */
+    public Error disabledError(Feature feature) {
+        Assert.check(!isEnabled());
+        return feature.isPlural() ?
+                Errors.PreviewFeatureDisabledPlural(feature.nameFragment()) :
+                Errors.PreviewFeatureDisabled(feature.nameFragment());
+    }
+
+    /**
+     * Generate an error key which captures the fact that a preview classfile cannot be loaded
+     * due to the preview feature support being disabled.
+     * @param classfile the name of the classfile with preview features enabled
+     * @param majorVersion the major version found in the classfile.
+     */
+    public Error disabledError(JavaFileObject classfile, int majorVersion) {
+        Assert.check(!isEnabled());
+        return Errors.PreviewFeatureDisabledClassfile(classfile, majorVersionToSource.get(majorVersion).name);
+    }
+
+    /**
+     * Report any deferred diagnostics.
+     */
+    public void reportDeferredDiagnostics() {
+        previewHandler.reportDeferredDiagnostic();
+    }
+}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index 822583edf77..9f643110332 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -217,6 +217,16 @@ public boolean allowedInSource(Source source) {
                     source.compareTo(maxLevel) <= 0;
         }
 
+        public boolean isPlural() {
+            Assert.checkNonNull(optKind);
+            return optKind == DiagKind.PLURAL;
+        }
+
+        public Fragment nameFragment() {
+            Assert.checkNonNull(optFragment);
+            return optFragment;
+        }
+
         public Fragment fragment(String sourceName) {
             Assert.checkNonNull(optFragment);
             return optKind == DiagKind.NORMAL ?
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
index 54f316eb253..4daeb73bc0a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
@@ -105,6 +105,8 @@ public class ClassFile {
     public final static int MAX_LOCALS = 0xffff;
     public final static int MAX_STACK = 0xffff;
 
+    public final static int PREVIEW_MINOR_VERSION = 0xffff;
+
     public enum Version {
         V45_3(45, 3), // base level for all attributes
         V49(49, 0),   // JDK 1.5: enum, generics, annotations
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 557d04228cf..5a1d3b9005f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -148,6 +148,11 @@ public class ClassReader {
 
     DeferredCompletionFailureHandler dcfh;
 
+    /**
+     * Support for preview language features.
+     */
+    Preview preview;
+
     /** The current scope where type variables are entered.
      */
     protected WriteableScope typevars;
@@ -270,6 +275,7 @@ protected ClassReader(Context context) {
         verbose         = options.isSet(Option.VERBOSE);
 
         Source source = Source.instance(context);
+        preview = Preview.instance(context);
         allowSimplifiedVarargs = Feature.SIMPLIFIED_VARARGS.allowedInSource(source);
         allowModules     = Feature.MODULES.allowedInSource(source);
 
@@ -2786,6 +2792,14 @@ private void readClassBuffer(ClassSymbol c) throws IOException {
                                    Integer.toString(maxMinor));
         }
 
+        if (minorVersion == ClassFile.PREVIEW_MINOR_VERSION) {
+            if (!preview.isEnabled()) {
+                log.error(preview.disabledError(currentClassFile, majorVersion));
+            } else {
+                preview.warnPreview(c.classfile, majorVersion);
+            }
+        }
+
         indexPool();
         if (signatureBuffer.length < bp) {
             int ns = Integer.highestOneBit(bp) << 1;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index e582e7b4cb6..f658b3f7d58 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -49,7 +49,6 @@
 import com.sun.tools.javac.jvm.Pool.Method;
 import com.sun.tools.javac.jvm.Pool.MethodHandle;
 import com.sun.tools.javac.jvm.Pool.Variable;
-import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.util.*;
 
 import static com.sun.tools.javac.code.Flags.*;
@@ -89,6 +88,10 @@ public class ClassWriter extends ClassFile {
      */
     private boolean debugstackmap;
 
+    /** Preview language level.
+     */
+    private Preview preview;
+
     /**
      * Target class version.
      */
@@ -178,6 +181,7 @@ protected ClassWriter(Context context) {
         log = Log.instance(context);
         names = Names.instance(context);
         options = Options.instance(context);
+        preview = Preview.instance(context);
         target = Target.instance(context);
         source = Source.instance(context);
         types = Types.instance(context);
@@ -1819,7 +1823,11 @@ public void writeClassFile(OutputStream out, ClassSymbol c)
         acount += writeExtraClassAttributes(c);
 
         poolbuf.appendInt(JAVA_MAGIC);
-        poolbuf.appendChar(target.minorVersion);
+        if (preview.isEnabled()) {
+            poolbuf.appendChar(ClassFile.PREVIEW_MINOR_VERSION);
+        } else {
+            poolbuf.appendChar(target.minorVersion);
+        }
         poolbuf.appendChar(target.majorVersion);
 
         writePool(c.pool);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
index 70d7be3d170..99853cc9c61 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
@@ -536,6 +536,20 @@ public boolean validate() {
             }
         }
 
+        if (options.isSet(Option.PREVIEW)) {
+            if (sourceString == null) {
+                //enable-preview must be used with explicit -source or --release
+                error("err.preview.without.source.or.release");
+                return false;
+            } else if (source != Source.DEFAULT) {
+                //enable-preview must be used with latest source version
+                error("err.preview.not.latest",
+                        sourceString,
+                        Source.DEFAULT.name);
+                return false;
+            }
+        }
+
         String profileString = options.get(Option.PROFILE);
         if (profileString != null) {
             Profile profile = Profile.lookup(profileString);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 954bb9cf48c..54d5676d251 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -275,6 +275,10 @@ else if (option.equals("class"))
      */
     protected Source source;
 
+    /** The preview language version.
+     */
+    protected Preview preview;
+
     /** The module for code generation.
      */
     protected Gen gen;
@@ -405,6 +409,7 @@ public JavaCompiler(Context context) {
             log.error(Errors.CantAccess(ex.sym, ex.getDetailValue()));
         }
         source = Source.instance(context);
+        preview = Preview.instance(context);
         attr = Attr.instance(context);
         analyzer = Analyzer.instance(context);
         chk = Check.instance(context);
@@ -1725,6 +1730,7 @@ public void reportDeferredDiagnostics() {
                 log.warning(Warnings.ProcUseProcOrImplicit);
         }
         chk.reportDeferredDiagnostics();
+        preview.reportDeferredDiagnostics();
         if (log.compressedOutput) {
             log.mandatoryNote(null, Notes.CompressedDiags);
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index 23bfdec575e..8c7a3da8fc7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -330,6 +330,8 @@ protected void help(Log log) {
         }
     },
 
+    PREVIEW("--enable-preview", "opt.preview", STANDARD, BASIC),
+
     PROFILE("-profile", "opt.arg.profile", "opt.profile", STANDARD, BASIC) {
         @Override
         public void process(OptionHelper helper, String option, String operand) throws InvalidValueException {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
index df1d5bb62ba..35fd2243cdf 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -25,6 +25,7 @@
 
 package com.sun.tools.javac.parser;
 
+import com.sun.tools.javac.code.Preview;
 import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.code.Source.Feature;
 import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
@@ -53,6 +54,9 @@ public class JavaTokenizer {
      */
     private Source source;
 
+    /** The preview language setting. */
+    private Preview preview;
+
     /** The log to be used for error reporting.
      */
     private final Log log;
@@ -115,12 +119,20 @@ protected JavaTokenizer(ScannerFactory fac, UnicodeReader reader) {
         this.log = fac.log;
         this.tokens = fac.tokens;
         this.source = fac.source;
+        this.preview = fac.preview;
         this.reader = reader;
     }
 
-    private void checkSourceLevel(int pos, Feature feature) {
-        if (!feature.allowedInSource(source)) {
+    protected void checkSourceLevel(int pos, Feature feature) {
+        if (preview.isPreview(feature) && !preview.isEnabled()) {
+            //preview feature without --preview flag, error
+            lexError(DiagnosticFlag.SOURCE_LEVEL, pos, preview.disabledError(feature));
+        } else if (!feature.allowedInSource(source)) {
+            //incompatible source level, error
             lexError(DiagnosticFlag.SOURCE_LEVEL, pos, feature.error(source.name));
+        } else if (preview.isPreview(feature)) {
+            //use of preview feature, warn
+            preview.warnPreview(pos, feature);
         }
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 05d81f99356..82dddd48d77 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -95,6 +95,9 @@ public class JavacParser implements Parser {
     /** The Source language setting. */
     private Source source;
 
+    /** The Preview language setting. */
+    private Preview preview;
+
     /** The name table. */
     private Names names;
 
@@ -169,6 +172,7 @@ protected JavacParser(ParserFactory fac,
         this.log = fac.log;
         this.names = fac.names;
         this.source = fac.source;
+        this.preview = fac.preview;
         this.allowStringFolding = fac.options.getBoolean("allowStringFolding", true);
         this.keepDocComments = keepDocComments;
         this.parseModuleInfo = parseModuleInfo;
@@ -4219,8 +4223,15 @@ void checkSourceLevel(Feature feature) {
     }
 
     protected void checkSourceLevel(int pos, Feature feature) {
-        if (!feature.allowedInSource(source)) {
+        if (preview.isPreview(feature) && !preview.isEnabled()) {
+            //preview feature without --preview flag, error
+            log.error(DiagnosticFlag.SOURCE_LEVEL, pos, preview.disabledError(feature));
+        } else if (!feature.allowedInSource(source)) {
+            //incompatible source level, error
             log.error(DiagnosticFlag.SOURCE_LEVEL, pos, feature.error(source.name));
+        } else if (preview.isPreview(feature)) {
+            //use of preview feature, warn
+            preview.warnPreview(pos, feature);
         }
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
index e9c53c9920c..e699a81d7b2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
@@ -27,6 +27,7 @@
 
 import java.util.Locale;
 
+import com.sun.tools.javac.code.Preview;
 import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.tree.DocTreeMaker;
 import com.sun.tools.javac.tree.TreeMaker;
@@ -62,6 +63,7 @@ public static ParserFactory instance(Context context) {
     final Log log;
     final Tokens tokens;
     final Source source;
+    final Preview preview;
     final Names names;
     final Options options;
     final ScannerFactory scannerFactory;
@@ -76,6 +78,7 @@ protected ParserFactory(Context context) {
         this.names = Names.instance(context);
         this.tokens = Tokens.instance(context);
         this.source = Source.instance(context);
+        this.preview = Preview.instance(context);
         this.options = Options.instance(context);
         this.scannerFactory = ScannerFactory.instance(context);
         this.locale = context.get(Locale.class);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
index 838f13b5f3b..c15a1e37150 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
@@ -27,6 +27,7 @@
 
 import java.nio.CharBuffer;
 
+import com.sun.tools.javac.code.Preview;
 import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
@@ -56,6 +57,7 @@ public static ScannerFactory instance(Context context) {
     final Log log;
     final Names names;
     final Source source;
+    final Preview preview;
     final Tokens tokens;
 
     /** Create a new scanner factory. */
@@ -64,6 +66,7 @@ protected ScannerFactory(Context context) {
         this.log = Log.instance(context);
         this.names = Names.instance(context);
         this.source = Source.instance(context);
+        this.preview = Preview.instance(context);
         this.tokens = Tokens.instance(context);
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 7d5891b02e6..169529a6396 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1547,6 +1547,25 @@ compiler.note.unchecked.filename.additional=\
 compiler.note.unchecked.plural.additional=\
     Some input files additionally use unchecked or unsafe operations.
 
+# 0: file name
+compiler.note.preview.filename=\
+    {0} uses preview language features.
+
+compiler.note.preview.plural=\
+    Some input files use preview language features.
+
+# The following string may appear after one of the above deprecation
+# messages.
+compiler.note.preview.recompile=\
+    Recompile with -Xlint:preview for details.
+
+# 0: file name
+compiler.note.preview.filename.additional=\
+    {0} has additional uses of preview language features.
+
+compiler.note.preview.plural.additional=\
+    Some input files additionally use preview language features.
+
 # Notes related to annotation processing
 
 # Print a client-generated note; assumed to be localized, no translation required
@@ -2665,6 +2684,34 @@ compiler.misc.feature.not.supported.in.source.plural=\
    {0} are not supported in -source {1}\n\
     (use -source {2} or higher to enable {0})
 
+# 0: message segment (feature)
+compiler.err.preview.feature.disabled=\
+   {0} is a preview feature and is disabled by default.\n\
+   (use --enable-preview to enable {0})
+
+# 0: message segment (feature)
+compiler.err.preview.feature.disabled.plural=\
+   {0} are a preview feature and are disabled by default.\n\
+   (use --enable-preview to enable {0})
+
+# 0: file object (classfile), 1: string (expected version)
+compiler.err.preview.feature.disabled.classfile=\
+   classfile for {0} uses preview features of Java SE {1}.\n\
+   (use --enable-preview to allow loading of classfiles which contain preview features)
+
+# 0: message segment (feature)
+compiler.warn.preview.feature.use=\
+   {0} is a preview feature and may be removed in a future release.
+
+# 0: message segment (feature)
+compiler.warn.preview.feature.use.plural=\
+   {0} are a preview feature and may be removed in a future release.
+
+# 0: file object (classfile), 1: string (expected version)
+compiler.warn.preview.feature.use.classfile=\
+   classfile for {0} uses preview features of Java SE {1}.
+
+
 compiler.misc.feature.modules=\
     modules
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index 67e77e3bd16..169f697ad92 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -252,6 +252,9 @@ javac.opt.Xlint.desc.unchecked=\
 javac.opt.Xlint.desc.varargs=\
     Warn about potentially unsafe vararg methods
 
+javac.opt.Xlint.desc.preview=\
+    Warn about use of preview language features
+
 javac.opt.Xdoclint=\
     Enable recommended checks for problems in javadoc comments
 # L10N: do not localize: all none
@@ -293,6 +296,8 @@ javac.opt.userpathsfirst=\
     Search classpath and sourcepath for classes before the bootclasspath instead of after
 javac.opt.prefer=\
     Specify which file to read when both a source file and class file are found for an implicitly compiled class
+javac.opt.preview=\
+    Enable preview language features. To be used in conjunction with either -source or --release.
 javac.opt.AT=\
     Read options and filenames from file
 javac.opt.diags=\
@@ -368,6 +373,11 @@ javac.warn.target.default.source.conflict=\
     target release {0} conflicts with default source release {1}
 javac.warn.profile.target.conflict=\
     profile {0} is not valid for target release {1}
+javac.err.preview.not.latest=\
+    invalid source release {0} with --enable-preview\n\
+    (preview language features are only supported for release {1})
+javac.err.preview.without.source.or.release=\
+    --enable-preview must be used with either -source or --release
 javac.err.file.not.found=\
     file not found: {0}
 javac.err.file.not.directory=\
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index ff90131995e..a3d227af59b 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -127,6 +127,8 @@ compiler.misc.bad.const.pool.entry                      # constant pool entry ha
 compiler.warn.access.to.member.from.serializable.lambda # in order to generate it we need to modify a restricted package
 compiler.warn.invalid.path                              # this warning is generated only in Windows systems
 compiler.note.multiple.elements                         # needs user code
+compiler.err.preview.feature.disabled.classfile         # preview feature support: needs compilation against classfile
+compiler.warn.preview.feature.use.classfile             # preview feature support: needs compilation against classfile
 
 # The following module-related messages will have to stay on the not-yet list for various reasons:
 compiler.warn.locn.unknown.file.on.module.path                # Never issued ATM (short circuited with an if (false))
diff --git a/test/langtools/tools/javac/diags/examples/PreviewFeatureDisabled.java b/test/langtools/tools/javac/diags/examples/PreviewFeatureDisabled.java
new file mode 100644
index 00000000000..3aaeccc09a9
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewFeatureDisabled.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+// key: compiler.err.preview.feature.disabled
+// key: compiler.misc.feature.diamond
+// options: -XDforcePreview
+
+import java.util.ArrayList;
+
+class PreviewFeatureDisabled {
+    void m() {
+        new ArrayList<>();
+    }
+}
diff --git a/test/langtools/tools/javac/diags/examples/PreviewFeatureDisabledPlural.java b/test/langtools/tools/javac/diags/examples/PreviewFeatureDisabledPlural.java
new file mode 100644
index 00000000000..734dab010fe
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewFeatureDisabledPlural.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+// key: compiler.err.preview.feature.disabled.plural
+// key: compiler.misc.feature.lambda
+// options: -XDforcePreview
+
+class PreviewFeatureDisabledPlural {
+    void m() {
+        Runnable r = () -> {};
+    }
+}
diff --git a/test/langtools/tools/javac/diags/examples/PreviewFeatureUse.java b/test/langtools/tools/javac/diags/examples/PreviewFeatureUse.java
new file mode 100644
index 00000000000..b280d901d0a
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewFeatureUse.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+//key: compiler.warn.preview.feature.use
+//key: compiler.warn.preview.feature.use.plural
+//key: compiler.misc.feature.diamond
+//key: compiler.misc.feature.lambda
+//options: -Xlint:preview -XDforcePreview -source 11 --enable-preview
+
+import java.util.ArrayList;
+
+class PreviewFeatureUse {
+    void test() {
+        new ArrayList<>();
+        Runnable r = () -> {};
+    }
+}
diff --git a/test/langtools/tools/javac/diags/examples/PreviewFilename.java b/test/langtools/tools/javac/diags/examples/PreviewFilename.java
new file mode 100644
index 00000000000..7a58e964bbd
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewFilename.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+// key: compiler.note.preview.filename
+// key: compiler.note.preview.recompile
+// options: -XDforcePreview  -source 11 --enable-preview
+
+import java.util.ArrayList;
+import java.util.List;
+
+class PreviewFilename {
+    List<String> ls = new ArrayList<>();
+}
diff --git a/test/langtools/tools/javac/diags/examples/PreviewFilenameAdditional.java b/test/langtools/tools/javac/diags/examples/PreviewFilenameAdditional.java
new file mode 100644
index 00000000000..b813fd02c37
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewFilenameAdditional.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+// key: compiler.note.preview.filename.additional
+// key: compiler.warn.preview.feature.use
+// key: compiler.misc.feature.diamond
+// options: -Xlint:preview -Xmaxwarns 1 -XDforcePreview  -source 11 --enable-preview
+
+import java.util.ArrayList;
+
+class PreviewFilenameAdditional {
+    void test() {
+        new ArrayList<>();
+        new ArrayList<>();
+    }
+}
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java b/test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java
new file mode 100644
index 00000000000..a2d62055954
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+class Bar {
+    Runnable r = () -> {};
+}
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java
new file mode 100644
index 00000000000..a43f435e8ff
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+// key: compiler.note.preview.plural
+// key: compiler.note.preview.recompile
+// options: -XDforcePreview  -source 11 --enable-preview
+
+import java.util.ArrayList;
+
+class PreviewPlural {
+    void test() {
+        new Bar();
+        new ArrayList<>();
+    }
+}
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java
new file mode 100644
index 00000000000..0b243569554
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+import java.util.ArrayList;
+
+class Bar {
+    Runnable r = () -> {};
+    void test() {
+        new ArrayList<>();
+    }
+}
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
new file mode 100644
index 00000000000..2bcb2dae3cd
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+// key: compiler.note.preview.plural.additional
+// key: compiler.warn.preview.feature.use.plural
+// key: compiler.misc.feature.lambda
+// options: -Xlint:preview -Xmaxwarns 1 -XDforcePreview  -source 11 --enable-preview
+
+import java.util.ArrayList;
+
+class PreviewPlural {
+    void test() {
+        new Bar();
+        new ArrayList<>();
+    }
+}
diff --git a/test/langtools/tools/javac/preview/PreviewOptionTest.java b/test/langtools/tools/javac/preview/PreviewOptionTest.java
new file mode 100644
index 00000000000..80db6ba595c
--- /dev/null
+++ b/test/langtools/tools/javac/preview/PreviewOptionTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+/*
+ * @test
+ * @bug 8199194
+ * @summary smoke test for enable-preview command line flag
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ */
+
+import java.io.*;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.sun.tools.javac.code.Source;
+
+public class PreviewOptionTest {
+    public static void main(String... args) throws Exception {
+        PreviewOptionTest t = new PreviewOptionTest();
+        t.run();
+    }
+
+    public void run() throws Exception {
+        try (FileWriter out = new FileWriter("Test.java")) {
+            out.write("class Test { }");
+        }
+
+        testWithNoFlags();
+
+        List<Source> versionsToTest = Stream.of(Source.values())
+                .filter(s -> s.compareTo(Source.MIN) >= 0)
+                .collect(Collectors.toList());
+
+        versionsToTest.stream().forEach(this::testWithSourceFlag);
+        versionsToTest.stream().forEach(this::testWithReleaseFlag);
+
+        if (errors > 0)
+            throw new Exception(errors + " errors occurred");
+    }
+
+    void testWithNoFlags() {
+        testInternal(null, null, true);
+    }
+
+    void testWithSourceFlag(Source source) {
+        testInternal(source, null, source != Source.DEFAULT);
+    }
+
+    void testWithReleaseFlag(Source release) {
+        //Todo: the condition below should say "release != Source.DEFAULT", but we can't do that
+        //since --release 11 is not supported yet.
+        testInternal(null, release, true);
+    }
+
+    void testInternal(Source source, Source release, boolean shouldFail) {
+        System.err.println("Test: source:" + source + ", release:" + release + " " + shouldFail + " " + shouldFail);
+        List<String> args = new ArrayList<>();
+        args.add("--enable-preview");
+        if (source != null) {
+            args.add("-source");
+            args.add(source.name);
+        }
+        if (release != null) {
+            args.add("--release");
+            args.add(release.name);
+        }
+        args.add("Test.java");
+
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        int rc = com.sun.tools.javac.Main.compile(args.toArray(new String[args.size()]), pw);
+        pw.close();
+        boolean hasErrors = rc != 0;
+        if (hasErrors != shouldFail) {
+            if (hasErrors) {
+                String out = sw.toString();
+                error("error not expected but found:\n" + out);
+            } else {
+                error("error expected but not found");
+            }
+        }
+    }
+
+    void error(String msg) {
+        System.err.println("error: " + msg);
+        errors++;
+    }
+
+    int errors;
+}
diff --git a/test/langtools/tools/javac/preview/classReaderTest/Bar.java b/test/langtools/tools/javac/preview/classReaderTest/Bar.java
new file mode 100644
index 00000000000..65a0687a4e7
--- /dev/null
+++ b/test/langtools/tools/javac/preview/classReaderTest/Bar.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+public class Bar {
+    Runnable r = () -> {};
+}
diff --git a/test/langtools/tools/javac/preview/classReaderTest/Client.java b/test/langtools/tools/javac/preview/classReaderTest/Client.java
new file mode 100644
index 00000000000..91ac53e334e
--- /dev/null
+++ b/test/langtools/tools/javac/preview/classReaderTest/Client.java
@@ -0,0 +1,14 @@
+/*
+ * @test /nodynamioccopyright/
+ * @bug 8199194
+ * @summary smoke test for --enabled-preview classreader support
+ * @compile -XDforcePreview --enable-preview -source 11 Bar.java
+ * @compile/fail/ref=Client.nopreview.out -Xlint:preview -XDrawDiagnostics Client.java
+ * @compile/fail/ref=Client.preview.out -Werror -Xlint:preview -XDrawDiagnostics --enable-preview -source 11 Client.java
+ */
+
+public class Client {
+    void test() {
+        new Bar();
+    }
+}
diff --git a/test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out b/test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out
new file mode 100644
index 00000000000..967077d52d8
--- /dev/null
+++ b/test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out
@@ -0,0 +1,2 @@
+- compiler.err.preview.feature.disabled.classfile: Bar.class, 11
+1 error
diff --git a/test/langtools/tools/javac/preview/classReaderTest/Client.preview.out b/test/langtools/tools/javac/preview/classReaderTest/Client.preview.out
new file mode 100644
index 00000000000..43212d9f565
--- /dev/null
+++ b/test/langtools/tools/javac/preview/classReaderTest/Client.preview.out
@@ -0,0 +1,4 @@
+- compiler.warn.preview.feature.use.classfile: Bar.class, 11
+- compiler.err.warnings.and.werror
+1 error
+1 warning

From 7b733a72230570f4879a14f4e527cf8c29566e5b Mon Sep 17 00:00:00 2001
From: aivanov <unknown>
Date: Thu, 12 Apr 2018 14:03:54 +0100
Subject: [PATCH 146/196] 8201240: Improve releasing native resources of
 BufImgSurfaceData.ICMColorData Reviewed-by: prr, serb

---
 .../sun/awt/image/BufImgSurfaceData.java      | 16 +-----------
 .../libawt/awt/image/BufImgSurfaceData.c      | 26 +++++++++----------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java b/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java
index ac42b424152..025ed19b918 100644
--- a/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java
+++ b/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -25,7 +25,6 @@
 
 package sun.awt.image;
 
-import java.awt.Color;
 import java.awt.Rectangle;
 import java.awt.GraphicsConfiguration;
 import java.awt.image.ColorModel;
@@ -38,9 +37,6 @@
 
 import sun.java2d.SurfaceData;
 import sun.java2d.SunGraphics2D;
-import sun.java2d.StateTrackable;
-import sun.java2d.StateTrackable.*;
-import sun.java2d.StateTracker;
 import sun.java2d.loops.SurfaceType;
 import sun.java2d.loops.CompositeType;
 import sun.java2d.loops.RenderLoops;
@@ -446,8 +442,6 @@ protected void checkCustomComposite() {
         // their pixels are immediately retrievable anyway.
     }
 
-    private static native void freeNativeICMData(long pData);
-
     /**
      * Returns destination Image associated with this SurfaceData.
      */
@@ -471,13 +465,5 @@ public static final class ICMColorData {
         private ICMColorData(long pData) {
             this.pData = pData;
         }
-
-        @SuppressWarnings("deprecation")
-        public void finalize() {
-            if (pData != 0L) {
-                BufImgSurfaceData.freeNativeICMData(pData);
-                pData = 0L;
-            }
-        }
     }
 }
diff --git a/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c b/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c
index 4c33baeca36..c13bbdfd7e5 100644
--- a/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c
+++ b/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -32,6 +32,7 @@
 #include "jni_util.h"
 /* Define uintptr_t */
 #include "gdefs.h"
+#include "Disposer.h"
 
 /**
  * This include file contains support code for loops using the
@@ -79,19 +80,6 @@ Java_sun_awt_image_BufImgSurfaceData_initIDs
                                            "Lsun/awt/image/BufImgSurfaceData$ICMColorData;"));
 }
 
-/*
- * Class:     sun_java2d_SurfaceData
- * Method:    freeNativeICMData
- * Signature: (Ljava/awt/image/IndexColorModel;)V
- */
-JNIEXPORT void JNICALL
-Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData
-    (JNIEnv *env, jclass sd, jlong pData)
-{
-    ColorData *cdata = (ColorData*)jlong_to_ptr(pData);
-    freeICMColorData(cdata);
-}
-
 /*
  * Class:     sun_awt_image_BufImgSurfaceData
  * Method:    initOps
@@ -139,6 +127,15 @@ Java_sun_awt_image_BufImgSurfaceData_initRaster(JNIEnv *env, jobject bisd,
     bisdo->rasbounds.y2 = height;
 }
 
+/*
+ * Releases native structures associated with BufImgSurfaceData.ICMColorData.
+ */
+static void BufImg_Dispose_ICMColorData(JNIEnv *env, jlong pData)
+{
+    ColorData *cdata = (ColorData*)jlong_to_ptr(pData);
+    freeICMColorData(cdata);
+}
+
 /*
  * Method for disposing native BufImgSD
  */
@@ -373,6 +370,7 @@ static ColorData *BufImg_SetupICM(JNIEnv *env,
             }
 
             (*env)->SetObjectField(env, bisdo->icm, colorDataID, colorData);
+            Disposer_AddRecord(env, colorData, BufImg_Dispose_ICMColorData, pData);
         }
     }
 

From 54c61d22e954cbe2a6b9c499ab823b0de96cef0e Mon Sep 17 00:00:00 2001
From: aivanov <unknown>
Date: Thu, 12 Apr 2018 14:11:42 +0100
Subject: [PATCH 147/196] 8199627: Use "Per-Monitor V2" High DPI awareness for
 Windows 10 v1703 Reviewed-by: serb, prr

---
 src/java.base/windows/native/launcher/java.manifest | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/java.base/windows/native/launcher/java.manifest b/src/java.base/windows/native/launcher/java.manifest
index 882d93c9a68..d13834f3317 100644
--- a/src/java.base/windows/native/launcher/java.manifest
+++ b/src/java.base/windows/native/launcher/java.manifest
@@ -36,8 +36,10 @@
 
   <!-- Indicate JDK is high-dpi aware. -->
   <asmv3:application>
-    <asmv3:windowsSettings  xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-       <dpiAware>true/PM</dpiAware>
+    <asmv3:windowsSettings xmlns:dpi1="http://schemas.microsoft.com/SMI/2005/WindowsSettings"
+                           xmlns:dpi2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+      <dpi1:dpiAware>true/PM</dpi1:dpiAware>
+      <dpi2:dpiAwareness>PerMonitorV2, PerMonitor, system</dpi2:dpiAwareness>
     </asmv3:windowsSettings>
   </asmv3:application>
 

From 59b3c54959fcf3eeb2f92215d38810bd42b39429 Mon Sep 17 00:00:00 2001
From: redestad <unknown>
Date: Thu, 12 Apr 2018 17:23:32 +0200
Subject: [PATCH 148/196] 8201494: Avoid early initialization of java.nio.Bits
 Reviewed-by: rriggs, alanb

---
 src/java.base/share/classes/java/nio/Bits.java     | 14 +-------------
 src/java.base/share/classes/java/nio/Buffer.java   |  2 +-
 .../share/classes/java/nio/ByteOrder.java          |  9 ++++++++-
 .../share/classes/java/nio/X-Buffer.java.template  |  4 ++--
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/Bits.java b/src/java.base/share/classes/java/nio/Bits.java
index fff84e9e58d..f96d2f48bae 100644
--- a/src/java.base/share/classes/java/nio/Bits.java
+++ b/src/java.base/share/classes/java/nio/Bits.java
@@ -65,25 +65,13 @@ static long swap(long x) {
 
     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
-    static Unsafe unsafe() {
-        return UNSAFE;
-    }
-
-
     // -- Processor and memory-system properties --
 
-    private static final ByteOrder BYTE_ORDER
-        = UNSAFE.isBigEndian() ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
-
-    static ByteOrder byteOrder() {
-        return BYTE_ORDER;
-    }
-
     private static int PAGE_SIZE = -1;
 
     static int pageSize() {
         if (PAGE_SIZE == -1)
-            PAGE_SIZE = unsafe().pageSize();
+            PAGE_SIZE = UNSAFE.pageSize();
         return PAGE_SIZE;
     }
 
diff --git a/src/java.base/share/classes/java/nio/Buffer.java b/src/java.base/share/classes/java/nio/Buffer.java
index 1217ca78a74..8741108b96d 100644
--- a/src/java.base/share/classes/java/nio/Buffer.java
+++ b/src/java.base/share/classes/java/nio/Buffer.java
@@ -183,7 +183,7 @@
 
 public abstract class Buffer {
     // Cached unsafe-access object
-    static final Unsafe UNSAFE = Bits.unsafe();
+    static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
     /**
      * The characteristics of Spliterators that traverse and split elements
diff --git a/src/java.base/share/classes/java/nio/ByteOrder.java b/src/java.base/share/classes/java/nio/ByteOrder.java
index 97dc16b3909..64c09394ea5 100644
--- a/src/java.base/share/classes/java/nio/ByteOrder.java
+++ b/src/java.base/share/classes/java/nio/ByteOrder.java
@@ -25,6 +25,7 @@
 
 package java.nio;
 
+import jdk.internal.misc.Unsafe;
 
 /**
  * A typesafe enumeration for byte orders.
@@ -57,6 +58,12 @@ private ByteOrder(String name) {
     public static final ByteOrder LITTLE_ENDIAN
         = new ByteOrder("LITTLE_ENDIAN");
 
+    // Retrieve the native byte order. It's used early during bootstrap, and
+    // must be initialized after BIG_ENDIAN and LITTLE_ENDIAN.
+    private static final ByteOrder NATIVE_ORDER
+        = Unsafe.getUnsafe().isBigEndian()
+            ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
+
     /**
      * Retrieves the native byte order of the underlying platform.
      *
@@ -69,7 +76,7 @@ private ByteOrder(String name) {
      *          virtual machine is running
      */
     public static ByteOrder nativeOrder() {
-        return Bits.byteOrder();
+        return NATIVE_ORDER;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/nio/X-Buffer.java.template b/src/java.base/share/classes/java/nio/X-Buffer.java.template
index b59755b1fd5..fa2598ad4db 100644
--- a/src/java.base/share/classes/java/nio/X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/X-Buffer.java.template
@@ -1579,7 +1579,7 @@ public abstract class $Type$Buffer
     boolean bigEndian                                   // package-private
         = true;
     boolean nativeByteOrder                             // package-private
-        = (Bits.byteOrder() == ByteOrder.BIG_ENDIAN);
+        = (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN);
 
     /**
      * Retrieves this buffer's byte order.
@@ -1608,7 +1608,7 @@ public abstract class $Type$Buffer
     public final $Type$Buffer order(ByteOrder bo) {
         bigEndian = (bo == ByteOrder.BIG_ENDIAN);
         nativeByteOrder =
-            (bigEndian == (Bits.byteOrder() == ByteOrder.BIG_ENDIAN));
+            (bigEndian == (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN));
         return this;
     }
 

From f6e5ea31aaa16dc4b9628832f1c3eee4937da01e Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Thu, 12 Apr 2018 20:20:27 +0200
Subject: [PATCH 149/196] 8201483: Make it possible to disable JVM features
 Reviewed-by: erikj, stuefe

---
 make/autoconf/basics.m4    | 68 ++++++++++++++++++++++++++++++++++
 make/autoconf/configure.ac |  2 +-
 make/autoconf/help.m4      | 12 +++++-
 make/autoconf/hotspot.m4   | 76 +++++++++++++++++++++-----------------
 4 files changed, 122 insertions(+), 36 deletions(-)

diff --git a/make/autoconf/basics.m4 b/make/autoconf/basics.m4
index de2c26607cd..ad79dd29b41 100644
--- a/make/autoconf/basics.m4
+++ b/make/autoconf/basics.m4
@@ -23,6 +23,7 @@
 # questions.
 #
 
+###############################################################################
 # Create a function/macro that takes a series of named arguments. The call is
 # similar to AC_DEFUN, but the setup of the function looks like this:
 # BASIC_DEFUN_NAMED([MYFUNC], [FOO *BAR], [$@], [
@@ -91,6 +92,42 @@ AC_DEFUN([BASIC_DEFUN_NAMED],
   ])
 ])
 
+###############################################################################
+# Check if a list of space-separated words are selected only from a list of
+# space-separated legal words. Typical use is to see if a user-specified
+# set of words is selected from a set of legal words.
+#
+# Sets the specified variable to list of non-matching (offending) words, or to
+# the empty string if all words are matching the legal set.
+#
+# $1: result variable name
+# $2: list of values to check
+# $3: list of legal values
+AC_DEFUN([BASIC_GET_NON_MATCHING_VALUES],
+[
+  # grep filter function inspired by a comment to http://stackoverflow.com/a/1617326
+  # Notice that the original variant fails on SLES 10 and 11
+  values_to_check=`$ECHO $2 | $TR ' ' '\n'`
+  legal_values=`$ECHO $3 | $TR ' ' '\n'`
+  result=`$GREP -Fvx "$legal_values" <<< "$values_to_check" | $GREP -v '^$'`
+  $1=${result//$'\n'/ }
+])
+
+###############################################################################
+# Sort a space-separated list, and remove duplicates.
+#
+# Sets the specified variable to the resulting list.
+#
+# $1: result variable name
+# $2: list of values to sort
+AC_DEFUN([BASIC_SORT_LIST],
+[
+  values_to_sort=`$ECHO $2 | $TR ' ' '\n'`
+  result=`$SORT -u <<< "$values_to_sort" | $GREP -v '^$'`
+  $1=${result//$'\n'/ }
+])
+
+###############################################################################
 # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
 # If so, then append $1 to $2 \
 # Also set JVM_ARG_OK to true/false depending on outcome.
@@ -135,6 +172,7 @@ AC_DEFUN([BASIC_PREPEND_TO_PATH],
   fi
 ])
 
+###############################################################################
 # This will make sure the given variable points to a full and proper
 # path. This means:
 # 1) There will be no spaces in the path. On unix platforms,
@@ -178,6 +216,7 @@ AC_DEFUN([BASIC_FIXUP_PATH],
   fi
 ])
 
+###############################################################################
 # This will make sure the given variable points to a executable
 # with a full and proper path. This means:
 # 1) There will be no spaces in the path. On unix platforms,
@@ -249,6 +288,7 @@ AC_DEFUN([BASIC_FIXUP_EXECUTABLE],
   fi
 ])
 
+###############################################################################
 AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
 [
   if test "x$OPENJDK_BUILD_OS" != xwindows; then
@@ -295,6 +335,7 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
   fi
 ])
 
+###############################################################################
 # Register a --with argument but mark it as deprecated
 # $1: The name of the with argument to deprecate, not including --with-
 AC_DEFUN([BASIC_DEPRECATED_ARG_WITH],
@@ -304,6 +345,7 @@ AC_DEFUN([BASIC_DEPRECATED_ARG_WITH],
       [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
 ])
 
+###############################################################################
 # Register a --enable argument but mark it as deprecated
 # $1: The name of the with argument to deprecate, not including --enable-
 # $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
@@ -322,6 +364,7 @@ AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
   fi
 ])
 
+###############################################################################
 AC_DEFUN_ONCE([BASIC_INIT],
 [
   # Save the original command line. This is passed to us by the wrapper configure script.
@@ -334,6 +377,7 @@ AC_DEFUN_ONCE([BASIC_INIT],
   AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
 ])
 
+###############################################################################
 # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
 # $1: variable to check
 AC_DEFUN([BASIC_CHECK_NONEMPTY],
@@ -343,6 +387,7 @@ AC_DEFUN([BASIC_CHECK_NONEMPTY],
   fi
 ])
 
+###############################################################################
 # Check that there are no unprocessed overridden variables left.
 # If so, they are an incorrect argument and we will exit with an error.
 AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
@@ -354,6 +399,7 @@ AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
   fi
 ])
 
+###############################################################################
 # Setup a tool for the given variable. If correctly specified by the user,
 # use that value, otherwise search for the tool using the supplied code snippet.
 # $1: variable to set
@@ -420,6 +466,7 @@ AC_DEFUN([BASIC_SETUP_TOOL],
   fi
 ])
 
+###############################################################################
 # Call BASIC_SETUP_TOOL with AC_PATH_PROGS to locate the tool
 # $1: variable to set
 # $2: executable name (or list of names) to look for
@@ -429,6 +476,7 @@ AC_DEFUN([BASIC_PATH_PROGS],
   BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)])
 ])
 
+###############################################################################
 # Call BASIC_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool
 # $1: variable to set
 # $2: executable name (or list of names) to look for
@@ -437,6 +485,7 @@ AC_DEFUN([BASIC_CHECK_TOOLS],
   BASIC_SETUP_TOOL($1, [AC_CHECK_TOOLS($1, $2)])
 ])
 
+###############################################################################
 # Like BASIC_PATH_PROGS but fails if no tool was found.
 # $1: variable to set
 # $2: executable name (or list of names) to look for
@@ -447,6 +496,7 @@ AC_DEFUN([BASIC_REQUIRE_PROGS],
   BASIC_CHECK_NONEMPTY($1)
 ])
 
+###############################################################################
 # Like BASIC_SETUP_TOOL but fails if no tool was found.
 # $1: variable to set
 # $2: autoconf macro to call to look for the special tool
@@ -456,6 +506,7 @@ AC_DEFUN([BASIC_REQUIRE_SPECIAL],
   BASIC_CHECK_NONEMPTY($1)
 ])
 
+###############################################################################
 # Setup the most fundamental tools that relies on not much else to set up,
 # but is used by much of the early bootstrap code.
 AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
@@ -528,6 +579,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   BASIC_PATH_PROGS(PANDOC, pandoc)
 ])
 
+###############################################################################
 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
 AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
 [
@@ -569,6 +621,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   AC_SUBST(USERNAME)
 ])
 
+###############################################################################
 # Evaluates platform specific overrides for devkit variables.
 # $1: Name of variable
 AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
@@ -578,6 +631,7 @@ AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
   fi
 ])
 
+###############################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
 [
   AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
@@ -756,6 +810,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   AC_MSG_RESULT([$EXTRA_PATH])
 ])
 
+###############################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
 [
 
@@ -855,6 +910,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
 
 #%%% Simple tools %%%
 
+###############################################################################
 # Check if we have found a usable version of make
 # $1: the path to a potential make binary (or empty)
 # $2: the description on how we found this
@@ -908,6 +964,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
   fi
 ])
 
+###############################################################################
 AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
 [
   # Check if make supports the output sync option and if so, setup using it.
@@ -934,6 +991,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
   AC_SUBST(OUTPUT_SYNC)
 ])
 
+###############################################################################
 # Goes looking for a usable version of GNU make.
 AC_DEFUN([BASIC_CHECK_GNU_MAKE],
 [
@@ -981,6 +1039,7 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE],
   BASIC_CHECK_MAKE_OUTPUT_SYNC
 ])
 
+###############################################################################
 AC_DEFUN([BASIC_CHECK_FIND_DELETE],
 [
   # Test if find supports -delete
@@ -1009,6 +1068,7 @@ AC_DEFUN([BASIC_CHECK_FIND_DELETE],
   AC_SUBST(FIND_DELETE)
 ])
 
+###############################################################################
 AC_DEFUN([BASIC_CHECK_TAR],
 [
   # Test which kind of tar was found
@@ -1043,6 +1103,7 @@ AC_DEFUN([BASIC_CHECK_TAR],
   AC_SUBST(TAR_SUPPORTS_TRANSFORM)
 ])
 
+###############################################################################
 AC_DEFUN([BASIC_CHECK_GREP],
 [
   # Test that grep supports -Fx with a list of pattern which includes null pattern.
@@ -1066,6 +1127,7 @@ AC_DEFUN([BASIC_CHECK_GREP],
   fi
 ])
 
+###############################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
 [
   BASIC_CHECK_GNU_MAKE
@@ -1132,6 +1194,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   fi
 ])
 
+###############################################################################
 # Check if build directory is on local disk. If not possible to determine,
 # we prefer to claim it's local.
 # Argument 1: directory to test
@@ -1171,6 +1234,7 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
   fi
 ])
 
+###############################################################################
 # Check that source files have basic read permissions set. This might
 # not be the case in cygwin in certain conditions.
 AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
@@ -1183,6 +1247,7 @@ AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
   fi
 ])
 
+###############################################################################
 AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
 [
   AC_MSG_CHECKING([if build directory is on local disk])
@@ -1205,6 +1270,7 @@ AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
   fi
 ])
 
+###############################################################################
 # Check for support for specific options in bash
 AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS],
 [
@@ -1260,6 +1326,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_MAKE_TARGET],
   AC_SUBST(DEFAULT_MAKE_TARGET)
 ])
 
+###############################################################################
 # Setup the default value for LOG=
 #
 AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_LOG],
@@ -1278,6 +1345,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_LOG],
   AC_SUBST(DEFAULT_LOG)
 ])
 
+###############################################################################
 # Code to run after AC_OUTPUT
 AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
 [
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index 62178677837..936af504e86 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -273,7 +273,7 @@ BASIC_TEST_USABILITY_ISSUES
 CUSTOM_LATE_HOOK
 
 # This needs to be done after CUSTOM_LATE_HOOK since we can setup custom features.
-HOTSPOT_VALIDATE_JVM_FEATURES
+HOTSPOT_FINALIZE_JVM_FEATURES
 
 # Did user specify any unknown variables?
 BASIC_CHECK_LEFTOVER_OVERRIDDEN
diff --git a/make/autoconf/help.m4 b/make/autoconf/help.m4
index 2080981af5d..d1a0aa9031b 100644
--- a/make/autoconf/help.m4
+++ b/make/autoconf/help.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, 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
@@ -213,8 +213,16 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
   printf "Configuration summary:\n"
   printf "* Debug level:    $DEBUG_LEVEL\n"
   printf "* HS debug level: $HOTSPOT_DEBUG_LEVEL\n"
-  printf "* JDK variant:    $JDK_VARIANT\n"
   printf "* JVM variants:   $JVM_VARIANTS\n"
+  printf "* JVM features:   "
+
+  for variant in $JVM_VARIANTS; do
+    features_var_name=JVM_FEATURES_$variant
+    JVM_FEATURES_FOR_VARIANT=${!features_var_name}
+    printf "$variant: \'$JVM_FEATURES_FOR_VARIANT\' "
+  done
+  printf "\n"
+
   printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
   printf "* Version string: $VERSION_STRING ($VERSION_SHORT)\n"
 
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index f6301b6980a..98a3ef44554 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -93,22 +93,16 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
   AC_MSG_RESULT([$JVM_VARIANTS])
 
   # Check that the selected variants are valid
-
-  # grep filter function inspired by a comment to http://stackoverflow.com/a/1617326
-  # Notice that the original variant failes on SLES 10 and 11
-  NEEDLE=${VALID_JVM_VARIANTS// /$'\n'}
-  STACK=${JVM_VARIANTS// /$'\n'}
-  INVALID_VARIANTS=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"`
+  BASIC_GET_NON_MATCHING_VALUES(INVALID_VARIANTS, $JVM_VARIANTS, $VALID_JVM_VARIANTS)
   if test "x$INVALID_VARIANTS" != x; then
-    AC_MSG_NOTICE([Unknown variant(s) specified: $INVALID_VARIANTS])
-    AC_MSG_ERROR([The available JVM variants are: $VALID_JVM_VARIANTS])
+    AC_MSG_NOTICE([Unknown variant(s) specified: "$INVALID_VARIANTS"])
+    AC_MSG_NOTICE([The available JVM variants are: "$VALID_JVM_VARIANTS"])
+    AC_MSG_ERROR([Cannot continue])
   fi
 
   # All "special" variants share the same output directory ("server")
   VALID_MULTIPLE_JVM_VARIANTS="server client minimal"
-  NEEDLE=${VALID_MULTIPLE_JVM_VARIANTS// /$'\n'}
-  STACK=${JVM_VARIANTS// /$'\n'}
-  INVALID_MULTIPLE_VARIANTS=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"`
+  BASIC_GET_NON_MATCHING_VALUES(INVALID_MULTIPLE_VARIANTS, $JVM_VARIANTS, $VALID_MULTIPLE_JVM_VARIANTS)
   if  test "x$INVALID_MULTIPLE_VARIANTS" != x && test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = xtrue; then
     AC_MSG_ERROR([You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS.])
   fi
@@ -263,14 +257,30 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS],
 #
 AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
 [
+  # Prettify the VALID_JVM_FEATURES string
+  BASIC_SORT_LIST(VALID_JVM_FEATURES, $VALID_JVM_FEATURES)
+
   # The user can in some cases supply additional jvm features. For the custom
   # variant, this defines the entire variant.
   AC_ARG_WITH([jvm-features], [AS_HELP_STRING([--with-jvm-features],
-      [additional JVM features to enable (separated by comma),  use '--help' to show possible values @<:@none@:>@])])
+      [JVM features to enable (foo) or disable (-foo), separated by comma. Use '--help' to show possible values @<:@none@:>@])])
   if test "x$with_jvm_features" != x; then
-    AC_MSG_CHECKING([additional JVM features])
-    JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
-    AC_MSG_RESULT([$JVM_FEATURES])
+    AC_MSG_CHECKING([user specified JVM feature list])
+    USER_JVM_FEATURE_LIST=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
+    AC_MSG_RESULT([$user_jvm_feature_list])
+    # These features will be added to all variant defaults
+    JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (!match($i, /-.*/)) print $i }'`
+    # These features will be removed from all variant defaults
+    DISABLED_JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (match($i, /-.*/)) print substr($i, 2) }'`
+
+    # Verify that the user has provided valid features
+    BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES $DISABLED_JVM_FEATURES, $VALID_JVM_FEATURES)
+    if test "x$INVALID_FEATURES" != x; then
+      AC_MSG_NOTICE([Unknown JVM features specified: "$INVALID_FEATURES"])
+      AC_MSG_NOTICE([The available JVM features are: "$VALID_JVM_FEATURES"])
+      AC_MSG_ERROR([Cannot continue])
+    fi
+
   fi
 
   # Override hotspot cpu definitions for ARM platforms
@@ -390,7 +400,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
   fi
 
-  # Enable features depending on variant.
+  # Enable default features depending on variant.
   JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
   JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
   JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
@@ -413,29 +423,29 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
 ])
 
 ###############################################################################
-# Validate JVM features once all setup is complete, including custom setup.
+# Finalize JVM features once all setup is complete, including custom setup.
 #
-AC_DEFUN_ONCE([HOTSPOT_VALIDATE_JVM_FEATURES],
+AC_DEFUN_ONCE([HOTSPOT_FINALIZE_JVM_FEATURES],
 [
-  # Keep feature lists sorted and free of duplicates
-  JVM_FEATURES_server="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_server | $SORT -u))"
-  JVM_FEATURES_client="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_client | $SORT -u))"
-  JVM_FEATURES_core="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_core | $SORT -u))"
-  JVM_FEATURES_minimal="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_minimal | $SORT -u))"
-  JVM_FEATURES_zero="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_zero | $SORT -u))"
-  JVM_FEATURES_custom="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_custom | $SORT -u))"
-
-  # Validate features
   for variant in $JVM_VARIANTS; do
     AC_MSG_CHECKING([JVM features for JVM variant '$variant'])
     features_var_name=JVM_FEATURES_$variant
-    JVM_FEATURES_TO_TEST=${!features_var_name}
-    AC_MSG_RESULT([$JVM_FEATURES_TO_TEST])
-    NEEDLE=${VALID_JVM_FEATURES// /$'\n'}
-    STACK=${JVM_FEATURES_TO_TEST// /$'\n'}
-    INVALID_FEATURES=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"`
+    JVM_FEATURES_FOR_VARIANT=${!features_var_name}
+
+    # Filter out user-requested disabled features
+    BASIC_GET_NON_MATCHING_VALUES(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT, $DISABLED_JVM_FEATURES)
+
+    # Keep feature lists sorted and free of duplicates
+    BASIC_SORT_LIST(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT)
+
+    # Update real feature set variable
+    eval $features_var_name='"'$JVM_FEATURES_FOR_VARIANT'"'
+    AC_MSG_RESULT(["$JVM_FEATURES_FOR_VARIANT"])
+
+    # Validate features (for configure script errors, not user errors)
+    INVALID_FEATURES=`$GREP -Fvx "${VALID_JVM_FEATURES// /$'\n'}" <<< "${JVM_FEATURES_FOR_VARIANT// /$'\n'}"`
     if test "x$INVALID_FEATURES" != x; then
-      AC_MSG_ERROR([Invalid JVM feature(s): $INVALID_FEATURES])
+      AC_MSG_ERROR([Internal configure script error. Invalid JVM feature(s): $INVALID_FEATURES])
     fi
   done
 ])

From dd431a6806560bd706710b97146cfcb98e61c8ce Mon Sep 17 00:00:00 2001
From: aharlap <unknown>
Date: Thu, 12 Apr 2018 14:56:27 -0400
Subject: [PATCH 150/196] 8201330: Add
 java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java to the
 ProblemList Summary: Add
 java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java to the
 ProblemList until JDK-8081652 is resolved Reviewed-by: tschatzl

---
 test/jdk/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 6c24e2a6d3b..c5b90ed04e7 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -505,6 +505,8 @@ java/lang/instrument/BootClassPath/BootClassPathTest.sh         8072130 macosx-a
 java/lang/management/MemoryMXBean/Pending.java                  8158837 generic-all
 java/lang/management/MemoryMXBean/PendingAllGC.sh               8158837 generic-all
 
+java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java    8081652 generic-all
+
 ############################################################################
 
 # jdk_io

From 2a490fa8b9c1ef7ebbab474e65d2fb70e554f0ce Mon Sep 17 00:00:00 2001
From: sherman <unknown>
Date: Thu, 12 Apr 2018 13:30:58 -0700
Subject: [PATCH 151/196] 8201443: NoSuchMethodException JarFile.open when jar
 file is used in classpath Reviewed-by: rriggs, redestad

---
 .../share/classes/java/util/zip/ZipFile.java       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java
index ee53b62ee6d..d4ff24077e7 100644
--- a/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -37,7 +37,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.Files;
-
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -52,13 +51,14 @@
 import java.util.Spliterator;
 import java.util.Spliterators;
 import java.util.WeakHashMap;
-
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.IntFunction;
 import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+import jdk.internal.misc.JavaLangAccess;
 import jdk.internal.misc.JavaUtilZipFileAccess;
 import jdk.internal.misc.SharedSecrets;
 import jdk.internal.misc.VM;
@@ -834,11 +834,10 @@ public void run() {
         static CleanableResource get(ZipFile zf, File file, int mode)
             throws IOException {
             Class<?> clz = zf.getClass();
-            while (clz != ZipFile.class) {
-                try {
-                    clz.getDeclaredMethod("close");
+            while (clz != ZipFile.class && clz != JarFile.class) {
+                if (JLA.getDeclaredPublicMethods(clz, "close").size() != 0) {
                     return new FinalizableResource(zf, file, mode);
-                } catch (NoSuchMethodException nsme) {}
+                }
                 clz = clz.getSuperclass();
             }
             return new CleanableResource(zf, file, mode);
@@ -1101,6 +1100,8 @@ private String[] getMetaInfEntryNames() {
     }
 
     private static boolean isWindows;
+    private static final JavaLangAccess JLA;
+
     static {
         SharedSecrets.setJavaUtilZipFileAccess(
             new JavaUtilZipFileAccess() {
@@ -1133,6 +1134,7 @@ public Stream<String> entryNameStream(ZipFile zip) {
                 }
              }
         );
+        JLA = jdk.internal.misc.SharedSecrets.getJavaLangAccess();
         isWindows = VM.getSavedProperty("os.name").contains("Windows");
     }
 

From 00360d080d9f1792603a13aede39a385f4a8e4d7 Mon Sep 17 00:00:00 2001
From: bpb <unknown>
Date: Thu, 12 Apr 2018 14:03:46 -0700
Subject: [PATCH 152/196] 8009632: (fs) FileStore.supportsFileAttributeView
 does not detect user_xattr enabled on ext4 Reviewed-by: alanb

---
 .../linux/classes/sun/nio/fs/LinuxFileStore.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java
index c14cac0b5f3..a8fd51882b6 100644
--- a/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java
+++ b/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java
@@ -140,10 +140,12 @@ public boolean supportsFileAttributeView(Class<? extends FileAttributeView> type
             if ((entry().hasOption("user_xattr")))
                 return true;
 
-            // user_xattr option not present but we special-case ext3/4 as we
-            // know that extended attributes are not enabled by default.
-            if (entry().fstype().equals("ext3") || entry().fstype().equals("ext4"))
-                return false;
+            // for ext3 and ext4 user_xattr option is enabled by default so
+            // check for explicit disabling of this option
+            if (entry().fstype().equals("ext3") ||
+                entry().fstype().equals("ext4")) {
+                return !entry().hasOption("nouser_xattr");
+            }
 
             // not ext3/4 so probe mount point
             if (!xattrChecked) {

From 58d7d135d04473b49646c43b4b0d0d1d690ea2c0 Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Thu, 12 Apr 2018 15:26:59 -0700
Subject: [PATCH 153/196] 8201508: Macosx builds fail in
 GenerateLinkOptData.gmk Reviewed-by: tbell

---
 make/autoconf/basics.m4 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/basics.m4 b/make/autoconf/basics.m4
index ad79dd29b41..0033447ab3b 100644
--- a/make/autoconf/basics.m4
+++ b/make/autoconf/basics.m4
@@ -107,10 +107,16 @@ AC_DEFUN([BASIC_GET_NON_MATCHING_VALUES],
 [
   # grep filter function inspired by a comment to http://stackoverflow.com/a/1617326
   # Notice that the original variant fails on SLES 10 and 11
+  # Some grep versions (at least bsd) behaves strangely on the base case with
+  # no legal_values, so make it explicit.
   values_to_check=`$ECHO $2 | $TR ' ' '\n'`
   legal_values=`$ECHO $3 | $TR ' ' '\n'`
-  result=`$GREP -Fvx "$legal_values" <<< "$values_to_check" | $GREP -v '^$'`
-  $1=${result//$'\n'/ }
+  if test -z "$legal_values"; then
+    $1="$2"
+  else
+    result=`$GREP -Fvx "$legal_values" <<< "$values_to_check" | $GREP -v '^$'`
+    $1=${result//$'\n'/ }
+  fi
 ])
 
 ###############################################################################

From 4d32704c1e367136bdffe0f86326c4b683a82519 Mon Sep 17 00:00:00 2001
From: redestad <unknown>
Date: Fri, 13 Apr 2018 01:04:33 +0200
Subject: [PATCH 154/196] 8152821: Merge jdk.internal.misc.JavaSecurityAccess
 and jdk.internal.misc.JavaSecurityProtectionDomainAccess shared secrets
 Reviewed-by: mullan

---
 .../java/security/ProtectionDomain.java       | 38 ++++++++----------
 .../jdk/internal/misc/JavaSecurityAccess.java | 13 ++++++-
 .../JavaSecurityProtectionDomainAccess.java   | 39 -------------------
 .../jdk/internal/misc/SharedSecrets.java      | 18 +--------
 .../sun/security/provider/PolicyFile.java     |  8 ++--
 5 files changed, 34 insertions(+), 82 deletions(-)
 delete mode 100644 src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java

diff --git a/src/java.base/share/classes/java/security/ProtectionDomain.java b/src/java.base/share/classes/java/security/ProtectionDomain.java
index 7830ee4d8f9..1965bd409d0 100644
--- a/src/java.base/share/classes/java/security/ProtectionDomain.java
+++ b/src/java.base/share/classes/java/security/ProtectionDomain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -33,8 +33,6 @@
 import java.util.Objects;
 import java.util.WeakHashMap;
 import jdk.internal.misc.JavaSecurityAccess;
-import jdk.internal.misc.JavaSecurityProtectionDomainAccess;
-import static jdk.internal.misc.JavaSecurityProtectionDomainAccess.ProtectionDomainCache;
 import jdk.internal.misc.SharedSecrets;
 import sun.security.action.GetPropertyAction;
 import sun.security.provider.PolicyFile;
@@ -110,6 +108,21 @@ private static AccessControlContext getCombinedACC(
 
             return new AccessControlContext(stack.getContext(), acc).optimize();
         }
+
+        @Override
+        public ProtectionDomainCache getProtectionDomainCache() {
+            return new ProtectionDomainCache() {
+                private final Map<Key, PermissionCollection> map =
+                        Collections.synchronizedMap(new WeakHashMap<>());
+                public void put(ProtectionDomain pd,
+                                PermissionCollection pc) {
+                    map.put((pd == null ? null : pd.key), pc);
+                }
+                public PermissionCollection get(ProtectionDomain pd) {
+                    return pd == null ? map.get(null) : map.get(pd.key);
+                }
+            };
+        }
     }
 
     static {
@@ -560,23 +573,4 @@ public PermissionCollection run() {
      */
     final class Key {}
 
-    static {
-        SharedSecrets.setJavaSecurityProtectionDomainAccess(
-            new JavaSecurityProtectionDomainAccess() {
-                public ProtectionDomainCache getProtectionDomainCache() {
-                    return new ProtectionDomainCache() {
-                        private final Map<Key, PermissionCollection> map =
-                            Collections.synchronizedMap
-                                (new WeakHashMap<Key, PermissionCollection>());
-                        public void put(ProtectionDomain pd,
-                            PermissionCollection pc) {
-                            map.put((pd == null ? null : pd.key), pc);
-                        }
-                        public PermissionCollection get(ProtectionDomain pd) {
-                            return pd == null ? map.get(null) : map.get(pd.key);
-                        }
-                    };
-                }
-            });
-    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java
index 833a01b7c1d..2c1038f9b53 100644
--- a/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java
+++ b/src/java.base/share/classes/jdk/internal/misc/JavaSecurityAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -26,6 +26,7 @@
 package jdk.internal.misc;
 
 import java.security.AccessControlContext;
+import java.security.PermissionCollection;
 import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 
@@ -39,4 +40,14 @@ <T> T doIntersectionPrivilege(PrivilegedAction<T> action,
                                   AccessControlContext context);
 
     ProtectionDomain[] getProtectDomains(AccessControlContext context);
+
+    interface ProtectionDomainCache {
+        void put(ProtectionDomain pd, PermissionCollection pc);
+        PermissionCollection get(ProtectionDomain pd);
+    }
+
+    /**
+     * Returns the ProtectionDomainCache.
+     */
+    ProtectionDomainCache getProtectionDomainCache();
 }
diff --git a/src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java b/src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java
deleted file mode 100644
index 263d2c653fd..00000000000
--- a/src/java.base/share/classes/jdk/internal/misc/JavaSecurityProtectionDomainAccess.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2009, 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.internal.misc;
-
-import java.security.PermissionCollection;
-import java.security.ProtectionDomain;
-
-public interface JavaSecurityProtectionDomainAccess {
-    interface ProtectionDomainCache {
-        void put(ProtectionDomain pd, PermissionCollection pc);
-        PermissionCollection get(ProtectionDomain pd);
-    }
-    /**
-     * Returns the ProtectionDomainCache.
-     */
-    ProtectionDomainCache getProtectionDomainCache();
-}
diff --git a/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
index 0f60833ec78..fd792cd847f 100644
--- a/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
+++ b/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -35,7 +35,6 @@
 import java.io.ObjectInputStream;
 import java.io.RandomAccessFile;
 import java.security.ProtectionDomain;
-import java.security.AccessController;
 
 /** A repository of "shared secrets", which are a mechanism for
     calling implementation-private methods in another package without
@@ -63,7 +62,6 @@ public class SharedSecrets {
     private static JavaNioAccess javaNioAccess;
     private static JavaIOFileDescriptorAccess javaIOFileDescriptorAccess;
     private static JavaIOFilePermissionAccess javaIOFilePermissionAccess;
-    private static JavaSecurityProtectionDomainAccess javaSecurityProtectionDomainAccess;
     private static JavaSecurityAccess javaSecurityAccess;
     private static JavaUtilZipFileAccess javaUtilZipFileAccess;
     private static JavaUtilResourceBundleAccess javaUtilResourceBundleAccess;
@@ -235,25 +233,13 @@ public static JavaIOFileDescriptorAccess getJavaIOFileDescriptorAccess() {
         return javaIOFileDescriptorAccess;
     }
 
-    public static void setJavaSecurityProtectionDomainAccess
-        (JavaSecurityProtectionDomainAccess jspda) {
-            javaSecurityProtectionDomainAccess = jspda;
-    }
-
-    public static JavaSecurityProtectionDomainAccess
-        getJavaSecurityProtectionDomainAccess() {
-            if (javaSecurityProtectionDomainAccess == null)
-                unsafe.ensureClassInitialized(ProtectionDomain.class);
-            return javaSecurityProtectionDomainAccess;
-    }
-
     public static void setJavaSecurityAccess(JavaSecurityAccess jsa) {
         javaSecurityAccess = jsa;
     }
 
     public static JavaSecurityAccess getJavaSecurityAccess() {
         if (javaSecurityAccess == null) {
-            unsafe.ensureClassInitialized(AccessController.class);
+            unsafe.ensureClassInitialized(ProtectionDomain.class);
         }
         return javaSecurityAccess;
     }
diff --git a/src/java.base/share/classes/sun/security/provider/PolicyFile.java b/src/java.base/share/classes/sun/security/provider/PolicyFile.java
index 6aadd9c2361..587d885d92f 100644
--- a/src/java.base/share/classes/sun/security/provider/PolicyFile.java
+++ b/src/java.base/share/classes/sun/security/provider/PolicyFile.java
@@ -41,8 +41,8 @@
 import java.net.SocketPermission;
 import java.net.NetPermission;
 import java.util.concurrent.atomic.AtomicReference;
-import jdk.internal.misc.JavaSecurityProtectionDomainAccess;
-import static jdk.internal.misc.JavaSecurityProtectionDomainAccess.ProtectionDomainCache;
+import jdk.internal.misc.JavaSecurityAccess;
+import static jdk.internal.misc.JavaSecurityAccess.ProtectionDomainCache;
 import jdk.internal.misc.SharedSecrets;
 import sun.security.util.*;
 import sun.net.www.ParseUtil;
@@ -2202,8 +2202,8 @@ private static class PolicyInfo {
             aliasMapping = Collections.synchronizedMap(new HashMap<>(11));
 
             pdMapping = new ProtectionDomainCache[numCaches];
-            JavaSecurityProtectionDomainAccess jspda
-                = SharedSecrets.getJavaSecurityProtectionDomainAccess();
+            JavaSecurityAccess jspda
+                = SharedSecrets.getJavaSecurityAccess();
             for (int i = 0; i < numCaches; i++) {
                 pdMapping[i] = jspda.getProtectionDomainCache();
             }

From 19a19c829b988e3a378ad437d596def711ff0d98 Mon Sep 17 00:00:00 2001
From: mli <unknown>
Date: Fri, 13 Apr 2018 09:06:37 +0800
Subject: [PATCH 155/196] 8078221: java/rmi/Naming/DefaultRegistryPort.java
 fails intermittently Reviewed-by: rriggs

---
 .../java/rmi/Naming/DefaultRegistryPort.java  | 87 ++++++-------------
 1 file changed, 27 insertions(+), 60 deletions(-)

diff --git a/test/jdk/java/rmi/Naming/DefaultRegistryPort.java b/test/jdk/java/rmi/Naming/DefaultRegistryPort.java
index 0c5efcb55d8..01a4c4065ae 100644
--- a/test/jdk/java/rmi/Naming/DefaultRegistryPort.java
+++ b/test/jdk/java/rmi/Naming/DefaultRegistryPort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -39,10 +39,7 @@
 /*
  * Ensure that the default registry port for java.rmi.Naming URLs
  * is 1099. Test creates a registry on port 1099 and then does a
- * lookup with a Naming URL that uses the default port. Test fails
- * if the lookup yields a NotBoundException. If the registry could
- * not be created, a fallback strategy of using an existing one is
- * tried.
+ * lookup with a Naming URL that uses the default port.
  */
 
 import java.rmi.Naming;
@@ -52,67 +49,37 @@
 
 public class DefaultRegistryPort {
 
-    public static void main(String args[]) {
+    public static void main(String args[]) throws Exception {
 
         Registry registry = null;
-        try {
-
-            System.err.println(
-                "Starting registry on default port REGISTRY_PORT=" +
-                Registry.REGISTRY_PORT);
-
-            registry = LocateRegistry.createRegistry(Registry.REGISTRY_PORT);
-
-            System.err.println("Created registry=" + registry);
-
-        } catch(java.rmi.RemoteException e) {
-
+        System.err.println("Starting registry on default port REGISTRY_PORT="
+                           + Registry.REGISTRY_PORT);
+        final int NUM = 10;
+        for (int loop = 0; loop < NUM; loop++) {
+            System.err.println("in loop: " + loop);
             try {
-
-                System.err.println(
-                    "Failed to create a registry, try using existing one");
-                registry = LocateRegistry.getRegistry();
-
-                System.err.println("Found registry=" + registry);
-
-            } catch (Exception ge) {
-
-                TestLibrary.bomb(
-                    "Test Failed: cound not find or create a registry");
+                registry = LocateRegistry.createRegistry(Registry.REGISTRY_PORT);
+                System.err.println("Created registry=" + registry);
+                break;
+            } catch(java.rmi.RemoteException e) {
+                String err = e.getMessage();
+                if (err.contains("Address already in use")
+                        || err.contains("Port already in use")) {
+                    try {
+                        Thread.sleep((long)(TestLibrary.getTimeoutFactor() * 100));
+                    } catch (InterruptedException ignore) { }
+                    continue;
+                }
+                TestLibrary.bomb(e);
             }
-
         }
-
-        try {
-
-            if (registry != null) {
-
-                registry.rebind("myself", registry);
-
-                Remote myself = Naming.lookup("rmi://localhost/myself");
-
-                System.err.println("Test PASSED");
-
-            } else {
-
-                TestLibrary.bomb(
-                    "Test Failed: cound not find or create a registry");
-
-            }
-
-        } catch(java.rmi.NotBoundException e) {
-
-            TestLibrary.bomb(
-                "Test Failed: could not find myself");
-
-        } catch(Exception e) {
-
-            e.printStackTrace();
-            TestLibrary.bomb(
-                "Test failed: unexpected exception");
-
+        if (registry == null) {
+            throw new RuntimeException("can not create registry at "
+                  + Registry.REGISTRY_PORT + " after trying " + NUM + "times");
         }
 
+        registry.rebind("myself", registry);
+        Remote myself = Naming.lookup("rmi://localhost/myself");
+        System.err.println("Test PASSED");
     }
-
 }

From c0c0ed3396f30cb05cdf37299bc4d3f05ad5cfd0 Mon Sep 17 00:00:00 2001
From: weijun <unknown>
Date: Fri, 13 Apr 2018 15:29:33 +0800
Subject: [PATCH 156/196] 8200468: Port the native GSS-API bridge to Windows
 Reviewed-by: ihse, valeriep

---
 make/lib/Lib-java.security.jgss.gmk           |  31 +++--
 .../sun/security/jgss/GSSManagerImpl.java     |  12 +-
 .../share/native/libj2gss/GSSLibStub.c        | 109 +++++++++++-------
 .../native/libj2gss/NativeFunc.c              |  70 ++++++-----
 .../native/libj2gss/NativeFunc.h              |  16 ++-
 .../share/native/libj2gss/NativeUtil.c        |  13 +--
 .../share/native/libj2gss/NativeUtil.h        |   3 +-
 .../share/native/libj2gss/gssapi.h            |  72 ++++++------
 test/jdk/java/security/testlibrary/Proc.java  |   5 +-
 .../jdk/sun/security/krb5/auto/BasicProc.java |  13 ++-
 10 files changed, 184 insertions(+), 160 deletions(-)
 rename src/java.security.jgss/{unix => share}/native/libj2gss/NativeFunc.c (77%)
 rename src/java.security.jgss/{unix => share}/native/libj2gss/NativeFunc.h (96%)

diff --git a/make/lib/Lib-java.security.jgss.gmk b/make/lib/Lib-java.security.jgss.gmk
index 90420b40e79..89752deef9f 100644
--- a/make/lib/Lib-java.security.jgss.gmk
+++ b/make/lib/Lib-java.security.jgss.gmk
@@ -27,25 +27,22 @@ include LibCommon.gmk
 
 ################################################################################
 
-ifneq ($(OPENJDK_TARGET_OS), windows)
-  LIBJ2GSS_SRC := $(TOPDIR)/src/java.security.jgss/share/native/libj2gss \
-      $(TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_TYPE)/native/libj2gss \
-      #
+LIBJ2GSS_SRC := $(TOPDIR)/src/java.security.jgss/share/native/libj2gss \
+  #
 
-  $(eval $(call SetupJdkLibrary, BUILD_LIBJ2GSS, \
-      NAME := j2gss, \
-      SRC := $(LIBJ2GSS_SRC), \
-      OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \
-          $(LIBJAVA_HEADER_FLAGS) \
-          -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
-      LDFLAGS := $(LDFLAGS_JDKLIB) \
-          $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LIBS := $(LIBDL), \
-  ))
+$(eval $(call SetupJdkLibrary, BUILD_LIBJ2GSS, \
+    NAME := j2gss, \
+    SRC := $(LIBJ2GSS_SRC), \
+    OPTIMIZATION := LOW, \
+    CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \
+        $(LIBJAVA_HEADER_FLAGS) \
+        -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
+    LDFLAGS := $(LDFLAGS_JDKLIB) \
+        $(call SET_SHARED_LIBRARY_ORIGIN), \
+    LIBS := $(LIBDL), \
+))
 
-  TARGETS += $(BUILD_LIBJ2GSS)
-endif
+TARGETS += $(BUILD_LIBJ2GSS)
 
 ################################################################################
 
diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java b/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java
index 487d5e31080..a63db5ee30d 100644
--- a/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java
+++ b/src/java.security.jgss/share/classes/sun/security/jgss/GSSManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -46,14 +46,8 @@ public class GSSManagerImpl extends GSSManager {
         USE_NATIVE =
             AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
                     public Boolean run() {
-                            String osname = System.getProperty("os.name");
-                            if (osname.startsWith("SunOS") ||
-                                osname.contains("OS X") ||
-                                osname.startsWith("Linux")) {
-                                return Boolean.valueOf(System.getProperty
-                                        (USE_NATIVE_PROP));
-                            }
-                            return Boolean.FALSE;
+                        return Boolean.valueOf(System.getProperty
+                                (USE_NATIVE_PROP));
                     }
             });
 
diff --git a/src/java.security.jgss/share/native/libj2gss/GSSLibStub.c b/src/java.security.jgss/share/native/libj2gss/GSSLibStub.c
index f56c5600931..cfcb7b5c35f 100644
--- a/src/java.security.jgss/share/native/libj2gss/GSSLibStub.c
+++ b/src/java.security.jgss/share/native/libj2gss/GSSLibStub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -45,6 +45,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_init(JNIEnv *env,
                                                jstring jlibName,
                                                jboolean jDebug) {
     const char *libName;
+    int failed;
     char *error = NULL;
 
     if (!jDebug) {
@@ -65,13 +66,38 @@ Java_sun_security_jgss_wrapper_GSSLibStub_init(JNIEnv *env,
     TRACE1("[GSSLibStub_init] libName=%s", libName);
 
     /* initialize global function table */
-    error = loadNative(libName);
+    failed = loadNative(libName);
     (*env)->ReleaseStringUTFChars(env, jlibName, libName);
 
-    if (error == NULL) {
+    if (!failed) {
         return JNI_TRUE;
     } else {
-        TRACE0(error);
+        if (JGSS_DEBUG) {
+#ifdef WIN32
+            #define MAX_MSG_SIZE 256
+            static CHAR szMsgBuf[MAX_MSG_SIZE];
+            DWORD dwRes;
+            DWORD dwError = GetLastError();
+            dwRes = FormatMessage (
+                    FORMAT_MESSAGE_FROM_SYSTEM,
+                    NULL,
+                    dwError,
+                    0,
+                    szMsgBuf,
+                    MAX_MSG_SIZE,
+                    NULL);
+            if (0 == dwRes) {
+                printf("GSS-API: Unknown failure %d\n", dwError);
+            } else {
+                printf("GSS-API: %s\n",szMsgBuf);
+            }
+#else
+            char* error = dlerror();
+            if (error) {
+                TRACE0(error);
+            }
+#endif
+        }
         return JNI_FALSE;
     }
 }
@@ -88,7 +114,6 @@ Java_sun_security_jgss_wrapper_GSSLibStub_getMechPtr(JNIEnv *env,
   gss_OID cOid;
   unsigned int i, len;
   jbyte* bytes;
-  jthrowable gssEx;
   int found;
 
   if (jbytes != NULL) {
@@ -125,8 +150,6 @@ Java_sun_security_jgss_wrapper_GSSLibStub_getMechPtr(JNIEnv *env,
  * structure.
  */
 void deleteGSSCB(gss_channel_bindings_t cb) {
-  jobject jinetAddr;
-  jbyteArray value;
 
   if (cb == GSS_C_NO_CHANNEL_BINDINGS) return;
 
@@ -154,7 +177,6 @@ gss_channel_bindings_t newGSSCB(JNIEnv *env, jobject jcb) {
   gss_channel_bindings_t cb;
   jobject jinetAddr;
   jbyteArray value;
-  int i;
 
   if (jcb == NULL) {
     return GSS_C_NO_CHANNEL_BINDINGS;
@@ -355,7 +377,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_importName(JNIEnv *env,
      GSS_S_BAD_MECH */
   major = (*ftab->importName)(&minor, &nameVal, nameType, &nameHdl);
 
-  TRACE1("[GSSLibStub_importName] %ld", (long) nameHdl);
+  TRACE1("[GSSLibStub_importName] %" PRIuPTR  "", (uintptr_t) nameHdl);
 
   /* release intermediate buffers */
   deleteGSSOID(nameType);
@@ -426,7 +448,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_canonicalizeName(JNIEnv *env,
        GSS_S_BAD_NAME, GSS_S_BAD_MECH */
     major = (*ftab->canonicalizeName)(&minor, nameHdl, mech, &mnNameHdl);
 
-    TRACE1("[GSSLibStub_canonicalizeName] MN=%ld", (long)mnNameHdl);
+    TRACE1("[GSSLibStub_canonicalizeName] MN=%" PRIuPTR "", (uintptr_t)mnNameHdl);
 
     checkStatus(env, jobj, major, minor, "[GSSLibStub_canonicalizeName]");
     if ((*env)->ExceptionCheck(env)) {
@@ -596,7 +618,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_acquireCred(JNIEnv *env,
   /* release intermediate buffers */
   deleteGSSOIDSet(mechs);
 
-  TRACE1("[GSSLibStub_acquireCred] pCred=%ld", (long) credHdl);
+  TRACE1("[GSSLibStub_acquireCred] pCred=%" PRIuPTR "", (uintptr_t) credHdl);
 
   checkStatus(env, jobj, major, minor, "[GSSLibStub_acquireCred]");
   if ((*env)->ExceptionCheck(env)) {
@@ -645,7 +667,7 @@ void inquireCred(JNIEnv *env, jobject jobj, gss_cred_id_t pCred,
 
   credHdl = pCred;
 
-  TRACE1("[gss_inquire_cred] %ld", (long) pCred);
+  TRACE1("[gss_inquire_cred] %" PRIuPTR "", (uintptr_t) pCred);
 
   /* gss_inquire_cred(...) => GSS_S_DEFECTIVE_CREDENTIAL(!),
      GSS_S_CREDENTIALS_EXPIRED(!), GSS_S_NO_CRED(!) */
@@ -694,7 +716,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_getCredName(JNIEnv *env,
     return jlong_zero;
   }
 
-  TRACE1("[GSSLibStub_getCredName] pName=%ld", (long) nameHdl);
+  TRACE1("[GSSLibStub_getCredName] pName=%" PRIuPTR "", (uintptr_t) nameHdl);
   return ptr_to_jlong(nameHdl);
 }
 
@@ -775,7 +797,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_importContext(JNIEnv *env,
      GSS_S_UNAVAILABLE, GSS_S_UNAUTHORIZED */
   major = (*ftab->importSecContext)(&minor, &ctxtToken, &contextHdl);
 
-  TRACE1("[GSSLibStub_importContext] pContext=%ld", (long) contextHdl);
+  TRACE1("[GSSLibStub_importContext] pContext=%" PRIuPTR "", (uintptr_t) contextHdl);
 
   /* release intermediate buffers */
   resetGSSBuffer(&ctxtToken);
@@ -866,8 +888,8 @@ Java_sun_security_jgss_wrapper_GSSLibStub_initContext(JNIEnv *env,
     return NULL;
   }
 
-  TRACE2( "[GSSLibStub_initContext] before: pCred=%ld, pContext=%ld",
-          (long)credHdl, (long)contextHdl);
+  TRACE2( "[GSSLibStub_initContext] before: pCred=%" PRIuPTR ", pContext=%" PRIuPTR "",
+          (uintptr_t)credHdl, (uintptr_t)contextHdl);
 
   /* gss_init_sec_context(...) => GSS_S_CONTINUE_NEEDED(!),
      GSS_S_DEFECTIVE_TOKEN, GSS_S_NO_CRED, GSS_S_DEFECTIVE_CREDENTIAL(!),
@@ -879,8 +901,8 @@ Java_sun_security_jgss_wrapper_GSSLibStub_initContext(JNIEnv *env,
                                  flags, time, cb, &inToken, NULL /*aMech*/,
                                  &outToken, &aFlags, &aTime);
 
-  TRACE2("[GSSLibStub_initContext] after: pContext=%ld, outToken len=%ld",
-            (long)contextHdl, (long)outToken.length);
+  TRACE2("[GSSLibStub_initContext] after: pContext=%" PRIuPTR ", outToken len=%ld",
+            (uintptr_t)contextHdl, (long)outToken.length);
 
   // update context handle with the latest value if changed
   // this is to work with both MIT and Solaris. Former deletes half-built
@@ -888,7 +910,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_initContext(JNIEnv *env,
   if (contextHdl != contextHdlSave) {
     (*env)->SetLongField(env, jcontextSpi, FID_NativeGSSContext_pContext,
                          ptr_to_jlong(contextHdl));
-    TRACE1("[GSSLibStub_initContext] set pContext=%ld", (long)contextHdl);
+    TRACE1("[GSSLibStub_initContext] set pContext=%" PRIuPTR "", (uintptr_t)contextHdl);
   }
 
   if (GSS_ERROR(major) == GSS_S_COMPLETE) {
@@ -959,7 +981,6 @@ Java_sun_security_jgss_wrapper_GSSLibStub_acceptContext(JNIEnv *env,
   jobject jsrcName=GSS_C_NO_NAME;
   jobject jdelCred;
   jobject jMech;
-  jbyteArray jresult;
   jboolean setTarget;
   gss_name_t targetName;
   jobject jtargetName;
@@ -983,8 +1004,8 @@ Java_sun_security_jgss_wrapper_GSSLibStub_acceptContext(JNIEnv *env,
   setTarget = (credHdl == GSS_C_NO_CREDENTIAL);
   aFlags = 0;
 
-  TRACE2( "[GSSLibStub_acceptContext] before: pCred=%ld, pContext=%ld",
-          (long) credHdl, (long) contextHdl);
+  TRACE2( "[GSSLibStub_acceptContext] before: pCred=%" PRIuPTR ", pContext=%" PRIuPTR "",
+          (uintptr_t) credHdl, (uintptr_t) contextHdl);
 
   /* gss_accept_sec_context(...) => GSS_S_CONTINUE_NEEDED(!),
      GSS_S_DEFECTIVE_TOKEN, GSS_S_DEFECTIVE_CREDENTIAL(!),
@@ -1000,8 +1021,8 @@ Java_sun_security_jgss_wrapper_GSSLibStub_acceptContext(JNIEnv *env,
   deleteGSSCB(cb);
   resetGSSBuffer(&inToken);
 
-  TRACE3("[GSSLibStub_acceptContext] after: pCred=%ld, pContext=%ld, pDelegCred=%ld",
-        (long)credHdl, (long)contextHdl, (long) delCred);
+  TRACE3("[GSSLibStub_acceptContext] after: pCred=%" PRIuPTR ", pContext=%" PRIuPTR ", pDelegCred=%" PRIuPTR "",
+        (uintptr_t)credHdl, (uintptr_t)contextHdl, (uintptr_t) delCred);
 
   // update context handle with the latest value if changed
   // this is to work with both MIT and Solaris. Former deletes half-built
@@ -1009,7 +1030,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_acceptContext(JNIEnv *env,
   if (contextHdl != contextHdlSave) {
     (*env)->SetLongField(env, jcontextSpi, FID_NativeGSSContext_pContext,
                          ptr_to_jlong(contextHdl));
-    TRACE1("[GSSLibStub_acceptContext] set pContext=%ld", (long)contextHdl);
+    TRACE1("[GSSLibStub_acceptContext] set pContext=%" PRIuPTR "", (uintptr_t)contextHdl);
   }
 
   if (GSS_ERROR(major) == GSS_S_COMPLETE) {
@@ -1038,8 +1059,8 @@ Java_sun_security_jgss_wrapper_GSSLibStub_acceptContext(JNIEnv *env,
         goto error;
       }
 
-      TRACE1("[GSSLibStub_acceptContext] set targetName=%ld",
-              (long)targetName);
+      TRACE1("[GSSLibStub_acceptContext] set targetName=%" PRIuPTR "",
+              (uintptr_t)targetName);
 
       (*env)->SetObjectField(env, jcontextSpi, FID_NativeGSSContext_targetName,
                              jtargetName);
@@ -1055,7 +1076,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_acceptContext(JNIEnv *env,
         goto error;
       }
 
-      TRACE1("[GSSLibStub_acceptContext] set srcName=%ld", (long)srcName);
+      TRACE1("[GSSLibStub_acceptContext] set srcName=%" PRIuPTR "", (uintptr_t)srcName);
 
       (*env)->SetObjectField(env, jcontextSpi, FID_NativeGSSContext_srcName,
                              jsrcName);
@@ -1090,8 +1111,8 @@ Java_sun_security_jgss_wrapper_GSSLibStub_acceptContext(JNIEnv *env,
         (*env)->SetObjectField(env, jcontextSpi,
                                FID_NativeGSSContext_delegatedCred,
                                jdelCred);
-        TRACE1("[GSSLibStub_acceptContext] set delegatedCred=%ld",
-                (long) delCred);
+        TRACE1("[GSSLibStub_acceptContext] set delegatedCred=%" PRIuPTR "",
+                (uintptr_t) delCred);
 
         if ((*env)->ExceptionCheck(env)) {
           goto error;
@@ -1144,7 +1165,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_inquireContext(JNIEnv *env,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE1("[GSSLibStub_inquireContext] %ld", (long)contextHdl);
+  TRACE1("[GSSLibStub_inquireContext] %" PRIuPTR "", (uintptr_t)contextHdl);
 
   srcName = targetName = GSS_C_NO_NAME;
   time = 0;
@@ -1155,8 +1176,8 @@ Java_sun_security_jgss_wrapper_GSSLibStub_inquireContext(JNIEnv *env,
                               &targetName, &time, NULL, &flags,
                               &isInitiator, &isEstablished);
   /* update member values if needed */
-  TRACE2("[GSSLibStub_inquireContext] srcName %ld, targetName %ld",
-      (long)srcName, (long)targetName);
+  TRACE2("[GSSLibStub_inquireContext] srcName %" PRIuPTR ", targetName %" PRIuPTR "",
+      (uintptr_t)srcName, (uintptr_t)targetName);
 
   checkStatus(env, jobj, major, minor, "[GSSLibStub_inquireContext]");
   if ((*env)->ExceptionCheck(env)) {
@@ -1225,8 +1246,8 @@ Java_sun_security_jgss_wrapper_GSSLibStub_getContextName(JNIEnv *env,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE2("[GSSLibStub_getContextName] %ld, isSrc=%d",
-          (long)contextHdl, isSrc);
+  TRACE2("[GSSLibStub_getContextName] %" PRIuPTR ", isSrc=%d",
+          (uintptr_t)contextHdl, isSrc);
 
   nameHdl = GSS_C_NO_NAME;
   if (isSrc == JNI_TRUE) {
@@ -1243,7 +1264,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_getContextName(JNIEnv *env,
     return jlong_zero;
   }
 
-  TRACE1("[GSSLibStub_getContextName] pName=%ld", (long) nameHdl);
+  TRACE1("[GSSLibStub_getContextName] pName=%" PRIuPTR "", (uintptr_t) nameHdl);
 
   return ptr_to_jlong(nameHdl);
 }
@@ -1263,7 +1284,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_getContextTime(JNIEnv *env,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE1("[GSSLibStub_getContextTime] %ld", (long)contextHdl);
+  TRACE1("[GSSLibStub_getContextTime] %" PRIuPTR "", (uintptr_t)contextHdl);
 
   if (contextHdl == GSS_C_NO_CONTEXT) return 0;
 
@@ -1295,7 +1316,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_deleteContext(JNIEnv *env,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE1("[GSSLibStub_deleteContext] %ld", (long)contextHdl);
+  TRACE1("[GSSLibStub_deleteContext] %" PRIuPTR "", (uintptr_t)contextHdl);
 
   if (contextHdl == GSS_C_NO_CONTEXT) return ptr_to_jlong(GSS_C_NO_CONTEXT);
 
@@ -1329,7 +1350,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_wrapSizeLimit(JNIEnv *env,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE1("[GSSLibStub_wrapSizeLimit] %ld", (long)contextHdl);
+  TRACE1("[GSSLibStub_wrapSizeLimit] %" PRIuPTR "", (uintptr_t)contextHdl);
 
   if (contextHdl == GSS_C_NO_CONTEXT) {
     // Twik per javadoc
@@ -1369,7 +1390,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_exportContext(JNIEnv *env,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE1("[GSSLibStub_exportContext] %ld", (long)contextHdl);
+  TRACE1("[GSSLibStub_exportContext] %" PRIuPTR "", (uintptr_t)contextHdl);
 
   if (contextHdl == GSS_C_NO_CONTEXT) {
     // Twik per javadoc
@@ -1413,7 +1434,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_getMic(JNIEnv *env, jobject jobj,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE1("[GSSLibStub_getMic] %ld", (long)contextHdl);
+  TRACE1("[GSSLibStub_getMic] %" PRIuPTR "", (uintptr_t)contextHdl);
 
   if (contextHdl == GSS_C_NO_CONTEXT) {
     // Twik per javadoc
@@ -1466,7 +1487,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_verifyMic(JNIEnv *env,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE1("[GSSLibStub_verifyMic] %ld", (long)contextHdl);
+  TRACE1("[GSSLibStub_verifyMic] %" PRIuPTR "", (uintptr_t)contextHdl);
 
   if (contextHdl == GSS_C_NO_CONTEXT) {
     // Twik per javadoc
@@ -1537,7 +1558,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_wrap(JNIEnv *env,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE1("[GSSLibStub_wrap] %ld", (long)contextHdl);
+  TRACE1("[GSSLibStub_wrap] %" PRIuPTR "", (uintptr_t)contextHdl);
 
   if (contextHdl == GSS_C_NO_CONTEXT) {
     // Twik per javadoc
@@ -1609,7 +1630,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_unwrap(JNIEnv *env,
 
   contextHdl = (gss_ctx_id_t) jlong_to_ptr(pContext);
 
-  TRACE1("[GSSLibStub_unwrap] %ld", (long)contextHdl);
+  TRACE1("[GSSLibStub_unwrap] %" PRIuPTR "", (uintptr_t)contextHdl);
 
   if (contextHdl == GSS_C_NO_CONTEXT) {
     // Twik per javadoc
diff --git a/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
similarity index 77%
rename from src/java.security.jgss/unix/native/libj2gss/NativeFunc.c
rename to src/java.security.jgss/share/native/libj2gss/NativeFunc.c
index 8a1d0ee93ce..da7bc0445b9 100644
--- a/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c
+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <dlfcn.h>
 #include "NativeFunc.h"
 
 /* standard GSS method names (ordering is from mapfile) */
@@ -64,18 +63,16 @@ static const char RELEASE_BUFFER[]              = "gss_release_buffer";
 /**
  * Initialize native GSS function pointers
  */
-char* loadNative(const char *libName) {
+int loadNative(const char *libName) {
 
-    char *error;
     void *gssLib;
     int failed;
     OM_uint32 minor, major;
 
     ftab = NULL;
     failed = FALSE;
-    error = NULL;
 
-    gssLib = dlopen(libName, RTLD_NOW);
+    gssLib = GETLIB(libName);
     if (gssLib == NULL) {
         failed = TRUE;
         goto out;
@@ -88,183 +85,183 @@ char* loadNative(const char *libName) {
         goto out;
     }
 
-    ftab->releaseName = (RELEASE_NAME_FN_PTR)dlsym(gssLib, RELEASE_NAME);
+    ftab->releaseName = (RELEASE_NAME_FN_PTR)GETFUNC(gssLib, RELEASE_NAME);
     if (ftab->releaseName == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->importName = (IMPORT_NAME_FN_PTR)dlsym(gssLib, IMPORT_NAME);
+    ftab->importName = (IMPORT_NAME_FN_PTR)GETFUNC(gssLib, IMPORT_NAME);
     if (ftab->importName == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->compareName = (COMPARE_NAME_FN_PTR)dlsym(gssLib, COMPARE_NAME);
+    ftab->compareName = (COMPARE_NAME_FN_PTR)GETFUNC(gssLib, COMPARE_NAME);
     if (ftab->compareName == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->canonicalizeName = (CANONICALIZE_NAME_FN_PTR)
-                                dlsym(gssLib, CANONICALIZE_NAME);
+                                GETFUNC(gssLib, CANONICALIZE_NAME);
     if (ftab->canonicalizeName == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->exportName = (EXPORT_NAME_FN_PTR)dlsym(gssLib, EXPORT_NAME);
+    ftab->exportName = (EXPORT_NAME_FN_PTR)GETFUNC(gssLib, EXPORT_NAME);
     if (ftab->exportName == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->displayName = (DISPLAY_NAME_FN_PTR)dlsym(gssLib, DISPLAY_NAME);
+    ftab->displayName = (DISPLAY_NAME_FN_PTR)GETFUNC(gssLib, DISPLAY_NAME);
     if (ftab->displayName == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->acquireCred = (ACQUIRE_CRED_FN_PTR)dlsym(gssLib, ACQUIRE_CRED);
+    ftab->acquireCred = (ACQUIRE_CRED_FN_PTR)GETFUNC(gssLib, ACQUIRE_CRED);
     if (ftab->acquireCred == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->releaseCred = (RELEASE_CRED_FN_PTR)dlsym(gssLib, RELEASE_CRED);
+    ftab->releaseCred = (RELEASE_CRED_FN_PTR)GETFUNC(gssLib, RELEASE_CRED);
     if (ftab->releaseCred == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->inquireCred = (INQUIRE_CRED_FN_PTR)dlsym(gssLib, INQUIRE_CRED);
+    ftab->inquireCred = (INQUIRE_CRED_FN_PTR)GETFUNC(gssLib, INQUIRE_CRED);
     if (ftab->inquireCred == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->importSecContext = (IMPORT_SEC_CONTEXT_FN_PTR)
-                        dlsym(gssLib, IMPORT_SEC_CONTEXT);
+                        GETFUNC(gssLib, IMPORT_SEC_CONTEXT);
     if (ftab->importSecContext == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->initSecContext = (INIT_SEC_CONTEXT_FN_PTR)
-                        dlsym(gssLib, INIT_SEC_CONTEXT);
+                        GETFUNC(gssLib, INIT_SEC_CONTEXT);
     if (ftab->initSecContext == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->acceptSecContext = (ACCEPT_SEC_CONTEXT_FN_PTR)
-                        dlsym(gssLib, ACCEPT_SEC_CONTEXT);
+                        GETFUNC(gssLib, ACCEPT_SEC_CONTEXT);
     if (ftab->acceptSecContext == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->inquireContext = (INQUIRE_CONTEXT_FN_PTR)
-                        dlsym(gssLib, INQUIRE_CONTEXT);
+                        GETFUNC(gssLib, INQUIRE_CONTEXT);
     if (ftab->inquireContext == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->deleteSecContext = (DELETE_SEC_CONTEXT_FN_PTR)
-                        dlsym(gssLib, DELETE_SEC_CONTEXT);
+                        GETFUNC(gssLib, DELETE_SEC_CONTEXT);
     if (ftab->deleteSecContext == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->contextTime = (CONTEXT_TIME_FN_PTR)dlsym(gssLib, CONTEXT_TIME);
+    ftab->contextTime = (CONTEXT_TIME_FN_PTR)GETFUNC(gssLib, CONTEXT_TIME);
     if (ftab->contextTime == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->wrapSizeLimit = (WRAP_SIZE_LIMIT_FN_PTR)
-                        dlsym(gssLib, WRAP_SIZE_LIMIT);
+                        GETFUNC(gssLib, WRAP_SIZE_LIMIT);
     if (ftab->wrapSizeLimit == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->exportSecContext = (EXPORT_SEC_CONTEXT_FN_PTR)
-                        dlsym(gssLib, EXPORT_SEC_CONTEXT);
+                        GETFUNC(gssLib, EXPORT_SEC_CONTEXT);
     if (ftab->exportSecContext == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->getMic = (GET_MIC_FN_PTR)dlsym(gssLib, GET_MIC);
+    ftab->getMic = (GET_MIC_FN_PTR)GETFUNC(gssLib, GET_MIC);
     if (ftab->getMic == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->verifyMic = (VERIFY_MIC_FN_PTR)dlsym(gssLib, VERIFY_MIC);
+    ftab->verifyMic = (VERIFY_MIC_FN_PTR)GETFUNC(gssLib, VERIFY_MIC);
     if (ftab->verifyMic == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->wrap = (WRAP_FN_PTR)dlsym(gssLib, WRAP);
+    ftab->wrap = (WRAP_FN_PTR)GETFUNC(gssLib, WRAP);
     if (ftab->wrap == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->unwrap = (UNWRAP_FN_PTR)dlsym(gssLib, UNWRAP);
+    ftab->unwrap = (UNWRAP_FN_PTR)GETFUNC(gssLib, UNWRAP);
     if (ftab->unwrap == NULL) {
         failed = TRUE;
         goto out;
     }
 
-    ftab->indicateMechs = (INDICATE_MECHS_FN_PTR)dlsym(gssLib, INDICATE_MECHS);
+    ftab->indicateMechs = (INDICATE_MECHS_FN_PTR)GETFUNC(gssLib, INDICATE_MECHS);
     if (ftab->indicateMechs == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->inquireNamesForMech = (INQUIRE_NAMES_FOR_MECH_FN_PTR)
-                        dlsym(gssLib, INQUIRE_NAMES_FOR_MECH);
+                        GETFUNC(gssLib, INQUIRE_NAMES_FOR_MECH);
     if (ftab->inquireNamesForMech == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->addOidSetMember = (ADD_OID_SET_MEMBER_FN_PTR)
-                        dlsym(gssLib, ADD_OID_SET_MEMBER);
+                        GETFUNC(gssLib, ADD_OID_SET_MEMBER);
     if (ftab->addOidSetMember == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->displayStatus = (DISPLAY_STATUS_FN_PTR)
-                        dlsym(gssLib, DISPLAY_STATUS);
+                        GETFUNC(gssLib, DISPLAY_STATUS);
     if (ftab->displayStatus == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->createEmptyOidSet = (CREATE_EMPTY_OID_SET_FN_PTR)
-                        dlsym(gssLib, CREATE_EMPTY_OID_SET);
+                        GETFUNC(gssLib, CREATE_EMPTY_OID_SET);
     if (ftab->createEmptyOidSet == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->releaseOidSet = (RELEASE_OID_SET_FN_PTR)
-                        dlsym(gssLib, RELEASE_OID_SET);
+                        GETFUNC(gssLib, RELEASE_OID_SET);
     if (ftab->releaseOidSet == NULL) {
         failed = TRUE;
         goto out;
     }
 
     ftab->releaseBuffer = (RELEASE_BUFFER_FN_PTR)
-                        dlsym(gssLib, RELEASE_BUFFER);
+                        GETFUNC(gssLib, RELEASE_BUFFER);
     if (ftab->releaseBuffer == NULL) {
         failed = TRUE;
         goto out;
@@ -280,9 +277,8 @@ char* loadNative(const char *libName) {
 
 out:
     if (failed == TRUE) {
-        error = dlerror();
-        if (gssLib != NULL) dlclose(gssLib);
+        if (gssLib != NULL) CLOSELIB(gssLib);
         if (ftab != NULL) free(ftab);
     }
-    return error;
+    return failed;
 }
diff --git a/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
similarity index 96%
rename from src/java.security.jgss/unix/native/libj2gss/NativeFunc.h
rename to src/java.security.jgss/share/native/libj2gss/NativeFunc.h
index ea704b759cb..bf4ca99c176 100644
--- a/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h
+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -28,6 +28,18 @@
 
 #include "gssapi.h"
 
+#ifdef WIN32
+#include <windows.h>
+#define GETLIB(libName) LoadLibrary(libName)
+#define GETFUNC(lib,name) GetProcAddress(lib,name)
+#define CLOSELIB(lib) CloseHandle(lib)
+#else
+#include <dlfcn.h>
+#define GETLIB(libName) dlopen(libName, RTLD_NOW)
+#define GETFUNC(lib,name) dlsym(lib,name)
+#define CLOSELIB(lib) dlclose(lib)
+#endif
+
 #ifndef TRUE
 #define TRUE    1
 #endif
@@ -36,7 +48,7 @@
 #define FALSE   0
 #endif
 
-char* loadNative(const char *libName);
+int loadNative(const char *libName);
 
 /* function pointer definitions */
 typedef OM_uint32 (*RELEASE_NAME_FN_PTR)
diff --git a/src/java.security.jgss/share/native/libj2gss/NativeUtil.c b/src/java.security.jgss/share/native/libj2gss/NativeUtil.c
index 033f0994796..8e40177babf 100644
--- a/src/java.security.jgss/share/native/libj2gss/NativeUtil.c
+++ b/src/java.security.jgss/share/native/libj2gss/NativeUtil.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -469,7 +469,7 @@ jstring getJavaString(JNIEnv *env, gss_buffer_t bytes) {
   if (bytes != NULL) {
     /* constructs the String object with new String(byte[])
        NOTE: do NOT include the trailing NULL */
-    len = bytes->length;
+    len = (int) bytes->length;
     jbytes = (*env)->NewByteArray(env, len);
     if (jbytes == NULL) {
       goto finish;
@@ -497,7 +497,6 @@ jstring getMinorMessage(JNIEnv *env, jobject jstub, OM_uint32 statusValue) {
   OM_uint32 messageContext, minor, major;
   gss_buffer_desc statusString;
   gss_OID mech;
-  jstring msg;
 
   messageContext = 0;
   if (jstub != NULL) {
@@ -636,11 +635,11 @@ jbyteArray getJavaBuffer(JNIEnv *env, gss_buffer_t cbytes) {
 
   if (cbytes != NULL) {
     if ((cbytes != GSS_C_NO_BUFFER) && (cbytes->length != 0)) {
-      result = (*env)->NewByteArray(env, cbytes->length);
+      result = (*env)->NewByteArray(env, (int) cbytes->length);
       if (result == NULL) {
         goto finish;
       }
-      (*env)->SetByteArrayRegion(env, result, 0, cbytes->length,
+      (*env)->SetByteArrayRegion(env, result, 0, (int) cbytes->length,
                                  cbytes->value);
       if ((*env)->ExceptionCheck(env)) {
         result = NULL;
@@ -661,7 +660,6 @@ jbyteArray getJavaBuffer(JNIEnv *env, gss_buffer_t cbytes) {
 gss_OID newGSSOID(JNIEnv *env, jobject jOid) {
   jbyteArray jbytes;
   gss_OID cOid;
-  jthrowable gssEx;
   if (jOid != NULL) {
     jbytes = (*env)->CallObjectMethod(env, jOid, MID_Oid_getDER);
     if ((*env)->ExceptionCheck(env)) {
@@ -783,10 +781,9 @@ jobjectArray getJavaOIDArray(JNIEnv *env, gss_OID_set cOidSet) {
   jobjectArray jOidSet;
   jobject jOid;
   int i;
-  jthrowable gssEx;
 
   if (cOidSet != NULL && cOidSet != GSS_C_NO_OID_SET) {
-    numOfOids = cOidSet->count;
+    numOfOids = (int) cOidSet->count;
     jOidSet = (*env)->NewObjectArray(env, numOfOids, CLS_Oid, NULL);
     if ((*env)->ExceptionCheck(env)) {
       return NULL;
diff --git a/src/java.security.jgss/share/native/libj2gss/NativeUtil.h b/src/java.security.jgss/share/native/libj2gss/NativeUtil.h
index 3fe1903726d..04dee5fbc54 100644
--- a/src/java.security.jgss/share/native/libj2gss/NativeUtil.h
+++ b/src/java.security.jgss/share/native/libj2gss/NativeUtil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -26,6 +26,7 @@
 #include <jni.h>
 #include <stdlib.h>
 #include <string.h>
+#include <inttypes.h>
 #include "gssapi.h"
 
 #ifndef _Included_NATIVE_Util
diff --git a/src/java.security.jgss/share/native/libj2gss/gssapi.h b/src/java.security.jgss/share/native/libj2gss/gssapi.h
index f0aa4c570d9..a1f1e3456c1 100644
--- a/src/java.security.jgss/share/native/libj2gss/gssapi.h
+++ b/src/java.security.jgss/share/native/libj2gss/gssapi.h
@@ -387,7 +387,7 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_EXPORT_NAME;
 
 /* Function Prototypes */
 
-OM_uint32 gss_acquire_cred(
+GSS_DLLIMP OM_uint32 gss_acquire_cred(
         OM_uint32 *,            /* minor_status */
         gss_name_t,             /* desired_name */
         OM_uint32,              /* time_req */
@@ -398,12 +398,12 @@ OM_uint32 gss_acquire_cred(
         OM_uint32 *             /* time_rec */
 );
 
-OM_uint32 gss_release_cred(
+GSS_DLLIMP OM_uint32 gss_release_cred(
         OM_uint32 *,            /* minor_status */
         gss_cred_id_t *         /* cred_handle */
 );
 
-OM_uint32 gss_init_sec_context(
+GSS_DLLIMP OM_uint32 gss_init_sec_context(
         OM_uint32 *,            /* minor_status */
         gss_cred_id_t,          /* claimant_cred_handle */
         gss_ctx_id_t *,         /* context_handle */
@@ -419,7 +419,7 @@ OM_uint32 gss_init_sec_context(
         OM_uint32 *             /* time_rec */
 );
 
-OM_uint32 gss_accept_sec_context(
+GSS_DLLIMP OM_uint32 gss_accept_sec_context(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t *,         /* context_handle */
         gss_cred_id_t,          /* acceptor_cred_handle */
@@ -433,26 +433,26 @@ OM_uint32 gss_accept_sec_context(
         gss_cred_id_t *         /* delegated_cred_handle */
 );
 
-OM_uint32 gss_process_context_token(
+GSS_DLLIMP OM_uint32 gss_process_context_token(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t,           /* context_handle */
         gss_buffer_t            /* token_buffer */
 );
 
-OM_uint32 gss_delete_sec_context(
+GSS_DLLIMP OM_uint32 gss_delete_sec_context(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t *,         /* context_handle */
         gss_buffer_t            /* output_token */
 );
 
-OM_uint32 gss_context_time(
+GSS_DLLIMP OM_uint32 gss_context_time(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t,           /* context_handle */
         OM_uint32 *             /* time_rec */
 );
 
 /* New for V2 */
-OM_uint32 gss_get_mic(
+GSS_DLLIMP OM_uint32 gss_get_mic(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t,           /* context_handle */
         gss_qop_t,              /* qop_req */
@@ -461,7 +461,7 @@ OM_uint32 gss_get_mic(
 );
 
 /* New for V2 */
-OM_uint32 gss_verify_mic(
+GSS_DLLIMP OM_uint32 gss_verify_mic(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t,           /* context_handle */
         gss_buffer_t,           /* message_buffer */
@@ -470,7 +470,7 @@ OM_uint32 gss_verify_mic(
 );
 
 /* New for V2 */
-OM_uint32 gss_wrap(
+GSS_DLLIMP OM_uint32 gss_wrap(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t,           /* context_handle */
         int,                    /* conf_req_flag */
@@ -481,7 +481,7 @@ OM_uint32 gss_wrap(
 );
 
 /* New for V2 */
-OM_uint32 gss_unwrap(
+GSS_DLLIMP OM_uint32 gss_unwrap(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t,           /* context_handle */
         gss_buffer_t,           /* input_message_buffer */
@@ -490,7 +490,7 @@ OM_uint32 gss_unwrap(
         gss_qop_t *             /* qop_state */
 );
 
-OM_uint32 gss_display_status(
+GSS_DLLIMP OM_uint32 gss_display_status(
         OM_uint32 *,            /* minor_status */
         OM_uint32,              /* status_value */
         int,                    /* status_type */
@@ -499,48 +499,48 @@ OM_uint32 gss_display_status(
         gss_buffer_t            /* status_string */
 );
 
-OM_uint32 gss_indicate_mechs(
+GSS_DLLIMP OM_uint32 gss_indicate_mechs(
         OM_uint32 *,            /* minor_status */
         gss_OID_set *           /* mech_set */
 );
 
-OM_uint32 gss_compare_name(
+GSS_DLLIMP OM_uint32 gss_compare_name(
         OM_uint32 *,            /* minor_status */
         gss_name_t,             /* name1 */
         gss_name_t,             /* name2 */
         int *                   /* name_equal */
 );
 
-OM_uint32 gss_display_name(
+GSS_DLLIMP OM_uint32 gss_display_name(
         OM_uint32 *,            /* minor_status */
         gss_name_t,             /* input_name */
         gss_buffer_t,           /* output_name_buffer */
         gss_OID *               /* output_name_type */
 );
 
-OM_uint32 gss_import_name(
+GSS_DLLIMP OM_uint32 gss_import_name(
         OM_uint32 *,            /* minor_status */
         gss_buffer_t,           /* input_name_buffer */
         gss_OID,                /* input_name_type(used to be const) */
         gss_name_t *            /* output_name */
 );
 
-OM_uint32 gss_release_name(
+GSS_DLLIMP OM_uint32 gss_release_name(
         OM_uint32 *,            /* minor_status */
         gss_name_t *            /* input_name */
 );
 
-OM_uint32 gss_release_buffer(
+GSS_DLLIMP OM_uint32 gss_release_buffer(
         OM_uint32 *,            /* minor_status */
         gss_buffer_t            /* buffer */
 );
 
-OM_uint32 gss_release_oid_set(
+GSS_DLLIMP OM_uint32 gss_release_oid_set(
         OM_uint32 *,            /* minor_status */
         gss_OID_set *           /* set */
 );
 
-OM_uint32 gss_inquire_cred(
+GSS_DLLIMP OM_uint32 gss_inquire_cred(
         OM_uint32 *,            /* minor_status */
         gss_cred_id_t,          /* cred_handle */
         gss_name_t *,           /* name */
@@ -550,7 +550,7 @@ OM_uint32 gss_inquire_cred(
 );
 
 /* Last argument new for V2 */
-OM_uint32 gss_inquire_context(
+GSS_DLLIMP OM_uint32 gss_inquire_context(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t,           /* context_handle */
         gss_name_t *,           /* src_name */
@@ -563,7 +563,7 @@ OM_uint32 gss_inquire_context(
 );
 
 /* New for V2 */
-OM_uint32 gss_wrap_size_limit(
+GSS_DLLIMP OM_uint32 gss_wrap_size_limit(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t,           /* context_handle */
         int,                    /* conf_req_flag */
@@ -573,7 +573,7 @@ OM_uint32 gss_wrap_size_limit(
 );
 
 /* New for V2 */
-OM_uint32 gss_add_cred(
+GSS_DLLIMP OM_uint32 gss_add_cred(
         OM_uint32 *,            /* minor_status */
         gss_cred_id_t,          /* input_cred_handle */
         gss_name_t,             /* desired_name */
@@ -588,7 +588,7 @@ OM_uint32 gss_add_cred(
 );
 
 /* New for V2 */
-OM_uint32 gss_inquire_cred_by_mech(
+GSS_DLLIMP OM_uint32 gss_inquire_cred_by_mech(
         OM_uint32 *,            /* minor_status */
         gss_cred_id_t,          /* cred_handle */
         gss_OID,                /* mech_type */
@@ -599,40 +599,40 @@ OM_uint32 gss_inquire_cred_by_mech(
 );
 
 /* New for V2 */
-OM_uint32 gss_export_sec_context(
+GSS_DLLIMP OM_uint32 gss_export_sec_context(
         OM_uint32 *,            /* minor_status */
         gss_ctx_id_t *,         /* context_handle */
         gss_buffer_t            /* interprocess_token */
 );
 
 /* New for V2 */
-OM_uint32 gss_import_sec_context(
+GSS_DLLIMP OM_uint32 gss_import_sec_context(
         OM_uint32 *,            /* minor_status */
         gss_buffer_t,           /* interprocess_token */
         gss_ctx_id_t *          /* context_handle */
 );
 
 /* New for V2 */
-OM_uint32 gss_release_oid(
+GSS_DLLIMP OM_uint32 gss_release_oid(
         OM_uint32 *,            /* minor_status */
         gss_OID *               /* oid */
 );
 
 /* New for V2 */
-OM_uint32 gss_create_empty_oid_set(
+GSS_DLLIMP OM_uint32 gss_create_empty_oid_set(
         OM_uint32 *,            /* minor_status */
         gss_OID_set *           /* oid_set */
 );
 
 /* New for V2 */
-OM_uint32 gss_add_oid_set_member(
+GSS_DLLIMP OM_uint32 gss_add_oid_set_member(
         OM_uint32 *,            /* minor_status */
         gss_OID,                /* member_oid */
         gss_OID_set *           /* oid_set */
 );
 
 /* New for V2 */
-OM_uint32 gss_test_oid_set_member(
+GSS_DLLIMP OM_uint32 gss_test_oid_set_member(
         OM_uint32 *,            /* minor_status */
         gss_OID,                /* member */
         gss_OID_set,            /* set */
@@ -640,42 +640,42 @@ OM_uint32 gss_test_oid_set_member(
 );
 
 /* New for V2 */
-OM_uint32 gss_str_to_oid(
+GSS_DLLIMP OM_uint32 gss_str_to_oid(
         OM_uint32 *,            /* minor_status */
         gss_buffer_t,           /* oid_str */
         gss_OID *               /* oid */
 );
 
 /* New for V2 */
-OM_uint32 gss_oid_to_str(
+GSS_DLLIMP OM_uint32 gss_oid_to_str(
         OM_uint32 *,            /* minor_status */
         gss_OID,                /* oid */
         gss_buffer_t            /* oid_str */
 );
 
 /* New for V2 */
-OM_uint32 gss_inquire_names_for_mech(
+GSS_DLLIMP OM_uint32 gss_inquire_names_for_mech(
         OM_uint32 *,            /* minor_status */
         gss_OID,                /* mechanism */
         gss_OID_set *           /* name_types */
 );
 
 /* New for V2 */
-OM_uint32 gss_export_name(
+GSS_DLLIMP OM_uint32 gss_export_name(
         OM_uint32  *,           /* minor_status */
         const gss_name_t,       /* input_name */
         gss_buffer_t            /* exported_name */
 );
 
 /* New for V2 */
-OM_uint32 gss_duplicate_name(
+GSS_DLLIMP OM_uint32 gss_duplicate_name(
         OM_uint32  *,           /* minor_status */
         const gss_name_t,       /* input_name */
         gss_name_t *            /* dest_name */
 );
 
 /* New for V2 */
-OM_uint32 gss_canonicalize_name(
+GSS_DLLIMP OM_uint32 gss_canonicalize_name(
         OM_uint32  *,           /* minor_status */
         const gss_name_t,       /* input_name */
         const gss_OID,          /* mech_type */
diff --git a/test/jdk/java/security/testlibrary/Proc.java b/test/jdk/java/security/testlibrary/Proc.java
index 1ade38c1ff6..abbc86a33be 100644
--- a/test/jdk/java/security/testlibrary/Proc.java
+++ b/test/jdk/java/security/testlibrary/Proc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -297,6 +297,9 @@ public Proc start() throws IOException {
         }
         if (debug != null) {
             System.out.println("PROC: " + debug + " cmdline: " + cmd);
+            for (String e : env.keySet()) {
+                System.out.print(e + "=" + env.get(e) + " ");
+            }
             for (String c : cmd) {
                 if (c.indexOf('\\') >= 0 || c.indexOf(' ') > 0) {
                     System.out.print('\'' + c + '\'');
diff --git a/test/jdk/sun/security/krb5/auto/BasicProc.java b/test/jdk/sun/security/krb5/auto/BasicProc.java
index 009b4e22a9a..5fa2a5f5fd0 100644
--- a/test/jdk/sun/security/krb5/auto/BasicProc.java
+++ b/test/jdk/sun/security/krb5/auto/BasicProc.java
@@ -40,6 +40,7 @@
 import java.util.Random;
 import java.util.Set;
 
+import jdk.test.lib.Platform;
 import org.ietf.jgss.Oid;
 import sun.security.krb5.Config;
 
@@ -239,10 +240,12 @@ private static void once(String label, String lc, String ls, String lb)
             pc.perm(new PropertyPermission("user.name", "read"));
         } else {
             Files.copy(Paths.get("base.ccache"), Paths.get(label + ".ccache"));
-            Files.setPosixFilePermissions(Paths.get(label + ".ccache"),
-                    Set.of(PosixFilePermission.OWNER_READ,
-                            PosixFilePermission.OWNER_WRITE));
-            pc.env("KRB5CCNAME", label + ".ccache");
+            if (!Platform.isWindows()) {
+                Files.setPosixFilePermissions(Paths.get(label + ".ccache"),
+                        Set.of(PosixFilePermission.OWNER_READ,
+                                PosixFilePermission.OWNER_WRITE));
+            }
+            pc.env("KRB5CCNAME", "FILE:" + label + ".ccache");
             // Do not try system ktab if ccache fails
             pc.env("KRB5_KTNAME", "none");
         }
@@ -310,7 +313,7 @@ private static Proc proc(String lib) throws Exception {
                 .perm(new javax.security.auth.AuthPermission("doAs"));
         if (lib != null) {
             p.env("KRB5_CONFIG", CONF)
-                    .env("KRB5_TRACE", "/dev/stderr")
+                    .env("KRB5_TRACE", Platform.isWindows() ? "CON" : "/dev/stderr")
                     .prop("sun.security.jgss.native", "true")
                     .prop("sun.security.jgss.lib", lib)
                     .prop("javax.security.auth.useSubjectCredsOnly", "false")

From ac68e651b0a05d4470ff19c5ffad781a4ebc7795 Mon Sep 17 00:00:00 2001
From: mcimadamore <unknown>
Date: Fri, 13 Apr 2018 16:23:56 +0100
Subject: [PATCH 157/196] 8201498:
 test/langtools/tools/javac/diags/CheckExamples.java 6 errors occurred
 Summary: Remove duplicate class names in diagnostic examples. Reviewed-by:
 jlahoda

---
 .../javac/diags/examples/PreviewPlural/PreviewPlural.java     | 2 +-
 .../PreviewPlural/{Bar.java => PreviewPluralBar.java}         | 2 +-
 .../PreviewPluralAdditional/PreviewPluralAdditional.java      | 4 ++--
 .../{Bar.java => PreviewPluralAdditionalBar.java}             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename test/langtools/tools/javac/diags/examples/PreviewPlural/{Bar.java => PreviewPluralBar.java} (98%)
 rename test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/{Bar.java => PreviewPluralAdditionalBar.java} (97%)

diff --git a/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java
index a43f435e8ff..ad24d64d312 100644
--- a/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java
+++ b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPlural.java
@@ -31,7 +31,7 @@
 
 class PreviewPlural {
     void test() {
-        new Bar();
+        new PreviewPluralBar();
         new ArrayList<>();
     }
 }
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPluralBar.java
similarity index 98%
rename from test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java
rename to test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPluralBar.java
index a2d62055954..9e1f2e7acf9 100644
--- a/test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java
+++ b/test/langtools/tools/javac/diags/examples/PreviewPlural/PreviewPluralBar.java
@@ -23,6 +23,6 @@
  * questions.
  */
 
-class Bar {
+class PreviewPluralBar {
     Runnable r = () -> {};
 }
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
index 2bcb2dae3cd..279b51902e7 100644
--- a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
+++ b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
@@ -30,9 +30,9 @@
 
 import java.util.ArrayList;
 
-class PreviewPlural {
+class PreviewPluralAdditional {
     void test() {
-        new Bar();
+        new PreviewPluralAdditionalBar();
         new ArrayList<>();
     }
 }
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java
similarity index 97%
rename from test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java
rename to test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java
index 0b243569554..5825e9b30d8 100644
--- a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java
+++ b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java
@@ -25,7 +25,7 @@
 
 import java.util.ArrayList;
 
-class Bar {
+class PreviewPluralAdditionalBar {
     Runnable r = () -> {};
     void test() {
         new ArrayList<>();

From 8d969b9a5440ea7d9323dba80ab9315e655f3f78 Mon Sep 17 00:00:00 2001
From: rhalade <unknown>
Date: Fri, 13 Apr 2018 09:37:01 -0700
Subject: [PATCH 158/196] 8198240: Allow cacerts test to pass when
 GTECyberTrust root expires Summary: Implemented expiry policy exception list
 Reviewed-by: mullan

---
 .../lib/security/cacerts/VerifyCACerts.java   | 345 +++++++++---------
 1 file changed, 177 insertions(+), 168 deletions(-)

diff --git a/test/jdk/lib/security/cacerts/VerifyCACerts.java b/test/jdk/lib/security/cacerts/VerifyCACerts.java
index 6e104ee4ab4..6c6dbf8261c 100644
--- a/test/jdk/lib/security/cacerts/VerifyCACerts.java
+++ b/test/jdk/lib/security/cacerts/VerifyCACerts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +23,7 @@
 
 /**
  * @test
- * @bug 8189131
+ * @bug 8189131 8198240
  * @requires java.runtime.name ~= "OpenJDK.*"
  * @summary Check root CA entries in cacerts file
  */
@@ -40,175 +40,181 @@ public class VerifyCACerts {
             = System.getProperty("java.home") + File.separator + "lib"
             + File.separator + "security" + File.separator + "cacerts";
 
-    private static final String BASE = System.getProperty("test.src", "./");
-
     // The numbers of certs now.
     private static final int COUNT = 80;
 
     // map of cert alias to SHA-256 fingerprint
     private static final Map<String, String> FINGERPRINT_MAP
-            = new HashMap<String, String>() {{
-        put("actalisauthenticationrootca [jdk]",
-                "55:92:60:84:EC:96:3A:64:B9:6E:2A:BE:01:CE:0B:A8:6A:64:FB:FE:BC:C7:AA:B5:AF:C1:55:B3:7F:D7:60:66");
-        put("buypassclass2ca [jdk]",
-                "9A:11:40:25:19:7C:5B:B9:5D:94:E6:3D:55:CD:43:79:08:47:B6:46:B2:3C:DF:11:AD:A4:A0:0E:FF:15:FB:48");
-        put("buypassclass3ca [jdk]",
-                "ED:F7:EB:BC:A2:7A:2A:38:4D:38:7B:7D:40:10:C6:66:E2:ED:B4:84:3E:4C:29:B4:AE:1D:5B:93:32:E6:B2:4D");
-        put("camerfirmachambersca [jdk]",
-                "06:3E:4A:FA:C4:91:DF:D3:32:F3:08:9B:85:42:E9:46:17:D8:93:D7:FE:94:4E:10:A7:93:7E:E2:9D:96:93:C0");
-        put("camerfirmachambersignca [jdk]",
-                "13:63:35:43:93:34:A7:69:80:16:A0:D3:24:DE:72:28:4E:07:9D:7B:52:20:BB:8F:BD:74:78:16:EE:BE:BA:CA");
-        put("camerfirmachamberscommerceca [jdk]",
-                "0C:25:8A:12:A5:67:4A:EF:25:F2:8B:A7:DC:FA:EC:EE:A3:48:E5:41:E6:F5:CC:4E:E6:3B:71:B3:61:60:6A:C3");
-        put("certumca [jdk]",
-                "D8:E0:FE:BC:1D:B2:E3:8D:00:94:0F:37:D2:7D:41:34:4D:99:3E:73:4B:99:D5:65:6D:97:78:D4:D8:14:36:24");
-        put("certumtrustednetworkca [jdk]",
-                "5C:58:46:8D:55:F5:8E:49:7E:74:39:82:D2:B5:00:10:B6:D1:65:37:4A:CF:83:A7:D4:A3:2D:B7:68:C4:40:8E");
-        put("chunghwaepkirootca [jdk]",
-                "C0:A6:F4:DC:63:A2:4B:FD:CF:54:EF:2A:6A:08:2A:0A:72:DE:35:80:3E:2F:F5:FF:52:7A:E5:D8:72:06:DF:D5");
-        put("comodorsaca [jdk]",
-                "52:F0:E1:C4:E5:8E:C6:29:29:1B:60:31:7F:07:46:71:B8:5D:7E:A8:0D:5B:07:27:34:63:53:4B:32:B4:02:34");
-        put("comodoaaaca [jdk]",
-                "D7:A7:A0:FB:5D:7E:27:31:D7:71:E9:48:4E:BC:DE:F7:1D:5F:0C:3E:0A:29:48:78:2B:C8:3E:E0:EA:69:9E:F4");
-        put("comodoeccca [jdk]",
-                "17:93:92:7A:06:14:54:97:89:AD:CE:2F:8F:34:F7:F0:B6:6D:0F:3A:E3:A3:B8:4D:21:EC:15:DB:BA:4F:AD:C7");
-        put("usertrustrsaca [jdk]",
-                "E7:93:C9:B0:2F:D8:AA:13:E2:1C:31:22:8A:CC:B0:81:19:64:3B:74:9C:89:89:64:B1:74:6D:46:C3:D4:CB:D2");
-        put("usertrusteccca [jdk]",
-                "4F:F4:60:D5:4B:9C:86:DA:BF:BC:FC:57:12:E0:40:0D:2B:ED:3F:BC:4D:4F:BD:AA:86:E0:6A:DC:D2:A9:AD:7A");
-        put("utnuserfirstobjectca [jdk]",
-                "6F:FF:78:E4:00:A7:0C:11:01:1C:D8:59:77:C4:59:FB:5A:F9:6A:3D:F0:54:08:20:D0:F4:B8:60:78:75:E5:8F");
-        put("utnuserfirstclientauthemailca [jdk]",
-                "43:F2:57:41:2D:44:0D:62:74:76:97:4F:87:7D:A8:F1:FC:24:44:56:5A:36:7A:E6:0E:DD:C2:7A:41:25:31:AE");
-        put("utnuserfirsthardwareca [jdk]",
-                "6E:A5:47:41:D0:04:66:7E:ED:1B:48:16:63:4A:A3:A7:9E:6E:4B:96:95:0F:82:79:DA:FC:8D:9B:D8:81:21:37");
-        put("addtrustclass1ca [jdk]",
-                "8C:72:09:27:9A:C0:4E:27:5E:16:D0:7F:D3:B7:75:E8:01:54:B5:96:80:46:E3:1F:52:DD:25:76:63:24:E9:A7");
-        put("addtrustexternalca [jdk]",
-                "68:7F:A4:51:38:22:78:FF:F0:C8:B1:1F:8D:43:D5:76:67:1C:6E:B2:BC:EA:B4:13:FB:83:D9:65:D0:6D:2F:F2");
-        put("addtrustqualifiedca [jdk]",
-                "80:95:21:08:05:DB:4B:BC:35:5E:44:28:D8:FD:6E:C2:CD:E3:AB:5F:B9:7A:99:42:98:8E:B8:F4:DC:D0:60:16");
-        put("baltimorecybertrustca [jdk]",
-                "16:AF:57:A9:F6:76:B0:AB:12:60:95:AA:5E:BA:DE:F2:2A:B3:11:19:D6:44:AC:95:CD:4B:93:DB:F3:F2:6A:EB");
-        put("baltimorecodesigningca [jdk]",
-                "A9:15:45:DB:D2:E1:9C:4C:CD:F9:09:AA:71:90:0D:18:C7:35:1C:89:B3:15:F0:F1:3D:05:C1:3A:8F:FB:46:87");
-        put("digicertglobalrootca [jdk]",
-                "43:48:A0:E9:44:4C:78:CB:26:5E:05:8D:5E:89:44:B4:D8:4F:96:62:BD:26:DB:25:7F:89:34:A4:43:C7:01:61");
-        put("digicertglobalrootg2 [jdk]",
-                "CB:3C:CB:B7:60:31:E5:E0:13:8F:8D:D3:9A:23:F9:DE:47:FF:C3:5E:43:C1:14:4C:EA:27:D4:6A:5A:B1:CB:5F");
-        put("digicertglobalrootg3 [jdk]",
-                "31:AD:66:48:F8:10:41:38:C7:38:F3:9E:A4:32:01:33:39:3E:3A:18:CC:02:29:6E:F9:7C:2A:C9:EF:67:31:D0");
-        put("digicerttrustedrootg4 [jdk]",
-                "55:2F:7B:DC:F1:A7:AF:9E:6C:E6:72:01:7F:4F:12:AB:F7:72:40:C7:8E:76:1A:C2:03:D1:D9:D2:0A:C8:99:88");
-        put("digicertassuredidrootca [jdk]",
-                "3E:90:99:B5:01:5E:8F:48:6C:00:BC:EA:9D:11:1E:E7:21:FA:BA:35:5A:89:BC:F1:DF:69:56:1E:3D:C6:32:5C");
-        put("digicertassuredidg2 [jdk]",
-                "7D:05:EB:B6:82:33:9F:8C:94:51:EE:09:4E:EB:FE:FA:79:53:A1:14:ED:B2:F4:49:49:45:2F:AB:7D:2F:C1:85");
-        put("digicertassuredidg3 [jdk]",
-                "7E:37:CB:8B:4C:47:09:0C:AB:36:55:1B:A6:F4:5D:B8:40:68:0F:BA:16:6A:95:2D:B1:00:71:7F:43:05:3F:C2");
-        put("digicerthighassuranceevrootca [jdk]",
-                "74:31:E5:F4:C3:C1:CE:46:90:77:4F:0B:61:E0:54:40:88:3B:A9:A0:1E:D0:0B:A6:AB:D7:80:6E:D3:B1:18:CF");
-        put("equifaxsecureca [jdk]",
-                "08:29:7A:40:47:DB:A2:36:80:C7:31:DB:6E:31:76:53:CA:78:48:E1:BE:BD:3A:0B:01:79:A7:07:F9:2C:F1:78");
-        put("equifaxsecureebusinessca1 [jdk]",
-                "2E:3A:2B:B5:11:25:05:83:6C:A8:96:8B:E2:CB:37:27:CE:9B:56:84:5C:6E:E9:8E:91:85:10:4A:FB:9A:F5:96");
-        put("equifaxsecureglobalebusinessca1 [jdk]",
-                "86:AB:5A:65:71:D3:32:9A:BC:D2:E4:E6:37:66:8B:A8:9C:73:1E:C2:93:B6:CB:A6:0F:71:63:40:A0:91:CE:AE");
-        put("geotrustglobalca [jdk]",
-                "FF:85:6A:2D:25:1D:CD:88:D3:66:56:F4:50:12:67:98:CF:AB:AA:DE:40:79:9C:72:2D:E4:D2:B5:DB:36:A7:3A");
-        put("geotrustprimaryca [jdk]",
-                "37:D5:10:06:C5:12:EA:AB:62:64:21:F1:EC:8C:92:01:3F:C5:F8:2A:E9:8E:E5:33:EB:46:19:B8:DE:B4:D0:6C");
-        put("geotrustprimarycag2 [jdk]",
-                "5E:DB:7A:C4:3B:82:A0:6A:87:61:E8:D7:BE:49:79:EB:F2:61:1F:7D:D7:9B:F9:1C:1C:6B:56:6A:21:9E:D7:66");
-        put("geotrustprimarycag3 [jdk]",
-                "B4:78:B8:12:25:0D:F8:78:63:5C:2A:A7:EC:7D:15:5E:AA:62:5E:E8:29:16:E2:CD:29:43:61:88:6C:D1:FB:D4");
-        put("geotrustuniversalca [jdk]",
-                "A0:45:9B:9F:63:B2:25:59:F5:FA:5D:4C:6D:B3:F9:F7:2F:F1:93:42:03:35:78:F0:73:BF:1D:1B:46:CB:B9:12");
-        put("gtecybertrustglobalca [jdk]",
-                "A5:31:25:18:8D:21:10:AA:96:4B:02:C7:B7:C6:DA:32:03:17:08:94:E5:FB:71:FF:FB:66:67:D5:E6:81:0A:36");
-        put("thawteprimaryrootca [jdk]",
-                "8D:72:2F:81:A9:C1:13:C0:79:1D:F1:36:A2:96:6D:B2:6C:95:0A:97:1D:B4:6B:41:99:F4:EA:54:B7:8B:FB:9F");
-        put("thawteprimaryrootcag2 [jdk]",
-                "A4:31:0D:50:AF:18:A6:44:71:90:37:2A:86:AF:AF:8B:95:1F:FB:43:1D:83:7F:1E:56:88:B4:59:71:ED:15:57");
-        put("thawteprimaryrootcag3 [jdk]",
-                "4B:03:F4:58:07:AD:70:F2:1B:FC:2C:AE:71:C9:FD:E4:60:4C:06:4C:F5:FF:B6:86:BA:E5:DB:AA:D7:FD:D3:4C");
-        put("thawtepremiumserverca [jdk]",
-                "3F:9F:27:D5:83:20:4B:9E:09:C8:A3:D2:06:6C:4B:57:D3:A2:47:9C:36:93:65:08:80:50:56:98:10:5D:BC:E9");
-        put("verisigntsaca [jdk]",
-                "CB:6B:05:D9:E8:E5:7C:D8:82:B1:0B:4D:B7:0D:E4:BB:1D:E4:2B:A4:8A:7B:D0:31:8B:63:5B:F6:E7:78:1A:9D");
-        put("verisignclass1ca [jdk]",
-                "51:84:7C:8C:BD:2E:9A:72:C9:1E:29:2D:2A:E2:47:D7:DE:1E:3F:D2:70:54:7A:20:EF:7D:61:0F:38:B8:84:2C");
-        put("verisignclass1g2ca [jdk]",
-                "34:1D:E9:8B:13:92:AB:F7:F4:AB:90:A9:60:CF:25:D4:BD:6E:C6:5B:9A:51:CE:6E:D0:67:D0:0E:C7:CE:9B:7F");
-        put("verisignclass1g3ca [jdk]",
-                "CB:B5:AF:18:5E:94:2A:24:02:F9:EA:CB:C0:ED:5B:B8:76:EE:A3:C1:22:36:23:D0:04:47:E4:F3:BA:55:4B:65");
-        put("verisignclass2g2ca [jdk]",
-                "3A:43:E2:20:FE:7F:3E:A9:65:3D:1E:21:74:2E:AC:2B:75:C2:0F:D8:98:03:05:BC:50:2C:AF:8C:2D:9B:41:A1");
-        put("verisignclass2g3ca [jdk]",
-                "92:A9:D9:83:3F:E1:94:4D:B3:66:E8:BF:AE:7A:95:B6:48:0C:2D:6C:6C:2A:1B:E6:5D:42:36:B6:08:FC:A1:BB");
-        put("verisignclass3ca [jdk]",
-                "A4:B6:B3:99:6F:C2:F3:06:B3:FD:86:81:BD:63:41:3D:8C:50:09:CC:4F:A3:29:C2:CC:F0:E2:FA:1B:14:03:05");
-        put("verisignclass3g2ca [jdk]",
-                "83:CE:3C:12:29:68:8A:59:3D:48:5F:81:97:3C:0F:91:95:43:1E:DA:37:CC:5E:36:43:0E:79:C7:A8:88:63:8B");
-        put("verisignuniversalrootca [jdk]",
-                "23:99:56:11:27:A5:71:25:DE:8C:EF:EA:61:0D:DF:2F:A0:78:B5:C8:06:7F:4E:82:82:90:BF:B8:60:E8:4B:3C");
-        put("verisignclass3g3ca [jdk]",
-                "EB:04:CF:5E:B1:F3:9A:FA:76:2F:2B:B1:20:F2:96:CB:A5:20:C1:B9:7D:B1:58:95:65:B8:1C:B9:A1:7B:72:44");
-        put("verisignclass3g4ca [jdk]",
-                "69:DD:D7:EA:90:BB:57:C9:3E:13:5D:C8:5E:A6:FC:D5:48:0B:60:32:39:BD:C4:54:FC:75:8B:2A:26:CF:7F:79");
-        put("verisignclass3g5ca [jdk]",
-                "9A:CF:AB:7E:43:C8:D8:80:D0:6B:26:2A:94:DE:EE:E4:B4:65:99:89:C3:D0:CA:F1:9B:AF:64:05:E4:1A:B7:DF");
-        put("certplusclass2primaryca [jdk]",
-                "0F:99:3C:8A:EF:97:BA:AF:56:87:14:0E:D5:9A:D1:82:1B:B4:AF:AC:F0:AA:9A:58:B5:D5:7A:33:8A:3A:FB:CB");
-        put("certplusclass3pprimaryca [jdk]",
-                "CC:C8:94:89:37:1B:AD:11:1C:90:61:9B:EA:24:0A:2E:6D:AD:D9:9F:9F:6E:1D:4D:41:E5:8E:D6:DE:3D:02:85");
-        put("keynectisrootca [jdk]",
-                "42:10:F1:99:49:9A:9A:C3:3C:8D:E0:2B:A6:DB:AA:14:40:8B:DD:8A:6E:32:46:89:C1:92:2D:06:97:15:A3:32");
-        put("dtrustclass3ca2 [jdk]",
-                "49:E7:A4:42:AC:F0:EA:62:87:05:00:54:B5:25:64:B6:50:E4:F4:9E:42:E3:48:D6:AA:38:E0:39:E9:57:B1:C1");
-        put("dtrustclass3ca2ev [jdk]",
-                "EE:C5:49:6B:98:8C:E9:86:25:B9:34:09:2E:EC:29:08:BE:D0:B0:F3:16:C2:D4:73:0C:84:EA:F1:F3:D3:48:81");
-        put("identrustdstx3 [jdk]",
-                "06:87:26:03:31:A7:24:03:D9:09:F1:05:E6:9B:CF:0D:32:E1:BD:24:93:FF:C6:D9:20:6D:11:BC:D6:77:07:39");
-        put("identrustpublicca [jdk]",
-                "30:D0:89:5A:9A:44:8A:26:20:91:63:55:22:D1:F5:20:10:B5:86:7A:CA:E1:2C:78:EF:95:8F:D4:F4:38:9F:2F");
-        put("identrustcommercial [jdk]",
-                "5D:56:49:9B:E4:D2:E0:8B:CF:CA:D0:8A:3E:38:72:3D:50:50:3B:DE:70:69:48:E4:2F:55:60:30:19:E5:28:AE");
-        put("letsencryptisrgx1 [jdk]",
-                "96:BC:EC:06:26:49:76:F3:74:60:77:9A:CF:28:C5:A7:CF:E8:A3:C0:AA:E1:1A:8F:FC:EE:05:C0:BD:DF:08:C6");
-        put("luxtrustglobalrootca [jdk]",
-                "A1:B2:DB:EB:64:E7:06:C6:16:9E:3C:41:18:B2:3B:AA:09:01:8A:84:27:66:6D:8B:F0:E2:88:91:EC:05:19:50");
-        put("quovadisrootca [jdk]",
-                "A4:5E:DE:3B:BB:F0:9C:8A:E1:5C:72:EF:C0:72:68:D6:93:A2:1C:99:6F:D5:1E:67:CA:07:94:60:FD:6D:88:73");
-        put("quovadisrootca1g3 [jdk]",
-                "8A:86:6F:D1:B2:76:B5:7E:57:8E:92:1C:65:82:8A:2B:ED:58:E9:F2:F2:88:05:41:34:B7:F1:F4:BF:C9:CC:74");
-        put("quovadisrootca2 [jdk]",
-                "85:A0:DD:7D:D7:20:AD:B7:FF:05:F8:3D:54:2B:20:9D:C7:FF:45:28:F7:D6:77:B1:83:89:FE:A5:E5:C4:9E:86");
-        put("quovadisrootca2g3 [jdk]",
-                "8F:E4:FB:0A:F9:3A:4D:0D:67:DB:0B:EB:B2:3E:37:C7:1B:F3:25:DC:BC:DD:24:0E:A0:4D:AF:58:B4:7E:18:40");
-        put("quovadisrootca3 [jdk]",
-                "18:F1:FC:7F:20:5D:F8:AD:DD:EB:7F:E0:07:DD:57:E3:AF:37:5A:9C:4D:8D:73:54:6B:F4:F1:FE:D1:E1:8D:35");
-        put("quovadisrootca3g3 [jdk]",
-                "88:EF:81:DE:20:2E:B0:18:45:2E:43:F8:64:72:5C:EA:5F:BD:1F:C2:D9:D2:05:73:07:09:C5:D8:B8:69:0F:46");
-        put("secomscrootca1 [jdk]",
-                "E7:5E:72:ED:9F:56:0E:EC:6E:B4:80:00:73:A4:3F:C3:AD:19:19:5A:39:22:82:01:78:95:97:4A:99:02:6B:6C");
-        put("secomscrootca2 [jdk]",
-                "51:3B:2C:EC:B8:10:D4:CD:E5:DD:85:39:1A:DF:C6:C2:DD:60:D8:7B:B7:36:D2:B5:21:48:4A:A4:7A:0E:BE:F6");
-        put("secomevrootca1 [jdk]",
-                "A2:2D:BA:68:1E:97:37:6E:2D:39:7D:72:8A:AE:3A:9B:62:96:B9:FD:BA:60:BC:2E:11:F6:47:F2:C6:75:FB:37");
-        put("swisssigngoldg2ca [jdk]",
-                "62:DD:0B:E9:B9:F5:0A:16:3E:A0:F8:E7:5C:05:3B:1E:CA:57:EA:55:C8:68:8F:64:7C:68:81:F2:C8:35:7B:95");
-        put("swisssignplatinumg2ca [jdk]",
-                "3B:22:2E:56:67:11:E9:92:30:0D:C0:B1:5A:B9:47:3D:AF:DE:F8:C8:4D:0C:EF:7D:33:17:B4:C1:82:1D:14:36");
-        put("swisssignsilverg2ca [jdk]",
-                "BE:6C:4D:A2:BB:B9:BA:59:B6:F3:93:97:68:37:42:46:C3:C0:05:99:3F:A9:8F:02:0D:1D:ED:BE:D4:8A:81:D5");
-        put("soneraclass2ca [jdk]",
-                "79:08:B4:03:14:C1:38:10:0B:51:8D:07:35:80:7F:FB:FC:F8:51:8A:00:95:33:71:05:BA:38:6B:15:3D:D9:27");
-        put("securetrustca [jdk]",
-                "F1:C1:B5:0A:E5:A2:0D:D8:03:0E:C9:F6:BC:24:82:3D:D3:67:B5:25:57:59:B4:E7:1B:61:FC:E9:F7:37:5D:73");
-        put("xrampglobalca [jdk]",
-                "CE:CD:DC:90:50:99:D8:DA:DF:C5:B1:D2:09:B7:37:CB:E2:C1:8C:FB:2C:10:C0:FF:0B:CF:0D:32:86:FC:1A:A2");
-    }};
+            = new HashMap<String, String>() {
+        {
+            put("actalisauthenticationrootca [jdk]",
+                    "55:92:60:84:EC:96:3A:64:B9:6E:2A:BE:01:CE:0B:A8:6A:64:FB:FE:BC:C7:AA:B5:AF:C1:55:B3:7F:D7:60:66");
+            put("buypassclass2ca [jdk]",
+                    "9A:11:40:25:19:7C:5B:B9:5D:94:E6:3D:55:CD:43:79:08:47:B6:46:B2:3C:DF:11:AD:A4:A0:0E:FF:15:FB:48");
+            put("buypassclass3ca [jdk]",
+                    "ED:F7:EB:BC:A2:7A:2A:38:4D:38:7B:7D:40:10:C6:66:E2:ED:B4:84:3E:4C:29:B4:AE:1D:5B:93:32:E6:B2:4D");
+            put("camerfirmachambersca [jdk]",
+                    "06:3E:4A:FA:C4:91:DF:D3:32:F3:08:9B:85:42:E9:46:17:D8:93:D7:FE:94:4E:10:A7:93:7E:E2:9D:96:93:C0");
+            put("camerfirmachambersignca [jdk]",
+                    "13:63:35:43:93:34:A7:69:80:16:A0:D3:24:DE:72:28:4E:07:9D:7B:52:20:BB:8F:BD:74:78:16:EE:BE:BA:CA");
+            put("camerfirmachamberscommerceca [jdk]",
+                    "0C:25:8A:12:A5:67:4A:EF:25:F2:8B:A7:DC:FA:EC:EE:A3:48:E5:41:E6:F5:CC:4E:E6:3B:71:B3:61:60:6A:C3");
+            put("certumca [jdk]",
+                    "D8:E0:FE:BC:1D:B2:E3:8D:00:94:0F:37:D2:7D:41:34:4D:99:3E:73:4B:99:D5:65:6D:97:78:D4:D8:14:36:24");
+            put("certumtrustednetworkca [jdk]",
+                    "5C:58:46:8D:55:F5:8E:49:7E:74:39:82:D2:B5:00:10:B6:D1:65:37:4A:CF:83:A7:D4:A3:2D:B7:68:C4:40:8E");
+            put("chunghwaepkirootca [jdk]",
+                    "C0:A6:F4:DC:63:A2:4B:FD:CF:54:EF:2A:6A:08:2A:0A:72:DE:35:80:3E:2F:F5:FF:52:7A:E5:D8:72:06:DF:D5");
+            put("comodorsaca [jdk]",
+                    "52:F0:E1:C4:E5:8E:C6:29:29:1B:60:31:7F:07:46:71:B8:5D:7E:A8:0D:5B:07:27:34:63:53:4B:32:B4:02:34");
+            put("comodoaaaca [jdk]",
+                    "D7:A7:A0:FB:5D:7E:27:31:D7:71:E9:48:4E:BC:DE:F7:1D:5F:0C:3E:0A:29:48:78:2B:C8:3E:E0:EA:69:9E:F4");
+            put("comodoeccca [jdk]",
+                    "17:93:92:7A:06:14:54:97:89:AD:CE:2F:8F:34:F7:F0:B6:6D:0F:3A:E3:A3:B8:4D:21:EC:15:DB:BA:4F:AD:C7");
+            put("usertrustrsaca [jdk]",
+                    "E7:93:C9:B0:2F:D8:AA:13:E2:1C:31:22:8A:CC:B0:81:19:64:3B:74:9C:89:89:64:B1:74:6D:46:C3:D4:CB:D2");
+            put("usertrusteccca [jdk]",
+                    "4F:F4:60:D5:4B:9C:86:DA:BF:BC:FC:57:12:E0:40:0D:2B:ED:3F:BC:4D:4F:BD:AA:86:E0:6A:DC:D2:A9:AD:7A");
+            put("utnuserfirstobjectca [jdk]",
+                    "6F:FF:78:E4:00:A7:0C:11:01:1C:D8:59:77:C4:59:FB:5A:F9:6A:3D:F0:54:08:20:D0:F4:B8:60:78:75:E5:8F");
+            put("utnuserfirstclientauthemailca [jdk]",
+                    "43:F2:57:41:2D:44:0D:62:74:76:97:4F:87:7D:A8:F1:FC:24:44:56:5A:36:7A:E6:0E:DD:C2:7A:41:25:31:AE");
+            put("utnuserfirsthardwareca [jdk]",
+                    "6E:A5:47:41:D0:04:66:7E:ED:1B:48:16:63:4A:A3:A7:9E:6E:4B:96:95:0F:82:79:DA:FC:8D:9B:D8:81:21:37");
+            put("addtrustclass1ca [jdk]",
+                    "8C:72:09:27:9A:C0:4E:27:5E:16:D0:7F:D3:B7:75:E8:01:54:B5:96:80:46:E3:1F:52:DD:25:76:63:24:E9:A7");
+            put("addtrustexternalca [jdk]",
+                    "68:7F:A4:51:38:22:78:FF:F0:C8:B1:1F:8D:43:D5:76:67:1C:6E:B2:BC:EA:B4:13:FB:83:D9:65:D0:6D:2F:F2");
+            put("addtrustqualifiedca [jdk]",
+                    "80:95:21:08:05:DB:4B:BC:35:5E:44:28:D8:FD:6E:C2:CD:E3:AB:5F:B9:7A:99:42:98:8E:B8:F4:DC:D0:60:16");
+            put("baltimorecybertrustca [jdk]",
+                    "16:AF:57:A9:F6:76:B0:AB:12:60:95:AA:5E:BA:DE:F2:2A:B3:11:19:D6:44:AC:95:CD:4B:93:DB:F3:F2:6A:EB");
+            put("baltimorecodesigningca [jdk]",
+                    "A9:15:45:DB:D2:E1:9C:4C:CD:F9:09:AA:71:90:0D:18:C7:35:1C:89:B3:15:F0:F1:3D:05:C1:3A:8F:FB:46:87");
+            put("digicertglobalrootca [jdk]",
+                    "43:48:A0:E9:44:4C:78:CB:26:5E:05:8D:5E:89:44:B4:D8:4F:96:62:BD:26:DB:25:7F:89:34:A4:43:C7:01:61");
+            put("digicertglobalrootg2 [jdk]",
+                    "CB:3C:CB:B7:60:31:E5:E0:13:8F:8D:D3:9A:23:F9:DE:47:FF:C3:5E:43:C1:14:4C:EA:27:D4:6A:5A:B1:CB:5F");
+            put("digicertglobalrootg3 [jdk]",
+                    "31:AD:66:48:F8:10:41:38:C7:38:F3:9E:A4:32:01:33:39:3E:3A:18:CC:02:29:6E:F9:7C:2A:C9:EF:67:31:D0");
+            put("digicerttrustedrootg4 [jdk]",
+                    "55:2F:7B:DC:F1:A7:AF:9E:6C:E6:72:01:7F:4F:12:AB:F7:72:40:C7:8E:76:1A:C2:03:D1:D9:D2:0A:C8:99:88");
+            put("digicertassuredidrootca [jdk]",
+                    "3E:90:99:B5:01:5E:8F:48:6C:00:BC:EA:9D:11:1E:E7:21:FA:BA:35:5A:89:BC:F1:DF:69:56:1E:3D:C6:32:5C");
+            put("digicertassuredidg2 [jdk]",
+                    "7D:05:EB:B6:82:33:9F:8C:94:51:EE:09:4E:EB:FE:FA:79:53:A1:14:ED:B2:F4:49:49:45:2F:AB:7D:2F:C1:85");
+            put("digicertassuredidg3 [jdk]",
+                    "7E:37:CB:8B:4C:47:09:0C:AB:36:55:1B:A6:F4:5D:B8:40:68:0F:BA:16:6A:95:2D:B1:00:71:7F:43:05:3F:C2");
+            put("digicerthighassuranceevrootca [jdk]",
+                    "74:31:E5:F4:C3:C1:CE:46:90:77:4F:0B:61:E0:54:40:88:3B:A9:A0:1E:D0:0B:A6:AB:D7:80:6E:D3:B1:18:CF");
+            put("equifaxsecureca [jdk]",
+                    "08:29:7A:40:47:DB:A2:36:80:C7:31:DB:6E:31:76:53:CA:78:48:E1:BE:BD:3A:0B:01:79:A7:07:F9:2C:F1:78");
+            put("equifaxsecureebusinessca1 [jdk]",
+                    "2E:3A:2B:B5:11:25:05:83:6C:A8:96:8B:E2:CB:37:27:CE:9B:56:84:5C:6E:E9:8E:91:85:10:4A:FB:9A:F5:96");
+            put("equifaxsecureglobalebusinessca1 [jdk]",
+                    "86:AB:5A:65:71:D3:32:9A:BC:D2:E4:E6:37:66:8B:A8:9C:73:1E:C2:93:B6:CB:A6:0F:71:63:40:A0:91:CE:AE");
+            put("geotrustglobalca [jdk]",
+                    "FF:85:6A:2D:25:1D:CD:88:D3:66:56:F4:50:12:67:98:CF:AB:AA:DE:40:79:9C:72:2D:E4:D2:B5:DB:36:A7:3A");
+            put("geotrustprimaryca [jdk]",
+                    "37:D5:10:06:C5:12:EA:AB:62:64:21:F1:EC:8C:92:01:3F:C5:F8:2A:E9:8E:E5:33:EB:46:19:B8:DE:B4:D0:6C");
+            put("geotrustprimarycag2 [jdk]",
+                    "5E:DB:7A:C4:3B:82:A0:6A:87:61:E8:D7:BE:49:79:EB:F2:61:1F:7D:D7:9B:F9:1C:1C:6B:56:6A:21:9E:D7:66");
+            put("geotrustprimarycag3 [jdk]",
+                    "B4:78:B8:12:25:0D:F8:78:63:5C:2A:A7:EC:7D:15:5E:AA:62:5E:E8:29:16:E2:CD:29:43:61:88:6C:D1:FB:D4");
+            put("geotrustuniversalca [jdk]",
+                    "A0:45:9B:9F:63:B2:25:59:F5:FA:5D:4C:6D:B3:F9:F7:2F:F1:93:42:03:35:78:F0:73:BF:1D:1B:46:CB:B9:12");
+            put("gtecybertrustglobalca [jdk]",
+                    "A5:31:25:18:8D:21:10:AA:96:4B:02:C7:B7:C6:DA:32:03:17:08:94:E5:FB:71:FF:FB:66:67:D5:E6:81:0A:36");
+            put("thawteprimaryrootca [jdk]",
+                    "8D:72:2F:81:A9:C1:13:C0:79:1D:F1:36:A2:96:6D:B2:6C:95:0A:97:1D:B4:6B:41:99:F4:EA:54:B7:8B:FB:9F");
+            put("thawteprimaryrootcag2 [jdk]",
+                    "A4:31:0D:50:AF:18:A6:44:71:90:37:2A:86:AF:AF:8B:95:1F:FB:43:1D:83:7F:1E:56:88:B4:59:71:ED:15:57");
+            put("thawteprimaryrootcag3 [jdk]",
+                    "4B:03:F4:58:07:AD:70:F2:1B:FC:2C:AE:71:C9:FD:E4:60:4C:06:4C:F5:FF:B6:86:BA:E5:DB:AA:D7:FD:D3:4C");
+            put("thawtepremiumserverca [jdk]",
+                    "3F:9F:27:D5:83:20:4B:9E:09:C8:A3:D2:06:6C:4B:57:D3:A2:47:9C:36:93:65:08:80:50:56:98:10:5D:BC:E9");
+            put("verisigntsaca [jdk]",
+                    "CB:6B:05:D9:E8:E5:7C:D8:82:B1:0B:4D:B7:0D:E4:BB:1D:E4:2B:A4:8A:7B:D0:31:8B:63:5B:F6:E7:78:1A:9D");
+            put("verisignclass1ca [jdk]",
+                    "51:84:7C:8C:BD:2E:9A:72:C9:1E:29:2D:2A:E2:47:D7:DE:1E:3F:D2:70:54:7A:20:EF:7D:61:0F:38:B8:84:2C");
+            put("verisignclass1g2ca [jdk]",
+                    "34:1D:E9:8B:13:92:AB:F7:F4:AB:90:A9:60:CF:25:D4:BD:6E:C6:5B:9A:51:CE:6E:D0:67:D0:0E:C7:CE:9B:7F");
+            put("verisignclass1g3ca [jdk]",
+                    "CB:B5:AF:18:5E:94:2A:24:02:F9:EA:CB:C0:ED:5B:B8:76:EE:A3:C1:22:36:23:D0:04:47:E4:F3:BA:55:4B:65");
+            put("verisignclass2g2ca [jdk]",
+                    "3A:43:E2:20:FE:7F:3E:A9:65:3D:1E:21:74:2E:AC:2B:75:C2:0F:D8:98:03:05:BC:50:2C:AF:8C:2D:9B:41:A1");
+            put("verisignclass2g3ca [jdk]",
+                    "92:A9:D9:83:3F:E1:94:4D:B3:66:E8:BF:AE:7A:95:B6:48:0C:2D:6C:6C:2A:1B:E6:5D:42:36:B6:08:FC:A1:BB");
+            put("verisignclass3ca [jdk]",
+                    "A4:B6:B3:99:6F:C2:F3:06:B3:FD:86:81:BD:63:41:3D:8C:50:09:CC:4F:A3:29:C2:CC:F0:E2:FA:1B:14:03:05");
+            put("verisignclass3g2ca [jdk]",
+                    "83:CE:3C:12:29:68:8A:59:3D:48:5F:81:97:3C:0F:91:95:43:1E:DA:37:CC:5E:36:43:0E:79:C7:A8:88:63:8B");
+            put("verisignuniversalrootca [jdk]",
+                    "23:99:56:11:27:A5:71:25:DE:8C:EF:EA:61:0D:DF:2F:A0:78:B5:C8:06:7F:4E:82:82:90:BF:B8:60:E8:4B:3C");
+            put("verisignclass3g3ca [jdk]",
+                    "EB:04:CF:5E:B1:F3:9A:FA:76:2F:2B:B1:20:F2:96:CB:A5:20:C1:B9:7D:B1:58:95:65:B8:1C:B9:A1:7B:72:44");
+            put("verisignclass3g4ca [jdk]",
+                    "69:DD:D7:EA:90:BB:57:C9:3E:13:5D:C8:5E:A6:FC:D5:48:0B:60:32:39:BD:C4:54:FC:75:8B:2A:26:CF:7F:79");
+            put("verisignclass3g5ca [jdk]",
+                    "9A:CF:AB:7E:43:C8:D8:80:D0:6B:26:2A:94:DE:EE:E4:B4:65:99:89:C3:D0:CA:F1:9B:AF:64:05:E4:1A:B7:DF");
+            put("certplusclass2primaryca [jdk]",
+                    "0F:99:3C:8A:EF:97:BA:AF:56:87:14:0E:D5:9A:D1:82:1B:B4:AF:AC:F0:AA:9A:58:B5:D5:7A:33:8A:3A:FB:CB");
+            put("certplusclass3pprimaryca [jdk]",
+                    "CC:C8:94:89:37:1B:AD:11:1C:90:61:9B:EA:24:0A:2E:6D:AD:D9:9F:9F:6E:1D:4D:41:E5:8E:D6:DE:3D:02:85");
+            put("keynectisrootca [jdk]",
+                    "42:10:F1:99:49:9A:9A:C3:3C:8D:E0:2B:A6:DB:AA:14:40:8B:DD:8A:6E:32:46:89:C1:92:2D:06:97:15:A3:32");
+            put("dtrustclass3ca2 [jdk]",
+                    "49:E7:A4:42:AC:F0:EA:62:87:05:00:54:B5:25:64:B6:50:E4:F4:9E:42:E3:48:D6:AA:38:E0:39:E9:57:B1:C1");
+            put("dtrustclass3ca2ev [jdk]",
+                    "EE:C5:49:6B:98:8C:E9:86:25:B9:34:09:2E:EC:29:08:BE:D0:B0:F3:16:C2:D4:73:0C:84:EA:F1:F3:D3:48:81");
+            put("identrustdstx3 [jdk]",
+                    "06:87:26:03:31:A7:24:03:D9:09:F1:05:E6:9B:CF:0D:32:E1:BD:24:93:FF:C6:D9:20:6D:11:BC:D6:77:07:39");
+            put("identrustpublicca [jdk]",
+                    "30:D0:89:5A:9A:44:8A:26:20:91:63:55:22:D1:F5:20:10:B5:86:7A:CA:E1:2C:78:EF:95:8F:D4:F4:38:9F:2F");
+            put("identrustcommercial [jdk]",
+                    "5D:56:49:9B:E4:D2:E0:8B:CF:CA:D0:8A:3E:38:72:3D:50:50:3B:DE:70:69:48:E4:2F:55:60:30:19:E5:28:AE");
+            put("letsencryptisrgx1 [jdk]",
+                    "96:BC:EC:06:26:49:76:F3:74:60:77:9A:CF:28:C5:A7:CF:E8:A3:C0:AA:E1:1A:8F:FC:EE:05:C0:BD:DF:08:C6");
+            put("luxtrustglobalrootca [jdk]",
+                    "A1:B2:DB:EB:64:E7:06:C6:16:9E:3C:41:18:B2:3B:AA:09:01:8A:84:27:66:6D:8B:F0:E2:88:91:EC:05:19:50");
+            put("quovadisrootca [jdk]",
+                    "A4:5E:DE:3B:BB:F0:9C:8A:E1:5C:72:EF:C0:72:68:D6:93:A2:1C:99:6F:D5:1E:67:CA:07:94:60:FD:6D:88:73");
+            put("quovadisrootca1g3 [jdk]",
+                    "8A:86:6F:D1:B2:76:B5:7E:57:8E:92:1C:65:82:8A:2B:ED:58:E9:F2:F2:88:05:41:34:B7:F1:F4:BF:C9:CC:74");
+            put("quovadisrootca2 [jdk]",
+                    "85:A0:DD:7D:D7:20:AD:B7:FF:05:F8:3D:54:2B:20:9D:C7:FF:45:28:F7:D6:77:B1:83:89:FE:A5:E5:C4:9E:86");
+            put("quovadisrootca2g3 [jdk]",
+                    "8F:E4:FB:0A:F9:3A:4D:0D:67:DB:0B:EB:B2:3E:37:C7:1B:F3:25:DC:BC:DD:24:0E:A0:4D:AF:58:B4:7E:18:40");
+            put("quovadisrootca3 [jdk]",
+                    "18:F1:FC:7F:20:5D:F8:AD:DD:EB:7F:E0:07:DD:57:E3:AF:37:5A:9C:4D:8D:73:54:6B:F4:F1:FE:D1:E1:8D:35");
+            put("quovadisrootca3g3 [jdk]",
+                    "88:EF:81:DE:20:2E:B0:18:45:2E:43:F8:64:72:5C:EA:5F:BD:1F:C2:D9:D2:05:73:07:09:C5:D8:B8:69:0F:46");
+            put("secomscrootca1 [jdk]",
+                    "E7:5E:72:ED:9F:56:0E:EC:6E:B4:80:00:73:A4:3F:C3:AD:19:19:5A:39:22:82:01:78:95:97:4A:99:02:6B:6C");
+            put("secomscrootca2 [jdk]",
+                    "51:3B:2C:EC:B8:10:D4:CD:E5:DD:85:39:1A:DF:C6:C2:DD:60:D8:7B:B7:36:D2:B5:21:48:4A:A4:7A:0E:BE:F6");
+            put("secomevrootca1 [jdk]",
+                    "A2:2D:BA:68:1E:97:37:6E:2D:39:7D:72:8A:AE:3A:9B:62:96:B9:FD:BA:60:BC:2E:11:F6:47:F2:C6:75:FB:37");
+            put("swisssigngoldg2ca [jdk]",
+                    "62:DD:0B:E9:B9:F5:0A:16:3E:A0:F8:E7:5C:05:3B:1E:CA:57:EA:55:C8:68:8F:64:7C:68:81:F2:C8:35:7B:95");
+            put("swisssignplatinumg2ca [jdk]",
+                    "3B:22:2E:56:67:11:E9:92:30:0D:C0:B1:5A:B9:47:3D:AF:DE:F8:C8:4D:0C:EF:7D:33:17:B4:C1:82:1D:14:36");
+            put("swisssignsilverg2ca [jdk]",
+                    "BE:6C:4D:A2:BB:B9:BA:59:B6:F3:93:97:68:37:42:46:C3:C0:05:99:3F:A9:8F:02:0D:1D:ED:BE:D4:8A:81:D5");
+            put("soneraclass2ca [jdk]",
+                    "79:08:B4:03:14:C1:38:10:0B:51:8D:07:35:80:7F:FB:FC:F8:51:8A:00:95:33:71:05:BA:38:6B:15:3D:D9:27");
+            put("securetrustca [jdk]",
+                    "F1:C1:B5:0A:E5:A2:0D:D8:03:0E:C9:F6:BC:24:82:3D:D3:67:B5:25:57:59:B4:E7:1B:61:FC:E9:F7:37:5D:73");
+            put("xrampglobalca [jdk]",
+                    "CE:CD:DC:90:50:99:D8:DA:DF:C5:B1:D2:09:B7:37:CB:E2:C1:8C:FB:2C:10:C0:FF:0B:CF:0D:32:86:FC:1A:A2");
+        }
+    };
+
+    // Exception list to 90 days expiry policy
+    private static final HashSet<String> EXPIRY_EXC_ENTRIES
+            = new HashSet<String>(Arrays.asList(
+                    "gtecybertrustglobalca [jdk]"
+            ));
 
     // Ninety days in milliseconds
     private static final long NINETY_DAYS = 7776000000L;
@@ -278,8 +284,11 @@ public static void main(String[] args) throws Exception {
             // that cert can be scheduled to be removed/renewed.
             Date notAfter = cert.getNotAfter();
             if (notAfter.getTime() - System.currentTimeMillis() < NINETY_DAYS) {
-                atLeastOneFailed = true;
-                System.err.println("WARNING: cert will expire within 90 days");
+                if (!EXPIRY_EXC_ENTRIES.contains(alias)) {
+                    atLeastOneFailed = true;
+                    System.err.println("ERROR: cert \"" + alias + "\" expiry \""
+                            + notAfter.toString() + "\" will expire within 90 days");
+                }
             }
         }
 

From 2d388fe8e3262167426d8bdb8484e058a8223a39 Mon Sep 17 00:00:00 2001
From: naoto <unknown>
Date: Fri, 13 Apr 2018 10:23:01 -0700
Subject: [PATCH 159/196] 8201507: Generate alias entries in j.t.f.ZoneName
 from tzdb at build time Reviewed-by: erikj, rriggs

---
 make/gensrc/GensrcCLDR.gmk                    |   4 +-
 .../tools/cldrconverter/CLDRConverter.java    |  32 ++
 .../java/time/format/ZoneName.java.template   | 137 +-------
 .../time/test/java/time/format/ZoneName.java  | 306 +++++++++++-------
 4 files changed, 225 insertions(+), 254 deletions(-)

diff --git a/make/gensrc/GensrcCLDR.gmk b/make/gensrc/GensrcCLDR.gmk
index f7d3d700992..f75b04a826e 100644
--- a/make/gensrc/GensrcCLDR.gmk
+++ b/make/gensrc/GensrcCLDR.gmk
@@ -35,6 +35,7 @@ CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleD
 CLDR_BASE_LOCALES := "en-US"
 
 ZONENAME_TEMPLATE := $(TOPDIR)/src/java.base/share/classes/java/time/format/ZoneName.java.template
+TZDATA_DIR := $(TOPDIR)/make/data/tzdata
 
 $(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
     $(wildcard $(CLDRSRCDIR)/common/main/en*.xml) \
@@ -46,7 +47,8 @@ $(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
 	    -baselocales $(CLDR_BASE_LOCALES) \
 	    -o $(GENSRC_BASEDIR) \
 	    -basemodule \
-	    -zntempfile $(ZONENAME_TEMPLATE)
+	    -zntempfile $(ZONENAME_TEMPLATE) \
+	    -tzdatadir $(TZDATA_DIR)
 
 $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
     $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
index ee40d07a61f..1ec839b818b 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -28,6 +28,8 @@
 import static build.tools.cldrconverter.Bundle.jreTimeZoneNames;
 import build.tools.cldrconverter.BundleGenerator.BundleType;
 import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.*;
 import java.time.*;
 import java.util.*;
@@ -103,6 +105,7 @@ public class CLDRConverter {
 
     private static final String[] AVAILABLE_TZIDS = TimeZone.getAvailableIDs();
     private static String zoneNameTempFile;
+    private static String tzDataDir;
 
     static enum DraftType {
         UNCONFIRMED,
@@ -203,6 +206,10 @@ public static void main(String[] args) throws Exception {
                         zoneNameTempFile = args[++i];
                         break;
 
+                    case "-tzdatadir":
+                        tzDataDir = args[++i];
+                        break;
+
                     case "-help":
                         usage();
                         System.exit(0);
@@ -261,6 +268,7 @@ private static void usage() {
                 + "\t-baselocales loc(,loc)*      locales that go into the base module%n"
                 + "\t-o dir         output directory (default: ./build/gensrc)%n"
                 + "\t-zntempfile    template file for java.time.format.ZoneName.java%n"
+                + "\t-tzdatadir     tzdata directory for java.time.format.ZoneName.java%n"
                 + "\t-utf8          use UTF-8 rather than \\uxxxx (for debug)%n");
     }
 
@@ -983,6 +991,8 @@ private static void generateZoneName() throws Exception {
                         return handlerMetaZones.mzoneMapEntry();
                     } else if (l.equals("%%%%DEPRECATED%%%%")) {
                         return handlerSupplMeta.deprecatedMap();
+                    } else if (l.equals("%%%%TZDATALINK%%%%")) {
+                        return tzDataLinkEntry();
                     } else {
                         return Stream.of(l);
                     }
@@ -1011,4 +1021,26 @@ private static Stream<String> zidMapEntry() {
                 .filter(s -> !s.isEmpty())
                 .sorted();
     }
+
+    private static Stream<String> tzDataLinkEntry() {
+        try {
+            return Files.walk(Paths.get(tzDataDir), 1)
+                .filter(p -> !Files.isDirectory(p))
+                .flatMap(CLDRConverter::extractLinks)
+                .sorted();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    private static Stream<String> extractLinks(Path tzFile) {
+        try {
+            return Files.lines(tzFile)
+                .filter(l -> l.startsWith("Link"))
+                .map(l -> l.replaceFirst("^Link[\\s]+(\\S+)\\s+(\\S+).*",
+                                         "        \"$2\", \"$1\","));
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
 }
diff --git a/src/java.base/share/classes/java/time/format/ZoneName.java.template b/src/java.base/share/classes/java/time/format/ZoneName.java.template
index 54e9d5b861f..7137b804d91 100644
--- a/src/java.base/share/classes/java/time/format/ZoneName.java.template
+++ b/src/java.base/share/classes/java/time/format/ZoneName.java.template
@@ -83,142 +83,7 @@ class ZoneName {
 %%%%DEPRECATED%%%%
 
         // From tzdb
-        "Brazil/Acre", "America/Rio_Branco",
-        "US/Indiana-Starke", "America/Indiana/Knox",
-        "America/Atka", "America/Adak",
-        "America/St_Barthelemy", "America/Guadeloupe",
-        "Australia/North", "Australia/Darwin",
-        "Europe/Zagreb", "Europe/Belgrade",
-        "Etc/Universal", "Etc/UTC",
-        "NZ-CHAT", "Pacific/Chatham",
-        "Asia/Macao", "Asia/Macau",
-        "Pacific/Yap", "Pacific/Chuuk",
-        "Egypt", "Africa/Cairo",
-        "US/Central", "America/Chicago",
-        "Canada/Atlantic", "America/Halifax",
-        "Brazil/East", "America/Sao_Paulo",
-        "America/Cordoba", "America/Argentina/Cordoba",
-        "US/Hawaii", "Pacific/Honolulu",
-        "America/Louisville", "America/Kentucky/Louisville",
-        "America/Shiprock", "America/Denver",
-        "Australia/Canberra", "Australia/Sydney",
-        "Asia/Chungking", "Asia/Chongqing",
-        "Universal", "Etc/UTC",
-        "US/Alaska", "America/Anchorage",
-        "Asia/Ujung_Pandang", "Asia/Makassar",
-        "Japan", "Asia/Tokyo",
-        "Atlantic/Faeroe", "Atlantic/Faroe",
-        "Asia/Istanbul", "Europe/Istanbul",
-        "US/Pacific", "America/Los_Angeles",
-        "Mexico/General", "America/Mexico_City",
-        "Poland", "Europe/Warsaw",
-        "Africa/Asmera", "Africa/Asmara",
-        "Asia/Saigon", "Asia/Ho_Chi_Minh",
-        "US/Michigan", "America/Detroit",
-        "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca",
-        "W-SU", "Europe/Moscow",
-        "Australia/ACT", "Australia/Sydney",
-        "Asia/Calcutta", "Asia/Kolkata",
-        "Arctic/Longyearbyen", "Europe/Oslo",
-        "America/Knox_IN", "America/Indiana/Knox",
-        "ROC", "Asia/Taipei",
-        "Zulu", "Etc/UTC",
-        "Australia/Yancowinna", "Australia/Broken_Hill",
-        "Australia/West", "Australia/Perth",
-        "Singapore", "Asia/Singapore",
-        "Europe/Mariehamn", "Europe/Helsinki",
-        "ROK", "Asia/Seoul",
-        "America/Porto_Acre", "America/Rio_Branco",
-        "Etc/Zulu", "Etc/UTC",
-        "Canada/Yukon", "America/Whitehorse",
-        "Europe/Vatican", "Europe/Rome",
-        "Africa/Timbuktu", "Africa/Bamako",
-        "America/Buenos_Aires", "America/Argentina/Buenos_Aires",
-        "Canada/Pacific", "America/Vancouver",
-        "US/Pacific-New", "America/Los_Angeles",
-        "Mexico/BajaNorte", "America/Tijuana",
-        "Europe/Guernsey", "Europe/London",
-        "Asia/Tel_Aviv", "Asia/Jerusalem",
-        "Chile/Continental", "America/Santiago",
-        "Jamaica", "America/Jamaica",
-        "Mexico/BajaSur", "America/Mazatlan",
-        "Canada/Eastern", "America/Toronto",
-        "Australia/Tasmania", "Australia/Hobart",
-        "NZ", "Pacific/Auckland",
-        "America/Lower_Princes", "America/Curacao",
-        "GMT-", "Etc/GMT",
-        "America/Rosario", "America/Argentina/Cordoba",
-        "Libya", "Africa/Tripoli",
-        "Asia/Ashkhabad", "Asia/Ashgabat",
-        "Australia/NSW", "Australia/Sydney",
-        "America/Marigot", "America/Guadeloupe",
-        "Europe/Bratislava", "Europe/Prague",
-        "Portugal", "Europe/Lisbon",
-        "Etc/GMT-", "Etc/GMT",
-        "Europe/San_Marino", "Europe/Rome",
-        "Europe/Sarajevo", "Europe/Belgrade",
-        "Antarctica/South_Pole", "Antarctica/McMurdo",
-        "Canada/Central", "America/Winnipeg",
-        "Etc/GMT", "Etc/GMT",
-        "Europe/Isle_of_Man", "Europe/London",
-        "America/Fort_Wayne", "America/Indiana/Indianapolis",
-        "Eire", "Europe/Dublin",
-        "America/Coral_Harbour", "America/Atikokan",
-        "Europe/Nicosia", "Asia/Nicosia",
-        "US/Samoa", "Pacific/Pago_Pago",
-        "Hongkong", "Asia/Hong_Kong",
-        "Canada/Saskatchewan", "America/Regina",
-        "Asia/Thimbu", "Asia/Thimphu",
-        "Kwajalein", "Pacific/Kwajalein",
-        "GB", "Europe/London",
-        "Chile/EasterIsland", "Pacific/Easter",
-        "US/East-Indiana", "America/Indiana/Indianapolis",
-        "Australia/LHI", "Australia/Lord_Howe",
-        "Cuba", "America/Havana",
-        "America/Jujuy", "America/Argentina/Jujuy",
-        "US/Mountain", "America/Denver",
-        "Atlantic/Jan_Mayen", "Europe/Oslo",
-        "Europe/Tiraspol", "Europe/Chisinau",
-        "Europe/Podgorica", "Europe/Belgrade",
-        "US/Arizona", "America/Phoenix",
-        "Navajo", "America/Denver",
-        "Etc/Greenwich", "Etc/GMT",
-        "Canada/Mountain", "America/Edmonton",
-        "Iceland", "Atlantic/Reykjavik",
-        "Australia/Victoria", "Australia/Melbourne",
-        "Australia/South", "Australia/Adelaide",
-        "Brazil/West", "America/Manaus",
-        "Pacific/Ponape", "Pacific/Pohnpei",
-        "Europe/Ljubljana", "Europe/Belgrade",
-        "Europe/Jersey", "Europe/London",
-        "Australia/Queensland", "Australia/Brisbane",
-        "UTC", "Etc/UTC",
-        "Canada/Newfoundland", "America/St_Johns",
-        "Europe/Skopje", "Europe/Belgrade",
-        "PRC", "Asia/Shanghai",
-        "UCT", "Etc/UCT",
-        "America/Mendoza", "America/Argentina/Mendoza",
-        "Israel", "Asia/Jerusalem",
-        "US/Eastern", "America/New_York",
-        "Asia/Ulan_Bator", "Asia/Ulaanbaatar",
-        "Turkey", "Europe/Istanbul",
-        "GMT", "Etc/GMT",
-        "US/Aleutian", "America/Adak",
-        "Brazil/DeNoronha", "America/Noronha",
-        "GB-Eire", "Europe/London",
-        "Asia/Dacca", "Asia/Dhaka",
-        "America/Ensenada", "America/Tijuana",
-        "America/Catamarca", "America/Argentina/Catamarca",
-        "Iran", "Asia/Tehran",
-        "Greenwich", "Etc/GMT",
-        "Pacific/Truk", "Pacific/Chuuk",
-        "Pacific/Samoa", "Pacific/Pago_Pago",
-        "America/Virgin", "America/St_Thomas",
-        "Asia/Katmandu", "Asia/Kathmandu",
-        "America/Indianapolis", "America/Indiana/Indianapolis",
-        "Europe/Belfast", "Europe/London",
-        "America/Kralendijk", "America/Curacao",
-        "Asia/Rangoon", "Asia/Yangon",
+%%%%TZDATALINK%%%%
     };
 
     private static final Map<String, String> zidToMzone = new HashMap<>();
diff --git a/test/jdk/java/time/test/java/time/format/ZoneName.java b/test/jdk/java/time/test/java/time/format/ZoneName.java
index 27fcdee34f3..4aa9c6d42e4 100644
--- a/test/jdk/java/time/test/java/time/format/ZoneName.java
+++ b/test/jdk/java/time/test/java/time/format/ZoneName.java
@@ -770,142 +770,214 @@ public static String toZid(String zid) {
         "SystemV/YST9YDT", "America/Anchorage",
 
         // From tzdb
-        "Brazil/Acre", "America/Rio_Branco",
-        "US/Indiana-Starke", "America/Indiana/Knox",
+        "Africa/Addis_Ababa", "Africa/Nairobi",
+        "Africa/Asmara", "Africa/Nairobi",
+        "Africa/Asmera", "Africa/Nairobi",
+        "Africa/Bamako", "Africa/Abidjan",
+        "Africa/Bangui", "Africa/Lagos",
+        "Africa/Banjul", "Africa/Abidjan",
+        "Africa/Blantyre", "Africa/Maputo",
+        "Africa/Brazzaville", "Africa/Lagos",
+        "Africa/Bujumbura", "Africa/Maputo",
+        "Africa/Conakry", "Africa/Abidjan",
+        "Africa/Dakar", "Africa/Abidjan",
+        "Africa/Dar_es_Salaam", "Africa/Nairobi",
+        "Africa/Djibouti", "Africa/Nairobi",
+        "Africa/Douala", "Africa/Lagos",
+        "Africa/Freetown", "Africa/Abidjan",
+        "Africa/Gaborone", "Africa/Maputo",
+        "Africa/Harare", "Africa/Maputo",
+        "Africa/Kampala", "Africa/Nairobi",
+        "Africa/Kigali", "Africa/Maputo",
+        "Africa/Kinshasa", "Africa/Lagos",
+        "Africa/Libreville", "Africa/Lagos",
+        "Africa/Lome", "Africa/Abidjan",
+        "Africa/Luanda", "Africa/Lagos",
+        "Africa/Lubumbashi", "Africa/Maputo",
+        "Africa/Lusaka", "Africa/Maputo",
+        "Africa/Malabo", "Africa/Lagos",
+        "Africa/Maseru", "Africa/Johannesburg",
+        "Africa/Mbabane", "Africa/Johannesburg",
+        "Africa/Mogadishu", "Africa/Nairobi",
+        "Africa/Niamey", "Africa/Lagos",
+        "Africa/Nouakchott", "Africa/Abidjan",
+        "Africa/Ouagadougou", "Africa/Abidjan",
+        "Africa/Porto-Novo", "Africa/Lagos",
+        "Africa/Timbuktu", "Africa/Abidjan",
+        "America/Anguilla", "America/Port_of_Spain",
+        "America/Antigua", "America/Port_of_Spain",
+        "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca",
+        "America/Aruba", "America/Curacao",
         "America/Atka", "America/Adak",
-        "America/St_Barthelemy", "America/Guadeloupe",
-        "Australia/North", "Australia/Darwin",
-        "Europe/Zagreb", "Europe/Belgrade",
-        "Etc/Universal", "Etc/UTC",
-        "NZ-CHAT", "Pacific/Chatham",
-        "Asia/Macao", "Asia/Macau",
-        "Pacific/Yap", "Pacific/Chuuk",
-        "Egypt", "Africa/Cairo",
-        "US/Central", "America/Chicago",
-        "Canada/Atlantic", "America/Halifax",
-        "Brazil/East", "America/Sao_Paulo",
+        "America/Buenos_Aires", "America/Argentina/Buenos_Aires",
+        "America/Catamarca", "America/Argentina/Catamarca",
+        "America/Cayman", "America/Panama",
+        "America/Coral_Harbour", "America/Atikokan",
         "America/Cordoba", "America/Argentina/Cordoba",
-        "US/Hawaii", "Pacific/Honolulu",
+        "America/Dominica", "America/Port_of_Spain",
+        "America/Ensenada", "America/Tijuana",
+        "America/Fort_Wayne", "America/Indiana/Indianapolis",
+        "America/Grenada", "America/Port_of_Spain",
+        "America/Guadeloupe", "America/Port_of_Spain",
+        "America/Indianapolis", "America/Indiana/Indianapolis",
+        "America/Jujuy", "America/Argentina/Jujuy",
+        "America/Knox_IN", "America/Indiana/Knox",
+        "America/Kralendijk", "America/Curacao",
         "America/Louisville", "America/Kentucky/Louisville",
+        "America/Lower_Princes", "America/Curacao",
+        "America/Marigot", "America/Port_of_Spain",
+        "America/Mendoza", "America/Argentina/Mendoza",
+        "America/Montreal", "America/Toronto",
+        "America/Montserrat", "America/Port_of_Spain",
+        "America/Porto_Acre", "America/Rio_Branco",
+        "America/Rosario", "America/Argentina/Cordoba",
+        "America/Santa_Isabel", "America/Tijuana",
         "America/Shiprock", "America/Denver",
-        "Australia/Canberra", "Australia/Sydney",
-        "Asia/Chungking", "Asia/Chongqing",
-        "Universal", "Etc/UTC",
-        "US/Alaska", "America/Anchorage",
-        "Asia/Ujung_Pandang", "Asia/Makassar",
-        "Japan", "Asia/Tokyo",
-        "Atlantic/Faeroe", "Atlantic/Faroe",
+        "America/St_Barthelemy", "America/Port_of_Spain",
+        "America/St_Kitts", "America/Port_of_Spain",
+        "America/St_Lucia", "America/Port_of_Spain",
+        "America/St_Thomas", "America/Port_of_Spain",
+        "America/St_Vincent", "America/Port_of_Spain",
+        "America/Tortola", "America/Port_of_Spain",
+        "America/Virgin", "America/Port_of_Spain",
+        "Antarctica/McMurdo", "Pacific/Auckland",
+        "Antarctica/South_Pole", "Pacific/Auckland",
+        "Arctic/Longyearbyen", "Europe/Oslo",
+        "Asia/Aden", "Asia/Riyadh",
+        "Asia/Ashkhabad", "Asia/Ashgabat",
+        "Asia/Bahrain", "Asia/Qatar",
+        "Asia/Calcutta", "Asia/Kolkata",
+        "Asia/Chongqing", "Asia/Shanghai",
+        "Asia/Chungking", "Asia/Shanghai",
+        "Asia/Dacca", "Asia/Dhaka",
+        "Asia/Harbin", "Asia/Shanghai",
         "Asia/Istanbul", "Europe/Istanbul",
-        "US/Pacific", "America/Los_Angeles",
-        "Mexico/General", "America/Mexico_City",
-        "Poland", "Europe/Warsaw",
-        "Africa/Asmera", "Africa/Asmara",
+        "Asia/Kashgar", "Asia/Urumqi",
+        "Asia/Katmandu", "Asia/Kathmandu",
+        "Asia/Kuwait", "Asia/Riyadh",
+        "Asia/Macao", "Asia/Macau",
+        "Asia/Muscat", "Asia/Dubai",
+        "Asia/Phnom_Penh", "Asia/Bangkok",
+        "Asia/Rangoon", "Asia/Yangon",
         "Asia/Saigon", "Asia/Ho_Chi_Minh",
-        "US/Michigan", "America/Detroit",
-        "America/Argentina/ComodRivadavia", "America/Argentina/Catamarca",
-        "W-SU", "Europe/Moscow",
+        "Asia/Tel_Aviv", "Asia/Jerusalem",
+        "Asia/Thimbu", "Asia/Thimphu",
+        "Asia/Ujung_Pandang", "Asia/Makassar",
+        "Asia/Ulan_Bator", "Asia/Ulaanbaatar",
+        "Asia/Vientiane", "Asia/Bangkok",
+        "Atlantic/Faeroe", "Atlantic/Faroe",
+        "Atlantic/Jan_Mayen", "Europe/Oslo",
+        "Atlantic/St_Helena", "Africa/Abidjan",
         "Australia/ACT", "Australia/Sydney",
-        "Asia/Calcutta", "Asia/Kolkata",
-        "Arctic/Longyearbyen", "Europe/Oslo",
-        "America/Knox_IN", "America/Indiana/Knox",
-        "ROC", "Asia/Taipei",
-        "Zulu", "Etc/UTC",
-        "Australia/Yancowinna", "Australia/Broken_Hill",
+        "Australia/Canberra", "Australia/Sydney",
+        "Australia/LHI", "Australia/Lord_Howe",
+        "Australia/NSW", "Australia/Sydney",
+        "Australia/North", "Australia/Darwin",
+        "Australia/Queensland", "Australia/Brisbane",
+        "Australia/South", "Australia/Adelaide",
+        "Australia/Tasmania", "Australia/Hobart",
+        "Australia/Victoria", "Australia/Melbourne",
         "Australia/West", "Australia/Perth",
-        "Singapore", "Asia/Singapore",
-        "Europe/Mariehamn", "Europe/Helsinki",
-        "ROK", "Asia/Seoul",
-        "America/Porto_Acre", "America/Rio_Branco",
-        "Etc/Zulu", "Etc/UTC",
-        "Canada/Yukon", "America/Whitehorse",
-        "Europe/Vatican", "Europe/Rome",
-        "Africa/Timbuktu", "Africa/Bamako",
-        "America/Buenos_Aires", "America/Argentina/Buenos_Aires",
+        "Australia/Yancowinna", "Australia/Broken_Hill",
+        "Brazil/Acre", "America/Rio_Branco",
+        "Brazil/DeNoronha", "America/Noronha",
+        "Brazil/East", "America/Sao_Paulo",
+        "Brazil/West", "America/Manaus",
+        "Canada/Atlantic", "America/Halifax",
+        "Canada/Central", "America/Winnipeg",
+        "Canada/Eastern", "America/Toronto",
+        "Canada/Mountain", "America/Edmonton",
+        "Canada/Newfoundland", "America/St_Johns",
         "Canada/Pacific", "America/Vancouver",
-        "US/Pacific-New", "America/Los_Angeles",
-        "Mexico/BajaNorte", "America/Tijuana",
-        "Europe/Guernsey", "Europe/London",
-        "Asia/Tel_Aviv", "Asia/Jerusalem",
+        "Canada/Saskatchewan", "America/Regina",
+        "Canada/Yukon", "America/Whitehorse",
         "Chile/Continental", "America/Santiago",
-        "Jamaica", "America/Jamaica",
-        "Mexico/BajaSur", "America/Mazatlan",
-        "Canada/Eastern", "America/Toronto",
-        "Australia/Tasmania", "Australia/Hobart",
-        "NZ", "Pacific/Auckland",
-        "America/Lower_Princes", "America/Curacao",
-        "GMT-", "Etc/GMT",
-        "America/Rosario", "America/Argentina/Cordoba",
-        "Libya", "Africa/Tripoli",
-        "Asia/Ashkhabad", "Asia/Ashgabat",
-        "Australia/NSW", "Australia/Sydney",
-        "America/Marigot", "America/Guadeloupe",
+        "Chile/EasterIsland", "Pacific/Easter",
+        "Cuba", "America/Havana",
+        "Egypt", "Africa/Cairo",
+        "Eire", "Europe/Dublin",
+        "Etc/GMT+0", "Etc/GMT",
+        "Etc/GMT-0", "Etc/GMT",
+        "Etc/GMT0", "Etc/GMT",
+        "Etc/Greenwich", "Etc/GMT",
+        "Etc/Universal", "Etc/UTC",
+        "Etc/Zulu", "Etc/UTC",
+        "Europe/Belfast", "Europe/London",
         "Europe/Bratislava", "Europe/Prague",
-        "Portugal", "Europe/Lisbon",
-        "Etc/GMT-", "Etc/GMT",
-        "Europe/San_Marino", "Europe/Rome",
-        "Europe/Sarajevo", "Europe/Belgrade",
-        "Antarctica/South_Pole", "Antarctica/McMurdo",
-        "Canada/Central", "America/Winnipeg",
-        "Etc/GMT", "Etc/GMT",
+        "Europe/Busingen", "Europe/Zurich",
+        "Europe/Guernsey", "Europe/London",
         "Europe/Isle_of_Man", "Europe/London",
-        "America/Fort_Wayne", "America/Indiana/Indianapolis",
-        "Eire", "Europe/Dublin",
-        "America/Coral_Harbour", "America/Atikokan",
+        "Europe/Jersey", "Europe/London",
+        "Europe/Ljubljana", "Europe/Belgrade",
+        "Europe/Mariehamn", "Europe/Helsinki",
         "Europe/Nicosia", "Asia/Nicosia",
-        "US/Samoa", "Pacific/Pago_Pago",
+        "Europe/Podgorica", "Europe/Belgrade",
+        "Europe/San_Marino", "Europe/Rome",
+        "Europe/Sarajevo", "Europe/Belgrade",
+        "Europe/Skopje", "Europe/Belgrade",
+        "Europe/Tiraspol", "Europe/Chisinau",
+        "Europe/Vaduz", "Europe/Zurich",
+        "Europe/Vatican", "Europe/Rome",
+        "Europe/Zagreb", "Europe/Belgrade",
+        "GB", "Europe/London",
+        "GB-Eire", "Europe/London",
+        "GMT", "Etc/GMT",
+        "GMT+0", "Etc/GMT",
+        "GMT-0", "Etc/GMT",
+        "GMT0", "Etc/GMT",
+        "Greenwich", "Etc/GMT",
         "Hongkong", "Asia/Hong_Kong",
-        "Canada/Saskatchewan", "America/Regina",
-        "Asia/Thimbu", "Asia/Thimphu",
+        "Iceland", "Atlantic/Reykjavik",
+        "Indian/Antananarivo", "Africa/Nairobi",
+        "Indian/Comoro", "Africa/Nairobi",
+        "Indian/Mayotte", "Africa/Nairobi",
+        "Iran", "Asia/Tehran",
+        "Israel", "Asia/Jerusalem",
+        "Jamaica", "America/Jamaica",
+        "Japan", "Asia/Tokyo",
         "Kwajalein", "Pacific/Kwajalein",
-        "GB", "Europe/London",
-        "Chile/EasterIsland", "Pacific/Easter",
-        "US/East-Indiana", "America/Indiana/Indianapolis",
-        "Australia/LHI", "Australia/Lord_Howe",
-        "Cuba", "America/Havana",
-        "America/Jujuy", "America/Argentina/Jujuy",
-        "US/Mountain", "America/Denver",
-        "Atlantic/Jan_Mayen", "Europe/Oslo",
-        "Europe/Tiraspol", "Europe/Chisinau",
-        "Europe/Podgorica", "Europe/Belgrade",
-        "US/Arizona", "America/Phoenix",
+        "Libya", "Africa/Tripoli",
+        "Mexico/BajaNorte", "America/Tijuana",
+        "Mexico/BajaSur", "America/Mazatlan",
+        "Mexico/General", "America/Mexico_City",
+        "Mideast/Riyadh87", "Asia/Riyadh87",
+        "Mideast/Riyadh88", "Asia/Riyadh88",
+        "Mideast/Riyadh89", "Asia/Riyadh89",
+        "NZ", "Pacific/Auckland",
+        "NZ-CHAT", "Pacific/Chatham",
         "Navajo", "America/Denver",
-        "Etc/Greenwich", "Etc/GMT",
-        "Canada/Mountain", "America/Edmonton",
-        "Iceland", "Atlantic/Reykjavik",
-        "Australia/Victoria", "Australia/Melbourne",
-        "Australia/South", "Australia/Adelaide",
-        "Brazil/West", "America/Manaus",
-        "Pacific/Ponape", "Pacific/Pohnpei",
-        "Europe/Ljubljana", "Europe/Belgrade",
-        "Europe/Jersey", "Europe/London",
-        "Australia/Queensland", "Australia/Brisbane",
-        "UTC", "Etc/UTC",
-        "Canada/Newfoundland", "America/St_Johns",
-        "Europe/Skopje", "Europe/Belgrade",
         "PRC", "Asia/Shanghai",
-        "UCT", "Etc/UCT",
-        "America/Mendoza", "America/Argentina/Mendoza",
-        "Israel", "Asia/Jerusalem",
-        "US/Eastern", "America/New_York",
-        "Asia/Ulan_Bator", "Asia/Ulaanbaatar",
+        "Pacific/Johnston", "Pacific/Honolulu",
+        "Pacific/Midway", "Pacific/Pago_Pago",
+        "Pacific/Ponape", "Pacific/Pohnpei",
+        "Pacific/Saipan", "Pacific/Guam",
+        "Pacific/Samoa", "Pacific/Pago_Pago",
+        "Pacific/Truk", "Pacific/Chuuk",
+        "Pacific/Yap", "Pacific/Chuuk",
+        "Poland", "Europe/Warsaw",
+        "Portugal", "Europe/Lisbon",
+        "ROC", "Asia/Taipei",
+        "ROK", "Asia/Seoul",
+        "Singapore", "Asia/Singapore",
         "Turkey", "Europe/Istanbul",
-        "GMT", "Etc/GMT",
+        "UCT", "Etc/UCT",
+        "US/Alaska", "America/Anchorage",
         "US/Aleutian", "America/Adak",
-        "Brazil/DeNoronha", "America/Noronha",
-        "GB-Eire", "Europe/London",
-        "Asia/Dacca", "Asia/Dhaka",
-        "America/Ensenada", "America/Tijuana",
-        "America/Catamarca", "America/Argentina/Catamarca",
-        "Iran", "Asia/Tehran",
-        "Greenwich", "Etc/GMT",
-        "Pacific/Truk", "Pacific/Chuuk",
-        "Pacific/Samoa", "Pacific/Pago_Pago",
-        "America/Virgin", "America/St_Thomas",
-        "Asia/Katmandu", "Asia/Kathmandu",
-        "America/Indianapolis", "America/Indiana/Indianapolis",
-        "Europe/Belfast", "Europe/London",
-        "America/Kralendijk", "America/Curacao",
-        "Asia/Rangoon", "Asia/Yangon",
+        "US/Arizona", "America/Phoenix",
+        "US/Central", "America/Chicago",
+        "US/East-Indiana", "America/Indiana/Indianapolis",
+        "US/Eastern", "America/New_York",
+        "US/Hawaii", "Pacific/Honolulu",
+        "US/Indiana-Starke", "America/Indiana/Knox",
+        "US/Michigan", "America/Detroit",
+        "US/Mountain", "America/Denver",
+        "US/Pacific", "America/Los_Angeles",
+        "US/Pacific-New", "America/Los_Angeles",
+        "US/Samoa", "Pacific/Pago_Pago",
+        "UTC", "Etc/UTC",
+        "Universal", "Etc/UTC",
+        "W-SU", "Europe/Moscow",
+        "Zulu", "Etc/UTC",
     };
 
     private static final Map<String, String> zidToMzone = new HashMap<>();

From a033e5d33585a88f6c0289b03fab4717ebdc8f32 Mon Sep 17 00:00:00 2001
From: valeriep <unknown>
Date: Fri, 13 Apr 2018 18:07:58 +0000
Subject: [PATCH 160/196] 8197441: Signature#initSign/initVerify for an invalid
 private/public key fails with ClassCastException for SunPKCS11 provider
 Summary: Rethrow ClassCastException with InvalidKeyException Reviewed-by:
 ascarpino

---
 .../sun/security/pkcs11/P11Signature.java     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
index 0260a55486d..82a4f2e2c9c 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -373,14 +373,19 @@ private void checkKeySize(String keyAlgo, Key key)
         if (key instanceof P11Key) {
             keySize = ((P11Key) key).length();
         } else {
-            if (keyAlgo.equals("RSA")) {
-                keySize = ((RSAKey) key).getModulus().bitLength();
-            } else if (keyAlgo.equals("DSA")) {
-                keySize = ((DSAKey) key).getParams().getP().bitLength();
-            } else if (keyAlgo.equals("EC")) {
-                keySize = ((ECKey) key).getParams().getCurve().getField().getFieldSize();
-            } else {
-                throw new ProviderException("Error: unsupported algo " + keyAlgo);
+            try {
+                if (keyAlgo.equals("RSA")) {
+                    keySize = ((RSAKey) key).getModulus().bitLength();
+                } else if (keyAlgo.equals("DSA")) {
+                    keySize = ((DSAKey) key).getParams().getP().bitLength();
+                } else if (keyAlgo.equals("EC")) {
+                    keySize = ((ECKey) key).getParams().getCurve().getField().getFieldSize();
+                } else {
+                    throw new ProviderException("Error: unsupported algo " + keyAlgo);
+                }
+            } catch (ClassCastException cce) {
+                throw new InvalidKeyException(keyAlgo +
+                    " key must be the right type", cce);
             }
         }
         if ((minKeySize != -1) && (keySize < minKeySize)) {

From a8c2df1bb92d2d0f3c6106f4debd756837b0645b Mon Sep 17 00:00:00 2001
From: mcimadamore <unknown>
Date: Fri, 13 Apr 2018 11:14:49 -0700
Subject: [PATCH 161/196] 8201554: Disable failing tier1 test for JDK-8201498
 Reviewed-by: jjg

---
 .../tools/javac/diags/examples.not-yet.txt    |  1 +
 .../PreviewPluralAdditional.java              | 38 -------------------
 .../PreviewPluralAdditionalBar.java           | 33 ----------------
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
 delete mode 100644 test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java

diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index a3d227af59b..a531ae00e13 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -129,6 +129,7 @@ compiler.warn.invalid.path                              # this warning is genera
 compiler.note.multiple.elements                         # needs user code
 compiler.err.preview.feature.disabled.classfile         # preview feature support: needs compilation against classfile
 compiler.warn.preview.feature.use.classfile             # preview feature support: needs compilation against classfile
+compiler.note.preview.plural.additional                 # preview feature support: diag test causes intermittent failures (see JDK-8201498)
 
 # The following module-related messages will have to stay on the not-yet list for various reasons:
 compiler.warn.locn.unknown.file.on.module.path                # Never issued ATM (short circuited with an if (false))
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
deleted file mode 100644
index 279b51902e7..00000000000
--- a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2018, 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.
- */
-
-// key: compiler.note.preview.plural.additional
-// key: compiler.warn.preview.feature.use.plural
-// key: compiler.misc.feature.lambda
-// options: -Xlint:preview -Xmaxwarns 1 -XDforcePreview  -source 11 --enable-preview
-
-import java.util.ArrayList;
-
-class PreviewPluralAdditional {
-    void test() {
-        new PreviewPluralAdditionalBar();
-        new ArrayList<>();
-    }
-}
diff --git a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java b/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java
deleted file mode 100644
index 5825e9b30d8..00000000000
--- a/test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditionalBar.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2018, 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.
- */
-
-import java.util.ArrayList;
-
-class PreviewPluralAdditionalBar {
-    Runnable r = () -> {};
-    void test() {
-        new ArrayList<>();
-    }
-}

From 9084067874ac83843aef515a1ca4a810dcb68cfb Mon Sep 17 00:00:00 2001
From: alanb <unknown>
Date: Sat, 14 Apr 2018 08:41:42 +0100
Subject: [PATCH 162/196] 8201474: (so) Socket adaptor connect(InetAddress,
 timeout) succeeds when connection fails Reviewed-by: bpb

---
 .../sun/nio/ch/DatagramChannelImpl.java       |  4 +-
 .../sun/nio/ch/ServerSocketChannelImpl.java   |  4 +-
 .../classes/sun/nio/ch/SocketChannelImpl.java | 13 ++++---
 src/java.base/unix/native/libnio/ch/Net.c     |  3 +-
 .../channels/SocketChannel/AdaptSocket.java   | 38 ++++++++++++++++---
 5 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
index 9e744350cd6..3107e661e2b 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -1280,8 +1280,8 @@ boolean pollRead(long timeout) throws IOException {
             boolean polled = false;
             try {
                 beginRead(blocking, false);
-                int n = Net.poll(fd, Net.POLLIN, timeout);
-                polled = (n > 0);
+                int events = Net.poll(fd, Net.POLLIN, timeout);
+                polled = (events != 0);
             } finally {
                 endRead(blocking, polled);
             }
diff --git a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
index 7b1e1d55a1a..9e23100591a 100644
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
@@ -431,8 +431,8 @@ boolean pollAccept(long timeout) throws IOException {
             boolean polled = false;
             try {
                 begin(true);
-                int n = Net.poll(fd, Net.POLLIN, timeout);
-                polled = (n > 0);
+                int events = Net.poll(fd, Net.POLLIN, timeout);
+                polled = (events != 0);
             } finally {
                 end(true, polled);
             }
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
index b9583aa1c42..095974d8f57 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -951,8 +951,8 @@ boolean pollRead(long timeout) throws IOException {
             boolean polled = false;
             try {
                 beginRead(blocking);
-                int n = Net.poll(fd, Net.POLLIN, timeout);
-                polled = (n > 0);
+                int events = Net.poll(fd, Net.POLLIN, timeout);
+                polled = (events != 0);
             } finally {
                 endRead(blocking, polled);
             }
@@ -977,10 +977,13 @@ boolean pollConnected(long timeout) throws IOException {
                 boolean polled = false;
                 try {
                     beginFinishConnect(blocking);
-                    int n = Net.poll(fd, Net.POLLCONN, timeout);
-                    polled = (n > 0);
+                    int events = Net.poll(fd, Net.POLLCONN, timeout);
+                    polled = (events != 0);
                 } finally {
-                    endFinishConnect(blocking, polled);
+                    // invoke endFinishConnect with completed = false so that
+                    // the state is not changed to ST_CONNECTED. The socket
+                    // adaptor will use finishConnect to finish.
+                    endFinishConnect(blocking, /*completed*/false);
                 }
                 return polled;
             } finally {
diff --git a/src/java.base/unix/native/libnio/ch/Net.c b/src/java.base/unix/native/libnio/ch/Net.c
index 8233399d16b..e1320599102 100644
--- a/src/java.base/unix/native/libnio/ch/Net.c
+++ b/src/java.base/unix/native/libnio/ch/Net.c
@@ -700,7 +700,8 @@ Java_sun_nio_ch_Net_poll(JNIEnv* env, jclass this, jobject fdo, jint events, jlo
     if (rv >= 0) {
         return pfd.revents;
     } else if (errno == EINTR) {
-        return IOS_INTERRUPTED;
+        // interrupted, no events to return
+        return 0;
     } else {
         handleSocketError(env, errno);
         return IOS_THROWN;
diff --git a/test/jdk/java/nio/channels/SocketChannel/AdaptSocket.java b/test/jdk/java/nio/channels/SocketChannel/AdaptSocket.java
index b02aab7b559..66cf4a663cf 100644
--- a/test/jdk/java/nio/channels/SocketChannel/AdaptSocket.java
+++ b/test/jdk/java/nio/channels/SocketChannel/AdaptSocket.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 8156002
+ * @bug 8156002 8201474
  * @summary Unit test for socket-channel adaptors
  * @library .. /test/lib
  * @build jdk.test.lib.Utils TestServers
@@ -37,18 +37,16 @@
 
 public class AdaptSocket {
 
-    static java.io.PrintStream out = System.out;
+    static final java.io.PrintStream out = System.out;
 
-    static void test(TestServers.DayTimeServer dayTimeServer,
+    static void test(TestServers.AbstractServer server,
                      int timeout,
                      boolean shouldTimeout)
         throws Exception
     {
         out.println();
 
-        InetSocketAddress isa
-            = new InetSocketAddress(dayTimeServer.getAddress(),
-                                    dayTimeServer.getPort());
+        InetSocketAddress isa = new InetSocketAddress(server.getAddress(), server.getPort());
         SocketChannel sc = SocketChannel.open();
         Socket so = sc.socket();
         out.println("opened: " + so);
@@ -151,6 +149,30 @@ static void testRead(TestServers.EchoServer echoServer,
         sc.close();
     }
 
+    static void testConnect(TestServers.AbstractServer server,
+                            int timeout,
+                            boolean shouldFail)
+        throws Exception
+    {
+        SocketAddress sa = new InetSocketAddress(server.getAddress(), server.getPort());
+        try (SocketChannel sc = SocketChannel.open()) {
+            Socket s = sc.socket();
+            try {
+                if (timeout > 0) {
+                    s.connect(sa, timeout);
+                } else {
+                    s.connect(sa);
+                }
+                if (shouldFail)
+                    throw new Exception("Connection should not be established");
+            } catch (SocketException se) {
+                if (!shouldFail)
+                    throw se;
+                out.println("connect failed as expected: " + se);
+            }
+        }
+    }
+
     public static void main(String[] args) throws Exception {
 
         try (TestServers.DayTimeServer dayTimeServer
@@ -177,5 +199,9 @@ public static void main(String[] args) throws Exception {
                 = TestServers.NoResponseServer.startNewServer()) {
             testRead(noResponseServer, 10, true);
         }
+
+        TestServers.RefusingServer refuser = TestServers.RefusingServer.newRefusingServer();
+        testConnect(refuser, 0, true);
+        testConnect(refuser, 2000, true);
     }
 }

From c49a3bb1122e4c47ff775715a36db44c2bba5081 Mon Sep 17 00:00:00 2001
From: sgehwolf <unknown>
Date: Mon, 16 Apr 2018 12:20:36 +0200
Subject: [PATCH 163/196] 8201495: [Zero] Reduce limits of max heap size for
 boot JDK on s390 Reviewed-by: ihse, aph, simonis

---
 make/autoconf/boot-jdk.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
index b1e8c41dc18..6d6aa1b4200 100644
--- a/make/autoconf/boot-jdk.m4
+++ b/make/autoconf/boot-jdk.m4
@@ -405,7 +405,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
   BOOTCYCLE_JVM_ARGS_BIG=-Xms64M
 
   # Maximum amount of heap memory and stack size.
-  JVM_HEAP_LIMIT_32="1024"
+  JVM_HEAP_LIMIT_32="768"
   # Running a 64 bit JVM allows for and requires a bigger heap
   JVM_HEAP_LIMIT_64="1600"
   STACK_SIZE_32=768

From d5199a5188d8a3a2a6a8e6f62397419987607c0b Mon Sep 17 00:00:00 2001
From: vtheeyarath <unknown>
Date: Mon, 16 Apr 2018 11:21:32 -0700
Subject: [PATCH 164/196] 8184692: add Pattern.asMatchPredicate Reviewed-by:
 psandoz, rriggs

---
 .../classes/java/util/regex/Pattern.java      | 24 +++++++++++++++++--
 test/jdk/java/util/regex/RegExTest.java       | 23 +++++++++++++++++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index 4c5b1cc6634..dc74eb669ba 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -5821,14 +5821,34 @@ static CharPredicate CIRangeU(int lower, int upper) {
      * }</pre>
      *
      * @return  The predicate which can be used for finding a match on a
-     * subsequence of a string
+     *          subsequence of a string
      * @since   1.8
-     * @see Matcher#find
+     * @see     Matcher#find
      */
     public Predicate<String> asPredicate() {
         return s -> matcher(s).find();
     }
 
+    /**
+     * Creates a predicate that tests if this pattern matches a given input string.
+     *
+     * @apiNote
+     * This method creates a predicate that behaves as if it creates a matcher
+     * from the input sequence and then calls {@code matches}, for example a
+     * predicate of the form:
+     * <pre>{@code
+     *   s -> matcher(s).matches();
+     * }</pre>
+     *
+     * @return  The predicate which can be used for matching an input string
+     *          against this pattern.
+     * @since   11
+     * @see     Matcher#matches
+     */
+    public Predicate<String> asMatchPredicate() {
+        return s -> matcher(s).matches();
+    }
+
     /**
      * Creates a stream from the given input sequence around matches of this
      * pattern.
diff --git a/test/jdk/java/util/regex/RegExTest.java b/test/jdk/java/util/regex/RegExTest.java
index d4f1815828f..23f71c63287 100644
--- a/test/jdk/java/util/regex/RegExTest.java
+++ b/test/jdk/java/util/regex/RegExTest.java
@@ -35,7 +35,7 @@
  * 8027645 8035076 8039124 8035975 8074678 6854417 8143854 8147531 7071819
  * 8151481 4867170 7080302 6728861 6995635 6736245 4916384 6328855 6192895
  * 6345469 6988218 6693451 7006761 8140212 8143282 8158482 8176029 8184706
- * 8194667 8197462
+ * 8194667 8197462 8184692
  *
  * @library /test/lib
  * @build jdk.test.lib.RandomFactory
@@ -164,6 +164,7 @@ public static void main(String[] args) throws Exception {
         groupCurlyNotFoundSuppTest();
         groupCurlyBackoffTest();
         patternAsPredicate();
+        patternAsMatchPredicate();
         invalidFlags();
         embeddedFlags();
         grapheme();
@@ -4689,6 +4690,26 @@ private static void patternAsPredicate() throws Exception {
         report("Pattern.asPredicate");
     }
 
+    // This test is for 8184692
+    private static void patternAsMatchPredicate() throws Exception {
+        Predicate<String> p = Pattern.compile("[a-z]+").asMatchPredicate();
+
+        if (p.test("")) {
+            failCount++;
+        }
+        if (!p.test("word")) {
+            failCount++;
+        }
+        if (p.test("1234word")) {
+            failCount++;
+        }
+        if (p.test("1234")) {
+            failCount++;
+        }
+        report("Pattern.asMatchPredicate");
+    }
+
+
     // This test is for 8035975
     private static void invalidFlags() throws Exception {
         for (int flag = 1; flag != 0; flag <<= 1) {

From 1f4abe3675bb0c359546a29f9b5137f77fd3cb68 Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Tue, 17 Apr 2018 15:39:20 +0200
Subject: [PATCH 165/196] 8201591: JVM features with "-" in name is not
 correctly handled Reviewed-by: erikj

---
 make/autoconf/hotspot.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 2d630bcb154..828c0dd6a36 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -269,9 +269,9 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     USER_JVM_FEATURE_LIST=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
     AC_MSG_RESULT([$user_jvm_feature_list])
     # These features will be added to all variant defaults
-    JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (!match($i, /-.*/)) print $i }'`
+    JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (!match($i, /^-.*/)) print $i }'`
     # These features will be removed from all variant defaults
-    DISABLED_JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (match($i, /-.*/)) print substr($i, 2) }'`
+    DISABLED_JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (match($i, /^-.*/)) print substr($i, 2) }'`
 
     # Verify that the user has provided valid features
     BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES $DISABLED_JVM_FEATURES, $VALID_JVM_FEATURES)

From 3b314f4eb366c5e8aced377ea5e6c2ec8c0c37ad Mon Sep 17 00:00:00 2001
From: chegar <unknown>
Date: Tue, 17 Apr 2018 08:54:17 -0700
Subject: [PATCH 166/196] 8197564: HTTP Client implementation Reviewed-by:
 chegar, dfuchs, michaelm, prappo Contributed-by: Chris Hegarty
 <chris.hegarty@oracle.com>, Daniel Fuchs <daniel.fuchs@oracle.com>, Michael
 McMahon <michael.x.mcmahon@oracle.com>, Pavel Rappo <pavel.rappo@oracle.com>

---
 make/common/Modules.gmk                       |    3 +-
 .../share/classes/java/net/CookieHandler.java |    6 +-
 .../java/net/doc-files/net-properties.html    |    2 +-
 .../share/classes/java/net/package-info.java  |    4 +-
 src/java.base/share/classes/module-info.java  |   11 +-
 .../share/lib/security/default.policy         |   17 +
 .../classes/java/net}/http/HttpClient.java    |  317 +--
 .../classes/java/net}/http/HttpHeaders.java   |   20 +-
 .../classes/java/net/http/HttpRequest.java    |  650 ++++++
 .../classes/java/net/http/HttpResponse.java   | 1315 ++++++++++++
 .../java/net}/http/HttpTimeoutException.java  |   13 +-
 .../classes/java/net/http/WebSocket.java      |  771 +++++++
 .../http/WebSocketHandshakeException.java     |   16 +-
 .../classes/java/net}/http/package-info.java  |   49 +-
 .../net}/http/AbstractAsyncSSLConnection.java |  106 +-
 .../net}/http/AbstractSubscription.java       |    8 +-
 .../jdk/internal/net}/http/AsyncEvent.java    |    4 +-
 .../net}/http/AsyncSSLConnection.java         |   27 +-
 .../net}/http/AsyncSSLTunnelConnection.java   |   35 +-
 .../internal/net}/http/AsyncTriggerEvent.java |    4 +-
 .../net}/http/AuthenticationFilter.java       |  134 +-
 .../net}/http/BufferingSubscriber.java        |   22 +-
 .../internal/net}/http/ConnectionPool.java    |   25 +-
 .../jdk/internal/net}/http/CookieFilter.java  |   36 +-
 .../jdk/internal/net}/http/Exchange.java      |  186 +-
 .../jdk/internal/net}/http/ExchangeImpl.java  |   53 +-
 .../jdk/internal/net}/http/FilterFactory.java |    9 +-
 .../jdk/internal/net}/http/HeaderFilter.java  |    6 +-
 .../jdk/internal/net}/http/HeaderParser.java  |    8 +-
 .../net}/http/Http1AsyncReceiver.java         |  193 +-
 .../jdk/internal/net}/http/Http1Exchange.java |  174 +-
 .../internal/net}/http/Http1HeaderParser.java |    5 +-
 .../jdk/internal/net}/http/Http1Request.java  |  157 +-
 .../jdk/internal/net}/http/Http1Response.java |  363 +++-
 .../internal/net}/http/Http2ClientImpl.java   |   78 +-
 .../internal/net}/http/Http2Connection.java   |  391 ++--
 .../net}/http/HttpClientBuilderImpl.java      |    9 +-
 .../internal/net}/http/HttpClientFacade.java  |   28 +-
 .../internal/net}/http/HttpClientImpl.java    |  346 ++--
 .../internal/net}/http/HttpConnection.java    |  230 ++-
 .../net}/http/HttpRequestBuilderImpl.java     |   48 +-
 .../internal/net}/http/HttpRequestImpl.java   |  101 +-
 .../internal/net}/http/HttpResponseImpl.java  |   53 +-
 .../internal/net}/http/ImmutableHeaders.java  |   63 +-
 .../net/http/LineSubscriberAdapter.java       |  466 +++++
 .../jdk/internal/net}/http/MultiExchange.java |  192 +-
 .../net}/http/PlainHttpConnection.java        |  153 +-
 .../net}/http/PlainProxyConnection.java       |    7 +-
 .../net}/http/PlainTunnelingConnection.java   |   63 +-
 .../net}/http/PrivilegedExecutor.java         |    4 +-
 .../net/http/ProxyAuthenticationRequired.java |   49 +
 .../jdk/internal/net}/http/PullPublisher.java |    8 +-
 .../jdk/internal/net/http/PushGroup.java      |  171 ++
 .../jdk/internal/net/http/RawChannelTube.java |  436 ++++
 .../internal/net}/http/RedirectFilter.java    |   46 +-
 .../internal/net}/http/RequestPublishers.java |  121 +-
 .../jdk/internal/net}/http/Response.java      |   59 +-
 .../net/http/ResponseBodyHandlers.java        |  279 +++
 .../internal/net}/http/ResponseContent.java   |   92 +-
 .../internal/net/http/ResponseInfoImpl.java   |   72 +
 .../net}/http/ResponseSubscribers.java        |  477 ++++-
 .../jdk/internal/net}/http/SocketTube.java    |  465 +++--
 .../jdk/internal/net}/http/Stream.java        |  423 ++--
 .../jdk/internal/net}/http/TimeoutEvent.java  |    4 +-
 .../internal/net}/http/WindowController.java  |   80 +-
 .../net}/http/WindowUpdateSender.java         |   26 +-
 .../net/http}/common/ByteBufferPool.java      |    4 +-
 .../net/http}/common/ByteBufferReference.java |    4 +-
 .../common/ConnectionExpiredException.java    |    4 +-
 .../net/http}/common/DebugLogger.java         |   55 +-
 .../jdk/internal/net/http}/common/Demand.java |   12 +-
 .../internal/net/http}/common/FlowTube.java   |    4 +-
 .../net/http}/common/HttpHeadersImpl.java     |   48 +-
 .../common/ImmutableExtendedSSLSession.java   |  149 ++
 .../net/http/common/ImmutableSSLSession.java  |  132 ++
 .../jdk/internal/net/http}/common/Log.java    |   38 +-
 .../jdk/internal/net/http/common/Logger.java  |  156 ++
 .../net/http}/common/MinimalFuture.java       |   80 +-
 .../net/http/common/OperationTrackers.java    |   85 +
 .../jdk/internal/net/http}/common/Pair.java   |    4 +-
 .../net/http}/common/SSLFlowDelegate.java     |  415 ++--
 .../internal/net/http}/common/SSLTube.java    |  108 +-
 .../net/http}/common/SequentialScheduler.java |   40 +-
 .../net/http}/common/SubscriberWrapper.java   |  101 +-
 .../net/http}/common/SubscriptionBase.java    |   31 +-
 .../jdk/internal/net/http}/common/Utils.java  |  408 +++-
 .../net/http}/frame/ContinuationFrame.java    |    4 +-
 .../internal/net/http}/frame/DataFrame.java   |    6 +-
 .../internal/net/http}/frame/ErrorFrame.java  |    4 +-
 .../net/http}/frame/FramesDecoder.java        |   54 +-
 .../net/http}/frame/FramesEncoder.java        |    4 +-
 .../internal/net/http}/frame/GoAwayFrame.java |   12 +-
 .../internal/net/http}/frame/HeaderFrame.java |    6 +-
 .../net/http}/frame/HeadersFrame.java         |    4 +-
 .../internal/net/http}/frame/Http2Frame.java  |    4 +-
 .../net/http}/frame/MalformedFrame.java       |    4 +-
 .../net/http}/frame/OutgoingHeaders.java      |    6 +-
 .../internal/net/http}/frame/PingFrame.java   |    8 +-
 .../net/http}/frame/PriorityFrame.java        |    4 +-
 .../net/http}/frame/PushPromiseFrame.java     |    4 +-
 .../internal/net/http}/frame/ResetFrame.java  |    4 +-
 .../net/http}/frame/SettingsFrame.java        |   14 +-
 .../net/http}/frame/WindowUpdateFrame.java    |    4 +-
 .../hpack/BinaryRepresentationWriter.java     |    4 +-
 .../net/http}/hpack/BulkSizeUpdateWriter.java |    4 +-
 .../jdk/internal/net/http}/hpack/Decoder.java |   30 +-
 .../net/http}/hpack/DecodingCallback.java     |    4 +-
 .../jdk/internal/net/http}/hpack/Encoder.java |   13 +-
 .../jdk/internal/net/http}/hpack/HPACK.java   |   14 +-
 .../internal/net/http/hpack/HeaderTable.java  |  232 +++
 .../jdk/internal/net/http}/hpack/Huffman.java |    4 +-
 .../internal/net/http}/hpack/ISO_8859_1.java  |    4 +-
 .../net/http}/hpack/IndexNameValueWriter.java |    4 +-
 .../net/http}/hpack/IndexedWriter.java        |    4 +-
 .../net/http}/hpack/IntegerReader.java        |    4 +-
 .../net/http}/hpack/IntegerWriter.java        |    6 +-
 .../hpack/LiteralNeverIndexedWriter.java      |    4 +-
 .../hpack/LiteralWithIndexingWriter.java      |    4 +-
 .../net/http}/hpack/LiteralWriter.java        |    4 +-
 .../net/http/hpack/SimpleHeaderTable.java}    |  260 +--
 .../net/http}/hpack/SizeUpdateWriter.java     |    4 +-
 .../net/http}/hpack/StringReader.java         |    4 +-
 .../net/http}/hpack/StringWriter.java         |    4 +-
 .../net/http}/hpack/package-info.java         |    8 +-
 .../net/http}/websocket/BuilderImpl.java      |   16 +-
 .../http}/websocket/CheckFailedException.java |    4 +-
 .../websocket/FailWebSocketException.java     |    6 +-
 .../internal/net/http}/websocket/Frame.java   |   12 +-
 .../net/http/websocket/MessageDecoder.java}   |  113 +-
 .../net/http/websocket/MessageEncoder.java    |  381 ++++
 .../net/http/websocket/MessageQueue.java      |  376 ++++
 .../websocket/MessageStreamConsumer.java      |   10 +-
 .../net/http}/websocket/OpeningHandshake.java |   38 +-
 .../net/http}/websocket/RawChannel.java       |    4 +-
 .../net/http}/websocket/StatusCodes.java      |    4 +-
 .../net/http/websocket/Transport.java         |  111 ++
 .../net/http/websocket/TransportFactory.java  |   33 +
 .../http/websocket/TransportFactoryImpl.java  |   41 +
 .../net/http/websocket/TransportImpl.java     |  765 +++++++
 .../websocket/UTF8AccumulatingDecoder.java    |    8 +-
 .../net/http/websocket/WebSocketImpl.java     |  872 ++++++++
 .../net/http}/websocket/WebSocketRequest.java |    4 +-
 .../share/classes/module-info.java            |   11 +-
 src/java.se/share/classes/module-info.java    |    1 +
 .../sun/net/httpserver/ServerImpl.java        |    2 +-
 .../jdk/incubator/http/HttpRequest.java       |  793 --------
 .../jdk/incubator/http/HttpResponse.java      | 1102 ----------
 .../jdk/incubator/http/MultiMapResult.java    |  119 --
 .../classes/jdk/incubator/http/PushGroup.java |  185 --
 .../jdk/incubator/http/RawChannelImpl.java    |  158 --
 .../jdk/incubator/http/SSLDelegate.java       |  489 -----
 .../classes/jdk/incubator/http/WebSocket.java |  718 -------
 .../internal/websocket/OutgoingMessage.java   |  296 ---
 .../http/internal/websocket/Receiver.java     |  188 --
 .../http/internal/websocket/Transmitter.java  |  124 --
 .../internal/websocket/TransportSupplier.java |  109 -
 .../internal/websocket/WebSocketImpl.java     |  605 ------
 test/jdk/ProblemList.txt                      |    2 -
 .../java/net/httpclient/AbstractNoBody.java   |   34 +-
 .../net/httpclient/AsFileDownloadTest.java    |  375 ++++
 .../net/httpclient/AsFileDownloadTest.policy  |   65 +
 .../java/net/httpclient/BasicAuthTest.java    |   27 +-
 .../net/httpclient/BasicRedirectTest.java     |  349 ++++
 .../BodyProcessorInputStreamTest.java         |   26 +-
 .../BufferingSubscriberCancelTest.java        |    4 +-
 .../BufferingSubscriberErrorCompleteTest.java |   11 +-
 .../httpclient/BufferingSubscriberTest.java   |   18 +-
 .../net/httpclient/CancelledResponse.java     |   67 +-
 .../net/httpclient/ConcurrentResponses.java   |   75 +-
 .../java/net/httpclient/CookieHeaderTest.java |  559 ++++++
 .../httpclient/CustomRequestPublisher.java    |   73 +-
 .../httpclient/CustomResponseSubscriber.java  |   67 +-
 .../net/httpclient/DependentActionsTest.java  |  674 +++++++
 .../DependentPromiseActionsTest.java          |  761 +++++++
 .../java/net/httpclient/DigestEchoClient.java |  700 +++++++
 .../net/httpclient/DigestEchoClientSSL.java   |   50 +
 .../java/net/httpclient/DigestEchoServer.java | 1774 +++++++++++++++++
 test/jdk/java/net/httpclient/EchoHandler.java |    8 +-
 .../net/httpclient/EncodedCharsInURI.java     |  518 +++++
 .../net/httpclient/EscapedOctetsInURI.java    |  250 +++
 .../java/net/httpclient/ExpectContinue.java   |  185 ++
 .../httpclient/FlowAdapterPublisherTest.java  |   65 +-
 .../httpclient/FlowAdapterSubscriberTest.java |  204 +-
 .../httpclient/FlowAdaptersCompileOnly.java   |  156 +-
 .../net/httpclient/HandshakeFailureTest.java  |   28 +-
 test/jdk/java/net/httpclient/HeadersTest.java |  509 ++++-
 .../jdk/java/net/httpclient/HeadersTest1.java |   36 +-
 .../jdk/java/net/httpclient/HeadersTest2.java |    6 +-
 .../net/httpclient/HttpClientBuilderTest.java |  155 +-
 .../java/net/httpclient/HttpEchoHandler.java  |   12 +-
 .../net/httpclient/HttpInputStreamTest.java   |   16 +-
 .../httpclient/HttpRequestBuilderTest.java    |   57 +-
 .../HttpResponseInputStreamTest.java          |   12 +-
 .../net/httpclient/HttpServerAdapters.java    |  614 ++++++
 .../java/net/httpclient/HttpsTunnelTest.java  |  179 ++
 .../net/httpclient/ImmutableFlowItems.java    |  284 +++
 .../java/net/httpclient/ImmutableHeaders.java |   19 +-
 .../httpclient/InterruptedBlockingSend.java   |   19 +-
 ...InvalidInputStreamSubscriptionRequest.java |  561 ++++++
 .../net/httpclient/InvalidSSLContextTest.java |  187 ++
 .../InvalidSubscriptionRequest.java           |  493 +++++
 .../net/httpclient/LightWeightHttpServer.java |    9 +-
 .../httpclient/LineAdaptersCompileOnly.java   |  130 ++
 .../net/httpclient/LineBodyHandlerTest.java   |  697 +++++++
 .../LineStreamsAndSurrogatesTest.java         |  311 +++
 .../LineSubscribersAndSurrogatesTest.java     |  379 ++++
 .../jdk/java/net/httpclient/ManyRequests.java |   21 +-
 .../java/net/httpclient/ManyRequests2.java    |    2 +-
 .../net/httpclient/ManyRequestsLegacy.java    |   37 +-
 .../httpclient/MappingResponseSubscriber.java |  348 ++++
 .../net/httpclient/MessageHeadersTest.java    |    4 +-
 test/jdk/java/net/httpclient/MethodsTest.java |  122 ++
 test/jdk/java/net/httpclient/MockServer.java  |   40 +-
 .../java/net/httpclient/MultiAuthTest.java    |   29 +-
 .../java/net/httpclient/NoBodyPartOne.java    |   40 +-
 .../java/net/httpclient/NoBodyPartTwo.java    |   44 +-
 .../httpclient/ProxyAuthDisabledSchemes.java  |   56 +
 .../ProxyAuthDisabledSchemesSSL.java          |   57 +
 .../java/net/httpclient/ProxyAuthTest.java    |   21 +-
 test/jdk/java/net/httpclient/ProxyServer.java |    6 +-
 test/jdk/java/net/httpclient/ProxyTest.java   |   97 +-
 .../net/httpclient/RedirectMethodChange.java  |  320 +++
 .../net/httpclient/RedirectWithCookie.java    |  233 +++
 .../java/net/httpclient/ReferenceTracker.java |  130 ++
 .../java/net/httpclient/RequestBodyTest.java  |   78 +-
 .../net/httpclient/RequestBodyTest.policy     |   52 +
 .../net/httpclient/RequestBuilderTest.java    |  116 +-
 .../net/httpclient/ResponsePublisher.java     |  516 +++++
 .../java/net/httpclient/RetryWithCookie.java  |  266 +++
 .../java/net/httpclient/ServerCloseTest.java  |  410 ++++
 .../java/net/httpclient/ShortRequestBody.java |   51 +-
 .../jdk/java/net/httpclient/SmallTimeout.java |   48 +-
 test/jdk/java/net/httpclient/SmokeTest.java   |  123 +-
 .../java/net/httpclient/SplitResponse.java    |   60 +-
 .../java/net/httpclient/SplitResponseSSL.java |    5 +-
 .../java/net/httpclient/StreamingBody.java    |  170 ++
 .../SubscriberPublisherAPIExceptions.java     |  135 +-
 test/jdk/java/net/httpclient/TEST.properties  |    2 +-
 test/jdk/java/net/httpclient/TestKit.java     |    2 +-
 test/jdk/java/net/httpclient/TestKitTest.java |    2 +-
 .../net/httpclient/ThrowingPublishers.java    |  685 +++++++
 .../net/httpclient/ThrowingPushPromises.java  |  757 +++++++
 .../net/httpclient/ThrowingSubscribers.java   |  734 +++++++
 .../jdk/java/net/httpclient/TimeoutBasic.java |   36 +-
 .../java/net/httpclient/TimeoutOrdering.java  |   24 +-
 test/jdk/java/net/httpclient/VersionTest.java |  102 +-
 .../java/net/httpclient/ZeroRedirects.java    |   52 +-
 test/jdk/java/net/httpclient/dependent.policy |   68 +
 .../httpclient/docs/files/notsobigfile.txt    |    2 +-
 .../httpclient/examples/JavadocExamples.java  |  272 +++
 .../httpclient/examples/WebSocketExample.java |   29 +-
 .../net/httpclient/http2/BadHeadersTest.java  |  326 +++
 .../java/net/httpclient/http2/BasicTest.java  |   45 +-
 .../http2/ContinuationFrameTest.java          |   50 +-
 .../java/net/httpclient/http2/ErrorTest.java  |   26 +-
 .../httpclient/http2/FixedThreadPoolTest.java |   39 +-
 .../http2/HpackBinaryTestDriver.java          |   10 +-
 .../http2/HpackCircularBufferDriver.java      |   12 +-
 .../httpclient/http2/HpackDecoderDriver.java  |   12 +-
 .../httpclient/http2/HpackEncoderDriver.java  |   12 +-
 .../http2/HpackHeaderTableDriver.java         |   12 +-
 .../httpclient/http2/HpackHuffmanDriver.java  |   12 +-
 .../net/httpclient/http2/HpackTestHelper.java |   12 +-
 .../httpclient/http2/ImplicitPushCancel.java  |   49 +-
 .../java/net/httpclient/http2/ProxyTest2.java |   93 +-
 .../net/httpclient/http2/RedirectTest.java    |   37 +-
 .../java/net/httpclient/http2/ServerPush.java |  324 ++-
 .../http2/ServerPushWithDiffTypes.java        |  258 +++
 .../net/httpclient/http2/TLSConnection.java   |   70 +-
 .../java/net/httpclient/http2/Timeout.java    |   28 +-
 .../net/http}/hpack/BinaryPrimitivesTest.java |   38 +-
 .../net/http}/hpack/BuffersTestingKit.java    |    4 +-
 .../net/http}/hpack/CircularBufferTest.java   |   46 +-
 .../internal/net/http}/hpack/DecoderTest.java |    6 +-
 .../internal/net/http}/hpack/EncoderTest.java |   12 +-
 .../net/http/hpack/HeaderTableTest.java       |  151 ++
 .../internal/net/http}/hpack/HuffmanTest.java |    4 +-
 .../http/hpack/SimpleHeaderTableTest.java}    |  195 +-
 .../internal/net/http}/hpack/SpecHelper.java  |    4 +-
 .../internal/net/http}/hpack/TestHelper.java  |    4 +-
 .../java/net/httpclient/http2/keystore.p12    |  Bin 2452 -> 2615 bytes
 .../http2/server/BodyInputStream.java         |   13 +-
 .../http2/server/BodyOutputStream.java        |   14 +-
 .../httpclient/http2/server/EchoHandler.java  |   12 +-
 .../http2/server/ExceptionallyCloseable.java  |    2 +-
 .../http2/server/Http2EchoHandler.java        |   15 +-
 .../httpclient/http2/server/Http2Handler.java |    2 +-
 .../http2/server/Http2RedirectHandler.java    |    4 +-
 .../http2/server/Http2TestExchange.java       |    2 +-
 .../http2/server/Http2TestExchangeImpl.java   |    8 +-
 .../server/Http2TestExchangeSupplier.java     |    2 +-
 .../http2/server/Http2TestServer.java         |   48 +-
 .../server/Http2TestServerConnection.java     |  121 +-
 .../http2/server/NoBodyHandler.java           |    2 +-
 .../http2/server/OutgoingPushPromise.java     |    6 +-
 .../httpclient/http2/server/PushHandler.java  |   15 +-
 .../net/httpclient/http2/server/Queue.java    |   10 +-
 .../net/httpclient/http2/server/TestUtil.java |    6 +-
 .../offline/DelegatingHttpClient.java         |  109 +
 .../httpclient/offline/FixedHttpHeaders.java  |   60 +
 .../httpclient/offline/FixedHttpResponse.java |  111 ++
 .../offline/FixedResponseHttpClient.java      |  243 +++
 .../httpclient/offline/OfflineTesting.java    |  161 ++
 .../jdk/java/net/httpclient/security/0.policy |   25 +-
 .../jdk/java/net/httpclient/security/1.policy |   30 +-
 .../java/net/httpclient/security/10.policy    |   29 +-
 .../java/net/httpclient/security/11.policy    |   31 +-
 .../java/net/httpclient/security/12.policy    |   31 +-
 .../java/net/httpclient/security/14.policy    |   29 +-
 .../java/net/httpclient/security/15.policy    |   29 +-
 .../jdk/java/net/httpclient/security/2.policy |   29 +-
 .../jdk/java/net/httpclient/security/3.policy |   29 +-
 .../jdk/java/net/httpclient/security/4.policy |   31 +-
 .../jdk/java/net/httpclient/security/5.policy |   29 +-
 .../jdk/java/net/httpclient/security/6.policy |   29 +-
 .../jdk/java/net/httpclient/security/7.policy |   29 +-
 .../jdk/java/net/httpclient/security/8.policy |   29 +-
 .../jdk/java/net/httpclient/security/9.policy |   29 +-
 .../java/net/httpclient/security/Driver.java  |   18 +-
 .../net/httpclient/security/Security.java     |  270 +--
 .../FileProcessorPermissionTest.java          |   59 +-
 .../filePerms/SecurityBeforeFile.java         |   94 +
 .../security/filePerms/allpermissions.policy  |   28 +
 .../security/filePerms/httpclient.policy      |   69 -
 .../security/filePerms/nopermissions.policy   |   26 +
 .../httpclient/ssltest/CertificateTest.java   |  140 ++
 .../java/net/httpclient/ssltest/Server.java   |  127 ++
 .../java/net/httpclient/ssltest/bad.keystore  |  Bin 0 -> 2329 bytes
 .../java/net/httpclient/ssltest/good.keystore |  Bin 0 -> 2321 bytes
 .../net/httpclient/ssltest/loopback.keystore  |  Bin 0 -> 2343 bytes
 .../java/net/httpclient/websocket/Abort.java  |  416 ++++
 .../httpclient/websocket/AutomaticPong.java   |  220 ++
 .../websocket/BlowupOutputQueue.java          |  133 ++
 ...dover.java => ConnectionHandoverTest.java} |   16 +-
 .../websocket/DummyWebSocketServer.java       |   76 +-
 .../java/net/httpclient/websocket/Frame.java  |  497 +++++
 .../websocket/HeaderWriterDriver.java         |    8 +-
 .../httpclient/websocket/MaskerDriver.java    |    8 +-
 ...estDriver.java => MessageQueueDriver.java} |   11 +-
 .../internal/websocket => }/MockListener.java |  195 +-
 .../websocket/PendingBinaryPingClose.java     |   89 +
 .../websocket/PendingBinaryPongClose.java     |   89 +
 .../websocket/PendingOperations.java          |   97 +
 .../websocket/PendingPingBinaryClose.java     |   87 +
 .../websocket/PendingPingTextClose.java       |   87 +
 .../websocket/PendingPongBinaryClose.java     |   87 +
 .../websocket/PendingPongTextClose.java       |   87 +
 .../websocket/PendingTextPingClose.java       |   90 +
 .../websocket/PendingTextPongClose.java       |   90 +
 .../httpclient/websocket/ReaderDriver.java    |    6 +-
 .../net/httpclient/websocket/SendTest.java    |  100 +
 .../net/httpclient/websocket/Support.java     |  197 ++
 ...ion.java => WSHandshakeExceptionTest.java} |   68 +-
 ...ketTest.java => WebSocketBuilderTest.java} |   87 +-
 .../websocket/WebSocketExtendedTest.java      |  323 +++
 .../httpclient/websocket/WebSocketTest.java   |  510 +++++
 .../net/http}/websocket/HeaderWriterTest.java |   12 +-
 .../net/http}/websocket/MaskerTest.java       |   10 +-
 .../net/http/websocket/MessageQueueTest.java  |  479 +++++
 .../net/http}/websocket/ReaderTest.java       |   10 +-
 .../net/http}/websocket/TestSupport.java      |   22 +-
 .../http/internal/websocket/MockReceiver.java |   87 -
 .../internal/websocket/MockTransmitter.java   |   71 -
 .../internal/websocket/MockTransport.java     |   68 -
 .../internal/websocket/ReceivingTest.java     |  206 --
 .../http/internal/websocket/SendingTest.java  |  164 --
 .../security/WSURLPermissionTest.java         |    8 +-
 .../websocket/security/httpclient.policy      |   44 +-
 .../AuthenticationFilterTestDriver.java}      |    7 +-
 .../whitebox/ConnectionPoolTestDriver.java    |    9 +-
 .../whitebox/DefaultProxyDriver.java          |   37 +
 .../httpclient/whitebox/DemandTestDriver.java |    4 +-
 .../httpclient/whitebox/FlowTestDriver.java   |    6 +-
 .../whitebox/FramesDecoderTestDriver.java     |    6 +-
 .../whitebox/Http1HeaderParserTestDriver.java |    6 +-
 .../whitebox/MinimalFutureTestDriver.java     |   28 +
 ...{Driver.java => RawChannelTestDriver.java} |    9 +-
 .../whitebox/SSLEchoTubeTestDriver.java       |    6 +-
 .../whitebox/SSLTubeTestDriver.java           |    6 +-
 .../SelectorTestDriver.java}                  |    9 +-
 .../whitebox/WrapperTestDriver.java           |    6 +-
 .../net}/http/AbstractRandomTest.java         |    2 +-
 .../net}/http/AbstractSSLTubeTest.java        |    9 +-
 .../net/http/AuthenticationFilterTest.java    |  565 ++++++
 .../net}/http/ConnectionPoolTest.java         |   22 +-
 .../jdk/internal/net/http/DefaultProxy.java   |  103 +
 .../jdk/internal/net}/http/FlowTest.java      |   14 +-
 .../net}/http/Http1HeaderParserTest.java      |    4 +-
 .../internal/net}/http/RawChannelTest.java    |   55 +-
 .../internal/net}/http/SSLEchoTubeTest.java   |   22 +-
 .../jdk/internal/net}/http/SSLTubeTest.java   |   16 +-
 .../jdk/internal/net}/http/SelectorTest.java  |   22 +-
 .../jdk/internal/net}/http/WrapperTest.java   |    4 +-
 .../internal/net/http}/common/DemandTest.java |    2 +-
 .../net/http/common/MinimalFutureTest.java    |  161 ++
 .../net/http}/frame/FramesDecoderTest.java    |    2 +-
 .../jdk/testlibrary/SimpleSSLContext.java     |   55 +-
 .../lib/testlibrary/jdk/testlibrary/testkeys  |  Bin 1369 -> 2321 bytes
 398 files changed, 37634 insertions(+), 10888 deletions(-)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/java/net}/http/HttpClient.java (57%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/java/net}/http/HttpHeaders.java (89%)
 create mode 100644 src/java.net.http/share/classes/java/net/http/HttpRequest.java
 create mode 100644 src/java.net.http/share/classes/java/net/http/HttpResponse.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/java/net}/http/HttpTimeoutException.java (83%)
 create mode 100644 src/java.net.http/share/classes/java/net/http/WebSocket.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/java/net}/http/WebSocketHandshakeException.java (84%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/java/net}/http/package-info.java (51%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/AbstractAsyncSSLConnection.java (54%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/AbstractSubscription.java (90%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/AsyncEvent.java (95%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/AsyncSSLConnection.java (79%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/AsyncSSLTunnelConnection.java (81%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/AsyncTriggerEvent.java (95%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/AuthenticationFilter.java (71%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/BufferingSubscriber.java (94%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/ConnectionPool.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/CookieFilter.java (73%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Exchange.java (73%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/ExchangeImpl.java (82%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/FilterFactory.java (88%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/HeaderFilter.java (90%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/HeaderParser.java (98%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Http1AsyncReceiver.java (78%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Http1Exchange.java (79%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Http1HeaderParser.java (98%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Http1Request.java (68%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Http1Response.java (56%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Http2ClientImpl.java (78%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Http2Connection.java (79%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/HttpClientBuilderImpl.java (93%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/HttpClientFacade.java (79%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/HttpClientImpl.java (77%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/HttpConnection.java (62%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/HttpRequestBuilderImpl.java (82%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/HttpRequestImpl.java (76%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/HttpResponseImpl.java (77%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/ImmutableHeaders.java (51%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/LineSubscriberAdapter.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/MultiExchange.java (69%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/PlainHttpConnection.java (59%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/PlainProxyConnection.java (90%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/PlainTunnelingConnection.java (68%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/PrivilegedExecutor.java (96%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/ProxyAuthenticationRequired.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/PullPublisher.java (95%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/PushGroup.java
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/RawChannelTube.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/RedirectFilter.java (72%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/RequestPublishers.java (72%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Response.java (55%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/ResponseBodyHandlers.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/ResponseContent.java (85%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/ResponseInfoImpl.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/ResponseSubscribers.java (53%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/SocketTube.java (69%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/Stream.java (74%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/TimeoutEvent.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/WindowController.java (82%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator => java.net.http/share/classes/jdk/internal/net}/http/WindowUpdateSender.java (80%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/ByteBufferPool.java (95%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/ByteBufferReference.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/ConnectionExpiredException.java (93%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/DebugLogger.java (85%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/Demand.java (90%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/FlowTube.java (98%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/HttpHeadersImpl.java (59%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableExtendedSSLSession.java
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableSSLSession.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/Log.java (88%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/common/Logger.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/MinimalFuture.java (52%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/common/OperationTrackers.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/Pair.java (94%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/SSLFlowDelegate.java (71%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/SSLTube.java (87%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/SequentialScheduler.java (91%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/SubscriberWrapper.java (83%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/SubscriptionBase.java (76%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/common/Utils.java (60%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/ContinuationFrame.java (94%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/DataFrame.java (95%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/ErrorFrame.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/FramesDecoder.java (93%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/FramesEncoder.java (99%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/GoAwayFrame.java (88%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/HeaderFrame.java (93%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/HeadersFrame.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/Http2Frame.java (97%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/MalformedFrame.java (95%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/OutgoingHeaders.java (94%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/PingFrame.java (91%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/PriorityFrame.java (94%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/PushPromiseFrame.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/ResetFrame.java (93%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/SettingsFrame.java (92%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/frame/WindowUpdateFrame.java (94%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/BinaryRepresentationWriter.java (92%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/BulkSizeUpdateWriter.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/Decoder.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/DecodingCallback.java (98%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/Encoder.java (97%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/HPACK.java (92%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/hpack/HeaderTable.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/Huffman.java (99%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/ISO_8859_1.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/IndexNameValueWriter.java (96%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/IndexedWriter.java (94%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/IntegerReader.java (97%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/IntegerWriter.java (95%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/LiteralNeverIndexedWriter.java (92%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/LiteralWithIndexingWriter.java (95%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/LiteralWriter.java (92%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java => java.net.http/share/classes/jdk/internal/net/http/hpack/SimpleHeaderTable.java} (57%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/SizeUpdateWriter.java (94%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/StringReader.java (97%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/StringWriter.java (97%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/hpack/package-info.java (83%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/BuilderImpl.java (92%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/CheckFailedException.java (93%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/FailWebSocketException.java (91%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/Frame.java (98%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FrameConsumer.java => java.net.http/share/classes/jdk/internal/net/http/websocket/MessageDecoder.java} (73%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageEncoder.java
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageQueue.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/MessageStreamConsumer.java (85%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/OpeningHandshake.java (93%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/RawChannel.java (97%)
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/StatusCodes.java (96%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/websocket/Transport.java
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportFactory.java
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportFactoryImpl.java
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/UTF8AccumulatingDecoder.java (94%)
 create mode 100644 src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketImpl.java
 rename src/{jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal => java.net.http/share/classes/jdk/internal/net/http}/websocket/WebSocketRequest.java (93%)
 rename src/{jdk.incubator.httpclient => java.net.http}/share/classes/module-info.java (84%)
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OutgoingMessage.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/TransportSupplier.java
 delete mode 100644 src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java
 create mode 100644 test/jdk/java/net/httpclient/AsFileDownloadTest.java
 create mode 100644 test/jdk/java/net/httpclient/AsFileDownloadTest.policy
 create mode 100644 test/jdk/java/net/httpclient/BasicRedirectTest.java
 create mode 100644 test/jdk/java/net/httpclient/CookieHeaderTest.java
 create mode 100644 test/jdk/java/net/httpclient/DependentActionsTest.java
 create mode 100644 test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
 create mode 100644 test/jdk/java/net/httpclient/DigestEchoClient.java
 create mode 100644 test/jdk/java/net/httpclient/DigestEchoClientSSL.java
 create mode 100644 test/jdk/java/net/httpclient/DigestEchoServer.java
 create mode 100644 test/jdk/java/net/httpclient/EncodedCharsInURI.java
 create mode 100644 test/jdk/java/net/httpclient/EscapedOctetsInURI.java
 create mode 100644 test/jdk/java/net/httpclient/ExpectContinue.java
 create mode 100644 test/jdk/java/net/httpclient/HttpServerAdapters.java
 create mode 100644 test/jdk/java/net/httpclient/HttpsTunnelTest.java
 create mode 100644 test/jdk/java/net/httpclient/ImmutableFlowItems.java
 create mode 100644 test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
 create mode 100644 test/jdk/java/net/httpclient/InvalidSSLContextTest.java
 create mode 100644 test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
 create mode 100644 test/jdk/java/net/httpclient/LineAdaptersCompileOnly.java
 create mode 100644 test/jdk/java/net/httpclient/LineBodyHandlerTest.java
 create mode 100644 test/jdk/java/net/httpclient/LineStreamsAndSurrogatesTest.java
 create mode 100644 test/jdk/java/net/httpclient/LineSubscribersAndSurrogatesTest.java
 create mode 100644 test/jdk/java/net/httpclient/MappingResponseSubscriber.java
 create mode 100644 test/jdk/java/net/httpclient/MethodsTest.java
 create mode 100644 test/jdk/java/net/httpclient/ProxyAuthDisabledSchemes.java
 create mode 100644 test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java
 create mode 100644 test/jdk/java/net/httpclient/RedirectMethodChange.java
 create mode 100644 test/jdk/java/net/httpclient/RedirectWithCookie.java
 create mode 100644 test/jdk/java/net/httpclient/ReferenceTracker.java
 create mode 100644 test/jdk/java/net/httpclient/RequestBodyTest.policy
 create mode 100644 test/jdk/java/net/httpclient/ResponsePublisher.java
 create mode 100644 test/jdk/java/net/httpclient/RetryWithCookie.java
 create mode 100644 test/jdk/java/net/httpclient/ServerCloseTest.java
 create mode 100644 test/jdk/java/net/httpclient/StreamingBody.java
 create mode 100644 test/jdk/java/net/httpclient/ThrowingPublishers.java
 create mode 100644 test/jdk/java/net/httpclient/ThrowingPushPromises.java
 create mode 100644 test/jdk/java/net/httpclient/ThrowingSubscribers.java
 create mode 100644 test/jdk/java/net/httpclient/dependent.policy
 create mode 100644 test/jdk/java/net/httpclient/examples/JavadocExamples.java
 create mode 100644 test/jdk/java/net/httpclient/http2/BadHeadersTest.java
 create mode 100644 test/jdk/java/net/httpclient/http2/ServerPushWithDiffTypes.java
 rename test/jdk/java/net/httpclient/http2/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/hpack/BinaryPrimitivesTest.java (92%)
 rename test/jdk/java/net/httpclient/http2/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/hpack/BuffersTestingKit.java (98%)
 rename test/jdk/java/net/httpclient/http2/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/hpack/CircularBufferTest.java (72%)
 rename test/jdk/java/net/httpclient/http2/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/hpack/DecoderTest.java (99%)
 rename test/jdk/java/net/httpclient/http2/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/hpack/EncoderTest.java (98%)
 create mode 100644 test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HeaderTableTest.java
 rename test/jdk/java/net/httpclient/http2/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/hpack/HuffmanTest.java (99%)
 rename test/jdk/java/net/httpclient/http2/{jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java => java.net.http/jdk/internal/net/http/hpack/SimpleHeaderTableTest.java} (64%)
 rename test/jdk/java/net/httpclient/http2/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/hpack/SpecHelper.java (95%)
 rename test/jdk/java/net/httpclient/http2/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/hpack/TestHelper.java (98%)
 create mode 100644 test/jdk/java/net/httpclient/offline/DelegatingHttpClient.java
 create mode 100644 test/jdk/java/net/httpclient/offline/FixedHttpHeaders.java
 create mode 100644 test/jdk/java/net/httpclient/offline/FixedHttpResponse.java
 create mode 100644 test/jdk/java/net/httpclient/offline/FixedResponseHttpClient.java
 create mode 100644 test/jdk/java/net/httpclient/offline/OfflineTesting.java
 create mode 100644 test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java
 create mode 100644 test/jdk/java/net/httpclient/security/filePerms/allpermissions.policy
 delete mode 100644 test/jdk/java/net/httpclient/security/filePerms/httpclient.policy
 create mode 100644 test/jdk/java/net/httpclient/security/filePerms/nopermissions.policy
 create mode 100644 test/jdk/java/net/httpclient/ssltest/CertificateTest.java
 create mode 100644 test/jdk/java/net/httpclient/ssltest/Server.java
 create mode 100644 test/jdk/java/net/httpclient/ssltest/bad.keystore
 create mode 100644 test/jdk/java/net/httpclient/ssltest/good.keystore
 create mode 100644 test/jdk/java/net/httpclient/ssltest/loopback.keystore
 create mode 100644 test/jdk/java/net/httpclient/websocket/Abort.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/AutomaticPong.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/BlowupOutputQueue.java
 rename test/jdk/java/net/httpclient/websocket/{ConnectionHandover.java => ConnectionHandoverTest.java} (95%)
 create mode 100644 test/jdk/java/net/httpclient/websocket/Frame.java
 rename test/jdk/java/net/httpclient/websocket/{SendingTestDriver.java => MessageQueueDriver.java} (75%)
 rename test/jdk/java/net/httpclient/websocket/{jdk.incubator.httpclient/jdk/incubator/http/internal/websocket => }/MockListener.java (65%)
 create mode 100644 test/jdk/java/net/httpclient/websocket/PendingBinaryPingClose.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/PendingBinaryPongClose.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/PendingOperations.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/PendingPingBinaryClose.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/PendingPingTextClose.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/PendingPongBinaryClose.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/PendingPongTextClose.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/PendingTextPingClose.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/PendingTextPongClose.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/SendTest.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/Support.java
 rename test/jdk/java/net/httpclient/websocket/{WSHandshakeException.java => WSHandshakeExceptionTest.java} (69%)
 rename test/jdk/java/net/httpclient/websocket/{jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java => WebSocketBuilderTest.java} (74%)
 create mode 100644 test/jdk/java/net/httpclient/websocket/WebSocketExtendedTest.java
 create mode 100644 test/jdk/java/net/httpclient/websocket/WebSocketTest.java
 rename test/jdk/java/net/httpclient/websocket/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/websocket/HeaderWriterTest.java (91%)
 rename test/jdk/java/net/httpclient/websocket/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/websocket/MaskerTest.java (94%)
 create mode 100644 test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/MessageQueueTest.java
 rename test/jdk/java/net/httpclient/websocket/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/websocket/ReaderTest.java (96%)
 rename test/jdk/java/net/httpclient/websocket/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/websocket/TestSupport.java (94%)
 delete mode 100644 test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockReceiver.java
 delete mode 100644 test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransmitter.java
 delete mode 100644 test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransport.java
 delete mode 100644 test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReceivingTest.java
 delete mode 100644 test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/SendingTest.java
 rename test/jdk/java/net/httpclient/{websocket/ReceivingTestDriver.java => whitebox/AuthenticationFilterTestDriver.java} (75%)
 create mode 100644 test/jdk/java/net/httpclient/whitebox/DefaultProxyDriver.java
 create mode 100644 test/jdk/java/net/httpclient/whitebox/MinimalFutureTestDriver.java
 rename test/jdk/java/net/httpclient/whitebox/{Driver.java => RawChannelTestDriver.java} (80%)
 rename test/jdk/java/net/httpclient/{websocket/BuildingWebSocketDriver.java => whitebox/SelectorTestDriver.java} (73%)
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/AbstractRandomTest.java (98%)
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/AbstractSSLTubeTest.java (98%)
 create mode 100644 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AuthenticationFilterTest.java
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/ConnectionPoolTest.java (94%)
 create mode 100644 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/DefaultProxy.java
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/FlowTest.java (98%)
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/Http1HeaderParserTest.java (99%)
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/RawChannelTest.java (84%)
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/SSLEchoTubeTest.java (96%)
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/SSLTubeTest.java (95%)
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/SelectorTest.java (92%)
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator => java.net.http/jdk/internal/net}/http/WrapperTest.java (98%)
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/common/DemandTest.java (99%)
 create mode 100644 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/MinimalFutureTest.java
 rename test/jdk/java/net/httpclient/whitebox/{jdk.incubator.httpclient/jdk/incubator/http/internal => java.net.http/jdk/internal/net/http}/frame/FramesDecoderTest.java (99%)

diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index d9e9352e118..f7105ea4b1c 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -89,6 +89,7 @@ PLATFORM_MODULES += \
     #
 
 PLATFORM_MODULES += \
+    java.net.http \
     java.scripting \
     java.security.jgss \
     java.smartcardio \
@@ -102,7 +103,6 @@ PLATFORM_MODULES += \
     jdk.crypto.ec \
     jdk.dynalink \
     jdk.httpserver \
-    jdk.incubator.httpclient \
     jdk.internal.vm.compiler.management \
     jdk.jsobject \
     jdk.localedata \
@@ -145,7 +145,6 @@ DOCS_MODULES += \
     jdk.editpad \
     jdk.hotspot.agent \
     jdk.httpserver \
-    jdk.incubator.httpclient \
     jdk.jartool \
     jdk.javadoc \
     jdk.jcmd \
diff --git a/src/java.base/share/classes/java/net/CookieHandler.java b/src/java.base/share/classes/java/net/CookieHandler.java
index af4c813926b..922eaf5bd21 100644
--- a/src/java.base/share/classes/java/net/CookieHandler.java
+++ b/src/java.base/share/classes/java/net/CookieHandler.java
@@ -36,9 +36,9 @@
  * handler. The HTTP state management mechanism specifies a way to
  * create a stateful session with HTTP requests and responses.
  *
- * <p>A system-wide CookieHandler that to used by the HTTP protocol
- * handler can be registered by doing a
- * CookieHandler.setDefault(CookieHandler). The currently registered
+ * <p> A system-wide CookieHandler to be used by the {@linkplain
+ * HttpURLConnection HTTP URL stream protocol handler} can be registered by
+ * doing a CookieHandler.setDefault(CookieHandler). The currently registered
  * CookieHandler can be retrieved by calling
  * CookieHandler.getDefault().
  *
diff --git a/src/java.base/share/classes/java/net/doc-files/net-properties.html b/src/java.base/share/classes/java/net/doc-files/net-properties.html
index f6f87b8edc3..19ba9a5f78f 100644
--- a/src/java.base/share/classes/java/net/doc-files/net-properties.html
+++ b/src/java.base/share/classes/java/net/doc-files/net-properties.html
@@ -156,7 +156,7 @@ <H2>Proxies</H2>
 	checked only once at startup.</P>
 </UL>
 <a id="MiscHTTP"></a>
-<H2>Misc HTTP properties</H2>
+<H2>Misc HTTP URL stream protocol handler properties</H2>
 <UL>
 	<LI><P><B>http.agent</B> (default: &ldquo;Java/&lt;version&gt;&rdquo;)<BR>
 	Defines the string sent in the User-Agent request header in http
diff --git a/src/java.base/share/classes/java/net/package-info.java b/src/java.base/share/classes/java/net/package-info.java
index 37a4ea69de1..1f305be9833 100644
--- a/src/java.base/share/classes/java/net/package-info.java
+++ b/src/java.base/share/classes/java/net/package-info.java
@@ -121,8 +121,8 @@
  *            underlying protocol handlers like http or https.</li>
  *       <li>{@link java.net.HttpURLConnection} is a subclass of URLConnection
  *            and provides some additional functionalities specific to the
- *            HTTP protocol. This API has been superceded by the newer
-              HTTP client API described in the previous section.</li>
+ *            HTTP protocol. This API has been superseded by the newer
+ *            {@linkplain java.net.http HTTP Client API}.</li>
  * </ul>
  * <p>The recommended usage is to use {@link java.net.URI} to identify
  *    resources, then convert it into a {@link java.net.URL} when it is time to
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 7a290b0f0f9..a32e332efc7 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -171,7 +171,7 @@
         jdk.attach,
         jdk.charsets,
         jdk.compiler,
-        jdk.incubator.httpclient,
+        java.net.http,
         jdk.jdeps,
         jdk.jlink,
         jdk.jshell,
@@ -204,12 +204,11 @@
         jdk.internal.jvmstat;
     exports jdk.internal.vm.annotation to
         jdk.unsupported,
-        jdk.internal.vm.ci,
-        jdk.incubator.httpclient;
+        jdk.internal.vm.ci;
     exports jdk.internal.util.jar to
         jdk.jartool;
     exports sun.net to
-        jdk.incubator.httpclient,
+        java.net.http,
         jdk.naming.dns;
     exports sun.net.ext to
         jdk.net;
@@ -219,10 +218,10 @@
     exports sun.net.util to
         java.desktop,
         jdk.jconsole,
-        jdk.incubator.httpclient;
+        java.net.http;
     exports sun.net.www to
         java.desktop,
-        jdk.incubator.httpclient,
+        java.net.http,
         jdk.jartool;
     exports sun.net.www.protocol.http to
         java.security.jgss;
diff --git a/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy
index a23b72d78bf..b0ffc990b46 100644
--- a/src/java.base/share/lib/security/default.policy
+++ b/src/java.base/share/lib/security/default.policy
@@ -14,6 +14,23 @@ grant codeBase "jrt:/java.compiler" {
 };
 
 
+grant codeBase "jrt:/java.net.http" {
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
+    permission java.net.SocketPermission "*","connect,resolve";
+    permission java.net.URLPermission "http:*","*:*";
+    permission java.net.URLPermission "https:*","*:*";
+    permission java.net.URLPermission "ws:*","*:*";
+    permission java.net.URLPermission "wss:*","*:*";
+    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
+    // For request/response body processors, fromFile, asFile
+    permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
+    permission java.util.PropertyPermission "*","read";
+    permission java.net.NetPermission "getProxySelector";
+};
+
 grant codeBase "jrt:/java.scripting" {
     permission java.security.AllPermission;
 };
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java b/src/java.net.http/share/classes/java/net/http/HttpClient.java
similarity index 57%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java
rename to src/java.net.http/share/classes/java/net/http/HttpClient.java
index d537c805d89..47c7ba0c28b 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package java.net.http;
 
 import java.io.IOException;
 import java.net.Authenticator;
@@ -31,7 +31,9 @@
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.ProxySelector;
-import java.net.URI;
+import java.net.URLPermission;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
@@ -39,19 +41,89 @@
 import java.util.concurrent.ThreadFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import jdk.internal.net.http.HttpClientBuilderImpl;
 
 /**
- * A container for configuration information common to multiple {@link
- * HttpRequest}s. All requests are sent through a {@code HttpClient}.
- * {@Incubating}
+ * An HTTP Client.
  *
- * <p> {@code HttpClient}s are immutable and created from a builder returned
- * from {@link HttpClient#newBuilder()}. Request builders are created by calling
- * {@link HttpRequest#newBuilder() }.
- * <p>
- * See {@link HttpRequest} for examples of usage of this API.
+ * <p> An {@code HttpClient} can be used to send {@linkplain HttpRequest
+ * requests} and retrieve their {@linkplain HttpResponse responses}. An {@code
+ * HttpClient} is created through a {@link HttpClient#newBuilder() builder}. The
+ * builder can be used to configure per-client state, like: the preferred
+ * protocol version ( HTTP/1.1 or HTTP/2 ), whether to follow redirects, a
+ * proxy, an authenticator, etc. Once built, an {@code HttpClient} is immutable,
+ * and can be used to send multiple requests.
  *
- * @since 9
+ * <p> An {@code HttpClient} provides configuration information, and resource
+ * sharing, for all requests send through it.
+ *
+ * <p> A {@link BodyHandler BodyHandler} must be supplied for each {@link
+ * HttpRequest} sent. The {@code BodyHandler} determines how to handle the
+ * response body, if any. Once an {@link HttpResponse} is received, the
+ * headers, response code, and body (typically) are available. Whether the
+ * response body bytes have been read or not depends on the type, {@code T}, of
+ * the response body.
+ *
+ * <p> Requests can be sent either synchronously or asynchronously:
+ * <ul>
+ *     <li>{@link HttpClient#send(HttpRequest, BodyHandler)} blocks
+ *     until the request has been sent and the response has been received.</li>
+ *
+ *     <li>{@link HttpClient#sendAsync(HttpRequest, BodyHandler)} sends the
+ *     request and receives the response asynchronously. The {@code sendAsync}
+ *     method returns immediately with a {@link CompletableFuture
+ *     CompletableFuture}&lt;{@link HttpResponse}&gt;. The {@code
+ *     CompletableFuture} completes when the response becomes available. The
+ *     returned {@code CompletableFuture} can be combined in different ways to
+ *     declare dependencies among several asynchronous tasks.</li>
+ * </ul>
+ *
+ * <p><b>Synchronous Example</b>
+ * <pre>{@code    HttpClient client = HttpClient.newBuilder()
+ *        .version(Version.HTTP_1_1)
+ *        .followRedirects(Redirect.NORMAL)
+ *        .proxy(ProxySelector.of(new InetSocketAddress("proxy.example.com", 80)))
+ *        .authenticator(Authenticator.getDefault())
+ *        .build();
+ *   HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+ *   System.out.println(response.statusCode());
+ *   System.out.println(response.body());  }</pre>
+ *
+ * <p><b>Asynchronous Example</b>
+ * <pre>{@code    HttpRequest request = HttpRequest.newBuilder()
+ *        .uri(URI.create("https://foo.com/"))
+ *        .timeout(Duration.ofMinutes(1))
+ *        .header("Content-Type", "application/json")
+ *        .POST(BodyPublishers.ofFile(Paths.get("file.json")))
+ *        .build();
+ *   client.sendAsync(request, BodyHandlers.ofString())
+ *        .thenApply(HttpResponse::body)
+ *        .thenAccept(System.out::println);  }</pre>
+ *
+ * <p> <a id="securitychecks"></a><b>Security checks</b></a>
+ *
+ * <p> If a security manager is present then security checks are performed by
+ * the HTTP Client's sending methods. An appropriate {@link URLPermission} is
+ * required to access the destination server, and proxy server if one has
+ * been configured. The form of the {@code URLPermission} required to access a
+ * proxy has a {@code method} parameter of {@code "CONNECT"} (for all kinds of
+ * proxying) and a {@code URL} string of the form {@code "socket://host:port"}
+ * where host and port specify the proxy's address.
+ *
+ * @implNote If an explicit {@linkplain HttpClient.Builder#executor(Executor)
+ * executor} has not been set for an {@code HttpClient}, and a security manager
+ * has been installed, then the default executor will execute asynchronous and
+ * dependent tasks in a context that is granted no permissions. Custom
+ * {@linkplain HttpRequest.BodyPublisher request body publishers}, {@linkplain
+ * HttpResponse.BodyHandler response body handlers}, {@linkplain
+ * HttpResponse.BodySubscriber response body subscribers}, and {@linkplain
+ * WebSocket.Listener WebSocket Listeners}, if executing operations that require
+ * privileges, should do so within an appropriate {@linkplain
+ * AccessController#doPrivileged(PrivilegedAction) privileged context}.
+ *
+ * @since 11
  */
 public abstract class HttpClient {
 
@@ -61,7 +133,7 @@ public abstract class HttpClient {
     protected HttpClient() {}
 
     /**
-     * Returns a new HttpClient with default settings.
+     * Returns a new {@code HttpClient} with default settings.
      *
      * <p> Equivalent to {@code newBuilder().build()}.
      *
@@ -87,38 +159,34 @@ public static HttpClient newHttpClient() {
     /**
      * Creates a new {@code HttpClient} builder.
      *
-     * @return a {@code HttpClient.Builder}
+     * @return an {@code HttpClient.Builder}
      */
     public static Builder newBuilder() {
         return new HttpClientBuilderImpl();
     }
 
     /**
-     * A builder of immutable {@link HttpClient}s.
-     * {@Incubating}
+     * A builder of {@linkplain HttpClient HTTP Clients}.
      *
-     * <p> Builders are created by invoking {@linkplain HttpClient#newBuilder()
+     * <p> Builders are created by invoking {@link HttpClient#newBuilder()
      * newBuilder}. Each of the setter methods modifies the state of the builder
      * and returns the same instance. Builders are not thread-safe and should not be
      * used concurrently from multiple threads without external synchronization.
      *
-     * @since 9
+     * @since 11
      */
-    public abstract static class Builder {
+    public interface Builder {
 
         /**
          * A proxy selector that always return {@link Proxy#NO_PROXY} implying
          * a direct connection.
-         * This is a convenience object that can be passed to {@link #proxy(ProxySelector)}
-         * in order to build an instance of {@link HttpClient} that uses no
-         * proxy.
+         *
+         * <p> This is a convenience object that can be passed to
+         * {@link #proxy(ProxySelector)} in order to build an instance of
+         * {@link HttpClient} that uses no proxy.
          */
         public static final ProxySelector NO_PROXY = ProxySelector.of(null);
 
-        /**
-         * Creates a Builder.
-         */
-        protected Builder() {}
 
         /**
          * Sets a cookie handler.
@@ -126,7 +194,7 @@ protected Builder() {}
          * @param cookieHandler the cookie handler
          * @return this builder
          */
-        public abstract Builder cookieHandler(CookieHandler cookieHandler);
+        public Builder cookieHandler(CookieHandler cookieHandler);
 
         /**
          * Sets an {@code SSLContext}.
@@ -140,7 +208,7 @@ protected Builder() {}
          * @param sslContext the SSLContext
          * @return this builder
          */
-        public abstract Builder sslContext(SSLContext sslContext);
+        public Builder sslContext(SSLContext sslContext);
 
         /**
          * Sets an {@code SSLParameters}.
@@ -157,7 +225,7 @@ protected Builder() {}
          * @param sslParameters the SSLParameters
          * @return this builder
          */
-        public abstract Builder sslParameters(SSLParameters sslParameters);
+        public Builder sslParameters(SSLParameters sslParameters);
 
         /**
          * Sets the executor to be used for asynchronous and dependent tasks.
@@ -175,7 +243,7 @@ protected Builder() {}
          * @param executor the Executor
          * @return this builder
          */
-        public abstract Builder executor(Executor executor);
+        public Builder executor(Executor executor);
 
         /**
          * Specifies whether requests will automatically follow redirects issued
@@ -188,7 +256,7 @@ protected Builder() {}
          * @param policy the redirection policy
          * @return this builder
          */
-        public abstract Builder followRedirects(Redirect policy);
+        public Builder followRedirects(Redirect policy);
 
         /**
          * Requests a specific HTTP protocol version where possible.
@@ -205,10 +273,14 @@ protected Builder() {}
          * will use HTTP/2. If the upgrade fails, then the response will be
          * handled using HTTP/1.1
          *
+         * @implNote Constraints may also affect the selection of protocol version.
+         * For example, if HTTP/2 is requested through a proxy, and if the implementation
+         * does not support this mode, then HTTP/1.1 may be used
+         *
          * @param version the requested HTTP protocol version
          * @return this builder
          */
-        public abstract Builder version(HttpClient.Version version);
+        public Builder version(HttpClient.Version version);
 
         /**
          * Sets the default priority for any HTTP/2 requests sent from this
@@ -219,51 +291,53 @@ protected Builder() {}
          * @return this builder
          * @throws IllegalArgumentException if the given priority is out of range
          */
-        public abstract Builder priority(int priority);
+        public Builder priority(int priority);
 
         /**
          * Sets a {@link java.net.ProxySelector}.
          *
-         * @apiNote {@link ProxySelector#of(InetSocketAddress)}
+         * @apiNote {@link ProxySelector#of(InetSocketAddress) ProxySelector::of}
          * provides a {@code ProxySelector} which uses a single proxy for all
          * requests. The system-wide proxy selector can be retrieved by
          * {@link ProxySelector#getDefault()}.
          *
          * @implNote
-         * If this method is not invoked prior to {@linkplain #build()
-         * building}, then newly built clients will use the {@linkplain
-         * ProxySelector#getDefault() default proxy selector}, which
-         * is normally adequate for client applications. This default
-         * behavior can be turned off by supplying an explicit proxy
-         * selector to this method, such as {@link #NO_PROXY} or one
-         * returned by {@link ProxySelector#of(InetSocketAddress)},
-         * before calling {@link #build()}.
+         * If this method is not invoked prior to {@linkplain #build() building},
+         * then newly built clients will use the {@linkplain
+         * ProxySelector#getDefault() default proxy selector}, which is usually
+         * adequate for client applications. The default proxy selector supports
+         * a set of system properties</a> related to
+         * <a href="{@docRoot}/java.base/java/net/doc-files/net-properties.html#Proxies">
+         * proxy settings</a>. This default behavior can be disabled by
+         * supplying an explicit proxy selector, such as {@link #NO_PROXY} or
+         * one returned by {@link ProxySelector#of(InetSocketAddress)
+         * ProxySelector::of}, before {@linkplain #build() building}.
          *
-         * @param selector the ProxySelector
+         * @param proxySelector the ProxySelector
          * @return this builder
          */
-        public abstract Builder proxy(ProxySelector selector);
+        public Builder proxy(ProxySelector proxySelector);
 
         /**
          * Sets an authenticator to use for HTTP authentication.
          *
-         * @param a the Authenticator
+         * @param authenticator the Authenticator
          * @return this builder
          */
-        public abstract Builder authenticator(Authenticator a);
+        public Builder authenticator(Authenticator authenticator);
 
         /**
          * Returns a new {@link HttpClient} built from the current state of this
          * builder.
          *
-         * @return this builder
+         * @return a new {@code HttpClient}
          */
-        public abstract HttpClient build();
+        public HttpClient build();
     }
 
 
     /**
-     * Returns an {@code Optional} containing this client's {@linkplain
+     * Returns an {@code Optional} containing this client's {@link
      * CookieHandler}. If no {@code CookieHandler} was set in this client's
      * builder, then the {@code Optional} is empty.
      *
@@ -286,7 +360,7 @@ protected Builder() {}
      * builder, then the {@code Optional} is empty.
      *
      * <p> Even though this method may return an empty optional, the {@code
-     * HttpClient} may still have an non-exposed {@linkplain
+     * HttpClient} may still have a non-exposed {@linkplain
      * Builder#proxy(ProxySelector) default proxy selector} that is
      * used for sending HTTP requests.
      *
@@ -326,15 +400,19 @@ protected Builder() {}
     public abstract Optional<Authenticator> authenticator();
 
     /**
-     * Returns the HTTP protocol version requested for this client. The default
+     * Returns the preferred HTTP protocol version for this client. The default
      * value is {@link HttpClient.Version#HTTP_2}
      *
+     * @implNote Constraints may also affect the selection of protocol version.
+     * For example, if HTTP/2 is requested through a proxy, and if the
+     * implementation does not support this mode, then HTTP/1.1 may be used
+     *
      * @return the HTTP protocol version requested
      */
     public abstract HttpClient.Version version();
 
     /**
-     * Returns an {@code Optional} containing this client's {@linkplain
+     * Returns an {@code Optional} containing this client's {@link
      * Executor}. If no {@code Executor} was set in the client's builder,
      * then the {@code Optional} is empty.
      *
@@ -349,9 +427,8 @@ protected Builder() {}
 
     /**
      * The HTTP protocol version.
-     * {@Incubating}
      *
-     * @since 9
+     * @since 11
      */
     public enum Version {
 
@@ -367,17 +444,25 @@ public enum Version {
     }
 
     /**
-     * Defines automatic redirection policy.
-     * {@Incubating}
+     * Defines the automatic redirection policy.
      *
-     * <p> This is checked whenever a {@code 3XX} response code is received. If
-     * redirection does not happen automatically then the response is returned
-     * to the user, where it can be handled manually.
+     * <p> The automatic redirection policy is checked whenever a {@code 3XX}
+     * response code is received. If redirection does not happen automatically,
+     * then the response, containing the  {@code 3XX} response code, is returned,
+     * where it can be handled manually.
      *
-     * <p> {@code Redirect} policy is set via the {@link
-     * HttpClient.Builder#followRedirects(HttpClient.Redirect)} method.
+     * <p> {@code Redirect} policy is set via the {@linkplain
+     * HttpClient.Builder#followRedirects(Redirect) Builder.followRedirects}
+     * method.
      *
-     * @since 9
+     * @implNote When automatic redirection occurs, the request method of the
+     * redirected request may be modified depending on the specific {@code 30X}
+     * status code, as specified in <a href="https://tools.ietf.org/html/rfc7231">
+     * RFC 7231</a>. In addition, the {@code 301} and {@code 302} status codes
+     * cause a {@code POST} request to be converted to a {@code GET} in the
+     * redirected request.
+     *
+     * @since 11
      */
     public enum Redirect {
 
@@ -392,15 +477,9 @@ public enum Redirect {
         ALWAYS,
 
         /**
-         * Redirect to same protocol only. Redirection may occur from HTTP URLs
-         * to other HTTP URLs, and from HTTPS URLs to other HTTPS URLs.
+         * Always redirect, except from HTTPS URLs to HTTP URLs.
          */
-        SAME_PROTOCOL,
-
-        /**
-         * Redirect always except from HTTPS URLs to HTTP URLs.
-         */
-        SECURE
+        NORMAL
     }
 
     /**
@@ -410,94 +489,96 @@ public enum Redirect {
      * handler ).
      *
      * @param <T> the response body type
-     * @param req the request
+     * @param request the request
      * @param responseBodyHandler the response body handler
-     * @return the response body
+     * @return the response
      * @throws IOException if an I/O error occurs when sending or receiving
      * @throws InterruptedException if the operation is interrupted
-     * @throws IllegalArgumentException if the request method is not supported
+     * @throws IllegalArgumentException if the {@code request} argument is not
+     *         a request that could have been validly built as specified by {@link
+     *         HttpRequest.Builder HttpRequest.Builder}.
      * @throws SecurityException If a security manager has been installed
      *          and it denies {@link java.net.URLPermission access} to the
      *          URL in the given request, or proxy if one is configured.
-     *          See HttpRequest for further information about
-     *          <a href="HttpRequest.html#securitychecks">security checks</a>.
+     *          See <a href="#securitychecks">security checks</a> for further
+     *          information.
      */
     public abstract <T> HttpResponse<T>
-    send(HttpRequest req, HttpResponse.BodyHandler<T> responseBodyHandler)
+    send(HttpRequest request, HttpResponse.BodyHandler<T> responseBodyHandler)
         throws IOException, InterruptedException;
 
     /**
-     * Sends the given request asynchronously using this client and the given
-     * response handler.
+     * Sends the given request asynchronously using this client with the given
+     * response body handler.
      *
-     * <p> The returned completable future completes exceptionally with:
-     * <ul>
-     * <li>{@link IOException} - if an I/O error occurs when sending or receiving</li>
-     * <li>{@link IllegalArgumentException} - if the request method is not supported</li>
-     * <li>{@link SecurityException} - If a security manager has been installed
-     *          and it denies {@link java.net.URLPermission access} to the
-     *          URL in the given request, or proxy if one is configured.
-     *          See HttpRequest for further information about
-     *          <a href="HttpRequest.html#securitychecks">security checks</a>.</li>
-     * </ul>
+     * <p> Equivalent to: {@code sendAsync(request, responseBodyHandler, null)}.
      *
      * @param <T> the response body type
-     * @param req the request
+     * @param request the request
      * @param responseBodyHandler the response body handler
      * @return a {@code CompletableFuture<HttpResponse<T>>}
+     * @throws IllegalArgumentException if the {@code request} argument is not
+     *         a request that could have been validly built as specified by {@link
+     *         HttpRequest.Builder HttpRequest.Builder}.
      */
     public abstract <T> CompletableFuture<HttpResponse<T>>
-    sendAsync(HttpRequest req, HttpResponse.BodyHandler<T> responseBodyHandler);
+    sendAsync(HttpRequest request,
+              BodyHandler<T> responseBodyHandler);
 
     /**
-     * Sends the given request asynchronously using this client and the given
-     * multi response handler.
+     * Sends the given request asynchronously using this client with the given
+     * response body handler and push promise handler.
+     *
+     * <p> The returned completable future, if completed successfully, completes
+     * with an {@link HttpResponse}{@code <T>} that contains the response status,
+     * headers, and body ( as handled by given response body handler ).
+     *
+     * <p> {@linkplain PushPromiseHandler Push promises} received, if any, are
+     * handled by the given {@code pushPromiseHandler}. A {@code null} valued
+     * {@code pushPromiseHandler} rejects any push promises.
      *
      * <p> The returned completable future completes exceptionally with:
      * <ul>
      * <li>{@link IOException} - if an I/O error occurs when sending or receiving</li>
-     * <li>{@link IllegalArgumentException} - if the request method is not supported</li>
      * <li>{@link SecurityException} - If a security manager has been installed
      *          and it denies {@link java.net.URLPermission access} to the
      *          URL in the given request, or proxy if one is configured.
-     *          See HttpRequest for further information about
-     *          <a href="HttpRequest.html#securitychecks">security checks</a>.</li>
+     *          See <a href="#securitychecks">security checks</a> for further
+     *          information.</li>
      * </ul>
      *
-     * @param <U> a type representing the aggregated results
-     * @param <T> a type representing all of the response bodies
-     * @param req the request
-     * @param multiSubscriber the multiSubscriber for the request
-     * @return a {@code CompletableFuture<U>}
+     * @param <T> the response body type
+     * @param request the request
+     * @param responseBodyHandler the response body handler
+     * @param pushPromiseHandler push promise handler, may be null
+     * @return a {@code CompletableFuture<HttpResponse<T>>}
+     * @throws IllegalArgumentException if the {@code request} argument is not
+     *         a request that could have been validly built as specified by {@link
+     *         HttpRequest.Builder HttpRequest.Builder}.
      */
-    public abstract <U, T> CompletableFuture<U>
-    sendAsync(HttpRequest req, HttpResponse.MultiSubscriber<U, T> multiSubscriber);
+    public abstract <T> CompletableFuture<HttpResponse<T>>
+    sendAsync(HttpRequest request,
+              BodyHandler<T> responseBodyHandler,
+              PushPromiseHandler<T> pushPromiseHandler);
 
     /**
      * Creates a new {@code WebSocket} builder (optional operation).
      *
      * <p> <b>Example</b>
-     * <pre>{@code
-     *     HttpClient client = HttpClient.newHttpClient();
-     *     CompletableFuture<WebSocket> ws = client.newWebSocketBuilder()
-     *             .buildAsync(URI.create("ws://websocket.example.com"), listener);
-     * }</pre>
+     * <pre>{@code    HttpClient client = HttpClient.newHttpClient();
+     *   CompletableFuture<WebSocket> ws = client.newWebSocketBuilder()
+     *           .buildAsync(URI.create("ws://websocket.example.com"), listener); }</pre>
      *
      * <p> Finer control over the WebSocket Opening Handshake can be achieved
      * by using a custom {@code HttpClient}.
      *
      * <p> <b>Example</b>
-     * <pre>{@code
-     *     InetSocketAddress addr = new InetSocketAddress("proxy.example.com", 80);
-     *     HttpClient client = HttpClient.newBuilder()
-     *             .proxy(ProxySelector.of(addr))
-     *             .build();
-     *     CompletableFuture<WebSocket> ws = client.newWebSocketBuilder()
-     *             .buildAsync(URI.create("ws://websocket.example.com"), listener);
-     * }</pre>
-     *
-     * <p> A {@code WebSocket.Builder} returned from this method is not safe for
-     * use by multiple threads without external synchronization.
+     * <pre>{@code    InetSocketAddress addr = new InetSocketAddress("proxy.example.com", 80);
+     *   HttpClient client = HttpClient.newBuilder()
+     *           .proxy(ProxySelector.of(addr))
+     *           .build();
+     *   CompletableFuture<WebSocket> ws = client.newWebSocketBuilder()
+     *           .buildAsync(URI.create("ws://websocket.example.com"), listener); }</pre>
      *
      * @implSpec The default implementation of this method throws
      * {@code UnsupportedOperationException}. Clients obtained through
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpHeaders.java b/src/java.net.http/share/classes/java/net/http/HttpHeaders.java
similarity index 89%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpHeaders.java
rename to src/java.net.http/share/classes/java/net/http/HttpHeaders.java
index a66908dcc1c..2b8b5bc7d8a 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpHeaders.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package java.net.http;
 
 import java.util.List;
 import java.util.Map;
@@ -35,15 +35,19 @@
 
 /**
  * A read-only view of a set of HTTP headers.
- * {@Incubating}
+ *
+ * <p> An {@code HttpHeaders} is not created directly, but rather returned from
+ * an {@link HttpResponse HttpResponse}. Specific HTTP headers can be set for
+ * {@linkplain HttpRequest requests} through the one of the request builder's
+ * {@link HttpRequest.Builder#header(String, String) headers} methods.
  *
  * <p> The methods of this class ( that accept a String header name ), and the
- * Map returned by the {@linkplain #map() map} method, operate without regard to
+ * Map returned by the {@link #map() map} method, operate without regard to
  * case when retrieving the header value.
  *
- * <p> HttpHeaders instances are immutable.
+ * <p> {@code HttpHeaders} instances are immutable.
  *
- * @since 9
+ * @since 11
  */
 public abstract class HttpHeaders {
 
@@ -139,7 +143,7 @@ public final boolean equals(Object obj) {
      * Computes a hash code for this HTTP headers instance.
      *
      * <p> The hash code is based upon the components of the HTTP headers
-     * {@linkplain #map() map}, and satisfies the general contract of the
+     * {@link #map() map}, and satisfies the general contract of the
      * {@link Object#hashCode Object.hashCode} method.
      *
      * @return the hash-code value for this HTTP headers
@@ -156,7 +160,7 @@ public final int hashCode() {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()).append(" ");
+        sb.append(super.toString()).append(" { ");
         sb.append(map());
         sb.append(" }");
         return sb.toString();
diff --git a/src/java.net.http/share/classes/java/net/http/HttpRequest.java b/src/java.net.http/share/classes/java/net/http/HttpRequest.java
new file mode 100644
index 00000000000..a06deb70857
--- /dev/null
+++ b/src/java.net.http/share/classes/java/net/http/HttpRequest.java
@@ -0,0 +1,650 @@
+/*
+ * Copyright (c) 2015, 2018, 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.io.FileNotFoundException;
+import java.io.InputStream;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.Flow;
+import java.util.function.Supplier;
+import jdk.internal.net.http.HttpRequestBuilderImpl;
+import jdk.internal.net.http.RequestPublishers;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+/**
+ * An HTTP request.
+ *
+ * <p> An {@code HttpRequest} instance is built through an {@code HttpRequest}
+ * {@linkplain HttpRequest.Builder builder}. An {@code HttpRequest} builder
+ * is obtained from one of the {@link HttpRequest#newBuilder(URI) newBuilder}
+ * methods. A request's {@link URI}, headers, and body can be set. Request
+ * bodies are provided through a {@link BodyPublisher BodyPublisher} supplied
+ * to one of the {@link Builder#POST(BodyPublisher) POST},
+ * {@link Builder#PUT(BodyPublisher) PUT} or
+ * {@link Builder#method(String,BodyPublisher) method} methods.
+ * Once all required parameters have been set in the builder, {@link
+ * Builder#build() build} will return the {@code HttpRequest}. Builders can be
+ * copied and modified many times in order to build multiple related requests
+ * that differ in some parameters.
+ *
+ * <p> The following is an example of a GET request that prints the response
+ * body as a String:
+ *
+ * <pre>{@code    HttpClient client = HttpClient.newHttpClient();
+ *   HttpRequest request = HttpRequest.newBuilder()
+ *         .uri(URI.create("http://foo.com/"))
+ *         .build();
+ *   client.sendAsync(request, BodyHandlers.ofString())
+ *         .thenApply(HttpResponse::body)
+ *         .thenAccept(System.out::println)
+ *         .join(); }</pre>
+ *
+ * <p>The class {@link BodyPublishers BodyPublishers} provides implementations
+ * of many common publishers. Alternatively, a custom {@code BodyPublisher}
+ * implementation can be used.
+ *
+ * @since 11
+ */
+public abstract class HttpRequest {
+
+    /**
+     * Creates an HttpRequest.
+     */
+    protected HttpRequest() {}
+
+    /**
+     * A builder of {@linkplain HttpRequest HTTP requests}.
+     *
+     * <p> Instances of {@code HttpRequest.Builder} are created by calling {@link
+     * HttpRequest#newBuilder(URI)} or {@link HttpRequest#newBuilder()}.
+     *
+     * <p> Each of the setter methods modifies the state of the builder
+     * and returns the same instance. The methods are not synchronized and
+     * should not be called from multiple threads without external
+     * synchronization. The {@link #build() build} method returns a new
+     * {@code HttpRequest} each time it is invoked. Once built an {@code
+     * HttpRequest} is immutable, and can be sent multiple times.
+     *
+     * <p> Note, that not all request headers may be set by user code. Some are
+     * restricted for security reasons and others such as the headers relating
+     * to authentication, redirection and cookie management may be managed by
+     * specific APIs rather than through directly user set headers.
+     *
+     * @since 11
+     */
+    public interface Builder {
+
+        /**
+         * Sets this {@code HttpRequest}'s request {@code URI}.
+         *
+         * @param uri the request URI
+         * @return this builder
+         * @throws IllegalArgumentException if the {@code URI} scheme is not
+         *         supported
+         */
+        public Builder uri(URI uri);
+
+        /**
+         * Requests the server to acknowledge the request before sending the
+         * body. This is disabled by default. If enabled, the server is
+         * requested to send an error response or a {@code 100 Continue}
+         * response before the client sends the request body. This means the
+         * request publisher for the request will not be invoked until this
+         * interim response is received.
+         *
+         * @param enable {@code true} if Expect continue to be sent
+         * @return this builder
+         */
+        public Builder expectContinue(boolean enable);
+
+        /**
+         * Sets the preferred {@link HttpClient.Version} for this request.
+         *
+         * <p> The corresponding {@link HttpResponse} should be checked for the
+         * version that was actually used. If the version is not set in a
+         * request, then the version requested will be that of the sending
+         * {@link HttpClient}.
+         *
+         * @param version the HTTP protocol version requested
+         * @return this builder
+         */
+        public Builder version(HttpClient.Version version);
+
+        /**
+         * Adds the given name value pair to the set of headers for this request.
+         * The given value is added to the list of values for that name.
+         *
+         * @implNote An implementation may choose to restrict some header names
+         *           or values, as the HTTP Client may determine their value itself.
+         *           For example, "Content-Length", which will be determined by
+         *           the request Publisher. In such a case, an implementation of
+         *           {@code HttpRequest.Builder} may choose to throw an
+         *           {@code IllegalArgumentException} if such a header is passed
+         *           to the builder.
+         *
+         * @param name the header name
+         * @param value the header value
+         * @return this builder
+         * @throws IllegalArgumentException if the header name or value is not
+         *         valid, see <a href="https://tools.ietf.org/html/rfc7230#section-3.2">
+         *         RFC 7230 section-3.2</a>, or the header name or value is restricted
+         *         by the implementation.
+         */
+        public Builder header(String name, String value);
+
+        /**
+         * Adds the given name value pairs to the set of headers for this
+         * request. The supplied {@code String} instances must alternate as
+         * header names and header values.
+         * To add several values to the same name then the same name must
+         * be supplied with each new value.
+         *
+         * @param headers the list of name value pairs
+         * @return this builder
+         * @throws IllegalArgumentException if there are an odd number of
+         *         parameters, or if a header name or value is not valid, see
+         *         <a href="https://tools.ietf.org/html/rfc7230#section-3.2">
+         *         RFC 7230 section-3.2</a>, or a header name or value is
+         *         {@linkplain #header(String, String) restricted} by the
+         *         implementation.
+         */
+        public Builder headers(String... headers);
+
+        /**
+         * Sets a timeout for this request. If the response is not received
+         * within the specified timeout then an {@link HttpTimeoutException} is
+         * thrown from {@link HttpClient#send(java.net.http.HttpRequest,
+         * java.net.http.HttpResponse.BodyHandler) HttpClient::send} or
+         * {@link HttpClient#sendAsync(java.net.http.HttpRequest,
+         * java.net.http.HttpResponse.BodyHandler) HttpClient::sendAsync}
+         * completes exceptionally with an {@code HttpTimeoutException}. The effect
+         * of not setting a timeout is the same as setting an infinite Duration, ie.
+         * block forever.
+         *
+         * @param duration the timeout duration
+         * @return this builder
+         * @throws IllegalArgumentException if the duration is non-positive
+         */
+        public abstract Builder timeout(Duration duration);
+
+        /**
+         * Sets the given name value pair to the set of headers for this
+         * request. This overwrites any previously set values for name.
+         *
+         * @param name the header name
+         * @param value the header value
+         * @return this builder
+         * @throws IllegalArgumentException if the header name or value is not valid,
+         *         see <a href="https://tools.ietf.org/html/rfc7230#section-3.2">
+         *         RFC 7230 section-3.2</a>, or the header name or value is
+         *         {@linkplain #header(String, String) restricted} by the
+         *         implementation.
+         */
+        public Builder setHeader(String name, String value);
+
+        /**
+         * Sets the request method of this builder to GET.
+         * This is the default.
+         *
+         * @return this builder
+         */
+        public Builder GET();
+
+        /**
+         * Sets the request method of this builder to POST and sets its
+         * request body publisher to the given value.
+         *
+         * @param bodyPublisher the body publisher
+         *
+         * @return this builder
+         */
+        public Builder POST(BodyPublisher bodyPublisher);
+
+        /**
+         * Sets the request method of this builder to PUT and sets its
+         * request body publisher to the given value.
+         *
+         * @param bodyPublisher the body publisher
+         *
+         * @return this builder
+         */
+        public Builder PUT(BodyPublisher bodyPublisher);
+
+        /**
+         * Sets the request method of this builder to DELETE.
+         *
+         * @return this builder
+         */
+        public Builder DELETE();
+
+        /**
+         * Sets the request method and request body of this builder to the
+         * given values.
+         *
+         * @apiNote The {@link BodyPublishers#noBody() noBody} request
+         * body publisher can be used where no request body is required or
+         * appropriate. Whether a method is restricted, or not, is
+         * implementation specific. For example, some implementations may choose
+         * to restrict the {@code CONNECT} method.
+         *
+         * @param method the method to use
+         * @param bodyPublisher the body publisher
+         * @return this builder
+         * @throws IllegalArgumentException if the method name is not
+         *         valid, see <a href="https://tools.ietf.org/html/rfc7230#section-3.1.1">
+         *         RFC 7230 section-3.1.1</a>, or the method is restricted by the
+         *         implementation.
+         */
+        public Builder method(String method, BodyPublisher bodyPublisher);
+
+        /**
+         * Builds and returns an {@link HttpRequest}.
+         *
+         * @return a new {@code HttpRequest}
+         * @throws IllegalStateException if a URI has not been set
+         */
+        public HttpRequest build();
+
+        /**
+         * Returns an exact duplicate copy of this {@code Builder} based on
+         * current state. The new builder can then be modified independently of
+         * this builder.
+         *
+         * @return an exact copy of this builder
+         */
+        public Builder copy();
+    }
+
+    /**
+     * Creates an {@code HttpRequest} builder with the given URI.
+     *
+     * @param uri the request URI
+     * @return a new request builder
+     * @throws IllegalArgumentException if the URI scheme is not supported.
+     */
+    public static HttpRequest.Builder newBuilder(URI uri) {
+        return new HttpRequestBuilderImpl(uri);
+    }
+
+    /**
+     * Creates an {@code HttpRequest} builder.
+     *
+     * @return a new request builder
+     */
+    public static HttpRequest.Builder newBuilder() {
+        return new HttpRequestBuilderImpl();
+    }
+
+    /**
+     * Returns an {@code Optional} containing the {@link BodyPublisher} set on
+     * this request. If no {@code BodyPublisher} was set in the requests's
+     * builder, then the {@code Optional} is empty.
+     *
+     * @return an {@code Optional} containing this request's {@code BodyPublisher}
+     */
+    public abstract Optional<BodyPublisher> bodyPublisher();
+
+    /**
+     * Returns the request method for this request. If not set explicitly,
+     * the default method for any request is "GET".
+     *
+     * @return this request's method
+     */
+    public abstract String method();
+
+    /**
+     * Returns an {@code Optional} containing this request's timeout duration.
+     * If the timeout duration was not set in the request's builder, then the
+     * {@code Optional} is empty.
+     *
+     * @return an {@code Optional} containing this request's timeout duration
+     */
+    public abstract Optional<Duration> timeout();
+
+    /**
+     * Returns this request's {@linkplain HttpRequest.Builder#expectContinue(boolean)
+     * expect continue} setting.
+     *
+     * @return this request's expect continue setting
+     */
+    public abstract boolean expectContinue();
+
+    /**
+     * Returns this request's {@code URI}.
+     *
+     * @return this request's URI
+     */
+    public abstract URI uri();
+
+    /**
+     * Returns an {@code Optional} containing the HTTP protocol version that
+     * will be requested for this {@code HttpRequest}. If the version was not
+     * set in the request's builder, then the {@code Optional} is empty.
+     * In that case, the version requested will be that of the sending
+     * {@link HttpClient}. The corresponding {@link HttpResponse} should be
+     * queried to determine the version that was actually used.
+     *
+     * @return HTTP protocol version
+     */
+    public abstract Optional<HttpClient.Version> version();
+
+    /**
+     * The (user-accessible) request headers that this request was (or will be)
+     * sent with.
+     *
+     * @return this request's HttpHeaders
+     */
+    public abstract HttpHeaders headers();
+
+    /**
+     * Tests this HTTP request instance for equality with the given object.
+     *
+     * <p> If the given object is not an {@code HttpRequest} then this
+     * method returns {@code false}. Two HTTP requests are equal if their URI,
+     * method, and headers fields are all equal.
+     *
+     * <p> This method satisfies the general contract of the {@link
+     * Object#equals(Object) Object.equals} method.
+     *
+     * @param obj the object to which this object is to be compared
+     * @return {@code true} if, and only if, the given object is an {@code
+     *         HttpRequest} that is equal to this HTTP request
+     */
+    @Override
+    public final boolean equals(Object obj) {
+       if (! (obj instanceof HttpRequest))
+           return false;
+       HttpRequest that = (HttpRequest)obj;
+       if (!that.method().equals(this.method()))
+           return false;
+       if (!that.uri().equals(this.uri()))
+           return false;
+       if (!that.headers().equals(this.headers()))
+           return false;
+       return true;
+    }
+
+    /**
+     * Computes a hash code for this HTTP request instance.
+     *
+     * <p> The hash code is based upon the HTTP request's URI, method, and
+     * header components, and satisfies the general contract of the
+     * {@link Object#hashCode Object.hashCode} method.
+     *
+     * @return the hash-code value for this HTTP request
+     */
+    public final int hashCode() {
+        return method().hashCode()
+                + uri().hashCode()
+                + headers().hashCode();
+    }
+
+    /**
+     * A {@code BodyPublisher} converts high-level Java objects into a flow of
+     * byte buffers suitable for sending as a request body.  The class
+     * {@link BodyPublishers BodyPublishers} provides implementations of many
+     * common publishers.
+     *
+     * <p> The {@code BodyPublisher} interface extends {@link Flow.Publisher
+     * Flow.Publisher&lt;ByteBuffer&gt;}, which means that a {@code BodyPublisher}
+     * acts as a publisher of {@linkplain ByteBuffer byte buffers}.
+     *
+     * <p> When sending a request that contains a body, the HTTP Client
+     * subscribes to the request's {@code BodyPublisher} in order to receive the
+     * flow of outgoing request body data. The normal semantics of {@link
+     * Flow.Subscriber} and {@link Flow.Publisher} are implemented by the HTTP
+     * Client and are expected from {@code BodyPublisher} implementations. Each
+     * outgoing request results in one HTTP Client {@code Subscriber}
+     * subscribing to the {@code BodyPublisher} in order to provide the sequence
+     * of byte buffers containing the request body. Instances of {@code
+     * ByteBuffer} published by the publisher must be allocated by the
+     * publisher, and must not be accessed after being published to the HTTP
+     * Client. These subscriptions complete normally when the request body is
+     * fully sent, and can be canceled or terminated early through error. If a
+     * request needs to be resent for any reason, then a new subscription is
+     * created which is expected to generate the same data as before.
+     *
+     * <p> A {@code BodyPublisher} that reports a {@linkplain #contentLength()
+     * content length} of {@code 0} may not be subscribed to by the HTTP Client,
+     * as it has effectively no data to publish.
+     *
+     * @see BodyPublishers
+     * @since 11
+     */
+    public interface BodyPublisher extends Flow.Publisher<ByteBuffer> {
+
+        /**
+         * Returns the content length for this request body. May be zero
+         * if no request body being sent, greater than zero for a fixed
+         * length content, or less than zero for an unknown content length.
+         *
+         * <p> This method may be invoked before the publisher is subscribed to.
+         * This method may be invoked more than once by the HTTP client
+         * implementation, and MUST return the same constant value each time.
+         *
+         * @return the content length for this request body, if known
+         */
+        long contentLength();
+    }
+
+    /**
+     * Implementations of {@link BodyPublisher BodyPublisher} that implement
+     * various useful publishers, such as publishing the request body from a
+     * String, or from a file.
+     *
+     * <p> The following are examples of using the predefined body publishers to
+     * convert common high-level Java objects into a flow of data suitable for
+     * sending as a request body:
+     *
+     *  <pre>{@code    // Request body from a String
+     *   HttpRequest request = HttpRequest.newBuilder()
+     *        .uri(URI.create("https://foo.com/"))
+     *        .header("Content-Type", "text/plain; charset=UTF-8")
+     *        .POST(BodyPublishers.ofString("some body text"))
+     *        .build();
+     *
+     *   // Request body from a File
+     *   HttpRequest request = HttpRequest.newBuilder()
+     *        .uri(URI.create("https://foo.com/"))
+     *        .header("Content-Type", "application/json")
+     *        .POST(BodyPublishers.ofFile(Paths.get("file.json")))
+     *        .build();
+     *
+     *   // Request body from a byte array
+     *   HttpRequest request = HttpRequest.newBuilder()
+     *        .uri(URI.create("https://foo.com/"))
+     *        .POST(BodyPublishers.ofByteArray(new byte[] { ... }))
+     *        .build(); }</pre>
+     *
+     * @since 11
+     */
+    public static class BodyPublishers {
+
+        private BodyPublishers() { }
+
+        /**
+         * Returns a request body publisher whose body is retrieved from the
+         * given {@code Flow.Publisher}. The returned request body publisher
+         * has an unknown content length.
+         *
+         * @apiNote This method can be used as an adapter between {@code
+         * BodyPublisher} and {@code Flow.Publisher}, where the amount of
+         * request body that the publisher will publish is unknown.
+         *
+         * @param publisher the publisher responsible for publishing the body
+         * @return a BodyPublisher
+         */
+        public static BodyPublisher
+        fromPublisher(Flow.Publisher<? extends ByteBuffer> publisher) {
+            return new RequestPublishers.PublisherAdapter(publisher, -1L);
+        }
+
+        /**
+         * Returns a request body publisher whose body is retrieved from the
+         * given {@code Flow.Publisher}. The returned request body publisher
+         * has the given content length.
+         *
+         * <p> The given {@code contentLength} is a positive number, that
+         * represents the exact amount of bytes the {@code publisher} must
+         * publish.
+         *
+         * @apiNote This method can be used as an adapter between {@code
+         * BodyPublisher} and {@code Flow.Publisher}, where the amount of
+         * request body that the publisher will publish is known.
+         *
+         * @param publisher the publisher responsible for publishing the body
+         * @param contentLength a positive number representing the exact
+         *                      amount of bytes the publisher will publish
+         * @throws IllegalArgumentException if the content length is
+         *                                  non-positive
+         * @return a BodyPublisher
+         */
+        public static BodyPublisher
+        fromPublisher(Flow.Publisher<? extends ByteBuffer> publisher,
+                      long contentLength) {
+            if (contentLength < 1)
+                throw new IllegalArgumentException("non-positive contentLength: "
+                        + contentLength);
+            return new RequestPublishers.PublisherAdapter(publisher, contentLength);
+        }
+
+        /**
+         * Returns a request body publisher whose body is the given {@code
+         * String}, converted using the {@link StandardCharsets#UTF_8 UTF_8}
+         * character set.
+         *
+         * @param body the String containing the body
+         * @return a BodyPublisher
+         */
+        public static BodyPublisher ofString(String body) {
+            return ofString(body, UTF_8);
+        }
+
+        /**
+         * Returns a request body publisher whose body is the given {@code
+         * String}, converted using the given character set.
+         *
+         * @param s the String containing the body
+         * @param charset the character set to convert the string to bytes
+         * @return a BodyPublisher
+         */
+        public static BodyPublisher ofString(String s, Charset charset) {
+            return new RequestPublishers.StringPublisher(s, charset);
+        }
+
+        /**
+         * A request body publisher that reads its data from an {@link
+         * InputStream}. A {@link Supplier} of {@code InputStream} is used in
+         * case the request needs to be repeated, as the content is not buffered.
+         * The {@code Supplier} may return {@code null} on subsequent attempts,
+         * in which case the request fails.
+         *
+         * @param streamSupplier a Supplier of open InputStreams
+         * @return a BodyPublisher
+         */
+        // TODO (spec): specify that the stream will be closed
+        public static BodyPublisher ofInputStream(Supplier<? extends InputStream> streamSupplier) {
+            return new RequestPublishers.InputStreamPublisher(streamSupplier);
+        }
+
+        /**
+         * Returns a request body publisher whose body is the given byte array.
+         *
+         * @param buf the byte array containing the body
+         * @return a BodyPublisher
+         */
+        public static BodyPublisher ofByteArray(byte[] buf) {
+            return new RequestPublishers.ByteArrayPublisher(buf);
+        }
+
+        /**
+         * Returns a request body publisher whose body is the content of the
+         * given byte array of {@code length} bytes starting from the specified
+         * {@code offset}.
+         *
+         * @param buf the byte array containing the body
+         * @param offset the offset of the first byte
+         * @param length the number of bytes to use
+         * @return a BodyPublisher
+         * @throws IndexOutOfBoundsException if the sub-range is defined to be
+         *                                   out-of-bounds
+         */
+        public static BodyPublisher ofByteArray(byte[] buf, int offset, int length) {
+            Objects.checkFromIndexSize(offset, length, buf.length);
+            return new RequestPublishers.ByteArrayPublisher(buf, offset, length);
+        }
+
+        /**
+         * A request body publisher that takes data from the contents of a File.
+         *
+         * <p> Security manager permission checks are performed in this factory
+         * method, when the {@code BodyPublisher} is created. Care must be taken
+         * that the {@code BodyPublisher} is not shared with untrusted code.
+         *
+         * @param path the path to the file containing the body
+         * @return a BodyPublisher
+         * @throws java.io.FileNotFoundException if the path is not found
+         * @throws SecurityException if a security manager has been installed
+         *          and it denies {@link SecurityManager#checkRead(String)
+         *          read access} to the given file
+         */
+        public static BodyPublisher ofFile(Path path) throws FileNotFoundException {
+            Objects.requireNonNull(path);
+            return RequestPublishers.FilePublisher.create(path);
+        }
+
+        /**
+         * A request body publisher that takes data from an {@code Iterable}
+         * of byte arrays. An {@link Iterable} is provided which supplies
+         * {@link Iterator} instances. Each attempt to send the request results
+         * in one invocation of the {@code Iterable}.
+         *
+         * @param iter an Iterable of byte arrays
+         * @return a BodyPublisher
+         */
+        public static BodyPublisher ofByteArrays(Iterable<byte[]> iter) {
+            return new RequestPublishers.IterablePublisher(iter);
+        }
+
+        /**
+         * A request body publisher which sends no request body.
+         *
+         * @return a BodyPublisher which completes immediately and sends
+         *         no request body.
+         */
+        public static BodyPublisher noBody() {
+            return new RequestPublishers.EmptyPublisher();
+        }
+    }
+}
diff --git a/src/java.net.http/share/classes/java/net/http/HttpResponse.java b/src/java.net.http/share/classes/java/net/http/HttpResponse.java
new file mode 100644
index 00000000000..0d960bf3ddc
--- /dev/null
+++ b/src/java.net.http/share/classes/java/net/http/HttpResponse.java
@@ -0,0 +1,1315 @@
+/*
+ * Copyright (c) 2015, 2018, 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.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.OpenOption;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
+import java.util.concurrent.Flow.Publisher;
+import java.util.concurrent.Flow.Subscription;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import javax.net.ssl.SSLSession;
+import jdk.internal.net.http.BufferingSubscriber;
+import jdk.internal.net.http.LineSubscriberAdapter;
+import jdk.internal.net.http.ResponseBodyHandlers.FileDownloadBodyHandler;
+import jdk.internal.net.http.ResponseBodyHandlers.PathBodyHandler;
+import jdk.internal.net.http.ResponseBodyHandlers.PushPromisesHandlerWithMap;
+import jdk.internal.net.http.ResponseSubscribers;
+import jdk.internal.net.http.ResponseSubscribers.PathSubscriber;
+import static java.nio.file.StandardOpenOption.*;
+import static jdk.internal.net.http.common.Utils.charsetFrom;
+
+/**
+ * An HTTP response.
+ *
+ * <p> An {@code HttpResponse} is not created directly, but rather returned as
+ * a result of sending an {@link HttpRequest}. An {@code HttpResponse} is
+ * made available when the response status code and headers have been received,
+ * and typically after the response body has also been completely received.
+ * Whether or not the {@code HttpResponse} is made available before the response
+ * body has been completely received depends on the {@link BodyHandler
+ * BodyHandler} provided when sending the {@code HttpRequest}.
+ *
+ * <p> This class provides methods for accessing the response status code,
+ * headers, the response body, and the {@code HttpRequest} corresponding
+ * to this response.
+ *
+ * <p> The following is an example of retrieving a response as a String:
+ *
+ * <pre>{@code    HttpResponse<String> response = client
+ *     .send(request, BodyHandlers.ofString()); }</pre>
+ *
+ * <p> The class {@link BodyHandlers BodyHandlers} provides implementations
+ * of many common response handlers. Alternatively, a custom {@code BodyHandler}
+ * implementation can be used.
+ *
+ * @param <T> the response body type
+ * @since 11
+ */
+public interface HttpResponse<T> {
+
+
+    /**
+     * Returns the status code for this response.
+     *
+     * @return the response code
+     */
+    public int statusCode();
+
+    /**
+     * Returns the {@link HttpRequest} corresponding to this response.
+     *
+     * <p> The returned {@code HttpRequest} may not be the initiating request
+     * provided when {@linkplain HttpClient#send(HttpRequest, BodyHandler)
+     * sending}. For example, if the initiating request was redirected, then the
+     * request returned by this method will have the redirected URI, which will
+     * be different from the initiating request URI.
+     *
+     * @see #previousResponse()
+     *
+     * @return the request
+     */
+    public HttpRequest request();
+
+    /**
+     * Returns an {@code Optional} containing the previous intermediate response
+     * if one was received. An intermediate response is one that is received
+     * as a result of redirection or authentication. If no previous response
+     * was received then an empty {@code Optional} is returned.
+     *
+     * @return an Optional containing the HttpResponse, if any.
+     */
+    public Optional<HttpResponse<T>> previousResponse();
+
+    /**
+     * Returns the received response headers.
+     *
+     * @return the response headers
+     */
+    public HttpHeaders headers();
+
+    /**
+     * Returns the body. Depending on the type of {@code T}, the returned body
+     * may represent the body after it was read (such as {@code byte[]}, or
+     * {@code String}, or {@code Path}) or it may represent an object with
+     * which the body is read, such as an {@link java.io.InputStream}.
+     *
+     * <p> If this {@code HttpResponse} was returned from an invocation of
+     * {@link #previousResponse()} then this method returns {@code null}
+     *
+     * @return the body
+     */
+    public T body();
+
+    /**
+     * Returns an {@link Optional} containing the {@link SSLSession} in effect
+     * for this response. Returns an empty {@code Optional} if this is not a
+     * <i>HTTPS</i> response.
+     *
+     * @return an {@code Optional} containing the {@code SSLSession} associated
+     *         with the response
+     */
+    public Optional<SSLSession> sslSession();
+
+    /**
+     * Returns the {@code URI} that the response was received from. This may be
+     * different from the request {@code URI} if redirection occurred.
+     *
+     * @return the URI of the response
+     */
+     public URI uri();
+
+    /**
+     * Returns the HTTP protocol version that was used for this response.
+     *
+     * @return HTTP protocol version
+     */
+    public HttpClient.Version version();
+
+
+    /**
+     * Initial response information supplied to a {@link BodyHandler BodyHandler}
+     * when a response is initially received and before the body is processed.
+     */
+    public interface ResponseInfo {
+        /**
+         * Provides the response status code.
+         * @return the response status code
+         */
+        public int statusCode();
+
+        /**
+         * Provides the response headers.
+         * @return the response headers
+         */
+        public HttpHeaders headers();
+
+        /**
+         * Provides the response protocol version.
+         * @return the response protocol version
+         */
+        public HttpClient.Version version();
+    }
+
+    /**
+     * A handler for response bodies.  The class {@link BodyHandlers BodyHandlers}
+     * provides implementations of many common body handlers.
+     *
+     * <p> The {@code BodyHandler} interface allows inspection of the response
+     * code and headers, before the actual response body is received, and is
+     * responsible for creating the response {@link BodySubscriber
+     * BodySubscriber}. The {@code BodySubscriber} consumes the actual response
+     * body bytes and, typically, converts them into a higher-level Java type.
+     *
+     * <p> A {@code BodyHandler} is a function that takes a {@link ResponseInfo
+     * ResponseInfo} object; and which returns a {@code BodySubscriber}. The
+     * {@code BodyHandler} is invoked when the response status code and headers
+     * are available, but before the response  body bytes are received.
+     *
+     * <p> The following example uses one of the {@linkplain BodyHandlers
+     * predefined body handlers} that always process the response body in the
+     * same way ( streams the response body to a file ).
+     *
+     * <pre>{@code   HttpRequest request = HttpRequest.newBuilder()
+     *        .uri(URI.create("http://www.foo.com/"))
+     *        .build();
+     *  client.sendAsync(request, BodyHandlers.ofFile(Paths.get("/tmp/f")))
+     *        .thenApply(HttpResponse::body)
+     *        .thenAccept(System.out::println); }</pre>
+     *
+     * Note, that even though the pre-defined handlers do not examine the
+     * response code, the response code and headers are always retrievable from
+     * the {@link HttpResponse}, when it is returned.
+     *
+     * <p> In the second example, the function returns a different subscriber
+     * depending on the status code.
+     * <pre>{@code   HttpRequest request = HttpRequest.newBuilder()
+     *        .uri(URI.create("http://www.foo.com/"))
+     *        .build();
+     *  BodyHandler<Path> bodyHandler = (rspInfo) -> rspInfo.statusCode() == 200
+     *                      ? BodySubscribers.ofFile(Paths.get("/tmp/f"))
+     *                      : BodySubscribers.replacing(Paths.get("/NULL"));
+     *  client.sendAsync(request, bodyHandler)
+     *        .thenApply(HttpResponse::body)
+     *        .thenAccept(System.out::println); }</pre>
+     *
+     * @param <T> the response body type
+     * @see BodyHandlers
+     * @since 11
+     */
+    @FunctionalInterface
+    public interface BodyHandler<T> {
+
+        /**
+         * Returns a {@link BodySubscriber BodySubscriber} considering the
+         * given response status code and headers. This method is invoked before
+         * the actual response body bytes are read and its implementation must
+         * return a {@link BodySubscriber BodySubscriber} to consume the response
+         * body bytes.
+         *
+         * <p> The response body can be discarded using one of {@link
+         * BodyHandlers#discarding() discarding} or {@link
+         * BodyHandlers#replacing(Object) replacing}.
+         *
+         * @param responseInfo the response info
+         * @return a body subscriber
+         */
+        public BodySubscriber<T> apply(ResponseInfo responseInfo);
+    }
+
+    /**
+     * Implementations of {@link BodyHandler BodyHandler} that implement various
+     * useful handlers, such as handling the response body as a String, or
+     * streaming the response body to a file.
+     *
+     * <p> These implementations do not examine the status code, meaning the
+     * body is always accepted. They typically return an equivalently named
+     * {@code BodySubscriber}. Alternatively, a custom handler can be used to
+     * examine the status code and headers, and return a different body
+     * subscriber, of the same type, as appropriate.
+     *
+     * <p>The following are examples of using the predefined body handlers to
+     * convert a flow of response body data into common high-level Java objects:
+     *
+     * <pre>{@code    // Receives the response body as a String
+     *   HttpResponse<String> response = client
+     *     .send(request, BodyHandlers.ofString());
+     *
+     *   // Receives the response body as a file
+     *   HttpResponse<Path> response = client
+     *     .send(request, BodyHandlers.ofFile(Paths.get("example.html")));
+     *
+     *   // Receives the response body as an InputStream
+     *   HttpResponse<InputStream> response = client
+     *     .send(request, BodyHandlers.ofInputStream());
+     *
+     *   // Discards the response body
+     *   HttpResponse<Void> response = client
+     *     .send(request, BodyHandlers.discarding());  }</pre>
+     *
+     * @since 11
+     */
+    public static class BodyHandlers {
+
+        private BodyHandlers() { }
+
+        /**
+         * Returns a response body handler that returns a {@link BodySubscriber
+         * BodySubscriber}{@code <Void>} obtained from {@link
+         * BodySubscribers#fromSubscriber(Subscriber)}, with the given
+         * {@code subscriber}.
+         *
+         * <p> The response body is not available through this, or the {@code
+         * HttpResponse} API, but instead all response body is forwarded to the
+         * given {@code subscriber}, which should make it available, if
+         * appropriate, through some other mechanism, e.g. an entry in a
+         * database, etc.
+         *
+         * @apiNote This method can be used as an adapter between {@code
+         * BodySubscriber} and {@code Flow.Subscriber}.
+         *
+         * <p> For example:
+         * <pre> {@code  TextSubscriber subscriber = new TextSubscriber();
+         *  HttpResponse<Void> response = client.sendAsync(request,
+         *      BodyHandlers.fromSubscriber(subscriber)).join();
+         *  System.out.println(response.statusCode()); }</pre>
+         *
+         * @param subscriber the subscriber
+         * @return a response body handler
+         */
+        public static BodyHandler<Void>
+        fromSubscriber(Subscriber<? super List<ByteBuffer>> subscriber) {
+            Objects.requireNonNull(subscriber);
+            return (responseInfo) -> BodySubscribers.fromSubscriber(subscriber,
+                                                                       s -> null);
+        }
+
+        /**
+         * Returns a response body handler that returns a {@link BodySubscriber
+         * BodySubscriber}{@code <T>} obtained from {@link
+         * BodySubscribers#fromSubscriber(Subscriber, Function)}, with the
+         * given {@code subscriber} and {@code finisher} function.
+         *
+         * <p> The given {@code finisher} function is applied after the given
+         * subscriber's {@code onComplete} has been invoked. The {@code finisher}
+         * function is invoked with the given subscriber, and returns a value
+         * that is set as the response's body.
+         *
+         * @apiNote This method can be used as an adapter between {@code
+         * BodySubscriber} and {@code Flow.Subscriber}.
+         *
+         * <p> For example:
+         * <pre> {@code  TextSubscriber subscriber = ...;  // accumulates bytes and transforms them into a String
+         *  HttpResponse<String> response = client.sendAsync(request,
+         *      BodyHandlers.fromSubscriber(subscriber, TextSubscriber::getTextResult)).join();
+         *  String text = response.body(); }</pre>
+         *
+         * @param <S> the type of the Subscriber
+         * @param <T> the type of the response body
+         * @param subscriber the subscriber
+         * @param finisher a function to be applied after the subscriber has completed
+         * @return a response body handler
+         */
+        public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodyHandler<T>
+        fromSubscriber(S subscriber, Function<? super S,? extends T> finisher) {
+            Objects.requireNonNull(subscriber);
+            Objects.requireNonNull(finisher);
+            return (responseInfo) -> BodySubscribers.fromSubscriber(subscriber,
+                                                                      finisher);
+        }
+
+        /**
+         * Returns a response body handler that returns a {@link BodySubscriber
+         * BodySubscriber}{@code <Void>} obtained from {@link
+         * BodySubscribers#fromLineSubscriber(Subscriber, Function, Charset, String)
+         * BodySubscribers.fromLineSubscriber(subscriber, s -> null, charset, null)},
+         * with the given {@code subscriber}.
+         * The {@link Charset charset} used to decode the response body bytes is
+         * obtained from the HTTP response headers as specified by {@link #ofString()},
+         * and lines are delimited in the manner of {@link BufferedReader#readLine()}.
+         *
+         * <p> The response body is not available through this, or the {@code
+         * HttpResponse} API, but instead all response body is forwarded to the
+         * given {@code subscriber}, which should make it available, if
+         * appropriate, through some other mechanism, e.g. an entry in a
+         * database, etc.
+         *
+         * @apiNote This method can be used as an adapter between a {@code
+         * BodySubscriber} and a text based {@code Flow.Subscriber} that parses
+         * text line by line.
+         *
+         * <p> For example:
+         * <pre> {@code  // A PrintSubscriber that implements Flow.Subscriber<String>
+         *  // and print lines received by onNext() on System.out
+         *  PrintSubscriber subscriber = new PrintSubscriber(System.out);
+         *  client.sendAsync(request, BodyHandlers.fromLineSubscriber(subscriber))
+         *      .thenApply(HttpResponse::statusCode)
+         *      .thenAccept((status) -> {
+         *          if (status != 200) {
+         *              System.err.printf("ERROR: %d status received%n", status);
+         *          }
+         *      }); }</pre>
+         *
+         * @param subscriber the subscriber
+         * @return a response body handler
+         */
+        public static BodyHandler<Void>
+        fromLineSubscriber(Subscriber<? super String> subscriber) {
+            Objects.requireNonNull(subscriber);
+            return (responseInfo) ->
+                        BodySubscribers.fromLineSubscriber(subscriber,
+                                                           s -> null,
+                                                           charsetFrom(responseInfo.headers()),
+                                                           null);
+        }
+
+        /**
+         * Returns a response body handler that returns a {@link BodySubscriber
+         * BodySubscriber}{@code <T>} obtained from {@link
+         * BodySubscribers#fromLineSubscriber(Subscriber, Function, Charset, String)
+         * BodySubscribers.fromLineSubscriber(subscriber, finisher, charset, lineSeparator)},
+         * with the given {@code subscriber}, {@code finisher} function, and line separator.
+         * The {@link Charset charset} used to decode the response body bytes is
+         * obtained from the HTTP response headers as specified by {@link #ofString()}.
+         *
+         * <p> The given {@code finisher} function is applied after the given
+         * subscriber's {@code onComplete} has been invoked. The {@code finisher}
+         * function is invoked with the given subscriber, and returns a value
+         * that is set as the response's body.
+         *
+         * @apiNote This method can be used as an adapter between a {@code
+         * BodySubscriber} and a text based {@code Flow.Subscriber} that parses
+         * text line by line.
+         *
+         * <p> For example:
+         * <pre> {@code  // A LineParserSubscriber that implements Flow.Subscriber<String>
+         *  // and accumulates lines that match a particular pattern
+         *  Pattern pattern = ...;
+         *  LineParserSubscriber subscriber = new LineParserSubscriber(pattern);
+         *  HttpResponse<List<String>> response = client.send(request,
+         *      BodyHandlers.fromLineSubscriber(subscriber, s -> s.getMatchingLines(), "\n"));
+         *  if (response.statusCode() != 200) {
+         *      System.err.printf("ERROR: %d status received%n", response.statusCode());
+         *  } }</pre>
+         *
+         *
+         * @param <S> the type of the Subscriber
+         * @param <T> the type of the response body
+         * @param subscriber the subscriber
+         * @param finisher a function to be applied after the subscriber has completed
+         * @param lineSeparator an optional line separator: can be {@code null},
+         *                      in which case lines will be delimited in the manner of
+         *                      {@link BufferedReader#readLine()}.
+         * @return a response body handler
+         * @throws IllegalArgumentException if the supplied {@code lineSeparator}
+         *         is the empty string
+         */
+        public static <S extends Subscriber<? super String>,T> BodyHandler<T>
+        fromLineSubscriber(S subscriber,
+                           Function<? super S,? extends T> finisher,
+                           String lineSeparator) {
+            Objects.requireNonNull(subscriber);
+            Objects.requireNonNull(finisher);
+            // implicit null check
+            if (lineSeparator != null && lineSeparator.isEmpty())
+                throw new IllegalArgumentException("empty line separator");
+            return (responseInfo) ->
+                        BodySubscribers.fromLineSubscriber(subscriber,
+                                                           finisher,
+                                                           charsetFrom(responseInfo.headers()),
+                                                           lineSeparator);
+        }
+
+        /**
+         * Returns a response body handler that discards the response body.
+         *
+         * @return a response body handler
+         */
+        public static BodyHandler<Void> discarding() {
+            return (responseInfo) -> BodySubscribers.discarding();
+        }
+
+        /**
+         * Returns a response body handler that returns the given replacement
+         * value, after discarding the response body.
+         *
+         * @param <U> the response body type
+         * @param value the value of U to return as the body, may be {@code null}
+         * @return a response body handler
+         */
+        public static <U> BodyHandler<U> replacing(U value) {
+            return (responseInfo) -> BodySubscribers.replacing(value);
+        }
+
+        /**
+         * Returns a {@code BodyHandler<String>} that returns a
+         * {@link BodySubscriber BodySubscriber}{@code <String>} obtained from
+         * {@link BodySubscribers#ofString(Charset) BodySubscribers.ofString(Charset)}.
+         * The body is decoded using the given character set.
+         *
+         * @param charset the character set to convert the body with
+         * @return a response body handler
+         */
+        public static BodyHandler<String> ofString(Charset charset) {
+            Objects.requireNonNull(charset);
+            return (responseInfo) -> BodySubscribers.ofString(charset);
+        }
+
+        /**
+         * Returns a {@code BodyHandler<Path>} that returns a
+         * {@link BodySubscriber BodySubscriber}{@code <Path>} obtained from
+         * {@link BodySubscribers#ofFile(Path, OpenOption...)
+         * BodySubscribers.ofFile(Path,OpenOption...)}.
+         *
+         * <p> When the {@code HttpResponse} object is returned, the body has
+         * been completely written to the file, and {@link #body()} returns a
+         * reference to its {@link Path}.
+         *
+         * <p> Security manager permission checks are performed in this factory
+         * method, when the {@code BodyHandler} is created. Care must be taken
+         * that the {@code BodyHandler} is not shared with untrusted code.
+         *
+         * @param file the file to store the body in
+         * @param openOptions any options to use when opening/creating the file
+         * @return a response body handler
+         * @throws IllegalArgumentException if an invalid set of open options
+         *          are specified
+         * @throws SecurityException If a security manager has been installed
+         *          and it denies {@link SecurityManager#checkWrite(String)
+         *          write access} to the file.
+         */
+        public static BodyHandler<Path> ofFile(Path file, OpenOption... openOptions) {
+            Objects.requireNonNull(file);
+            List<OpenOption> opts = List.of(openOptions);
+            if (opts.contains(DELETE_ON_CLOSE) || opts.contains(READ)) {
+                // these options make no sense, since the FileChannel is not exposed
+                throw new IllegalArgumentException("invalid openOptions: " + opts);
+            }
+            return PathBodyHandler.create(file, opts);
+        }
+
+        /**
+         * Returns a {@code BodyHandler<Path>} that returns a
+         * {@link BodySubscriber BodySubscriber}{@code <Path>}.
+         *
+         * <p> Equivalent to: {@code ofFile(file, CREATE, WRITE)}
+         *
+         * <p> Security manager permission checks are performed in this factory
+         * method, when the {@code BodyHandler} is created. Care must be taken
+         * that the {@code BodyHandler} is not shared with untrusted code.
+         *
+         * @param file the file to store the body in
+         * @return a response body handler
+         * @throws SecurityException If a security manager has been installed
+         *          and it denies {@link SecurityManager#checkWrite(String)
+         *          write access} to the file.
+         */
+        public static BodyHandler<Path> ofFile(Path file) {
+            return BodyHandlers.ofFile(file, CREATE, WRITE);
+        }
+
+        /**
+         * Returns a {@code BodyHandler<Path>} that returns a
+         * {@link BodySubscriber BodySubscriber}&lt;{@link Path}&gt;
+         * where the download directory is specified, but the filename is
+         * obtained from the {@code Content-Disposition} response header. The
+         * {@code Content-Disposition} header must specify the <i>attachment</i>
+         * type and must also contain a <i>filename</i> parameter. If the
+         * filename specifies multiple path components only the final component
+         * is used as the filename (with the given directory name).
+         *
+         * <p> When the {@code HttpResponse} object is returned, the body has
+         * been completely written to the file and {@link #body()} returns a
+         * {@code Path} object for the file. The returned {@code Path} is the
+         * combination of the supplied directory name and the file name supplied
+         * by the server. If the destination directory does not exist or cannot
+         * be written to, then the response will fail with an {@link IOException}.
+         *
+         * <p> Security manager permission checks are performed in this factory
+         * method, when the {@code BodyHandler} is created. Care must be taken
+         * that the {@code BodyHandler} is not shared with untrusted code.
+         *
+         * @param directory the directory to store the file in
+         * @param openOptions open options used when opening the file
+         * @return a response body handler
+         * @throws IllegalArgumentException if the given path does not exist,
+         *          is not a directory, is not writable, or if an invalid set
+         *          of open options are specified
+         * @throws SecurityException If a security manager has been installed
+         *          and it denies
+         *          {@linkplain SecurityManager#checkRead(String) read access}
+         *          to the directory, or it denies
+         *          {@linkplain SecurityManager#checkWrite(String) write access}
+         *          to the directory, or it denies
+         *          {@linkplain SecurityManager#checkWrite(String) write access}
+         *          to the files within the directory.
+         */
+        public static BodyHandler<Path> ofFileDownload(Path directory,
+                                                       OpenOption... openOptions) {
+            Objects.requireNonNull(directory);
+            List<OpenOption> opts = List.of(openOptions);
+            if (opts.contains(DELETE_ON_CLOSE)) {
+                throw new IllegalArgumentException("invalid option: " + DELETE_ON_CLOSE);
+            }
+            return FileDownloadBodyHandler.create(directory, opts);
+        }
+
+        /**
+         * Returns a {@code BodyHandler<InputStream>} that returns a
+         * {@link BodySubscriber BodySubscriber}{@code <InputStream>} obtained from
+         * {@link BodySubscribers#ofInputStream() BodySubscribers.ofInputStream}.
+         *
+         * <p> When the {@code HttpResponse} object is returned, the response
+         * headers will have been completely read, but the body may not have
+         * been fully received yet. The {@link #body()} method returns an
+         * {@link InputStream} from which the body can be read as it is received.
+         *
+         * @apiNote See {@link BodySubscribers#ofInputStream()} for more
+         * information.
+         *
+         * @return a response body handler
+         */
+        public static BodyHandler<InputStream> ofInputStream() {
+            return (responseInfo) -> BodySubscribers.ofInputStream();
+        }
+
+        /**
+         * Returns a {@code BodyHandler<Stream<String>>} that returns a
+         * {@link BodySubscriber BodySubscriber}{@code <Stream<String>>} obtained
+         * from {@link BodySubscribers#ofLines(Charset) BodySubscribers.ofLines(charset)}.
+         * The {@link Charset charset} used to decode the response body bytes is
+         * obtained from the HTTP response headers as specified by {@link #ofString()},
+         * and lines are delimited in the manner of {@link BufferedReader#readLine()}.
+         *
+         * <p> When the {@code HttpResponse} object is returned, the body may
+         * not have been completely received.
+         *
+         * @return a response body handler
+         */
+        public static BodyHandler<Stream<String>> ofLines() {
+            return (responseInfo) ->
+                    BodySubscribers.ofLines(charsetFrom(responseInfo.headers()));
+        }
+
+        /**
+         * Returns a {@code BodyHandler<Void>} that returns a
+         * {@link BodySubscriber BodySubscriber}{@code <Void>} obtained from
+         * {@link BodySubscribers#ofByteArrayConsumer(Consumer)
+         * BodySubscribers.ofByteArrayConsumer(Consumer)}.
+         *
+         * <p> When the {@code HttpResponse} object is returned, the body has
+         * been completely written to the consumer.
+         *
+         * @apiNote
+         * The subscriber returned by this handler is not flow controlled.
+         * Therefore, the supplied consumer must be able to process whatever
+         * amount of data is delivered in a timely fashion.
+         *
+         * @param consumer a Consumer to accept the response body
+         * @return a response body handler
+         */
+        public static BodyHandler<Void>
+        ofByteArrayConsumer(Consumer<Optional<byte[]>> consumer) {
+            Objects.requireNonNull(consumer);
+            return (responseInfo) -> BodySubscribers.ofByteArrayConsumer(consumer);
+        }
+
+        /**
+         * Returns a {@code BodyHandler<byte[]>} that returns a
+         * {@link BodySubscriber BodySubscriber}&lt;{@code byte[]}&gt; obtained
+         * from {@link BodySubscribers#ofByteArray() BodySubscribers.ofByteArray()}.
+         *
+         * <p> When the {@code HttpResponse} object is returned, the body has
+         * been completely written to the byte array.
+         *
+         * @return a response body handler
+         */
+        public static BodyHandler<byte[]> ofByteArray() {
+            return (responseInfo) -> BodySubscribers.ofByteArray();
+        }
+
+        /**
+         * Returns a {@code BodyHandler<String>} that returns a
+         * {@link BodySubscriber BodySubscriber}{@code <String>} obtained from
+         * {@link BodySubscribers#ofString(Charset) BodySubscribers.ofString(Charset)}.
+         * The body is decoded using the character set specified in
+         * the {@code Content-Type} response header. If there is no such
+         * header, or the character set is not supported, then
+         * {@link StandardCharsets#UTF_8 UTF_8} is used.
+         *
+         * <p> When the {@code HttpResponse} object is returned, the body has
+         * been completely written to the string.
+         *
+         * @return a response body handler
+         */
+        public static BodyHandler<String> ofString() {
+            return (responseInfo) -> BodySubscribers.ofString(charsetFrom(responseInfo.headers()));
+        }
+
+        /**
+         * Returns a {@code BodyHandler<Publisher<List<ByteBuffer>>>} that creates a
+         * {@link BodySubscriber BodySubscriber}{@code <Publisher<List<ByteBuffer>>>}
+         * obtained from {@link BodySubscribers#ofPublisher()
+         * BodySubscribers.ofPublisher()}.
+         *
+         * <p> When the {@code HttpResponse} object is returned, the response
+         * headers will have been completely read, but the body may not have
+         * been fully received yet. The {@link #body()} method returns a
+         * {@link Publisher Publisher<List<ByteBuffer>>} from which the body
+         * response bytes can be obtained as they are received. The publisher
+         * can and must be subscribed to only once.
+         *
+         * @apiNote See {@link BodySubscribers#ofPublisher()} for more
+         * information.
+         *
+         * @return a response body handler
+         */
+        public static BodyHandler<Publisher<List<ByteBuffer>>> ofPublisher() {
+            return (responseInfo) -> BodySubscribers.ofPublisher();
+        }
+
+        /**
+         * Returns a {@code BodyHandler} which, when invoked, returns a {@linkplain
+         * BodySubscribers#buffering(BodySubscriber,int) buffering BodySubscriber}
+         * that buffers data before delivering it to the downstream subscriber.
+         * These {@code BodySubscriber} instances are created by calling
+         * {@link BodySubscribers#buffering(BodySubscriber,int)
+         * BodySubscribers.buffering} with a subscriber obtained from the given
+         * downstream handler and the {@code bufferSize} parameter.
+         *
+         * @param <T> the response body type
+         * @param downstreamHandler the downstream handler
+         * @param bufferSize the buffer size parameter passed to {@link
+         *        BodySubscribers#buffering(BodySubscriber,int) BodySubscribers.buffering}
+         * @return a body handler
+         * @throws IllegalArgumentException if {@code bufferSize <= 0}
+         */
+         public static <T> BodyHandler<T> buffering(BodyHandler<T> downstreamHandler,
+                                                    int bufferSize) {
+             Objects.requireNonNull(downstreamHandler);
+             if (bufferSize <= 0)
+                 throw new IllegalArgumentException("must be greater than 0");
+             return (responseInfo) -> BodySubscribers
+                     .buffering(downstreamHandler.apply(responseInfo),
+                                bufferSize);
+         }
+    }
+
+    /**
+     * A handler for push promises.
+     *
+     * <p> A <i>push promise</i> is a synthetic request sent by an HTTP/2 server
+     * when retrieving an initiating client-sent request. The server has
+     * determined, possibly through inspection of the initiating request, that
+     * the client will likely need the promised resource, and hence pushes a
+     * synthetic push request, in the form of a push promise, to the client. The
+     * client can choose to accept or reject the push promise request.
+     *
+     * <p> A push promise request may be received up to the point where the
+     * response body of the initiating client-sent request has been fully
+     * received. The delivery of a push promise response, however, is not
+     * coordinated with the delivery of the response to the initiating
+     * client-sent request.
+     *
+     * @param <T> the push promise response body type
+     * @since 11
+     */
+    public interface PushPromiseHandler<T> {
+
+        /**
+         * Notification of an incoming push promise.
+         *
+         * <p> This method is invoked once for each push promise received, up
+         * to the point where the response body of the initiating client-sent
+         * request has been fully received.
+         *
+         * <p> A push promise is accepted by invoking the given {@code acceptor}
+         * function. The {@code acceptor} function must be passed a non-null
+         * {@code BodyHandler}, that is to be used to handle the promise's
+         * response body. The acceptor function will return a {@code
+         * CompletableFuture} that completes with the promise's response.
+         *
+         * <p> If the {@code acceptor} function is not successfully invoked,
+         * then the push promise is rejected. The {@code acceptor} function will
+         * throw an {@code IllegalStateException} if invoked more than once.
+         *
+         * @param initiatingRequest the initiating client-send request
+         * @param pushPromiseRequest the synthetic push request
+         * @param acceptor the acceptor function that must be successfully
+         *                 invoked to accept the push promise
+         */
+        public void applyPushPromise(
+            HttpRequest initiatingRequest,
+            HttpRequest pushPromiseRequest,
+            Function<HttpResponse.BodyHandler<T>,CompletableFuture<HttpResponse<T>>> acceptor
+        );
+
+
+        /**
+         * Returns a push promise handler that accumulates push promises, and
+         * their responses, into the given map.
+         *
+         * <p> Entries are added to the given map for each push promise accepted.
+         * The entry's key is the push request, and the entry's value is a
+         * {@code CompletableFuture} that completes with the response
+         * corresponding to the key's push request. A push request is rejected /
+         * cancelled if there is already an entry in the map whose key is
+         * {@link HttpRequest#equals equal} to it. A push request is
+         * rejected / cancelled if it  does not have the same origin as its
+         * initiating request.
+         *
+         * <p> Entries are added to the given map as soon as practically
+         * possible when a push promise is received and accepted. That way code,
+         * using such a map like a cache, can determine if a push promise has
+         * been issued by the server and avoid making, possibly, unnecessary
+         * requests.
+         *
+         * <p> The delivery of a push promise response is not coordinated with
+         * the delivery of the response to the initiating client-sent request.
+         * However, when the response body for the initiating client-sent
+         * request has been fully received, the map is guaranteed to be fully
+         * populated, that is, no more entries will be added. The individual
+         * {@code CompletableFutures} contained in the map may or may not
+         * already be completed at this point.
+         *
+         * @param <T> the push promise response body type
+         * @param pushPromiseHandler t he body handler to use for push promises
+         * @param pushPromisesMap a map to accumulate push promises into
+         * @return a push promise handler
+         */
+        public static <T> PushPromiseHandler<T>
+        of(Function<HttpRequest,BodyHandler<T>> pushPromiseHandler,
+           ConcurrentMap<HttpRequest,CompletableFuture<HttpResponse<T>>> pushPromisesMap) {
+            return new PushPromisesHandlerWithMap<>(pushPromiseHandler, pushPromisesMap);
+        }
+    }
+
+    /**
+     * A {@code BodySubscriber} consumes response body bytes and converts them
+     * into a higher-level Java type.  The class {@link BodySubscribers
+     * BodySubscriber} provides implementations of many common body subscribers.
+     *
+     * <p> The object acts as a {@link Flow.Subscriber}&lt;{@link List}&lt;{@link
+     * ByteBuffer}&gt;&gt; to the HTTP client implementation, which publishes
+     * unmodifiable lists of read-only ByteBuffers containing the response body.
+     * The Flow of data, as well as the order of ByteBuffers in the Flow lists,
+     * is a strictly ordered representation of the response body. Both the Lists
+     * and the ByteBuffers, once passed to the subscriber, are no longer used by
+     * the HTTP client. The subscriber converts the incoming buffers of data to
+     * some higher-level Java type {@code T}.
+     *
+     * <p> The {@link #getBody()} method returns a
+     * {@link CompletionStage}&lt;{@code T}&gt; that provides the response body
+     * object. The {@code CompletionStage} must be obtainable at any time. When
+     * it completes depends on the nature of type {@code T}. In many cases,
+     * when {@code T} represents the entire body after being consumed then
+     * the {@code CompletionStage} completes after the body has been consumed.
+     * If  {@code T} is a streaming type, such as {@link java.io.InputStream
+     * InputStream}, then it completes before the body has been read, because
+     * the calling code uses the {@code InputStream} to consume the data.
+     *
+     * @apiNote To ensure that all resources associated with the corresponding
+     * HTTP exchange are properly released, an implementation of {@code
+     * BodySubscriber} should ensure to {@link Flow.Subscription#request
+     * request} more data until one of {@link #onComplete() onComplete} or
+     * {@link #onError(Throwable) onError} are signalled, or {@link
+     * Flow.Subscription#request cancel} its {@linkplain
+     * #onSubscribe(Flow.Subscription) subscription} if unable or unwilling to
+     * do so. Calling {@code cancel} before exhausting the response body data
+     * may cause the underlying HTTP connection to be closed and prevent it
+     * from being reused for subsequent operations.
+     *
+     * @param <T> the response body type
+     * @see BodySubscribers
+     * @since 11
+     */
+    public interface BodySubscriber<T>
+            extends Flow.Subscriber<List<ByteBuffer>> {
+
+        /**
+         * Returns a {@code CompletionStage} which when completed will return
+         * the response body object. This method can be called at any time
+         * relative to the other {@link Flow.Subscriber} methods and is invoked
+         * using the client's {@link HttpClient#executor() executor}.
+         *
+         * @return a CompletionStage for the response body
+         */
+        public CompletionStage<T> getBody();
+    }
+
+    /**
+     * Implementations of {@link BodySubscriber BodySubscriber} that implement
+     * various useful subscribers, such as converting the response body bytes
+     * into a String, or streaming the bytes to a file.
+     *
+     * <p>The following are examples of using the predefined body subscribers
+     * to convert a flow of response body data into common high-level Java
+     * objects:
+     *
+     * <pre>{@code    // Streams the response body to a File
+     *   HttpResponse<byte[]> response = client
+     *     .send(request, (statusCode, responseHeaders) -> BodySubscribers.ofByteArray());
+     *
+     *   // Accumulates the response body and returns it as a byte[]
+     *   HttpResponse<byte[]> response = client
+     *     .send(request, (statusCode, responseHeaders) -> BodySubscribers.ofByteArray());
+     *
+     *   // Discards the response body
+     *   HttpResponse<Void> response = client
+     *     .send(request, (statusCode, responseHeaders) -> BodySubscribers.discarding());
+     *
+     *   // Accumulates the response body as a String then maps it to its bytes
+     *   HttpResponse<byte[]> response = client
+     *     .send(request, (sc, hdrs) ->
+     *        BodySubscribers.mapping(BodySubscribers.ofString(), String::getBytes));
+     * }</pre>
+     *
+     * @since 11
+     */
+    public static class BodySubscribers {
+
+        private BodySubscribers() { }
+
+        /**
+         * Returns a body subscriber that forwards all response body to the
+         * given {@code Flow.Subscriber}. The {@linkplain BodySubscriber#getBody()
+         * completion stage} of the returned body subscriber completes after one
+         * of the given subscribers {@code onComplete} or {@code onError} has
+         * been invoked.
+         *
+         * @apiNote This method can be used as an adapter between {@code
+         * BodySubscriber} and {@code Flow.Subscriber}.
+         *
+         * @param subscriber the subscriber
+         * @return a body subscriber
+         */
+        public static BodySubscriber<Void>
+        fromSubscriber(Subscriber<? super List<ByteBuffer>> subscriber) {
+            return new ResponseSubscribers.SubscriberAdapter<>(subscriber, s -> null);
+        }
+
+        /**
+         * Returns a body subscriber that forwards all response body to the
+         * given {@code Flow.Subscriber}. The {@linkplain BodySubscriber#getBody()
+         * completion stage} of the returned body subscriber completes after one
+         * of the given subscribers {@code onComplete} or {@code onError} has
+         * been invoked.
+         *
+         * <p> The given {@code finisher} function is applied after the given
+         * subscriber's {@code onComplete} has been invoked. The {@code finisher}
+         * function is invoked with the given subscriber, and returns a value
+         * that is set as the response's body.
+         *
+         * @apiNote This method can be used as an adapter between {@code
+         * BodySubscriber} and {@code Flow.Subscriber}.
+         *
+         * @param <S> the type of the Subscriber
+         * @param <T> the type of the response body
+         * @param subscriber the subscriber
+         * @param finisher a function to be applied after the subscriber has
+         *                 completed
+         * @return a body subscriber
+         */
+        public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodySubscriber<T>
+        fromSubscriber(S subscriber,
+                       Function<? super S,? extends T> finisher) {
+            return new ResponseSubscribers.SubscriberAdapter<>(subscriber, finisher);
+        }
+
+        /**
+         * Returns a body subscriber that forwards all response body to the
+         * given {@code Flow.Subscriber}, line by line.
+         * The {@linkplain BodySubscriber#getBody() completion
+         * stage} of the returned body subscriber completes after one of the
+         * given subscribers {@code onComplete} or {@code onError} has been
+         * invoked.
+         * Bytes are decoded using the {@link StandardCharsets#UTF_8
+         * UTF-8} charset, and lines are delimited in the manner of
+         * {@link BufferedReader#readLine()}.
+         *
+         * @apiNote This method can be used as an adapter between {@code
+         * BodySubscriber} and {@code Flow.Subscriber}.
+         *
+         * @implNote This is equivalent to calling <pre>{@code
+         *      fromLineSubscriber(subscriber, s -> null, StandardCharsets.UTF_8, null)
+         * }</pre>
+         *
+         * @param subscriber the subscriber
+         * @return a body subscriber
+         */
+        public static BodySubscriber<Void>
+        fromLineSubscriber(Subscriber<? super String> subscriber) {
+            return fromLineSubscriber(subscriber,  s -> null,
+                    StandardCharsets.UTF_8, null);
+        }
+
+        /**
+         * Returns a body subscriber that forwards all response body to the
+         * given {@code Flow.Subscriber}, line by line. The {@linkplain
+         * BodySubscriber#getBody() completion stage} of the returned body
+         * subscriber completes after one of the given subscribers
+         * {@code onComplete} or {@code onError} has been invoked.
+         *
+         * <p> The given {@code finisher} function is applied after the given
+         * subscriber's {@code onComplete} has been invoked. The {@code finisher}
+         * function is invoked with the given subscriber, and returns a value
+         * that is set as the response's body.
+         *
+         * @apiNote This method can be used as an adapter between {@code
+         * BodySubscriber} and {@code Flow.Subscriber}.
+         *
+         * @param <S> the type of the Subscriber
+         * @param <T> the type of the response body
+         * @param subscriber the subscriber
+         * @param finisher a function to be applied after the subscriber has
+         *                 completed
+         * @param charset a {@link Charset} to decode the bytes
+         * @param lineSeparator an optional line separator: can be {@code null},
+         *                      in which case lines will be delimited in the manner of
+         *                      {@link BufferedReader#readLine()}.
+         * @return a body subscriber
+         * @throws IllegalArgumentException if the supplied {@code lineSeparator}
+         *         is the empty string
+         */
+        public static <S extends Subscriber<? super String>,T> BodySubscriber<T>
+        fromLineSubscriber(S subscriber,
+                           Function<? super S,? extends T> finisher,
+                           Charset charset,
+                           String lineSeparator) {
+            return LineSubscriberAdapter.create(subscriber,
+                    finisher, charset, lineSeparator);
+        }
+
+        /**
+         * Returns a body subscriber which stores the response body as a {@code
+         * String} converted using the given {@code Charset}.
+         *
+         * <p> The {@link HttpResponse} using this subscriber is available after
+         * the entire response has been read.
+         *
+         * @param charset the character set to convert the String with
+         * @return a body subscriber
+         */
+        public static BodySubscriber<String> ofString(Charset charset) {
+            Objects.requireNonNull(charset);
+            return new ResponseSubscribers.ByteArraySubscriber<>(
+                    bytes -> new String(bytes, charset)
+            );
+        }
+
+        /**
+         * Returns a {@code BodySubscriber} which stores the response body as a
+         * byte array.
+         *
+         * <p> The {@link HttpResponse} using this subscriber is available after
+         * the entire response has been read.
+         *
+         * @return a body subscriber
+         */
+        public static BodySubscriber<byte[]> ofByteArray() {
+            return new ResponseSubscribers.ByteArraySubscriber<>(
+                    Function.identity() // no conversion
+            );
+        }
+
+        /**
+         * Returns a {@code BodySubscriber} which stores the response body in a
+         * file opened with the given options and name. The file will be opened
+         * with the given options using {@link FileChannel#open(Path,OpenOption...)
+         * FileChannel.open} just before the body is read. Any exception thrown
+         * will be returned or thrown from {@link HttpClient#send(HttpRequest,
+         * BodyHandler) HttpClient::send} or {@link HttpClient#sendAsync(HttpRequest,
+         * BodyHandler) HttpClient::sendAsync} as appropriate.
+         *
+         * <p> The {@link HttpResponse} using this subscriber is available after
+         * the entire response has been read.
+         *
+         * <p> Security manager permission checks are performed in this factory
+         * method, when the {@code BodySubscriber} is created. Care must be taken
+         * that the {@code BodyHandler} is not shared with untrusted code.
+         *
+         * @param file the file to store the body in
+         * @param openOptions the list of options to open the file with
+         * @return a body subscriber
+         * @throws IllegalArgumentException if an invalid set of open options
+         *          are specified
+         * @throws SecurityException if a security manager has been installed
+         *          and it denies {@link SecurityManager#checkWrite(String)
+         *          write access} to the file
+         */
+        public static BodySubscriber<Path> ofFile(Path file, OpenOption... openOptions) {
+            Objects.requireNonNull(file);
+            List<OpenOption> opts = List.of(openOptions);
+            if (opts.contains(DELETE_ON_CLOSE) || opts.contains(READ)) {
+                // these options make no sense, since the FileChannel is not exposed
+                throw new IllegalArgumentException("invalid openOptions: " + opts);
+            }
+            return PathSubscriber.create(file, opts);
+        }
+
+        /**
+         * Returns a {@code BodySubscriber} which stores the response body in a
+         * file opened with the given name.
+         *
+         * <p> Equivalent to: {@code ofFile(file, CREATE, WRITE)}
+         *
+         * <p> Security manager permission checks are performed in this factory
+         * method, when the {@code BodySubscriber} is created. Care must be taken
+         * that the {@code BodyHandler} is not shared with untrusted code.
+         *
+         * @param file the file to store the body in
+         * @return a body subscriber
+         * @throws SecurityException if a security manager has been installed
+         *          and it denies {@link SecurityManager#checkWrite(String)
+         *          write access} to the file
+         */
+        public static BodySubscriber<Path> ofFile(Path file) {
+            return ofFile(file, CREATE, WRITE);
+        }
+
+        /**
+         * Returns a {@code BodySubscriber} which provides the incoming body
+         * data to the provided Consumer of {@code Optional<byte[]>}. Each
+         * call to {@link Consumer#accept(java.lang.Object) Consumer.accept()}
+         * will contain a non empty {@code Optional}, except for the final
+         * invocation after all body data has been read, when the {@code
+         * Optional} will be empty.
+         *
+         * <p> The {@link HttpResponse} using this subscriber is available after
+         * the entire response has been read.
+         *
+         * @apiNote
+         * This subscriber is not flow controlled.
+         * Therefore, the supplied consumer must be able to process whatever
+         * amount of data is delivered in a timely fashion.
+         *
+         * @param consumer a Consumer of byte arrays
+         * @return a BodySubscriber
+         */
+        public static BodySubscriber<Void>
+        ofByteArrayConsumer(Consumer<Optional<byte[]>> consumer) {
+            return new ResponseSubscribers.ConsumerSubscriber(consumer);
+        }
+
+        /**
+         * Returns a {@code BodySubscriber} which streams the response body as
+         * an {@link InputStream}.
+         *
+         * <p> The {@link HttpResponse} using this subscriber is available
+         * immediately after the response headers have been read, without
+         * requiring to wait for the entire body to be processed. The response
+         * body can then be read directly from the {@link InputStream}.
+         *
+         * @apiNote To ensure that all resources associated with the
+         * corresponding exchange are properly released the caller must
+         * ensure to either read all bytes until EOF is reached, or call
+         * {@link InputStream#close} if it is unable or unwilling to do so.
+         * Calling {@code close} before exhausting the stream may cause
+         * the underlying HTTP connection to be closed and prevent it
+         * from being reused for subsequent operations.
+         *
+         * @return a body subscriber that streams the response body as an
+         *         {@link InputStream}.
+         */
+        public static BodySubscriber<InputStream> ofInputStream() {
+            return new ResponseSubscribers.HttpResponseInputStream();
+        }
+
+        /**
+         * Returns a {@code BodySubscriber} which streams the response body as
+         * a {@link Stream Stream<String>}, where each string in the stream
+         * corresponds to a line as defined by {@link BufferedReader#lines()}.
+         *
+         * <p> The {@link HttpResponse} using this subscriber is available
+         * immediately after the response headers have been read, without
+         * requiring to wait for the entire body to be processed. The response
+         * body can then be read directly from the {@link Stream}.
+         *
+         * @apiNote To ensure that all resources associated with the
+         * corresponding exchange are properly released the caller must
+         * ensure to either read all lines until the stream is exhausted,
+         * or call {@link Stream#close} if it is unable or unwilling to do so.
+         * Calling {@code close} before exhausting the stream may cause
+         * the underlying HTTP connection to be closed and prevent it
+         * from being reused for subsequent operations.
+         *
+         * @param charset the character set to use when converting bytes to characters
+         * @return a body subscriber that streams the response body as a
+         *         {@link Stream Stream<String>}.
+         *
+         * @see BufferedReader#lines()
+         */
+        public static BodySubscriber<Stream<String>> ofLines(Charset charset) {
+            return ResponseSubscribers.createLineStream(charset);
+        }
+
+        /**
+         * Returns a response subscriber which publishes the response body
+         * through a {@link Publisher Publisher<List<ByteBuffer>>}.
+         *
+         * <p> The {@link HttpResponse} using this subscriber is available
+         * immediately after the response headers have been read, without
+         * requiring to wait for the entire body to be processed. The response
+         * body bytes can then be obtained by subscribing to the publisher
+         * returned by the {@code HttpResponse} {@link HttpResponse#body() body}
+         * method.
+         *
+         * <p>The publisher returned by the {@link HttpResponse#body() body}
+         * method can be subscribed to only once. The first subscriber will
+         * receive the body response bytes if successfully subscribed, or will
+         * cause the subscription to be cancelled otherwise.
+         * If more subscriptions are attempted, the subsequent subscribers will
+         * be immediately subscribed with an empty subscription and their
+         * {@link Subscriber#onError(Throwable) onError} method
+         * will be invoked with an {@code IllegalStateException}.
+         *
+         * @apiNote To ensure that all resources associated with the
+         * corresponding exchange are properly released the caller must
+         * ensure that the provided publisher is subscribed once, and either
+         * {@linkplain Subscription#request(long) requests} all bytes
+         * until {@link Subscriber#onComplete() onComplete} or
+         * {@link Subscriber#onError(Throwable) onError} are invoked, or
+         * cancel the provided {@linkplain Subscriber#onSubscribe(Subscription)
+         * subscription} if it is unable or unwilling to do so.
+         * Note that depending on the actual HTTP protocol {@linkplain
+         * HttpClient.Version version} used for the exchange, cancelling the
+         * subscription instead of exhausting the flow may cause the underlying
+         * HTTP connection to be closed and prevent it from being reused for
+         * subsequent operations.
+         *
+         * @return A {@code BodySubscriber} which publishes the response body
+         *         through a {@code Publisher<List<ByteBuffer>>}.
+         */
+        public static BodySubscriber<Publisher<List<ByteBuffer>>> ofPublisher() {
+            return ResponseSubscribers.createPublisher();
+        }
+
+        /**
+         * Returns a response subscriber which discards the response body. The
+         * supplied value is the value that will be returned from
+         * {@link HttpResponse#body()}.
+         *
+         * @param <U> the type of the response body
+         * @param value the value to return from HttpResponse.body(), may be {@code null}
+         * @return a {@code BodySubscriber}
+         */
+        public static <U> BodySubscriber<U> replacing(U value) {
+            return new ResponseSubscribers.NullSubscriber<>(Optional.ofNullable(value));
+        }
+
+        /**
+         * Returns a response subscriber which discards the response body.
+         *
+         * @return a response body subscriber
+         */
+        public static BodySubscriber<Void> discarding() {
+            return new ResponseSubscribers.NullSubscriber<>(Optional.ofNullable(null));
+        }
+
+        /**
+         * Returns a {@code BodySubscriber} which buffers data before delivering
+         * it to the given downstream subscriber. The subscriber guarantees to
+         * deliver {@code buffersize} bytes of data to each invocation of the
+         * downstream's {@link BodySubscriber#onNext(Object) onNext} method,
+         * except for the final invocation, just before
+         * {@link BodySubscriber#onComplete() onComplete} is invoked. The final
+         * invocation of {@code onNext} may contain fewer than {@code bufferSize}
+         * bytes.
+         *
+         * <p> The returned subscriber delegates its {@link BodySubscriber#getBody()
+         * getBody()} method to the downstream subscriber.
+         *
+         * @param <T> the type of the response body
+         * @param downstream the downstream subscriber
+         * @param bufferSize the buffer size
+         * @return a buffering body subscriber
+         * @throws IllegalArgumentException if {@code bufferSize <= 0}
+         */
+         public static <T> BodySubscriber<T> buffering(BodySubscriber<T> downstream,
+                                                       int bufferSize) {
+             if (bufferSize <= 0)
+                 throw new IllegalArgumentException("must be greater than 0");
+             return new BufferingSubscriber<>(downstream, bufferSize);
+         }
+
+        /**
+         * Returns a {@code BodySubscriber} whose response body value is that of
+         * the result of applying the given function to the body object of the
+         * given {@code upstream} {@code BodySubscriber}.
+         *
+         * <p> The mapping function is executed using the client's {@linkplain
+         * HttpClient#executor() executor}, and can therefore be used to map any
+         * response body type, including blocking {@link InputStream}, as shown
+         * in the following example which uses a well-known JSON parser to
+         * convert an {@code InputStream} into any annotated Java type.
+         *
+         * <p>For example:
+         * <pre> {@code  public static <W> BodySubscriber<W> asJSON(Class<W> targetType) {
+         *     BodySubscriber<InputStream> upstream = BodySubscribers.ofInputStream();
+         *
+         *     BodySubscriber<W> downstream = BodySubscribers.mapping(
+         *           upstream,
+         *           (InputStream is) -> {
+         *               try (InputStream stream = is) {
+         *                   ObjectMapper objectMapper = new ObjectMapper();
+         *                   return objectMapper.readValue(stream, targetType);
+         *               } catch (IOException e) {
+         *                   throw new UncheckedIOException(e);
+         *               }
+         *           });
+         *    return downstream;
+         * } }</pre>
+         *
+         * @param <T> the upstream body type
+         * @param <U> the type of the body subscriber returned
+         * @param upstream the body subscriber to be mapped
+         * @param mapper the mapping function
+         * @return a mapping body subscriber
+         */
+        public static <T,U> BodySubscriber<U> mapping(BodySubscriber<T> upstream,
+                                                      Function<? super T, ? extends U> mapper)
+        {
+            return new ResponseSubscribers.MappingSubscriber<>(upstream, mapper);
+        }
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpTimeoutException.java b/src/java.net.http/share/classes/java/net/http/HttpTimeoutException.java
similarity index 83%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpTimeoutException.java
rename to src/java.net.http/share/classes/java/net/http/HttpTimeoutException.java
index 84160fe8f13..9853c49e442 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpTimeoutException.java
+++ b/src/java.net.http/share/classes/java/net/http/HttpTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,18 +23,25 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package java.net.http;
 
 import java.io.IOException;
 
 /**
  * Thrown when a response is not received within a specified time period.
- * {@Incubating}
+ *
+ * @since 11
  */
 public class HttpTimeoutException extends IOException {
 
     private static final long serialVersionUID = 981344271622632951L;
 
+    /**
+     * Constructs an {@code HttpTimeoutException} with the given detail message.
+     *
+     * @param message
+     *        The detail message; can be {@code null}
+     */
     public HttpTimeoutException(String message) {
         super(message);
     }
diff --git a/src/java.net.http/share/classes/java/net/http/WebSocket.java b/src/java.net.http/share/classes/java/net/http/WebSocket.java
new file mode 100644
index 00000000000..dd7f67e6b9a
--- /dev/null
+++ b/src/java.net.http/share/classes/java/net/http/WebSocket.java
@@ -0,0 +1,771 @@
+/*
+ * Copyright (c) 2015, 2018, 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.io.IOException;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+/**
+ * A WebSocket Client.
+ *
+ * <p> {@code WebSocket} instances can be created via {@link WebSocket.Builder}.
+ *
+ * <p> WebSocket has an input and an output sides. These sides are independent
+ * from each other. A side can either be open or closed. Once closed, the side
+ * remains closed. WebSocket messages are sent through a {@code WebSocket} and
+ * received through a {@code WebSocket.Listener} associated with it. Messages
+ * can be sent until the WebSocket's output is closed, and received until the
+ * WebSocket's input is closed.
+ *
+ * <p> A send method is any of the {@code sendText}, {@code sendBinary},
+ * {@code sendPing}, {@code sendPong} and {@code sendClose} methods of
+ * {@code WebSocket}. A send method initiates a send operation and returns a
+ * {@code CompletableFuture} which completes once the operation has completed.
+ * If the {@code CompletableFuture} completes normally the operation is
+ * considered succeeded. If the {@code CompletableFuture} completes
+ * exceptionally, the operation is considered failed. An operation that has been
+ * initiated but not yet completed is considered pending.
+ *
+ * <p> A receive method is any of the {@code onText}, {@code onBinary},
+ * {@code onPing}, {@code onPong} and {@code onClose} methods of
+ * {@code Listener}. A receive method initiates a receive operation and returns
+ * a {@code CompletionStage} which completes once the operation has completed.
+ *
+ * <p> A WebSocket maintains an <a id="counter">internal counter</a>.
+ * This counter's value is a number of times the WebSocket has yet to invoke a
+ * receive method. While this counter is zero the WebSocket does not invoke
+ * receive methods. The counter is incremented by {@code n} when {@code
+ * request(n)} is called. The counter is decremented by one when the WebSocket
+ * invokes a receive method. {@code onOpen} and {@code onError} are not receive
+ * methods. WebSocket invokes {@code onOpen} prior to any other methods on the
+ * listener. WebSocket invokes {@code onOpen} at most once. WebSocket may invoke
+ * {@code onError} at any given time. If the WebSocket invokes {@code onError}
+ * or {@code onClose}, then no further listener's methods will be invoked, no
+ * matter the value of the counter. For a newly built WebSocket the counter is
+ * zero. A WebSocket invokes methods on the listener in a thread-safe manner.
+ *
+ * <p> Unless otherwise stated, {@code null} arguments will cause methods
+ * of {@code WebSocket} to throw {@code NullPointerException}, similarly,
+ * {@code WebSocket} will not pass {@code null} arguments to methods of
+ * {@code Listener}. The state of a WebSocket is not changed by the invocations
+ * that throw or return a {@code CompletableFuture} that completes with one of
+ * the {@code NullPointerException}, {@code IllegalArgumentException},
+ * {@code IllegalStateException} exceptions.
+ *
+ * <p> {@code WebSocket} handles received Ping and Close messages automatically
+ * (as per the WebSocket Protocol) by replying with Pong and Close messages. If
+ * the listener receives Ping or Close messages, no mandatory actions from the
+ * listener are required.
+ *
+ * @apiNote The relationship between a WebSocket and the associated Listener is
+ * analogous to that of a Subscription and the associated Subscriber of type
+ * {@link java.util.concurrent.Flow}.
+ *
+ * @since 11
+ */
+public interface WebSocket {
+
+    /**
+     * The WebSocket Close message status code (<code>{@value}</code>),
+     * indicating normal closure, meaning that the purpose for which the
+     * connection was established has been fulfilled.
+     *
+     * @see #sendClose(int, String)
+     * @see Listener#onClose(WebSocket, int, String)
+     */
+    int NORMAL_CLOSURE = 1000;
+
+    /**
+     * A builder of {@linkplain WebSocket WebSocket Clients}.
+     *
+     * <p> A builder can be created by invoking the
+     * {@link HttpClient#newWebSocketBuilder HttpClient.newWebSocketBuilder}
+     * method. The intermediate (setter-like) methods change the state of the
+     * builder and return the same builder they have been invoked on. If an
+     * intermediate method is not invoked, an appropriate default value (or
+     * behavior) will be assumed. A {@code Builder} is not safe for use by
+     * multiple threads without external synchronization.
+     *
+     * @since 11
+     */
+    interface Builder {
+
+        /**
+         * Adds the given name-value pair to the list of additional HTTP headers
+         * sent during the opening handshake.
+         *
+         * <p> Headers defined in the
+         * <a href="https://tools.ietf.org/html/rfc6455#section-11.3">WebSocket
+         * Protocol</a> are illegal. If this method is not invoked, no
+         * additional HTTP headers will be sent.
+         *
+         * @param name
+         *         the header name
+         * @param value
+         *         the header value
+         *
+         * @return this builder
+         */
+        Builder header(String name, String value);
+
+        /**
+         * Sets a timeout for establishing a WebSocket connection.
+         *
+         * <p> If the connection is not established within the specified
+         * duration then building of the {@code WebSocket} will fail with
+         * {@link HttpTimeoutException}. If this method is not invoked then the
+         * infinite timeout is assumed.
+         *
+         * @param timeout
+         *         the timeout, non-{@linkplain Duration#isNegative() negative},
+         *         non-{@linkplain Duration#ZERO ZERO}
+         *
+         * @return this builder
+         */
+        Builder connectTimeout(Duration timeout);
+
+        /**
+         * Sets a request for the given subprotocols.
+         *
+         * <p> After the {@code WebSocket} has been built, the actual
+         * subprotocol can be queried via
+         * {@link WebSocket#getSubprotocol WebSocket.getSubprotocol()}.
+         *
+         * <p> Subprotocols are specified in the order of preference. The most
+         * preferred subprotocol is specified first. If there are any additional
+         * subprotocols they are enumerated from the most preferred to the least
+         * preferred.
+         *
+         * <p> Subprotocols not conforming to the syntax of subprotocol
+         * identifiers are illegal. If this method is not invoked then no
+         * subprotocols will be requested.
+         *
+         * @param mostPreferred
+         *         the most preferred subprotocol
+         * @param lesserPreferred
+         *         the lesser preferred subprotocols
+         *
+         * @return this builder
+         */
+        Builder subprotocols(String mostPreferred, String... lesserPreferred);
+
+        /**
+         * Builds a {@link WebSocket} connected to the given {@code URI} and
+         * associated with the given {@code Listener}.
+         *
+         * <p> Returns a {@code CompletableFuture} which will either complete
+         * normally with the resulting {@code WebSocket} or complete
+         * exceptionally with one of the following errors:
+         * <ul>
+         * <li> {@link IOException} -
+         *          if an I/O error occurs
+         * <li> {@link WebSocketHandshakeException} -
+         *          if the opening handshake fails
+         * <li> {@link HttpTimeoutException} -
+         *          if the opening handshake does not complete within
+         *          the timeout
+         * <li> {@link InterruptedException} -
+         *          if the operation is interrupted
+         * <li> {@link SecurityException} -
+         *          if a security manager has been installed and it denies
+         *          {@link java.net.URLPermission access} to {@code uri}.
+         *          <a href="HttpRequest.html#securitychecks">Security checks</a>
+         *          contains more information relating to the security context
+         *          in which the the listener is invoked.
+         * <li> {@link IllegalArgumentException} -
+         *          if any of the arguments of this builder's methods are
+         *          illegal
+         * </ul>
+         *
+         * @param uri
+         *         the WebSocket URI
+         * @param listener
+         *         the listener
+         *
+         * @return a {@code CompletableFuture} with the {@code WebSocket}
+         */
+        CompletableFuture<WebSocket> buildAsync(URI uri, Listener listener);
+    }
+
+    /**
+     * The receiving interface of {@code WebSocket}.
+     *
+     * <p> A {@code WebSocket} invokes methods of the associated listener
+     * passing itself as an argument. When data has been received, the
+     * {@code WebSocket} invokes a receive method. Methods {@code onText},
+     * {@code onBinary}, {@code onPing} and {@code onPong} must return a
+     * {@code CompletionStage} that completes once the message has been received
+     * by the listener.
+     *
+     * <p> An {@code IOException} raised in {@code WebSocket} will result in an
+     * invocation of {@code onError} with that exception (if the input is not
+     * closed). Unless otherwise stated if the listener's method throws an
+     * exception or a {@code CompletionStage} returned from a method completes
+     * exceptionally, the WebSocket will invoke {@code onError} with this
+     * exception.
+     *
+     * <p> If a listener's method returns {@code null} rather than a
+     * {@code CompletionStage}, {@code WebSocket} will behave as if the listener
+     * returned a {@code CompletionStage} that is already completed normally.
+     *
+     * @apiNote Careful attention may be required if a listener is associated
+     * with more than a single {@code WebSocket}. In this case invocations
+     * related to different instances of {@code WebSocket} may not be ordered
+     * and may even happen concurrently.
+     *
+     * <p> {@code CompletionStage}s returned from the receive methods have
+     * nothing to do with the
+     * <a href="WebSocket.html#counter">counter of invocations</a>.
+     * Namely, a {@code CompletionStage} does not have to be completed in order
+     * to receive more invocations of the listener's methods.
+     * Here is an example of a listener that requests invocations, one at a
+     * time, until a complete message has been accumulated, then processes
+     * the result, and completes the {@code CompletionStage}:
+     * <pre>{@code     WebSocket.Listener listener = new WebSocket.Listener() {
+     *
+     *        List<CharSequence> parts = new ArrayList<>();
+     *        CompletableFuture<?> accumulatedMessage = new CompletableFuture<>();
+     *
+     *        public CompletionStage<?> onText(WebSocket webSocket,
+     *                                         CharSequence message,
+     *                                         boolean last) {
+     *            parts.add(message);
+     *            webSocket.request(1);
+     *            if (last) {
+     *                processWholeText(parts);
+     *                parts = new ArrayList<>();
+     *                accumulatedMessage.complete(null);
+     *                CompletionStage<?> cf = accumulatedMessage;
+     *                accumulatedMessage = new CompletableFuture<>();
+     *                return cf;
+     *            }
+     *            return accumulatedMessage;
+     *        }
+     *    ...
+     *    } } </pre>
+     *
+     * @since 11
+     */
+    interface Listener {
+
+        /**
+         * A {@code WebSocket} has been connected.
+         *
+         * <p> This is the initial invocation and it is made once. It is
+         * typically used to make a request for more invocations.
+         *
+         * @implSpec The default implementation is equivalent to:
+         * <pre>{@code     webSocket.request(1); }</pre>
+         *
+         * @param webSocket
+         *         the WebSocket that has been connected
+         */
+        default void onOpen(WebSocket webSocket) { webSocket.request(1); }
+
+        /**
+         * A textual data has been received.
+         *
+         * <p> Return a {@code CompletionStage} which will be used by the
+         * {@code WebSocket} as an indication it may reclaim the
+         * {@code CharSequence}. Do not access the {@code CharSequence} after
+         * this {@code CompletionStage} has completed.
+         *
+         * @implSpec The default implementation is equivalent to:
+         * <pre>{@code     webSocket.request(1);
+         *    return null; }</pre>
+         *
+         * @implNote The {@code data} is always a legal UTF-16 sequence.
+         *
+         * @param webSocket
+         *         the WebSocket on which the data has been received
+         * @param data
+         *         the data
+         * @param last
+         *         whether this invocation completes the message
+         *
+         * @return a {@code CompletionStage} which completes when the
+         * {@code CharSequence} may be reclaimed; or {@code null} if it may be
+         * reclaimed immediately
+         */
+        default CompletionStage<?> onText(WebSocket webSocket,
+                                          CharSequence data,
+                                          boolean last) {
+            webSocket.request(1);
+            return null;
+        }
+
+        /**
+         * A binary data has been received.
+         *
+         * <p> This data is located in bytes from the buffer's position to its
+         * limit.
+         *
+         * <p> Return a {@code CompletionStage} which will be used by the
+         * {@code WebSocket} as an indication it may reclaim the
+         * {@code ByteBuffer}. Do not access the {@code ByteBuffer} after
+         * this {@code CompletionStage} has completed.
+         *
+         * @implSpec The default implementation is equivalent to:
+         * <pre>{@code     webSocket.request(1);
+         *    return null; }</pre>
+         *
+         * @param webSocket
+         *         the WebSocket on which the data has been received
+         * @param data
+         *         the data
+         * @param last
+         *         whether this invocation completes the message
+         *
+         * @return a {@code CompletionStage} which completes when the
+         * {@code ByteBuffer} may be reclaimed; or {@code null} if it may be
+         * reclaimed immediately
+         */
+        default CompletionStage<?> onBinary(WebSocket webSocket,
+                                            ByteBuffer data,
+                                            boolean last) {
+            webSocket.request(1);
+            return null;
+        }
+
+        /**
+         * A Ping message has been received.
+         *
+         * <p> As guaranteed by the WebSocket Protocol, the message consists of
+         * not more than {@code 125} bytes. These bytes are located from the
+         * buffer's position to its limit.
+         *
+         * <p> Given that the WebSocket implementation will automatically send a
+         * reciprocal pong when a ping is received, it is rarely required to
+         * send a pong message explicitly when a ping is received.
+         *
+         * <p> Return a {@code CompletionStage} which will be used by the
+         * {@code WebSocket} as a signal it may reclaim the
+         * {@code ByteBuffer}. Do not access the {@code ByteBuffer} after
+         * this {@code CompletionStage} has completed.
+         *
+         * @implSpec The default implementation is equivalent to:
+         * <pre>{@code     webSocket.request(1);
+         *    return null; }</pre>
+         *
+         * @param webSocket
+         *         the WebSocket on which the message has been received
+         * @param message
+         *         the message
+         *
+         * @return a {@code CompletionStage} which completes when the
+         * {@code ByteBuffer} may be reclaimed; or {@code null} if it may be
+         * reclaimed immediately
+         */
+        default CompletionStage<?> onPing(WebSocket webSocket,
+                                          ByteBuffer message) {
+            webSocket.request(1);
+            return null;
+        }
+
+        /**
+         * A Pong message has been received.
+         *
+         * <p> As guaranteed by the WebSocket Protocol, the message consists of
+         * not more than {@code 125} bytes. These bytes are located from the
+         * buffer's position to its limit.
+         *
+         * <p> Return a {@code CompletionStage} which will be used by the
+         * {@code WebSocket} as a signal it may reclaim the
+         * {@code ByteBuffer}. Do not access the {@code ByteBuffer} after
+         * this {@code CompletionStage} has completed.
+         *
+         * @implSpec The default implementation is equivalent to:
+         * <pre>{@code     webSocket.request(1);
+         *    return null; }</pre>
+         *
+         * @param webSocket
+         *         the WebSocket on which the message has been received
+         * @param message
+         *         the message
+         *
+         * @return a {@code CompletionStage} which completes when the
+         * {@code ByteBuffer} may be reclaimed; or {@code null} if it may be
+         * reclaimed immediately
+         */
+        default CompletionStage<?> onPong(WebSocket webSocket,
+                                          ByteBuffer message) {
+            webSocket.request(1);
+            return null;
+        }
+
+        /**
+         * Receives a Close message indicating the WebSocket's input has been
+         * closed.
+         *
+         * <p> This is the last invocation from the specified {@code WebSocket}.
+         * By the time this invocation begins the WebSocket's input will have
+         * been closed.
+         *
+         * <p> A Close message consists of a status code and a reason for
+         * closing. The status code is an integer from the range
+         * {@code 1000 <= code <= 65535}. The {@code reason} is a string which
+         * has a UTF-8 representation not longer than {@code 123} bytes.
+         *
+         * <p> If the WebSocket's output is not already closed, the
+         * {@code CompletionStage} returned by this method will be used as an
+         * indication that the WebSocket's output may be closed. The WebSocket
+         * will close its output at the earliest of completion of the returned
+         * {@code CompletionStage} or invoking either of the {@code sendClose}
+         * or {@code abort} methods.
+         *
+         * @apiNote Returning a {@code CompletionStage} that never completes,
+         * effectively disables the reciprocating closure of the output.
+         *
+         * <p> To specify a custom closure code or reason code the
+         * {@code sendClose} method may be invoked from inside the
+         * {@code onClose} invocation:
+         * <pre>{@code     public CompletionStage<?> onClose(WebSocket webSocket,
+         *                                      int statusCode,
+         *                                      String reason) {
+         *        webSocket.sendClose(CUSTOM_STATUS_CODE, CUSTOM_REASON);
+         *        return new CompletableFuture<Void>();
+         *    } } </pre>
+         *
+         * @implSpec The default implementation of this method returns
+         * {@code null}, indicating that the output should be closed
+         * immediately.
+         *
+         * @param webSocket
+         *         the WebSocket on which the message has been received
+         * @param statusCode
+         *         the status code
+         * @param reason
+         *         the reason
+         *
+         * @return a {@code CompletionStage} which completes when the
+         * {@code WebSocket} may be closed; or {@code null} if it may be
+         * closed immediately
+         */
+        default CompletionStage<?> onClose(WebSocket webSocket,
+                                           int statusCode,
+                                           String reason) {
+            return null;
+        }
+
+        /**
+         * An error has occurred.
+         *
+         * <p> This is the last invocation from the specified WebSocket. By the
+         * time this invocation begins both the WebSocket's input and output
+         * will have been closed. A WebSocket may invoke this method on the
+         * associated listener at any time after it has invoked {@code onOpen},
+         * regardless of whether or not any invocations have been requested from
+         * the WebSocket.
+         *
+         * <p> If an exception is thrown from this method, resulting behavior is
+         * undefined.
+         *
+         * @param webSocket
+         *         the WebSocket on which the error has occurred
+         * @param error
+         *         the error
+         */
+        default void onError(WebSocket webSocket, Throwable error) { }
+    }
+
+    /**
+     * Sends textual data with characters from the given character sequence.
+     *
+     * <p> The character sequence must not be modified until the
+     * {@code CompletableFuture} returned from this method has completed.
+     *
+     * <p> A {@code CompletableFuture} returned from this method can
+     * complete exceptionally with:
+     * <ul>
+     * <li> {@link IllegalStateException} -
+     *          if there is a pending text or binary send operation
+     *          or if the previous binary data does not complete the message
+     * <li> {@link IOException} -
+     *          if an I/O error occurs, or if the output is closed
+     * </ul>
+     *
+     * @implNote If {@code data} is a malformed UTF-16 sequence, the operation
+     * will fail with {@code IOException}.
+     *
+     * @param data
+     *         the data
+     * @param last
+     *         {@code true} if this invocation completes the message,
+     *         {@code false} otherwise
+     *
+     * @return a {@code CompletableFuture} that completes, with this WebSocket,
+     * when the data has been sent
+     */
+    CompletableFuture<WebSocket> sendText(CharSequence data, boolean last);
+
+    /**
+     * Sends binary data with bytes from the given buffer.
+     *
+     * <p> The data is located in bytes from the buffer's position to its limit.
+     * Upon normal completion of a {@code CompletableFuture} returned from this
+     * method the buffer will have no remaining bytes. The buffer must not be
+     * accessed until after that.
+     *
+     * <p> The {@code CompletableFuture} returned from this method can
+     * complete exceptionally with:
+     * <ul>
+     * <li> {@link IllegalStateException} -
+     *          if there is a pending text or binary send operation
+     *          or if the previous textual data does not complete the message
+     * <li> {@link IOException} -
+     *          if an I/O error occurs, or if the output is closed
+     * </ul>
+     *
+     * @param data
+     *         the data
+     * @param last
+     *         {@code true} if this invocation completes the message,
+     *         {@code false} otherwise
+     *
+     * @return a {@code CompletableFuture} that completes, with this WebSocket,
+     * when the data has been sent
+     */
+    CompletableFuture<WebSocket> sendBinary(ByteBuffer data, boolean last);
+
+    /**
+     * Sends a Ping message with bytes from the given buffer.
+     *
+     * <p> The message consists of not more than {@code 125} bytes from the
+     * buffer's position to its limit. Upon normal completion of a
+     * {@code CompletableFuture} returned from this method the buffer will
+     * have no remaining bytes. The buffer must not be accessed until after that.
+     *
+     * <p> The {@code CompletableFuture} returned from this method can
+     * complete exceptionally with:
+     * <ul>
+     * <li> {@link IllegalStateException} -
+     *          if there is a pending ping or pong send operation
+     * <li> {@link IllegalArgumentException} -
+     *          if the message is too long
+     * <li> {@link IOException} -
+     *          if an I/O error occurs, or if the output is closed
+     * </ul>
+     *
+     * @param message
+     *         the message
+     *
+     * @return a {@code CompletableFuture} that completes, with this WebSocket,
+     * when the Ping message has been sent
+     */
+    CompletableFuture<WebSocket> sendPing(ByteBuffer message);
+
+    /**
+     * Sends a Pong message with bytes from the given buffer.
+     *
+     * <p> The message consists of not more than {@code 125} bytes from the
+     * buffer's position to its limit. Upon normal completion of a
+     * {@code CompletableFuture} returned from this method the buffer will have
+     * no remaining bytes. The buffer must not be accessed until after that.
+     *
+     * <p> Given that the WebSocket implementation will automatically send a
+     * reciprocal pong when a ping is received, it is rarely required to send a
+     * pong message explicitly.
+     *
+     * <p> The {@code CompletableFuture} returned from this method can
+     * complete exceptionally with:
+     * <ul>
+     * <li> {@link IllegalStateException} -
+     *          if there is a pending ping or pong send operation
+     * <li> {@link IllegalArgumentException} -
+     *          if the message is too long
+     * <li> {@link IOException} -
+     *          if an I/O error occurs, or if the output is closed
+     * </ul>
+     *
+     * @param message
+     *         the message
+     *
+     * @return a {@code CompletableFuture} that completes, with this WebSocket,
+     * when the Pong message has been sent
+     */
+    CompletableFuture<WebSocket> sendPong(ByteBuffer message);
+
+    /**
+     * Initiates an orderly closure of this WebSocket's output by
+     * sending a Close message with the given status code and the reason.
+     *
+     * <p> The {@code statusCode} is an integer from the range
+     * {@code 1000 <= code <= 4999}. Status codes {@code 1002}, {@code 1003},
+     * {@code 1006}, {@code 1007}, {@code 1009}, {@code 1010}, {@code 1012},
+     * {@code 1013} and {@code 1015} are illegal. Behaviour in respect to other
+     * status codes is implementation-specific. A legal {@code reason} is a
+     * string that has a UTF-8 representation not longer than {@code 123} bytes.
+     *
+     * <p> A {@code CompletableFuture} returned from this method can
+     * complete exceptionally with:
+     * <ul>
+     * <li> {@link IllegalArgumentException} -
+     *           if {@code statusCode} is illegal, or
+     *           if {@code reason} is illegal
+     * <li> {@link IOException} -
+     *           if an I/O error occurs, or if the output is closed
+     * </ul>
+     *
+     * <p> Unless the {@code CompletableFuture} returned from this method
+     * completes with {@code IllegalArgumentException}, or the method throws
+     * {@code NullPointerException}, the output will be closed.
+     *
+     * <p> If not already closed, the input remains open until a Close message
+     * {@linkplain Listener#onClose(WebSocket, int, String) received}, or
+     * {@code abort} is invoked, or an
+     * {@linkplain Listener#onError(WebSocket, Throwable) error} occurs.
+     *
+     * @apiNote Use the provided integer constant {@link #NORMAL_CLOSURE} as a
+     * status code and an empty string as a reason in a typical case:
+     * <pre>{@code     CompletableFuture<WebSocket> webSocket = ...
+     *    webSocket.thenCompose(ws -> ws.sendText("Hello, ", false))
+     *             .thenCompose(ws -> ws.sendText("world!", true))
+     *             .thenCompose(ws -> ws.sendClose(WebSocket.NORMAL_CLOSURE, ""))
+     *             .join(); }</pre>
+     *
+     * The {@code sendClose} method does not close this WebSocket's input. It
+     * merely closes this WebSocket's output by sending a Close message. To
+     * enforce closing the input, invoke the {@code abort} method. Here is an
+     * example of an application that sends a Close message, and then starts a
+     * timer. Once no data has been received within the specified timeout, the
+     * timer goes off and the alarm aborts {@code WebSocket}:
+     * <pre>{@code     MyAlarm alarm = new MyAlarm(webSocket::abort);
+     *    WebSocket.Listener listener = new WebSocket.Listener() {
+     *
+     *        public CompletionStage<?> onText(WebSocket webSocket,
+     *                                         CharSequence data,
+     *                                         boolean last) {
+     *            alarm.snooze();
+     *            ...
+     *        }
+     *        ...
+     *    };
+     *    ...
+     *    Runnable startTimer = () -> {
+     *        MyTimer idleTimer = new MyTimer();
+     *        idleTimer.add(alarm, 30, TimeUnit.SECONDS);
+     *    };
+     *    webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok").thenRun(startTimer);
+     * } </pre>
+     *
+     * @param statusCode
+     *         the status code
+     * @param reason
+     *         the reason
+     *
+     * @return a {@code CompletableFuture} that completes, with this WebSocket,
+     * when the Close message has been sent
+     */
+    CompletableFuture<WebSocket> sendClose(int statusCode, String reason);
+
+    /**
+     * Increments the counter of invocations of receive methods.
+     *
+     * <p> This WebSocket will invoke {@code onText}, {@code onBinary},
+     * {@code onPing}, {@code onPong} or {@code onClose} methods on the
+     * associated listener (i.e. receive methods) up to {@code n} more times.
+     *
+     * @apiNote The parameter of this method is the number of invocations being
+     * requested from this WebSocket to the associated listener, not the number
+     * of messages. Sometimes a message may be delivered to the listener in a
+     * single invocation, but not always. For example, Ping, Pong and Close
+     * messages are delivered in a single invocation of {@code onPing},
+     * {@code onPong} and {@code onClose} methods respectively. However, whether
+     * or not Text and Binary messages are delivered in a single invocation of
+     * {@code onText} and {@code onBinary} methods depends on the boolean
+     * argument ({@code last}) of these methods. If {@code last} is
+     * {@code false}, then there is more to a message than has been delivered to
+     * the invocation.
+     *
+     * <p> Here is an example of a listener that requests invocations, one at a
+     * time, until a complete message has been accumulated, and then processes
+     * the result:
+     * <pre>{@code     WebSocket.Listener listener = new WebSocket.Listener() {
+     *
+     *        StringBuilder text = new StringBuilder();
+     *
+     *        public CompletionStage<?> onText(WebSocket webSocket,
+     *                                         CharSequence message,
+     *                                         boolean last) {
+     *            text.append(message);
+     *            if (last) {
+     *                processCompleteTextMessage(text);
+     *                text = new StringBuilder();
+     *            }
+     *            webSocket.request(1);
+     *            return null;
+     *        }
+     *    ...
+     *    } } </pre>
+     *
+     * @param n
+     *         the number of invocations
+     *
+     * @throws IllegalArgumentException
+     *         if {@code n <= 0}
+     */
+    void request(long n);
+
+    /**
+     * Returns the subprotocol used by this WebSocket.
+     *
+     * @return the subprotocol, or an empty string if there's no subprotocol
+     */
+    String getSubprotocol();
+
+    /**
+     * Tells whether this WebSocket's output is closed.
+     *
+     * <p> If this method returns {@code true}, subsequent invocations will also
+     * return {@code true}.
+     *
+     * @return {@code true} if closed, {@code false} otherwise
+     */
+    boolean isOutputClosed();
+
+    /**
+     * Tells whether this WebSocket's input is closed.
+     *
+     * <p> If this method returns {@code true}, subsequent invocations will also
+     * return {@code true}.
+     *
+     * @return {@code true} if closed, {@code false} otherwise
+     */
+    boolean isInputClosed();
+
+    /**
+     * Closes this WebSocket's input and output abruptly.
+     *
+     * <p> When this method returns both the input and the output will have been
+     * closed. Any pending send operations will fail with {@code IOException}.
+     * Subsequent invocations of {@code abort} will have no effect.
+     */
+    void abort();
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocketHandshakeException.java b/src/java.net.http/share/classes/java/net/http/WebSocketHandshakeException.java
similarity index 84%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocketHandshakeException.java
rename to src/java.net.http/share/classes/java/net/http/WebSocketHandshakeException.java
index 988778f4df6..bd6aa5c9092 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocketHandshakeException.java
+++ b/src/java.net.http/share/classes/java/net/http/WebSocketHandshakeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,15 +23,14 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package java.net.http;
 
 import java.io.IOException;
 
 /**
  * An exception used to signal the opening handshake failed.
- * {@Incubating}
  *
- * @since 9
+ * @since 11
  */
 public final class WebSocketHandshakeException extends IOException {
 
@@ -39,6 +38,13 @@ public final class WebSocketHandshakeException extends IOException {
 
     private final transient HttpResponse<?> response;
 
+    /**
+     * Constructs a {@code WebSocketHandshakeException} with the given
+     * {@code HttpResponse}.
+     *
+     * @param response
+     *        the {@code HttpResponse} that resulted in the handshake failure
+     */
     public WebSocketHandshakeException(HttpResponse<?> response) {
         this.response = response;
     }
@@ -47,7 +53,7 @@ public WebSocketHandshakeException(HttpResponse<?> response) {
      * Returns the server's counterpart of the opening handshake.
      *
      * <p> The value may be unavailable ({@code null}) if this exception has
-     * been serialized and then read back in.
+     * been serialized and then deserialized.
      *
      * @return server response
      */
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/package-info.java b/src/java.net.http/share/classes/java/net/http/package-info.java
similarity index 51%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/package-info.java
rename to src/java.net.http/share/classes/java/net/http/package-info.java
index 15b99d35cee..dc7a67d7755 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/package-info.java
+++ b/src/java.net.http/share/classes/java/net/http/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,37 +24,42 @@
  */
 
 /**
- * <h2>High level HTTP and WebSocket API</h2>
- * {@Incubating}
+ * <h2>HTTP Client and WebSocket APIs</h2>
  *
  * <p> Provides high-level client interfaces to HTTP (versions 1.1 and 2) and
- * WebSocket. The main types defined are:
+ * low-level client interfaces to WebSocket. The main types defined are:
  *
  * <ul>
- *    <li>{@link jdk.incubator.http.HttpClient}</li>
- *    <li>{@link jdk.incubator.http.HttpRequest}</li>
- *    <li>{@link jdk.incubator.http.HttpResponse}</li>
- *    <li>{@link jdk.incubator.http.WebSocket}</li>
+ *    <li>{@link java.net.http.HttpClient}</li>
+ *    <li>{@link java.net.http.HttpRequest}</li>
+ *    <li>{@link java.net.http.HttpResponse}</li>
+ *    <li>{@link java.net.http.WebSocket}</li>
  * </ul>
  *
- * <p> The API functions asynchronously (using {@link java.util.concurrent.CompletableFuture})
- * and work is done on the threads supplied by the client's {@link java.util.concurrent.Executor}
- * where practical.
+ * <p> The protocol-specific requirements are defined in the
+ * <a href="https://tools.ietf.org/html/rfc7540">Hypertext Transfer Protocol
+ * Version 2 (HTTP/2)</a>, the <a href="https://tools.ietf.org/html/rfc2616">
+ * Hypertext Transfer Protocol (HTTP/1.1)</a>, and
+ * <a href="https://tools.ietf.org/html/rfc6455">The WebSocket Protocol</a>.
  *
- * <p> {@code HttpClient} also provides a simple synchronous mode, where all
- * work may be done on the calling thread.
+ * <p> Asynchronous tasks and dependent actions of returned {@link
+ * java.util.concurrent.CompletableFuture} instances are executed on the threads
+ * supplied by the client's {@link java.util.concurrent.Executor}, where
+ * practical.
  *
- * <p> {@code CompletableFuture}s returned by this API will throw {@link java.lang.UnsupportedOperationException}
- * for their {@link java.util.concurrent.CompletableFuture#obtrudeValue(Object) obtrudeValue}
- * and {@link java.util.concurrent.CompletableFuture#obtrudeException(Throwable) obtrudeException}
- * methods. Invoking the {@link java.util.concurrent.CompletableFuture#cancel cancel}
- * method on a {@code CompletableFuture} returned by this API will not interrupt
- * the underlying operation, but may be useful to complete, exceptionally,
- * dependent stages that have not already completed.
+ * <p> {@code CompletableFuture}s returned by this API will throw {@link
+ * java.lang.UnsupportedOperationException} for their {@link
+ * java.util.concurrent.CompletableFuture#obtrudeValue(Object) obtrudeValue}
+ * and {@link java.util.concurrent.CompletableFuture#obtrudeException(Throwable)
+ * obtrudeException} methods. Invoking the {@link
+ * java.util.concurrent.CompletableFuture#cancel cancel} method on a {@code
+ * CompletableFuture} returned by this API will not interrupt the underlying
+ * operation, but may be useful to complete, exceptionally, dependent stages
+ * that have not already completed.
  *
  * <p> Unless otherwise stated, {@code null} parameter values will cause methods
  * of all classes in this package to throw {@code NullPointerException}.
  *
- * @since 9
+ * @since 11
  */
-package jdk.incubator.http;
+package java.net.http;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/AbstractAsyncSSLConnection.java
similarity index 54%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/AbstractAsyncSSLConnection.java
index 67dd2aa5023..f2d88f9c1b3 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/AbstractAsyncSSLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,25 +23,21 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
-import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import javax.net.ssl.SNIHostName;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLParameters;
 
-import jdk.incubator.http.internal.common.SSLTube;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.Utils;
-
+import jdk.internal.net.http.common.SSLTube;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Utils;
+import static jdk.internal.net.http.common.Utils.ServerName;
 
 /**
  * Asynchronous version of SSLConnection.
@@ -67,16 +63,20 @@ abstract class AbstractAsyncSSLConnection extends HttpConnection
     protected final String serverName;
     protected final SSLParameters sslParameters;
 
+    // Setting this property disables HTTPS hostname verification. Use with care.
+    private static final boolean disableHostnameVerification
+            = Utils.isHostnameVerificationDisabled();
+
     AbstractAsyncSSLConnection(InetSocketAddress addr,
                                HttpClientImpl client,
-                               String serverName,
+                               ServerName serverName, int port,
                                String[] alpn) {
         super(addr, client);
-        this.serverName = serverName;
+        this.serverName = serverName.getName();
         SSLContext context = client.theSSLContext();
         sslParameters = createSSLParameters(client, serverName, alpn);
         Log.logParams(sslParameters);
-        engine = createEngine(context, sslParameters);
+        engine = createEngine(context, serverName.getName(), port, sslParameters);
     }
 
     abstract HttpConnection plainConnection();
@@ -90,10 +90,12 @@ final CompletableFuture<String> getALPN() {
     final SSLEngine getEngine() { return engine; }
 
     private static SSLParameters createSSLParameters(HttpClientImpl client,
-                                                     String serverName,
+                                                     ServerName serverName,
                                                      String[] alpn) {
         SSLParameters sslp = client.sslParameters();
         SSLParameters sslParameters = Utils.copySSLParameters(sslp);
+        if (!disableHostnameVerification)
+            sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
         if (alpn != null) {
             Log.logSSL("AbstractAsyncSSLConnection: Setting application protocols: {0}",
                        Arrays.toString(alpn));
@@ -101,15 +103,18 @@ private static SSLParameters createSSLParameters(HttpClientImpl client,
         } else {
             Log.logSSL("AbstractAsyncSSLConnection: no applications set!");
         }
-        if (serverName != null) {
-            sslParameters.setServerNames(List.of(new SNIHostName(serverName)));
+        if (!serverName.isLiteral()) {
+            String name = serverName.getName();
+            if (name != null && name.length() > 0) {
+                sslParameters.setServerNames(List.of(new SNIHostName(name)));
+            }
         }
         return sslParameters;
     }
 
-    private static SSLEngine createEngine(SSLContext context,
+    private static SSLEngine createEngine(SSLContext context, String serverName, int port,
                                           SSLParameters sslParameters) {
-        SSLEngine engine = context.createSSLEngine();
+        SSLEngine engine = context.createSSLEngine(serverName, port);
         engine.setUseClientMode(true);
         engine.setSSLParameters(sslParameters);
         return engine;
@@ -120,69 +125,4 @@ final boolean isSecure() {
         return true;
     }
 
-    // Support for WebSocket/RawChannelImpl which unfortunately
-    // still depends on synchronous read/writes.
-    // It should be removed when RawChannelImpl moves to using asynchronous APIs.
-    static final class SSLConnectionChannel extends DetachedConnectionChannel {
-        final DetachedConnectionChannel delegate;
-        final SSLDelegate sslDelegate;
-        SSLConnectionChannel(DetachedConnectionChannel delegate, SSLDelegate sslDelegate) {
-            this.delegate = delegate;
-            this.sslDelegate = sslDelegate;
-        }
-
-        SocketChannel channel() {
-            return delegate.channel();
-        }
-
-        @Override
-        ByteBuffer read() throws IOException {
-            SSLDelegate.WrapperResult r = sslDelegate.recvData(ByteBuffer.allocate(8192));
-            // TODO: check for closure
-            int n = r.result.bytesProduced();
-            if (n > 0) {
-                return r.buf;
-            } else if (n == 0) {
-                return Utils.EMPTY_BYTEBUFFER;
-            } else {
-                return null;
-            }
-        }
-        @Override
-        long write(ByteBuffer[] buffers, int start, int number) throws IOException {
-            long l = SSLDelegate.countBytes(buffers, start, number);
-            SSLDelegate.WrapperResult r = sslDelegate.sendData(buffers, start, number);
-            if (r.result.getStatus() == SSLEngineResult.Status.CLOSED) {
-                if (l > 0) {
-                    throw new IOException("SSLHttpConnection closed");
-                }
-            }
-            return l;
-        }
-        @Override
-        public void shutdownInput() throws IOException {
-            delegate.shutdownInput();
-        }
-        @Override
-        public void shutdownOutput() throws IOException {
-            delegate.shutdownOutput();
-        }
-        @Override
-        public void close() {
-            delegate.close();
-        }
-    }
-
-    // Support for WebSocket/RawChannelImpl which unfortunately
-    // still depends on synchronous read/writes.
-    // It should be removed when RawChannelImpl moves to using asynchronous APIs.
-    @Override
-    DetachedConnectionChannel detachChannel() {
-        assert client() != null;
-        DetachedConnectionChannel detachedChannel = plainConnection().detachChannel();
-        SSLDelegate sslDelegate = new SSLDelegate(engine,
-                                                  detachedChannel.channel());
-        return new SSLConnectionChannel(detachedChannel, sslDelegate);
-    }
-
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractSubscription.java b/src/java.net.http/share/classes/jdk/internal/net/http/AbstractSubscription.java
similarity index 90%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractSubscription.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/AbstractSubscription.java
index 859146c1db4..2dca4357ea9 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractSubscription.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/AbstractSubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,14 +23,13 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.util.concurrent.Flow;
-import jdk.incubator.http.internal.common.Demand;
+import jdk.internal.net.http.common.Demand;
 
 /**
  * A {@link Flow.Subscription} wrapping a {@link Demand} instance.
- *
  */
 abstract class AbstractSubscription implements Flow.Subscription {
 
@@ -41,5 +40,4 @@ abstract class AbstractSubscription implements Flow.Subscription {
      * @return the subscription's demand.
      */
     protected Demand demand() { return demand; }
-
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncEvent.java b/src/java.net.http/share/classes/jdk/internal/net/http/AsyncEvent.java
similarity index 95%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncEvent.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/AsyncEvent.java
index 655439934ea..38a1fd21be6 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncEvent.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/AsyncEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.nio.channels.SelectableChannel;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/AsyncSSLConnection.java
similarity index 79%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/AsyncSSLConnection.java
index cc77383d1a5..79447439261 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/AsyncSSLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,16 +23,13 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
-import java.io.IOException;
-import java.lang.System.Logger.Level;
 import java.net.InetSocketAddress;
 import java.nio.channels.SocketChannel;
 import java.util.concurrent.CompletableFuture;
-import jdk.incubator.http.internal.common.SSLTube;
-import jdk.incubator.http.internal.common.Utils;
-
+import jdk.internal.net.http.common.SSLTube;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * Asynchronous version of SSLConnection.
@@ -46,7 +43,7 @@ class AsyncSSLConnection extends AbstractAsyncSSLConnection {
     AsyncSSLConnection(InetSocketAddress addr,
                        HttpClientImpl client,
                        String[] alpn) {
-        super(addr, client, Utils.getServerName(addr), alpn);
+        super(addr, client, Utils.getServerName(addr), addr.getPort(), alpn);
         plainConnection = new PlainHttpConnection(addr, client);
         writePublisher = new PlainHttpPublisher();
     }
@@ -97,19 +94,7 @@ public void close() {
     }
 
     @Override
-    void shutdownInput() throws IOException {
-        debug.log(Level.DEBUG, "plainConnection.channel().shutdownInput()");
-        plainConnection.channel().shutdownInput();
-    }
-
-    @Override
-    void shutdownOutput() throws IOException {
-        debug.log(Level.DEBUG, "plainConnection.channel().shutdownOutput()");
-        plainConnection.channel().shutdownOutput();
-    }
-
-   @Override
-   SSLTube getConnectionFlow() {
+    SSLTube getConnectionFlow() {
        return flow;
    }
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/AsyncSSLTunnelConnection.java
similarity index 81%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/AsyncSSLTunnelConnection.java
index 1497db8c050..fb9b385571e 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/AsyncSSLTunnelConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,15 +23,14 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
-import java.io.IOException;
-import java.lang.System.Logger.Level;
 import java.net.InetSocketAddress;
 import java.nio.channels.SocketChannel;
 import java.util.concurrent.CompletableFuture;
-import jdk.incubator.http.internal.common.SSLTube;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpHeaders;
+import jdk.internal.net.http.common.SSLTube;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * An SSL tunnel built on a Plain (CONNECT) TCP tunnel.
@@ -45,23 +44,24 @@ class AsyncSSLTunnelConnection extends AbstractAsyncSSLConnection {
     AsyncSSLTunnelConnection(InetSocketAddress addr,
                              HttpClientImpl client,
                              String[] alpn,
-                             InetSocketAddress proxy)
+                             InetSocketAddress proxy,
+                             HttpHeaders proxyHeaders)
     {
-        super(addr, client, Utils.getServerName(addr), alpn);
-        this.plainConnection = new PlainTunnelingConnection(addr, proxy, client);
+        super(addr, client, Utils.getServerName(addr), addr.getPort(), alpn);
+        this.plainConnection = new PlainTunnelingConnection(addr, proxy, client, proxyHeaders);
         this.writePublisher = new PlainHttpPublisher();
     }
 
     @Override
     public CompletableFuture<Void> connectAsync() {
-        debug.log(Level.DEBUG, "Connecting plain tunnel connection");
+        if (debug.on()) debug.log("Connecting plain tunnel connection");
         // This will connect the PlainHttpConnection flow, so that
         // its HttpSubscriber and HttpPublisher are subscribed to the
         // SocketTube
         return plainConnection
                 .connectAsync()
                 .thenApply( unused -> {
-                    debug.log(Level.DEBUG, "creating SSLTube");
+                    if (debug.on()) debug.log("creating SSLTube");
                     // create the SSLTube wrapping the SocketTube, with the given engine
                     flow = new SSLTube(engine,
                                        client().theExecutor(),
@@ -69,6 +69,9 @@ public CompletableFuture<Void> connectAsync() {
                     return null;} );
     }
 
+    @Override
+    boolean isTunnel() { return true; }
+
     @Override
     boolean connected() {
         return plainConnection.connected(); // && sslDelegate.connected();
@@ -97,16 +100,6 @@ public void close() {
         plainConnection.close();
     }
 
-    @Override
-    void shutdownInput() throws IOException {
-        plainConnection.channel().shutdownInput();
-    }
-
-    @Override
-    void shutdownOutput() throws IOException {
-        plainConnection.channel().shutdownOutput();
-    }
-
     @Override
     SocketChannel channel() {
         return plainConnection.channel();
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncTriggerEvent.java b/src/java.net.http/share/classes/jdk/internal/net/http/AsyncTriggerEvent.java
similarity index 95%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncTriggerEvent.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/AsyncTriggerEvent.java
index 5becb011232..3013fba6e05 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncTriggerEvent.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/AsyncTriggerEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.nio.channels.SelectableChannel;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AuthenticationFilter.java b/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java
similarity index 71%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AuthenticationFilter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java
index 9659ce43022..07aeec9e6b2 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AuthenticationFilter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,18 +23,23 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.PasswordAuthentication;
 import java.net.URI;
 import java.net.InetSocketAddress;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Base64;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Objects;
 import java.util.WeakHashMap;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpHeaders;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Utils;
 import static java.net.Authenticator.RequestorType.PROXY;
 import static java.net.Authenticator.RequestorType.SERVER;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
@@ -43,7 +48,7 @@
  * Implementation of Http Basic authentication.
  */
 class AuthenticationFilter implements HeaderFilter {
-    volatile MultiExchange<?,?> exchange;
+    volatile MultiExchange<?> exchange;
     private static final Base64.Encoder encoder = Base64.getEncoder();
 
     static final int DEFAULT_RETRY_LIMIT = 3;
@@ -54,6 +59,10 @@ class AuthenticationFilter implements HeaderFilter {
     static final int UNAUTHORIZED = 401;
     static final int PROXY_UNAUTHORIZED = 407;
 
+    private static final List<String> BASIC_DUMMY =
+            List.of("Basic " + Base64.getEncoder()
+                    .encodeToString("o:o".getBytes(ISO_8859_1)));
+
     // A public no-arg constructor is required by FilterFactory
     public AuthenticationFilter() {}
 
@@ -72,19 +81,46 @@ private PasswordAuthentication getCredentials(String header,
 
         String realm = parser.findValue("realm");
         java.net.Authenticator.RequestorType rtype = proxy ? PROXY : SERVER;
+        URL url = toURL(uri, req.method(), proxy);
+        String host;
+        int port;
+        String protocol;
+        InetSocketAddress proxyAddress;
+        if (proxy && (proxyAddress = req.proxy()) != null) {
+            // request sent to server through proxy
+            proxyAddress = req.proxy();
+            host = proxyAddress.getHostString();
+            port = proxyAddress.getPort();
+            protocol = "http"; // we don't support https connection to proxy
+        } else {
+            // direct connection to server or proxy
+            host = uri.getHost();
+            port = uri.getPort();
+            protocol = uri.getScheme();
+        }
 
         // needs to be instance method in Authenticator
-        return auth.requestPasswordAuthenticationInstance(uri.getHost(),
+        return auth.requestPasswordAuthenticationInstance(host,
                                                           null,
-                                                          uri.getPort(),
-                                                          uri.getScheme(),
+                                                          port,
+                                                          protocol,
                                                           realm,
                                                           authscheme,
-                                                          uri.toURL(),
+                                                          url,
                                                           rtype
         );
     }
 
+    private URL toURL(URI uri, String method, boolean proxy)
+            throws MalformedURLException
+    {
+        if (proxy && "CONNECT".equalsIgnoreCase(method)
+                && "socket".equalsIgnoreCase(uri.getScheme())) {
+            return null; // proxy tunneling
+        }
+        return uri.toURL();
+    }
+
     private URI getProxyURI(HttpRequestImpl r) {
         InetSocketAddress proxy = r.proxy();
         if (proxy == null) {
@@ -99,7 +135,7 @@ private URI getProxyURI(HttpRequestImpl r) {
                            null,
                            proxy.getHostString(),
                            proxy.getPort(),
-                           null,
+                           "/",
                            null,
                            null);
         } catch (URISyntaxException e) {
@@ -108,7 +144,7 @@ private URI getProxyURI(HttpRequestImpl r) {
     }
 
     @Override
-    public void request(HttpRequestImpl r, MultiExchange<?,?> e) throws IOException {
+    public void request(HttpRequestImpl r, MultiExchange<?> e) throws IOException {
         // use preemptive authentication if an entry exists.
         Cache cache = getCache(e);
         this.exchange = e;
@@ -144,6 +180,21 @@ private static void addBasicCredentials(HttpRequestImpl r,
         sb.append(pw.getUserName()).append(':').append(pw.getPassword());
         String s = encoder.encodeToString(sb.toString().getBytes(ISO_8859_1));
         String value = "Basic " + s;
+        if (proxy) {
+            if (r.isConnect()) {
+                if (!Utils.PROXY_TUNNEL_FILTER
+                        .test(hdrname, List.of(value))) {
+                    Log.logError("{0} disabled", hdrname);
+                    return;
+                }
+            } else if (r.proxy() != null) {
+                if (!Utils.PROXY_FILTER
+                        .test(hdrname, List.of(value))) {
+                    Log.logError("{0} disabled", hdrname);
+                    return;
+                }
+            }
+        }
         r.setSystemHeader(hdrname, value);
     }
 
@@ -200,7 +251,10 @@ public HttpRequestImpl response(Response r) throws IOException {
             }
             if (exchange.proxyauth != null && !exchange.proxyauth.fromcache) {
                 AuthInfo au = exchange.proxyauth;
-                cache.store(au.scheme, req.uri(), false, au.credentials);
+                URI proxyURI = getProxyURI(req);
+                if (proxyURI != null) {
+                    cache.store(au.scheme, proxyURI, true, au.credentials);
+                }
             }
             return null;
         }
@@ -219,8 +273,27 @@ public HttpRequestImpl response(Response r) throws IOException {
             return null;   // error gets returned to app
         }
 
+        if (proxy) {
+            if (r.isConnectResponse) {
+                if (!Utils.PROXY_TUNNEL_FILTER
+                        .test("Proxy-Authorization", BASIC_DUMMY)) {
+                    Log.logError("{0} disabled", "Proxy-Authorization");
+                    return null;
+                }
+            } else if (req.proxy() != null) {
+                if (!Utils.PROXY_FILTER
+                        .test("Proxy-Authorization", BASIC_DUMMY)) {
+                    Log.logError("{0} disabled", "Proxy-Authorization");
+                    return null;
+                }
+            }
+        }
+
         AuthInfo au = proxy ? exchange.proxyauth : exchange.serverauth;
         if (au == null) {
+            // if no authenticator, let the user deal with 407/401
+            if (!exchange.client().authenticator().isPresent()) return null;
+
             PasswordAuthentication pw = getCredentials(authval, proxy, req);
             if (pw == null) {
                 throw new IOException("No credentials provided");
@@ -232,6 +305,7 @@ public HttpRequestImpl response(Response r) throws IOException {
             } else {
                 exchange.serverauth = au;
             }
+            req = HttpRequestImpl.newInstanceForAuthentication(req);
             addBasicCredentials(req, proxy, pw);
             return req;
         } else if (au.retries > retry_limit) {
@@ -242,6 +316,10 @@ public HttpRequestImpl response(Response r) throws IOException {
             if (au.fromcache) {
                 cache.remove(au.cacheEntry);
             }
+
+            // if no authenticator, let the user deal with 407/401
+            if (!exchange.client().authenticator().isPresent()) return null;
+
             // try again
             PasswordAuthentication pw = getCredentials(authval, proxy, req);
             if (pw == null) {
@@ -253,6 +331,7 @@ public HttpRequestImpl response(Response r) throws IOException {
             } else {
                 exchange.serverauth = au;
             }
+            req = HttpRequestImpl.newInstanceForAuthentication(req);
             addBasicCredentials(req, proxy, au.credentials);
             au.retries++;
             return req;
@@ -260,10 +339,10 @@ public HttpRequestImpl response(Response r) throws IOException {
     }
 
     // Use a WeakHashMap to make it possible for the HttpClient to
-    // be garbaged collected when no longer referenced.
+    // be garbage collected when no longer referenced.
     static final WeakHashMap<HttpClientImpl,Cache> caches = new WeakHashMap<>();
 
-    static synchronized Cache getCache(MultiExchange<?,?> exchange) {
+    static synchronized Cache getCache(MultiExchange<?> exchange) {
         HttpClientImpl client = exchange.client();
         Cache c = caches.get(client);
         if (c == null) {
@@ -276,9 +355,11 @@ static synchronized Cache getCache(MultiExchange<?,?> exchange) {
     // Note: Make sure that Cache and CacheEntry do not keep any strong
     //       reference to the HttpClient: it would prevent the client being
     //       GC'ed when no longer referenced.
-    static class Cache {
+    static final class Cache {
         final LinkedList<CacheEntry> entries = new LinkedList<>();
 
+        Cache() {}
+
         synchronized CacheEntry get(URI uri, boolean proxy) {
             for (CacheEntry entry : entries) {
                 if (entry.equalsKey(uri, proxy)) {
@@ -309,7 +390,26 @@ synchronized void store(String authscheme,
         }
     }
 
-    static class CacheEntry {
+    static URI normalize(URI uri, boolean isPrimaryKey) {
+        String path = uri.getPath();
+        if (path == null || path.isEmpty()) {
+            // make sure the URI has a path, ignore query and fragment
+            try {
+                return new URI(uri.getScheme(), uri.getAuthority(), "/", null, null);
+            } catch (URISyntaxException e) {
+                throw new InternalError(e);
+            }
+        } else if (isPrimaryKey || !"/".equals(path)) {
+            // remove extraneous components and normalize path
+            return uri.resolve(".");
+        } else {
+            // path == "/" and the URI is not used to store
+            // the primary key in the cache: nothing to do.
+            return uri;
+        }
+    }
+
+    static final class CacheEntry {
         final String root;
         final String scheme;
         final boolean proxy;
@@ -320,7 +420,7 @@ static class CacheEntry {
                    boolean proxy,
                    PasswordAuthentication value) {
             this.scheme = authscheme;
-            this.root = uri.resolve(".").toString(); // remove extraneous components
+            this.root = normalize(uri, true).toString(); // remove extraneous components
             this.proxy = proxy;
             this.value = value;
         }
@@ -333,7 +433,7 @@ public boolean equalsKey(URI uri, boolean proxy) {
             if (this.proxy != proxy) {
                 return false;
             }
-            String other = uri.toString();
+            String other = String.valueOf(normalize(uri, false));
             return other.startsWith(root);
         }
     }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BufferingSubscriber.java b/src/java.net.http/share/classes/jdk/internal/net/http/BufferingSubscriber.java
similarity index 94%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BufferingSubscriber.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/BufferingSubscriber.java
index da96d7d883a..d7421bf80aa 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BufferingSubscriber.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/BufferingSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -34,19 +34,20 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Flow;
 import java.util.concurrent.atomic.AtomicBoolean;
-import jdk.incubator.http.internal.common.Demand;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpResponse.BodySubscriber;
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.SequentialScheduler;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * A buffering BodySubscriber. When subscribed, accumulates ( buffers ) a given
  * amount ( in bytes ) of a publisher's data before pushing it to a downstream
  * subscriber.
  */
-class BufferingSubscriber<T> implements HttpResponse.BodySubscriber<T>
+public class BufferingSubscriber<T> implements BodySubscriber<T>
 {
     /** The downstream consumer of the data. */
-    private final HttpResponse.BodySubscriber<T> downstreamSubscriber;
+    private final BodySubscriber<T> downstreamSubscriber;
     /** The amount of data to be accumulate before pushing downstream. */
     private final int bufferSize;
 
@@ -78,8 +79,8 @@ class BufferingSubscriber<T> implements HttpResponse.BodySubscriber<T>
 
     private volatile int state;
 
-    BufferingSubscriber(HttpResponse.BodySubscriber<T> downstreamSubscriber,
-                        int bufferSize) {
+    public BufferingSubscriber(BodySubscriber<T> downstreamSubscriber,
+                               int bufferSize) {
         this.downstreamSubscriber = Objects.requireNonNull(downstreamSubscriber);
         this.bufferSize = bufferSize;
         synchronized (buffersLock) {
@@ -280,7 +281,8 @@ public void onNext(List<ByteBuffer> item) {
             throw new InternalError("onNext on inactive subscriber");
 
         synchronized (buffersLock) {
-            accumulatedBytes += Utils.accumulateBuffers(internalBuffers, item);
+            internalBuffers.addAll(item);
+            accumulatedBytes += remaining(item);
         }
 
         downstreamSubscription.pushDemanded();
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ConnectionPool.java b/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ConnectionPool.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
index 38f9b3d2546..33bf22afc80 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ConnectionPool.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ConnectionPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.System.Logger.Level;
@@ -42,8 +42,9 @@
 import java.util.Optional;
 import java.util.concurrent.Flow;
 import java.util.stream.Collectors;
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.Utils;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * Http 1.1 connection pool.
@@ -52,8 +53,7 @@ final class ConnectionPool {
 
     static final long KEEP_ALIVE = Utils.getIntegerNetProperty(
             "jdk.httpclient.keepalive.timeout", 1200); // seconds
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final System.Logger debug = Utils.getDebugLogger(this::dbgString, DEBUG);
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
 
     // Pools of idle connections
 
@@ -122,7 +122,7 @@ final String dbgString() {
         return dbgTag;
     }
 
-    void start() {
+    synchronized void start() {
         assert !stopped : "Already stopped";
     }
 
@@ -184,7 +184,7 @@ private CleanupTrigger registerCleanupTrigger(HttpConnection conn) {
         // while the connection is sitting in the pool.
         CleanupTrigger cleanup = new CleanupTrigger(conn);
         FlowTube flow = conn.getConnectionFlow();
-        debug.log(Level.DEBUG, "registering %s", cleanup);
+        if (debug.on()) debug.log("registering %s", cleanup);
         flow.connectFlows(cleanup, cleanup);
         return cleanup;
     }
@@ -420,10 +420,9 @@ void clear() {
     }
 
     void cleanup(HttpConnection c, Throwable error) {
-        debug.log(Level.DEBUG,
-                  "%s : ConnectionPool.cleanup(%s)",
-                  String.valueOf(c.getConnectionFlow()),
-                  error);
+        if (debug.on())
+            debug.log("%s : ConnectionPool.cleanup(%s)",
+                    String.valueOf(c.getConnectionFlow()), error);
         synchronized(this) {
             if (c instanceof PlainHttpConnection) {
                 removeFromPool(c, plainPool);
@@ -484,7 +483,5 @@ public void subscribe(Flow.Subscriber<? super List<ByteBuffer>> subscriber) {
         public String toString() {
             return "CleanupTrigger(" + connection.getConnectionFlow() + ")";
         }
-
     }
-
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java b/src/java.net.http/share/classes/jdk/internal/net/http/CookieFilter.java
similarity index 73%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/CookieFilter.java
index 8ebf726f04a..710c99e2044 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/CookieFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,15 +23,17 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.net.CookieHandler;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
-import jdk.incubator.http.internal.common.Log;
+import java.net.http.HttpHeaders;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Utils;
 
 class CookieFilter implements HeaderFilter {
 
@@ -39,7 +41,7 @@ public CookieFilter() {
     }
 
     @Override
-    public void request(HttpRequestImpl r, MultiExchange<?,?> e) throws IOException {
+    public void request(HttpRequestImpl r, MultiExchange<?> e) throws IOException {
         HttpClientImpl client = e.client();
         Optional<CookieHandler> cookieHandlerOpt = client.cookieHandler();
         if (cookieHandlerOpt.isPresent()) {
@@ -50,21 +52,25 @@ public void request(HttpRequestImpl r, MultiExchange<?,?> e) throws IOException
             // add the returned cookies
             HttpHeadersImpl systemHeaders = r.getSystemHeaders();
             if (cookies.isEmpty()) {
-                Log.logTrace("Request: no cookie to add for {0}",
-                             r.uri());
+                Log.logTrace("Request: no cookie to add for {0}", r.uri());
             } else {
-                Log.logTrace("Request: adding cookies for {0}",
-                             r.uri());
+                Log.logTrace("Request: adding cookies for {0}", r.uri());
             }
-            for (String hdrname : cookies.keySet()) {
-                List<String> vals = cookies.get(hdrname);
-                for (String val : vals) {
-                    systemHeaders.addHeader(hdrname, val);
+            for (Map.Entry<String,List<String>> entry : cookies.entrySet()) {
+                final String hdrname = entry.getKey();
+                if (!hdrname.equalsIgnoreCase("Cookie")
+                        && !hdrname.equalsIgnoreCase("Cookie2"))
+                    continue;
+                List<String> values = entry.getValue();
+                if (values == null || values.isEmpty()) continue;
+                for (String val : values) {
+                    if (Utils.isValidValue(val)) {
+                        systemHeaders.addHeader(hdrname, val);
+                    }
                 }
             }
         } else {
-            Log.logTrace("Request: No cookie manager found for {0}",
-                         r.uri());
+            Log.logTrace("Request: No cookie manager found for {0}", r.uri());
         }
     }
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
similarity index 73%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
index f073ee3e183..df0e99c338d 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Exchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.System.Logger.Level;
@@ -37,11 +37,18 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.Utils;
-import jdk.incubator.http.internal.common.Log;
+import java.util.function.Function;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpResponse;
+import java.net.http.HttpTimeoutException;
 
-import static jdk.incubator.http.internal.common.Utils.permissionForProxy;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.common.Log;
+
+import static jdk.internal.net.http.common.Utils.permissionForProxy;
 
 /**
  * One request/response exchange (handles 100/101 intermediate response also).
@@ -58,24 +65,25 @@
  */
 final class Exchange<T> {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final System.Logger  debug = Utils.getDebugLogger(this::dbgString, DEBUG);
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
 
     final HttpRequestImpl request;
     final HttpClientImpl client;
     volatile ExchangeImpl<T> exchImpl;
     volatile CompletableFuture<? extends ExchangeImpl<T>> exchangeCF;
+    volatile CompletableFuture<Void> bodyIgnored;
+
     // used to record possible cancellation raised before the exchImpl
     // has been established.
     private volatile IOException failed;
     final AccessControlContext acc;
-    final MultiExchange<?,T> multi;
+    final MultiExchange<T> multi;
     final Executor parentExecutor;
     boolean upgrading; // to HTTP/2
-    final PushGroup<?,T> pushGroup;
+    final PushGroup<T> pushGroup;
     final String dbgTag;
 
-    Exchange(HttpRequestImpl request, MultiExchange<?,T> multi) {
+    Exchange(HttpRequestImpl request, MultiExchange<T> multi) {
         this.request = request;
         this.upgrading = false;
         this.client = multi.client();
@@ -88,7 +96,7 @@ final class Exchange<T> {
 
     /* If different AccessControlContext to be used  */
     Exchange(HttpRequestImpl request,
-             MultiExchange<?,T> multi,
+             MultiExchange<T> multi,
              AccessControlContext acc)
     {
         this.request = request;
@@ -101,7 +109,7 @@ final class Exchange<T> {
         this.dbgTag = "Exchange";
     }
 
-    PushGroup<?,T> getPushGroup() {
+    PushGroup<T> getPushGroup() {
         return pushGroup;
     }
 
@@ -119,6 +127,12 @@ HttpClientImpl client() {
 
 
     public CompletableFuture<T> readBodyAsync(HttpResponse.BodyHandler<T> handler) {
+        // If we received a 407 while establishing the exchange
+        // there will be no body to read: bodyIgnored will be true,
+        // and exchImpl will be null (if we were trying to establish
+        // an HTTP/2 tunnel through an HTTP/1.1 proxy)
+        if (bodyIgnored != null) return MinimalFuture.completedFuture(null);
+
         // The connection will not be returned to the pool in the case of WebSocket
         return exchImpl.readBodyAsync(handler, !request.isWebSocket(), parentExecutor)
                 .whenComplete((r,t) -> exchImpl.completed());
@@ -131,6 +145,7 @@ public CompletableFuture<T> readBodyAsync(HttpResponse.BodyHandler<T> handler) {
      * other cases.
      */
     public CompletableFuture<Void> ignoreBody() {
+        if (bodyIgnored != null) return bodyIgnored;
         return exchImpl.ignoreBody();
     }
 
@@ -170,7 +185,7 @@ public void cancel(IOException cause) {
         ExchangeImpl<?> impl = exchImpl;
         if (impl != null) {
             // propagate the exception to the impl
-            debug.log(Level.DEBUG, "Cancelling exchImpl: %s", exchImpl);
+            if (debug.on()) debug.log("Cancelling exchImpl: %s", exchImpl);
             impl.cancel(cause);
         } else {
             // no impl yet. record the exception
@@ -202,7 +217,7 @@ private void checkCancelled() {
         if (cause == null) return;
         if (impl != null) {
             // The exception is raised by propagating it to the impl.
-            debug.log(Level.DEBUG, "Cancelling exchImpl: %s", impl);
+            if (debug.on()) debug.log("Cancelling exchImpl: %s", impl);
             impl.cancel(cause);
             failed = null;
         } else {
@@ -232,11 +247,9 @@ synchronized IOException getCancelCause() {
     // potential concurrent calls to cancel() or cancel(IOException)
     private CompletableFuture<? extends ExchangeImpl<T>>
     establishExchange(HttpConnection connection) {
-        if (debug.isLoggable(Level.DEBUG)) {
-            debug.log(Level.DEBUG,
-                    "establishing exchange for %s,%n\t proxy=%s",
-                    request,
-                    request.proxy());
+        if (debug.on()) {
+            debug.log("establishing exchange for %s,%n\t proxy=%s",
+                      request, request.proxy());
         }
         // check if we have been cancelled first.
         Throwable t = getCancelCause();
@@ -287,45 +300,94 @@ CompletableFuture<Response> responseAsyncImpl(HttpConnection connection) {
         }
     }
 
+    // check whether the headersSentCF was completed exceptionally with
+    // ProxyAuthorizationRequired. If so the Response embedded in the
+    // exception is returned. Otherwise we proceed.
+    private CompletableFuture<Response> checkFor407(ExchangeImpl<T> ex, Throwable t,
+                                                    Function<ExchangeImpl<T>,CompletableFuture<Response>> andThen) {
+        t = Utils.getCompletionCause(t);
+        if (t instanceof ProxyAuthenticationRequired) {
+            bodyIgnored = MinimalFuture.completedFuture(null);
+            Response proxyResponse = ((ProxyAuthenticationRequired)t).proxyResponse;
+            HttpConnection c = ex == null ? null : ex.connection();
+            Response syntheticResponse = new Response(request, this,
+                    proxyResponse.headers, c, proxyResponse.statusCode,
+                    proxyResponse.version, true);
+            return MinimalFuture.completedFuture(syntheticResponse);
+        } else if (t != null) {
+            return MinimalFuture.failedFuture(t);
+        } else {
+            return andThen.apply(ex);
+        }
+    }
+
+    // After sending the request headers, if no ProxyAuthorizationRequired
+    // was raised and the expectContinue flag is on, we need to wait
+    // for the 100-Continue response
+    private CompletableFuture<Response> expectContinue(ExchangeImpl<T> ex) {
+        assert request.expectContinue();
+        return ex.getResponseAsync(parentExecutor)
+                .thenCompose((Response r1) -> {
+            Log.logResponse(r1::toString);
+            int rcode = r1.statusCode();
+            if (rcode == 100) {
+                Log.logTrace("Received 100-Continue: sending body");
+                CompletableFuture<Response> cf =
+                        exchImpl.sendBodyAsync()
+                                .thenCompose(exIm -> exIm.getResponseAsync(parentExecutor));
+                cf = wrapForUpgrade(cf);
+                cf = wrapForLog(cf);
+                return cf;
+            } else {
+                Log.logTrace("Expectation failed: Received {0}",
+                        rcode);
+                if (upgrading && rcode == 101) {
+                    IOException failed = new IOException(
+                            "Unable to handle 101 while waiting for 100");
+                    return MinimalFuture.failedFuture(failed);
+                }
+                return exchImpl.readBodyAsync(this::ignoreBody, false, parentExecutor)
+                        .thenApply(v ->  r1);
+            }
+        });
+    }
+
+    // After sending the request headers, if no ProxyAuthorizationRequired
+    // was raised and the expectContinue flag is off, we can immediately
+    // send the request body and proceed.
+    private CompletableFuture<Response> sendRequestBody(ExchangeImpl<T> ex) {
+        assert !request.expectContinue();
+        CompletableFuture<Response> cf = ex.sendBodyAsync()
+                .thenCompose(exIm -> exIm.getResponseAsync(parentExecutor));
+        cf = wrapForUpgrade(cf);
+        cf = wrapForLog(cf);
+        return cf;
+    }
+
     CompletableFuture<Response> responseAsyncImpl0(HttpConnection connection) {
+        Function<ExchangeImpl<T>, CompletableFuture<Response>> after407Check;
+        bodyIgnored = null;
         if (request.expectContinue()) {
             request.addSystemHeader("Expect", "100-Continue");
             Log.logTrace("Sending Expect: 100-Continue");
-            return establishExchange(connection)
-                    .thenCompose((ex) -> ex.sendHeadersAsync())
-                    .thenCompose(v -> exchImpl.getResponseAsync(parentExecutor))
-                    .thenCompose((Response r1) -> {
-                        Log.logResponse(r1::toString);
-                        int rcode = r1.statusCode();
-                        if (rcode == 100) {
-                            Log.logTrace("Received 100-Continue: sending body");
-                            CompletableFuture<Response> cf =
-                                    exchImpl.sendBodyAsync()
-                                            .thenCompose(exIm -> exIm.getResponseAsync(parentExecutor));
-                            cf = wrapForUpgrade(cf);
-                            cf = wrapForLog(cf);
-                            return cf;
-                        } else {
-                            Log.logTrace("Expectation failed: Received {0}",
-                                         rcode);
-                            if (upgrading && rcode == 101) {
-                                IOException failed = new IOException(
-                                        "Unable to handle 101 while waiting for 100");
-                                return MinimalFuture.failedFuture(failed);
-                            }
-                            return exchImpl.readBodyAsync(this::ignoreBody, false, parentExecutor)
-                                  .thenApply(v ->  r1);
-                        }
-                    });
+            // wait for 100-Continue before sending body
+            after407Check = this::expectContinue;
         } else {
-            CompletableFuture<Response> cf = establishExchange(connection)
-                    .thenCompose((ex) -> ex.sendHeadersAsync())
-                    .thenCompose(ExchangeImpl::sendBodyAsync)
-                    .thenCompose(exIm -> exIm.getResponseAsync(parentExecutor));
-            cf = wrapForUpgrade(cf);
-            cf = wrapForLog(cf);
-            return cf;
+            // send request body and proceed.
+            after407Check = this::sendRequestBody;
         }
+        // The ProxyAuthorizationRequired can be triggered either by
+        // establishExchange (case of HTTP/2 SSL tunneling through HTTP/1.1 proxy
+        // or by sendHeaderAsync (case of HTTP/1.1 SSL tunneling through HTTP/1.1 proxy
+        // Therefore we handle it with a call to this checkFor407(...) after these
+        // two places.
+        Function<ExchangeImpl<T>, CompletableFuture<Response>> afterExch407Check =
+                (ex) -> ex.sendHeadersAsync()
+                        .handle((r,t) -> this.checkFor407(r, t, after407Check))
+                        .thenCompose(Function.identity());
+        return establishExchange(connection)
+                .handle((r,t) -> this.checkFor407(r,t, afterExch407Check))
+                .thenCompose(Function.identity());
     }
 
     private CompletableFuture<Response> wrapForUpgrade(CompletableFuture<Response> cf) {
@@ -345,8 +407,8 @@ private CompletableFuture<Response> wrapForLog(CompletableFuture<Response> cf) {
         return cf;
     }
 
-    HttpResponse.BodySubscriber<T> ignoreBody(int status, HttpHeaders hdrs) {
-        return HttpResponse.BodySubscriber.discard((T)null);
+    HttpResponse.BodySubscriber<T> ignoreBody(HttpResponse.ResponseInfo hdrs) {
+        return HttpResponse.BodySubscribers.replacing(null);
     }
 
     // if this response was received in reply to an upgrade
@@ -363,10 +425,10 @@ HttpResponse.BodySubscriber<T> ignoreBody(int status, HttpHeaders hdrs) {
             // check for 101 switching protocols
             // 101 responses are not supposed to contain a body.
             //    => should we fail if there is one?
-            debug.log(Level.DEBUG, "Upgrading async %s", e.connection());
+            if (debug.on()) debug.log("Upgrading async %s", e.connection());
             return e.readBodyAsync(this::ignoreBody, false, parentExecutor)
                 .thenCompose((T v) -> {// v is null
-                    debug.log(Level.DEBUG, "Ignored body");
+                    debug.log("Ignored body");
                     // we pass e::getBuffer to allow the ByteBuffers to accumulate
                     // while we build the Http2Connection
                     return Http2Connection.createAsync(e.connection(),
@@ -380,12 +442,15 @@ HttpResponse.BodySubscriber<T> ignoreBody(int status, HttpHeaders hdrs) {
                                 // s can be null if an exception occurred
                                 // asynchronously while sending the preface.
                                 Throwable t = c.getRecordedCause();
+                                IOException ioe;
                                 if (t != null) {
                                     if (!cached)
                                         c.close();
-                                    return MinimalFuture.failedFuture(
-                                            new IOException("Can't get stream 1: " + t, t));
+                                    ioe = new IOException("Can't get stream 1: " + t, t);
+                                } else {
+                                    ioe = new IOException("Can't get stream 1");
                                 }
+                                return MinimalFuture.failedFuture(ioe);
                             }
                             exchImpl.released();
                             Throwable t;
@@ -411,7 +476,8 @@ HttpResponse.BodySubscriber<T> ignoreBody(int status, HttpHeaders hdrs) {
                                  s.cancelImpl(t);
                                  return MinimalFuture.failedFuture(t);
                             }
-                            debug.log(Level.DEBUG, "Getting response async %s", s);
+                            if (debug.on())
+                                debug.log("Getting response async %s", s);
                             return s.getResponseAsync(null);
                         });}
                 );
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/ExchangeImpl.java
similarity index 82%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/ExchangeImpl.java
index 80f6bd304ef..93b348561e4 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ExchangeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,16 +23,17 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
-import java.lang.System.Logger.Level;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Function;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import static jdk.incubator.http.HttpClient.Version.HTTP_1_1;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpResponse;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.MinimalFuture;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * Splits request so that headers and body can be sent separately with optional
@@ -49,9 +50,8 @@
  */
 abstract class ExchangeImpl<T> {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    private static final System.Logger DEBUG_LOGGER =
-            Utils.getDebugLogger("ExchangeImpl"::toString, DEBUG);
+    private static final Logger debug =
+            Utils.getDebugLogger("ExchangeImpl"::toString, Utils.DEBUG);
 
     final Exchange<T> exchange;
 
@@ -79,13 +79,15 @@ final Exchange<T> getExchange() {
     get(Exchange<U> exchange, HttpConnection connection)
     {
         if (exchange.version() == HTTP_1_1) {
-            DEBUG_LOGGER.log(Level.DEBUG, "get: HTTP/1.1: new Http1Exchange");
+            if (debug.on())
+                debug.log("get: HTTP/1.1: new Http1Exchange");
             return createHttp1Exchange(exchange, connection);
         } else {
-            Http2ClientImpl c2 = exchange.client().client2(); // TODO: improve
+            Http2ClientImpl c2 = exchange.client().client2(); // #### improve
             HttpRequestImpl request = exchange.request();
             CompletableFuture<Http2Connection> c2f = c2.getConnectionFor(request);
-            DEBUG_LOGGER.log(Level.DEBUG, "get: Trying to get HTTP/2 connection");
+            if (debug.on())
+                debug.log("get: Trying to get HTTP/2 connection");
             return c2f.handle((h2c, t) -> createExchangeImpl(h2c, t, exchange, connection))
                     .thenCompose(Function.identity());
         }
@@ -97,28 +99,32 @@ final Exchange<T> getExchange() {
                        Exchange<U> exchange,
                        HttpConnection connection)
     {
-        DEBUG_LOGGER.log(Level.DEBUG, "handling HTTP/2 connection creation result");
+        if (debug.on())
+            debug.log("handling HTTP/2 connection creation result");
         boolean secure = exchange.request().secure();
         if (t != null) {
-            DEBUG_LOGGER.log(Level.DEBUG,
-                             "handling HTTP/2 connection creation failed: %s",
-                             (Object)t);
+            if (debug.on())
+                debug.log("handling HTTP/2 connection creation failed: %s",
+                                 (Object)t);
             t = Utils.getCompletionCause(t);
             if (t instanceof Http2Connection.ALPNException) {
                 Http2Connection.ALPNException ee = (Http2Connection.ALPNException)t;
                 AbstractAsyncSSLConnection as = ee.getConnection();
-                DEBUG_LOGGER.log(Level.DEBUG, "downgrading to HTTP/1.1 with: %s", as);
+                if (debug.on())
+                    debug.log("downgrading to HTTP/1.1 with: %s", as);
                 CompletableFuture<? extends ExchangeImpl<U>> ex =
                         createHttp1Exchange(exchange, as);
                 return ex;
             } else {
-                DEBUG_LOGGER.log(Level.DEBUG, "HTTP/2 connection creation failed "
-                                  + "with unexpected exception: %s", (Object)t);
-                return CompletableFuture.failedFuture(t);
+                if (debug.on())
+                    debug.log("HTTP/2 connection creation failed "
+                                     + "with unexpected exception: %s", (Object)t);
+                return MinimalFuture.failedFuture(t);
             }
         }
         if (secure && c== null) {
-            DEBUG_LOGGER.log(Level.DEBUG, "downgrading to HTTP/1.1 ");
+            if (debug.on())
+                debug.log("downgrading to HTTP/1.1 ");
             CompletableFuture<? extends ExchangeImpl<U>> ex =
                     createHttp1Exchange(exchange, null);
             return ex;
@@ -126,14 +132,15 @@ final Exchange<T> getExchange() {
         if (c == null) {
             // no existing connection. Send request with HTTP 1 and then
             // upgrade if successful
-            DEBUG_LOGGER.log(Level.DEBUG, "new Http1Exchange, try to upgrade");
+            if (debug.on())
+                debug.log("new Http1Exchange, try to upgrade");
             return createHttp1Exchange(exchange, connection)
                     .thenApply((e) -> {
                         exchange.h2Upgrade();
                         return e;
                     });
         } else {
-            DEBUG_LOGGER.log(Level.DEBUG, "creating HTTP/2 streams");
+            if (debug.on()) debug.log("creating HTTP/2 streams");
             Stream<U> s = c.createStream(exchange);
             CompletableFuture<? extends ExchangeImpl<U>> ex = MinimalFuture.completedFuture(s);
             return ex;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/FilterFactory.java b/src/java.net.http/share/classes/jdk/internal/net/http/FilterFactory.java
similarity index 88%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/FilterFactory.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/FilterFactory.java
index 0dac70da00a..6ad6da6f682 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/FilterFactory.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/FilterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,21 +23,22 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.util.LinkedList;
 import java.util.List;
 
 class FilterFactory {
 
+    // Strictly-ordered list of filters.
     final LinkedList<Class<? extends HeaderFilter>> filterClasses = new LinkedList<>();
 
     public void addFilter(Class<? extends HeaderFilter> type) {
         filterClasses.add(type);
     }
 
-    List<HeaderFilter> getFilterChain() {
-        List<HeaderFilter> l = new LinkedList<>();
+    LinkedList<HeaderFilter> getFilterChain() {
+        LinkedList<HeaderFilter> l = new LinkedList<>();
         for (Class<? extends HeaderFilter> clazz : filterClasses) {
             try {
                 // Requires a public no arg constructor.
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderFilter.java b/src/java.net.http/share/classes/jdk/internal/net/http/HeaderFilter.java
similarity index 90%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderFilter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/HeaderFilter.java
index c4baf8655ad..177c3a8f972 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderFilter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HeaderFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 
@@ -34,7 +34,7 @@
  */
 interface HeaderFilter {
 
-    void request(HttpRequestImpl r, MultiExchange<?,?> e) throws IOException;
+    void request(HttpRequestImpl r, MultiExchange<?> e) throws IOException;
 
     /**
      * Returns null if response ok to be given to user.  Non null is a request
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderParser.java b/src/java.net.http/share/classes/jdk/internal/net/http/HeaderParser.java
similarity index 98%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderParser.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/HeaderParser.java
index 5235d625ce7..b8eb2ca6f6f 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderParser.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HeaderParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.util.Iterator;
 import java.util.Locale;
@@ -142,7 +142,7 @@ private void parse() {
                         tab[i++][1] = (new String(ca, beg, end-beg+1));
                     }
                 } else {
-                    tab[i++][0] = (new String(ca, beg, end-beg+1)).toLowerCase();
+                    tab[i++][0] = (new String(ca, beg, end-beg+1)).toLowerCase(Locale.US);
                 }
             } else if (end == beg) {
                 if (!inKey) {
@@ -152,7 +152,7 @@ private void parse() {
                         tab[i++][1] = String.valueOf(ca[end]);
                     }
                 } else {
-                    tab[i++][0] = String.valueOf(ca[end]).toLowerCase();
+                    tab[i++][0] = String.valueOf(ca[end]).toLowerCase(Locale.US);
                 }
             }
             nkeys=i;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1AsyncReceiver.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1AsyncReceiver.java
similarity index 78%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1AsyncReceiver.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Http1AsyncReceiver.java
index 4f8fdf4da6a..010b9243115 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1AsyncReceiver.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1AsyncReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -39,12 +39,13 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-import jdk.incubator.http.internal.common.Demand;
-import jdk.incubator.http.internal.common.FlowTube.TubeSubscriber;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-import jdk.incubator.http.internal.common.ConnectionExpiredException;
-import jdk.incubator.http.internal.common.Utils;
+import java.util.function.Consumer;
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.FlowTube.TubeSubscriber;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.SequentialScheduler;
+import jdk.internal.net.http.common.ConnectionExpiredException;
+import jdk.internal.net.http.common.Utils;
 
 
 /**
@@ -53,8 +54,7 @@
  */
 class Http1AsyncReceiver {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final System.Logger  debug = Utils.getDebugLogger(this::dbgString, DEBUG);
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
 
     /**
      * A delegate that can asynchronously receive data from an upstream flow,
@@ -113,6 +113,14 @@ static interface Http1AsyncDelegate {
          */
         public AbstractSubscription subscription();
 
+        /**
+         * Called to make sure resources are released when the
+         * when the Http1AsyncReceiver is stopped.
+         * @param error The Http1AsyncReceiver pending error ref,
+         *              if any.
+         */
+        public void close(Throwable error);
+
     }
 
     /**
@@ -124,21 +132,34 @@ private static final class Http1AsyncDelegateSubscription
             extends AbstractSubscription
     {
         private final Runnable onCancel;
+        private final Consumer<Throwable> onError;
         private final SequentialScheduler scheduler;
+        private volatile boolean cancelled;
         Http1AsyncDelegateSubscription(SequentialScheduler scheduler,
-                                       Runnable onCancel) {
+                                       Runnable onCancel,
+                                       Consumer<Throwable> onError) {
             this.scheduler = scheduler;
             this.onCancel = onCancel;
+            this.onError = onError;
         }
         @Override
         public void request(long n) {
-            final Demand demand = demand();
-            if (demand.increase(n)) {
-                scheduler.runOrSchedule();
+            if (cancelled) return;
+            try {
+                final Demand demand = demand();
+                if (demand.increase(n)) {
+                    scheduler.runOrSchedule();
+                }
+            } catch (IllegalArgumentException x) {
+                cancelled = true;
+                onError.accept(x);
             }
         }
         @Override
-        public void cancel() { onCancel.run();}
+        public void cancel() {
+            cancelled = true;
+            onCancel.run();
+        }
     }
 
     private final ConcurrentLinkedDeque<ByteBuffer> queue
@@ -158,6 +179,7 @@ public void request(long n) {
     // Only used for checking whether we run on the selector manager thread.
     private final HttpClientImpl client;
     private boolean retry;
+    private volatile boolean stopRequested;
 
     public Http1AsyncReceiver(Executor executor, Http1Exchange<?> owner) {
         this.pendingDelegateRef = new AtomicReference<>();
@@ -184,10 +206,11 @@ private void flush() {
             handlePendingDelegate();
 
             // Then start emptying the queue, if possible.
-            while ((buf = queue.peek()) != null) {
+            while ((buf = queue.peek()) != null && !stopRequested) {
                 Http1AsyncDelegate delegate = this.delegate;
-                debug.log(Level.DEBUG, "Got %s bytes for delegate %s",
-                                       buf.remaining(), delegate);
+                if (debug.on())
+                    debug.log("Got %s bytes for delegate %s",
+                              buf.remaining(), delegate);
                 if (!hasDemand(delegate)) {
                     // The scheduler will be invoked again later when the demand
                     // becomes positive.
@@ -195,18 +218,19 @@ private void flush() {
                 }
 
                 assert delegate != null;
-                debug.log(Level.DEBUG, "Forwarding %s bytes to delegate %s",
-                          buf.remaining(), delegate);
+                if (debug.on())
+                    debug.log("Forwarding %s bytes to delegate %s",
+                              buf.remaining(), delegate);
                 // The delegate has demand: feed it the next buffer.
                 if (!delegate.tryAsyncReceive(buf)) {
                     final long remaining = buf.remaining();
-                    debug.log(Level.DEBUG, () -> {
+                    if (debug.on()) debug.log(() -> {
                         // If the scheduler is stopped, the queue may already
                         // be empty and the reference may already be released.
                         String remstr = scheduler.isStopped() ? "" :
                                 " remaining in ref: "
                                 + remaining;
-                        remstr =  remstr
+                        remstr +=  remstr
                                 + " total remaining: " + remaining();
                         return "Delegate done: " + remaining;
                     });
@@ -219,7 +243,7 @@ private void flush() {
                 // removed parsed buffer from queue, and continue with next
                 // if available
                 ByteBuffer parsed = queue.remove();
-                canRequestMore.set(queue.isEmpty());
+                canRequestMore.set(queue.isEmpty() && !stopRequested);
                 assert parsed == buf;
             }
 
@@ -229,7 +253,7 @@ private void flush() {
         } catch (Throwable t) {
             Throwable x = error;
             if (x == null) error = t; // will be handled in the finally block
-            debug.log(Level.DEBUG, "Unexpected error caught in flush()", t);
+            if (debug.on()) debug.log("Unexpected error caught in flush()", t);
         } finally {
             // Handles any pending error.
             // The most recently subscribed delegate will get the error.
@@ -252,14 +276,24 @@ private void checkForErrors() {
         Http1AsyncDelegate delegate = pendingDelegateRef.get();
         if (delegate == null) delegate = this.delegate;
         Throwable x = error;
-        if (delegate != null && x != null && queue.isEmpty()) {
+        if (delegate != null && x != null && (stopRequested || queue.isEmpty())) {
             // forward error only after emptying the queue.
             final Object captured = delegate;
-            debug.log(Level.DEBUG, () -> "flushing " + x
-                    + "\n\t delegate: " + captured
-                    + "\t\t queue.isEmpty: " + queue.isEmpty());
+            if (debug.on())
+                debug.log(() -> "flushing " + x + "\n\t delegate: " + captured
+                          + "\t\t queue.isEmpty: " + queue.isEmpty());
             scheduler.stop();
             delegate.onReadError(x);
+            if (stopRequested) {
+                // This is the special case where the subscriber
+                // has requested an illegal number of items.
+                // In this case, the error doesn't come from
+                // upstream, but from downstream, and we need to
+                // close the upstream connection.
+                Http1Exchange<?> exchg = owner;
+                stop();
+                if (exchg != null) exchg.connection().close();
+            }
         }
     }
 
@@ -272,9 +306,10 @@ private void checkRequestMore() {
         Http1AsyncDelegate delegate = this.delegate;
         boolean more = this.canRequestMore.get();
         boolean hasDemand = hasDemand(delegate);
-        debug.log(Level.DEBUG, () -> "checkRequestMore: "
-                  + "canRequestMore=" + more + ", hasDemand=" + hasDemand
-                  + (delegate == null ? ", delegate=null" : ""));
+        if (debug.on())
+            debug.log("checkRequestMore: " + "canRequestMore=" + more
+                      + ", hasDemand=" + hasDemand
+                      + (delegate == null ? ", delegate=null" : ""));
         if (hasDemand) {
             subscriber.requestMore();
         }
@@ -290,7 +325,8 @@ private boolean hasDemand(Http1AsyncDelegate delegate) {
         if (delegate == null) return false;
         AbstractSubscription subscription = delegate.subscription();
         long demand = subscription.demand().get();
-        debug.log(Level.DEBUG, "downstream subscription demand is %s", demand);
+        if (debug.on())
+            debug.log("downstream subscription demand is %s", demand);
         return demand > 0;
     }
 
@@ -308,8 +344,14 @@ private boolean handlePendingDelegate() {
         if (pending != null && pendingDelegateRef.compareAndSet(pending, null)) {
             Http1AsyncDelegate delegate = this.delegate;
             if (delegate != null) unsubscribe(delegate);
+            Consumer<Throwable> onSubscriptionError = (x) -> {
+                setRetryOnError(false);
+                stopRequested = true;
+                onReadError(x);
+            };
             Runnable cancel = () -> {
-                debug.log(Level.DEBUG, "Downstream subscription cancelled by %s", pending);
+                if (debug.on())
+                    debug.log("Downstream subscription cancelled by %s", pending);
                 // The connection should be closed, as some data may
                 // be left over in the stream.
                 try {
@@ -327,14 +369,15 @@ private boolean handlePendingDelegate() {
             // the header/body parser work with a flow of ByteBuffer, whereas
             // we have a flow List<ByteBuffer> upstream.
             Http1AsyncDelegateSubscription subscription =
-                    new Http1AsyncDelegateSubscription(scheduler, cancel);
+                    new Http1AsyncDelegateSubscription(scheduler, cancel, onSubscriptionError);
             pending.onSubscribe(subscription);
             this.delegate = delegate = pending;
             final Object captured = delegate;
-            debug.log(Level.DEBUG, () -> "delegate is now " + captured
-                  + ", demand=" + subscription.demand().get()
-                  + ", canRequestMore=" + canRequestMore.get()
-                  + ", queue.isEmpty=" + queue.isEmpty());
+            if (debug.on())
+                debug.log("delegate is now " + captured
+                          + ", demand=" + subscription.demand().get()
+                          + ", canRequestMore=" + canRequestMore.get()
+                          + ", queue.isEmpty=" + queue.isEmpty());
             return true;
         }
         return false;
@@ -345,7 +388,7 @@ synchronized void setRetryOnError(boolean retry) {
     }
 
     void clear() {
-        debug.log(Level.DEBUG, "cleared");
+        if (debug.on()) debug.log("cleared");
         this.pendingDelegateRef.set(null);
         this.delegate = null;
         this.owner = null;
@@ -358,13 +401,13 @@ void subscribe(Http1AsyncDelegate delegate) {
         if (queue.isEmpty()) {
             canRequestMore.set(true);
         }
-        debug.log(Level.DEBUG, () ->
-                "Subscribed pending " + delegate + " queue.isEmpty: "
-                + queue.isEmpty());
+        if (debug.on())
+            debug.log("Subscribed pending " + delegate + " queue.isEmpty: "
+                      + queue.isEmpty());
         // Everything may have been received already. Make sure
         // we parse it.
         if (client.isSelectorThread()) {
-            scheduler.deferOrSchedule(executor);
+            scheduler.runOrSchedule(executor);
         } else {
             scheduler.runOrSchedule();
         }
@@ -378,7 +421,7 @@ long remaining() {
     void unsubscribe(Http1AsyncDelegate delegate) {
         synchronized(this) {
             if (this.delegate == delegate) {
-                debug.log(Level.DEBUG, "Unsubscribed %s", delegate);
+                if (debug.on()) debug.log("Unsubscribed %s", delegate);
                 this.delegate = null;
             }
         }
@@ -386,21 +429,22 @@ void unsubscribe(Http1AsyncDelegate delegate) {
 
     // Callback: Consumer of ByteBuffer
     private void asyncReceive(ByteBuffer buf) {
-        debug.log(Level.DEBUG, "Putting %s bytes into the queue", buf.remaining());
+        if (debug.on())
+            debug.log("Putting %s bytes into the queue", buf.remaining());
         received.addAndGet(buf.remaining());
         queue.offer(buf);
 
         // This callback is called from within the selector thread.
         // Use an executor here to avoid doing the heavy lifting in the
         // selector.
-        scheduler.deferOrSchedule(executor);
+        scheduler.runOrSchedule(executor);
     }
 
     // Callback: Consumer of Throwable
     void onReadError(Throwable ex) {
         Http1AsyncDelegate delegate;
         Throwable recorded;
-        debug.log(Level.DEBUG, "onError: %s", (Object) ex);
+        if (debug.on()) debug.log("onError: %s", (Object) ex);
         synchronized (this) {
             delegate = this.delegate;
             recorded = error;
@@ -426,21 +470,25 @@ void onReadError(Throwable ex) {
                 error = ex;
             }
             final Throwable t = (recorded == null ? ex : recorded);
-            debug.log(Level.DEBUG, () -> "recorded " + t
-                    + "\n\t delegate: " + delegate
-                    + "\t\t queue.isEmpty: " + queue.isEmpty(), ex);
+            if (debug.on())
+                debug.log("recorded " + t + "\n\t delegate: " + delegate
+                          + "\t\t queue.isEmpty: " + queue.isEmpty(), ex);
         }
-        if (queue.isEmpty() || pendingDelegateRef.get() != null) {
+        if (queue.isEmpty() || pendingDelegateRef.get() != null || stopRequested) {
             // This callback is called from within the selector thread.
             // Use an executor here to avoid doing the heavy lifting in the
             // selector.
-            scheduler.deferOrSchedule(executor);
+            scheduler.runOrSchedule(executor);
         }
     }
 
     void stop() {
-        debug.log(Level.DEBUG, "stopping");
+        if (debug.on()) debug.log("stopping");
         scheduler.stop();
+        // make sure ref count is handled properly by
+        // closing the delegate.
+        Http1AsyncDelegate previous = delegate;
+        if (previous != null) previous.close(error);
         delegate = null;
         owner  = null;
     }
@@ -470,7 +518,7 @@ public void onSubscribe(Flow.Subscription subscription) {
             dropped = false;
             canRequestMore.set(true);
             if (delegate != null) {
-                scheduler.deferOrSchedule(executor);
+                scheduler.runOrSchedule(executor);
             }
         }
 
@@ -479,13 +527,14 @@ void requestMore() {
             if (s == null) return;
             if (canRequestMore.compareAndSet(true, false)) {
                 if (!completed && !dropped) {
-                    debug.log(Level.DEBUG,
-                        "Http1TubeSubscriber: requesting one more from upstream");
+                    if (debug.on())
+                        debug.log("Http1TubeSubscriber: requesting one more from upstream");
                     s.request(1);
                     return;
                 }
             }
-            debug.log(Level.DEBUG, "Http1TubeSubscriber: no need to request more");
+            if (debug.on())
+                debug.log("Http1TubeSubscriber: no need to request more");
         }
 
         @Override
@@ -509,7 +558,7 @@ public void onComplete() {
         }
 
         public void dropSubscription() {
-            debug.log(Level.DEBUG, "Http1TubeSubscriber: dropSubscription");
+            if (debug.on()) debug.log("Http1TubeSubscriber: dropSubscription");
             // we could probably set subscription to null here...
             // then we might not need the 'dropped' boolean?
             dropped = true;
@@ -530,9 +579,12 @@ ByteBuffer drain(ByteBuffer initial) {
         // sanity check: we shouldn't have queued the same
         // buffer twice.
         ByteBuffer[] qbb = queue.toArray(new ByteBuffer[queue.size()]);
-        assert java.util.stream.Stream.of(qbb)
-                .collect(Collectors.toSet())
-                .size() == qbb.length : debugQBB(qbb);
+
+// the assertion looks suspicious, more investigation needed
+//
+//        assert java.util.stream.Stream.of(qbb)
+//                .collect(Collectors.toSet())
+//                .size() == qbb.length : debugQBB(qbb);
 
         // compute the number of bytes in the queue, the number of bytes
         // in the initial buffer
@@ -541,14 +593,14 @@ ByteBuffer drain(ByteBuffer initial) {
         int size = Utils.remaining(qbb, Integer.MAX_VALUE);
         int remaining = b.remaining();
         int free = b.capacity() - b.position() - remaining;
-        debug.log(Level.DEBUG,
-            "Flushing %s bytes from queue into initial buffer (remaining=%s, free=%s)",
-            size, remaining, free);
+        if (debug.on())
+            debug.log("Flushing %s bytes from queue into initial buffer "
+                      + "(remaining=%s, free=%s)", size, remaining, free);
 
         // check whether the initial buffer has enough space
         if (size > free) {
-            debug.log(Level.DEBUG,
-                    "Allocating new buffer for initial: %s", (size + remaining));
+            if (debug.on())
+                debug.log("Allocating new buffer for initial: %s", (size + remaining));
             // allocates a new buffer and copy initial to it
             b = ByteBuffer.allocate(size + remaining);
             Utils.copy(initial, b);
@@ -597,8 +649,9 @@ ByteBuffer drain(ByteBuffer initial) {
         // we can clear the refs
         queue.clear();
         final ByteBuffer bb = b;
-        debug.log(Level.DEBUG, () -> "Initial buffer now has " + bb.remaining()
-                + " pos=" + bb.position() + " limit=" + bb.limit());
+        if (debug.on())
+            debug.log("Initial buffer now has " + bb.remaining()
+                       + " pos=" + bb.position() + " limit=" + bb.limit());
 
         return b;
     }
@@ -641,9 +694,9 @@ String dbgString() {
                     : null;
             flowTag = tag = flow == null ? null: (String.valueOf(flow));
             if (flowTag != null) {
-                dbgTag = tag = flowTag + " Http1AsyncReceiver";
+                dbgTag = tag = "Http1AsyncReceiver("+ flowTag + ")";
             } else {
-                tag = "Http1AsyncReceiver";
+                tag = "Http1AsyncReceiver(?)";
             }
         }
         return tag;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Exchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
similarity index 79%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Exchange.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
index 3dc754eff29..50230b1ab0b 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Exchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,13 +23,13 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.System.Logger.Level;
 import java.net.InetSocketAddress;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodySubscriber;
 import java.nio.ByteBuffer;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
@@ -38,24 +38,21 @@
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Flow;
-import jdk.incubator.http.internal.common.Demand;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.Utils;
-import static jdk.incubator.http.HttpClient.Version.HTTP_1_1;
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.SequentialScheduler;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.Utils;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
 
 /**
  * Encapsulates one HTTP/1.1 request/response exchange.
  */
 class Http1Exchange<T> extends ExchangeImpl<T> {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final System.Logger  debug = Utils.getDebugLogger(this::dbgString, DEBUG);
-    private static final System.Logger DEBUG_LOGGER =
-            Utils.getDebugLogger("Http1Exchange"::toString, DEBUG);
-
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
     final HttpRequestImpl request; // main request
     final Http1Request requestAction;
     private volatile Http1Response<T> response;
@@ -82,9 +79,9 @@ class Http1Exchange<T> extends ExchangeImpl<T> {
     private final Http1Publisher writePublisher = new Http1Publisher();
 
     /** Completed when the header have been published, or there is an error */
-    private volatile CompletableFuture<ExchangeImpl<T>> headersSentCF  = new MinimalFuture<>();
+    private final CompletableFuture<ExchangeImpl<T>> headersSentCF  = new MinimalFuture<>();
      /** Completed when the body has been published, or there is an error */
-    private volatile CompletableFuture<ExchangeImpl<T>> bodySentCF = new MinimalFuture<>();
+    private final CompletableFuture<ExchangeImpl<T>> bodySentCF = new MinimalFuture<>();
 
     /** The subscriber to the request's body published. Maybe null. */
     private volatile Http1BodySubscriber bodySubscriber;
@@ -118,20 +115,46 @@ public String toString() {
      * {@link Http1Request.FixedContentSubscriber}, for receiving chunked and
      * fixed length bodies, respectively. */
     static abstract class Http1BodySubscriber implements Flow.Subscriber<ByteBuffer> {
-        protected volatile Flow.Subscription subscription;
-        protected volatile boolean complete;
+        final MinimalFuture<Flow.Subscription> whenSubscribed = new MinimalFuture<>();
+        private volatile Flow.Subscription subscription;
+        volatile boolean complete;
+        private final Logger debug;
+        Http1BodySubscriber(Logger debug) {
+            assert debug != null;
+            this.debug = debug;
+        }
 
         /** Final sentinel in the stream of request body. */
         static final List<ByteBuffer> COMPLETED = List.of(ByteBuffer.allocate(0));
 
-        void request(long n) {
-            DEBUG_LOGGER.log(Level.DEBUG, () ->
-                "Http1BodySubscriber requesting " + n + ", from " + subscription);
+        final void request(long n) {
+            if (debug.on())
+                debug.log("Http1BodySubscriber requesting %d, from %s",
+                          n, subscription);
             subscription.request(n);
         }
 
-        static Http1BodySubscriber completeSubscriber() {
-            return new Http1BodySubscriber() {
+        final boolean isSubscribed() {
+            return subscription != null;
+        }
+
+        final void setSubscription(Flow.Subscription subscription) {
+            this.subscription = subscription;
+            whenSubscribed.complete(subscription);
+        }
+
+        final void cancelSubscription() {
+            try {
+                subscription.cancel();
+            } catch(Throwable t) {
+                String msg = "Ignoring exception raised when canceling BodyPublisher subscription";
+                if (debug.on()) debug.log("%s: %s", msg, t);
+                Log.logError("{0}: {1}", msg, (Object)t);
+            }
+        }
+
+        static Http1BodySubscriber completeSubscriber(Logger debug) {
+            return new Http1BodySubscriber(debug) {
                 @Override public void onSubscribe(Flow.Subscription subscription) { error(); }
                 @Override public void onNext(ByteBuffer item) { error(); }
                 @Override public void onError(Throwable throwable) { error(); }
@@ -192,9 +215,13 @@ public void onSubscribe(AbstractSubscription s) {
             this.s = s;
         }
 
+        @Override
         public AbstractSubscription subscription() {
             return s;
         }
+
+        @Override
+        public void close(Throwable error) {}
     }
 
     @Override
@@ -204,7 +231,7 @@ HttpConnection connection() {
 
     private void connectFlows(HttpConnection connection) {
         FlowTube tube =  connection.getConnectionFlow();
-        debug.log(Level.DEBUG, "%s connecting flows", tube);
+        if (debug.on()) debug.log("%s connecting flows", tube);
 
         // Connect the flow to our Http1TubeSubscriber:
         //   asyncReceiver.subscriber().
@@ -216,12 +243,12 @@ private void connectFlows(HttpConnection connection) {
     CompletableFuture<ExchangeImpl<T>> sendHeadersAsync() {
         // create the response before sending the request headers, so that
         // the response can set the appropriate receivers.
-        debug.log(Level.DEBUG, "Sending headers only");
+        if (debug.on()) debug.log("Sending headers only");
         if (response == null) {
             response = new Http1Response<>(connection, this, asyncReceiver);
         }
 
-        debug.log(Level.DEBUG, "response created in advance");
+        if (debug.on()) debug.log("response created in advance");
         // If the first attempt to read something triggers EOF, or
         // IOException("channel reset by peer"), we're going to retry.
         // Instruct the asyncReceiver to throw ConnectionExpiredException
@@ -230,7 +257,7 @@ CompletableFuture<ExchangeImpl<T>> sendHeadersAsync() {
 
         CompletableFuture<Void> connectCF;
         if (!connection.connected()) {
-            debug.log(Level.DEBUG, "initiating connect async");
+            if (debug.on()) debug.log("initiating connect async");
             connectCF = connection.connectAsync();
             synchronized (lock) {
                 operations.add(connectCF);
@@ -246,18 +273,18 @@ CompletableFuture<ExchangeImpl<T>> sendHeadersAsync() {
                     try {
                         connectFlows(connection);
 
-                        debug.log(Level.DEBUG, "requestAction.headers");
+                        if (debug.on()) debug.log("requestAction.headers");
                         List<ByteBuffer> data = requestAction.headers();
                         synchronized (lock) {
                             state = State.HEADERS;
                         }
-                        debug.log(Level.DEBUG, "setting outgoing with headers");
+                        if (debug.on()) debug.log("setting outgoing with headers");
                         assert outgoing.isEmpty() : "Unexpected outgoing:" + outgoing;
                         appendToOutgoing(data);
                         cf.complete(null);
                         return cf;
                     } catch (Throwable t) {
-                        debug.log(Level.DEBUG, "Failed to send headers: %s", t);
+                        if (debug.on()) debug.log("Failed to send headers: %s", t);
                         connection.close();
                         cf.completeExceptionally(t);
                         return cf;
@@ -271,13 +298,15 @@ CompletableFuture<ExchangeImpl<T>> sendBodyAsync() {
         try {
             bodySubscriber = requestAction.continueRequest();
             if (bodySubscriber == null) {
-                bodySubscriber = Http1BodySubscriber.completeSubscriber();
+                bodySubscriber = Http1BodySubscriber.completeSubscriber(debug);
                 appendToOutgoing(Http1BodySubscriber.COMPLETED);
             } else {
-                bodySubscriber.request(1);  // start
+                // start
+                bodySubscriber.whenSubscribed
+                        .thenAccept((s) -> requestMoreBody());
             }
         } catch (Throwable t) {
-            connection.close();
+            cancelImpl(t);
             bodySentCF.completeExceptionally(t);
         }
         return bodySentCF;
@@ -304,10 +333,9 @@ CompletableFuture<Response> getResponseAsync(Executor executor) {
                              + request.timeout().get().getNano() / 1000000) : -1,
                          cause);
             boolean acknowledged = cf.completeExceptionally(cause);
-            debug.log(Level.DEBUG,
-                      () -> acknowledged
-                            ? ("completed response with " + cause)
-                            : ("response already completed, ignoring " + cause));
+            if (debug.on())
+                debug.log(acknowledged ? ("completed response with " + cause)
+                          : ("response already completed, ignoring " + cause));
         }
         return cf;
     }
@@ -317,8 +345,9 @@ CompletableFuture<T> readBodyAsync(BodyHandler<T> handler,
                                        boolean returnConnectionToPool,
                                        Executor executor)
     {
-        BodySubscriber<T> bs = handler.apply(response.responseCode(),
-                                             response.responseHeaders());
+        BodySubscriber<T> bs = handler.apply(new ResponseInfoImpl(response.responseCode(),
+                                                                  response.responseHeaders(),
+                                                                  HTTP_1_1));
         CompletableFuture<T> bodyCF = response.readBody(bs,
                                                         returnConnectionToPool,
                                                         executor);
@@ -369,9 +398,11 @@ void cancel(IOException cause) {
     private void cancelImpl(Throwable cause) {
         LinkedList<CompletableFuture<?>> toComplete = null;
         int count = 0;
+        Throwable error;
         synchronized (lock) {
-            if (failed == null)
-                failed = cause;
+            if ((error = failed) == null) {
+                failed = error = cause;
+            }
             if (requestAction != null && requestAction.finished()
                     && response != null && response.finished()) {
                 return;
@@ -410,12 +441,13 @@ private void cancelImpl(Throwable cause) {
             Executor exec = client.isSelectorThread()
                             ? executor
                             : this::runInline;
+            Throwable x = error;
             while (!toComplete.isEmpty()) {
                 CompletableFuture<?> cf = toComplete.poll();
                 exec.execute(() -> {
-                    if (cf.completeExceptionally(cause)) {
-                        debug.log(Level.DEBUG, "completed cf with %s",
-                                 (Object) cause);
+                    if (cf.completeExceptionally(x)) {
+                        if (debug.on())
+                            debug.log("completed cf with %s", (Object) x);
                     }
                 });
             }
@@ -452,7 +484,7 @@ void appendToOutgoing(List<ByteBuffer> item) {
     }
 
     private void appendToOutgoing(DataPair dp) {
-        debug.log(Level.DEBUG, "appending to outgoing " + dp);
+        if (debug.on()) debug.log("appending to outgoing " + dp);
         outgoing.add(dp);
         writePublisher.writeScheduler.runOrSchedule();
     }
@@ -463,6 +495,17 @@ private boolean hasOutgoing() {
         return !outgoing.isEmpty();
     }
 
+    private void requestMoreBody() {
+        try {
+            if (debug.on()) debug.log("requesting more body from the subscriber");
+            bodySubscriber.request(1);
+        } catch (Throwable t) {
+            if (debug.on()) debug.log("Subscription::request failed", t);
+            cancelImpl(t);
+            bodySentCF.completeExceptionally(t);
+        }
+    }
+
     // Invoked only by the publisher
     // ALL tasks should execute off the Selector-Manager thread
     /** Returns the next portion of the HTTP request, or the error. */
@@ -477,9 +520,9 @@ private DataPair getOutgoing() {
             if (dp.throwable != null) {
                 state = State.ERROR;
                 exec.execute(() -> {
-                    connection.close();
                     headersSentCF.completeExceptionally(dp.throwable);
                     bodySentCF.completeExceptionally(dp.throwable);
+                    connection.close();
                 });
                 return dp;
             }
@@ -488,17 +531,16 @@ private DataPair getOutgoing() {
                 case HEADERS:
                     state = State.BODY;
                     // completeAsync, since dependent tasks should run in another thread
-                    debug.log(Level.DEBUG, "initiating completion of headersSentCF");
+                    if (debug.on()) debug.log("initiating completion of headersSentCF");
                     headersSentCF.completeAsync(() -> this, exec);
                     break;
                 case BODY:
                     if (dp.data == Http1BodySubscriber.COMPLETED) {
                         state = State.COMPLETING;
-                        debug.log(Level.DEBUG, "initiating completion of bodySentCF");
+                        if (debug.on()) debug.log("initiating completion of bodySentCF");
                         bodySentCF.completeAsync(() -> this, exec);
                     } else {
-                        debug.log(Level.DEBUG, "requesting more body from the subscriber");
-                        exec.execute(() -> bodySubscriber.request(1));
+                        exec.execute(this::requestMoreBody);
                     }
                     break;
                 case INITIAL:
@@ -516,7 +558,7 @@ private DataPair getOutgoing() {
     /** A Publisher of HTTP/1.1 headers and request body. */
     final class Http1Publisher implements FlowTube.TubePublisher {
 
-        final System.Logger  debug = Utils.getDebugLogger(this::dbgString);
+        final Logger debug = Utils.getDebugLogger(this::dbgString);
         volatile Flow.Subscriber<? super List<ByteBuffer>> subscriber;
         volatile boolean cancelled;
         final Http1WriteSubscription subscription = new Http1WriteSubscription();
@@ -531,7 +573,7 @@ public void subscribe(Flow.Subscriber<? super List<ByteBuffer>> s) {
             assert subscriber == null;
 
             subscriber = s;
-            debug.log(Level.DEBUG, "got subscriber: %s", s);
+            if (debug.on()) debug.log("got subscriber: %s", s);
             s.onSubscribe(subscription);
         }
 
@@ -551,17 +593,17 @@ final class WriteTask implements Runnable {
             @Override
             public void run() {
                 assert state != State.COMPLETED : "Unexpected state:" + state;
-                debug.log(Level.DEBUG, "WriteTask");
+                if (debug.on()) debug.log("WriteTask");
                 if (subscriber == null) {
-                    debug.log(Level.DEBUG, "no subscriber yet");
+                    if (debug.on()) debug.log("no subscriber yet");
                     return;
                 }
-                debug.log(Level.DEBUG, () -> "hasOutgoing = " + hasOutgoing());
+                if (debug.on()) debug.log(() -> "hasOutgoing = " + hasOutgoing());
                 while (hasOutgoing() && demand.tryDecrement()) {
                     DataPair dp = getOutgoing();
 
                     if (dp.throwable != null) {
-                        debug.log(Level.DEBUG, "onError");
+                        if (debug.on()) debug.log("onError");
                         // Do not call the subscriber's onError, it is not required.
                         writeScheduler.stop();
                     } else {
@@ -571,15 +613,15 @@ public void run() {
                                 assert state == State.COMPLETING : "Unexpected state:" + state;
                                 state = State.COMPLETED;
                             }
-                            debug.log(Level.DEBUG,
-                                     "completed, stopping %s", writeScheduler);
+                            if (debug.on())
+                                debug.log("completed, stopping %s", writeScheduler);
                             writeScheduler.stop();
                             // Do nothing more. Just do not publish anything further.
                             // The next Subscriber will eventually take over.
 
                         } else {
-                            debug.log(Level.DEBUG, () ->
-                                    "onNext with " + Utils.remaining(data) + " bytes");
+                            if (debug.on())
+                                debug.log("onNext with " + Utils.remaining(data) + " bytes");
                             subscriber.onNext(data);
                         }
                     }
@@ -594,14 +636,14 @@ public void request(long n) {
                 if (cancelled)
                     return;  //no-op
                 demand.increase(n);
-                debug.log(Level.DEBUG,
-                        "subscription request(%d), demand=%s", n, demand);
-                writeScheduler.deferOrSchedule(client.theExecutor());
+                if (debug.on())
+                    debug.log("subscription request(%d), demand=%s", n, demand);
+                writeScheduler.runOrSchedule(client.theExecutor());
             }
 
             @Override
             public void cancel() {
-                debug.log(Level.DEBUG, "subscription cancelled");
+                if (debug.on()) debug.log("subscription cancelled");
                 if (cancelled)
                     return;  //no-op
                 cancelled = true;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1HeaderParser.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java
similarity index 98%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1HeaderParser.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java
index 549d4b885d2..7fa02f80555 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1HeaderParser.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.net.ProtocolException;
 import java.nio.ByteBuffer;
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.net.http.HttpHeaders;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Request.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java
similarity index 68%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Request.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java
index 15e53be75a3..5f84825b7f1 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Request.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.System.Logger.Level;
@@ -35,11 +35,14 @@
 import java.net.InetSocketAddress;
 import java.util.Objects;
 import java.util.concurrent.Flow;
-
-import jdk.incubator.http.Http1Exchange.Http1BodySubscriber;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.Utils;
+import java.util.function.BiPredicate;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import jdk.internal.net.http.Http1Exchange.Http1BodySubscriber;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
 
@@ -47,6 +50,11 @@
  *  An HTTP/1.1 request.
  */
 class Http1Request {
+
+    private static final String COOKIE_HEADER = "Cookie";
+    private static final BiPredicate<String,List<String>> NOCOOKIES =
+            (k,v) -> !COOKIE_HEADER.equalsIgnoreCase(k);
+
     private final HttpRequestImpl request;
     private final Http1Exchange<?> http1Exchange;
     private final HttpConnection connection;
@@ -77,29 +85,114 @@ private void logHeaders(String completeHeaders) {
             //Log.logHeaders(sb.toString());
 
             String s = completeHeaders.replaceAll("\r\n", "\n");
-            Log.logHeaders("REQUEST HEADERS:\n" + s);
+            if (s.endsWith("\n\n")) s = s.substring(0, s.length() - 2);
+            Log.logHeaders("REQUEST HEADERS:\n{0}\n", s);
         }
     }
 
+
     private void collectHeaders0(StringBuilder sb) {
-        collectHeaders1(sb, systemHeaders);
-        collectHeaders1(sb, userHeaders);
-        sb.append("\r\n");
+        BiPredicate<String,List<String>> filter =
+                connection.headerFilter(request);
+
+        // Filter out 'Cookie:' headers, we will collect them at the end.
+        BiPredicate<String,List<String>> nocookies =
+                NOCOOKIES.and(filter);
+
+        // If we're sending this request through a tunnel,
+        // then don't send any preemptive proxy-* headers that
+        // the authentication filter may have saved in its
+        // cache.
+        collectHeaders1(sb, systemHeaders, nocookies);
+
+        // If we're sending this request through a tunnel,
+        // don't send any user-supplied proxy-* headers
+        // to the target server.
+        collectHeaders1(sb, userHeaders, nocookies);
+
+        // Gather all 'Cookie:' headers and concatenate their
+        // values in a single line.
+        collectCookies(sb, COOKIE_HEADER,
+                systemHeaders, userHeaders, filter);
+
+        // terminate headers
+        sb.append('\r').append('\n');
     }
 
-    private void collectHeaders1(StringBuilder sb, HttpHeaders headers) {
+    // Concatenate any 'Cookie:' header in a single line, as mandated
+    // by RFC 6265, section 5.4:
+    //
+    // <<When the user agent generates an HTTP request, the user agent MUST
+    //   NOT attach more than one Cookie header field.>>
+    //
+    // This constraint is relaxed for the HTTP/2 protocol, which
+    // explicitly allows sending multiple Cookie header fields.
+    // RFC 7540 section 8.1.2.5:
+    //
+    // <<To allow for better compression efficiency, the Cookie header
+    //   field MAY be split into separate header fields, each with one or
+    //   more cookie-pairs.>>
+    //
+    // This method will therefore concatenate multiple Cookie header field
+    // values into a single field, in a similar way than was implemented in
+    // the legacy HttpURLConnection.
+    //
+    // Note that at this point this method performs no further validation
+    // on the actual field-values, except to check that they do not contain
+    // any illegal character for header field values.
+    //
+    private void collectCookies(StringBuilder sb,
+                                String key,
+                                HttpHeaders system,
+                                HttpHeaders user,
+                                BiPredicate<String, List<String>> filter) {
+        List<String> systemList = system.allValues(key);
+        if (systemList != null && !filter.test(key, systemList)) systemList = null;
+        List<String> userList = user.allValues(key);
+        if (userList != null && !filter.test(key, userList)) userList = null;
+        boolean found = false;
+        if (systemList != null) {
+            for (String cookie : systemList) {
+                if (!found) {
+                    found = true;
+                    sb.append(key).append(':').append(' ');
+                } else {
+                    sb.append(';').append(' ');
+                }
+                sb.append(cookie);
+            }
+        }
+        if (userList != null) {
+            for (String cookie : userList) {
+                if (!found) {
+                    found = true;
+                    sb.append(key).append(':').append(' ');
+                } else {
+                    sb.append(';').append(' ');
+                }
+                sb.append(cookie);
+            }
+        }
+        if (found) sb.append('\r').append('\n');
+    }
+
+    private void collectHeaders1(StringBuilder sb, HttpHeaders headers,
+                                 BiPredicate<String, List<String>> filter) {
         for (Map.Entry<String,List<String>> entry : headers.map().entrySet()) {
             String key = entry.getKey();
             List<String> values = entry.getValue();
+            if (!filter.test(key, values)) continue;
             for (String value : values) {
-                sb.append(key).append(": ").append(value).append("\r\n");
+                sb.append(key).append(':').append(' ')
+                        .append(value)
+                        .append('\r').append('\n');
             }
         }
     }
 
     private String getPathAndQuery(URI uri) {
-        String path = uri.getPath();
-        String query = uri.getQuery();
+        String path = uri.getRawPath();
+        String query = uri.getRawQuery();
         if (path == null || path.equals("")) {
             path = "/";
         }
@@ -188,7 +281,7 @@ List<ByteBuffer> headers() {
         if (uri != null) {
             systemHeaders.setHeader("Host", hostString());
         }
-        if (request == null || requestPublisher == null) {
+        if (requestPublisher == null) {
             // Not a user request, or maybe a method, e.g. GET, with no body.
             contentLength = 0;
         } else {
@@ -226,15 +319,17 @@ Http1BodySubscriber continueRequest()  {
         return subscriber;
     }
 
-    class StreamSubscriber extends Http1BodySubscriber {
+    final class StreamSubscriber extends Http1BodySubscriber {
+
+        StreamSubscriber() { super(debug); }
 
         @Override
         public void onSubscribe(Flow.Subscription subscription) {
-            if (this.subscription != null) {
+            if (isSubscribed()) {
                 Throwable t = new IllegalStateException("already subscribed");
                 http1Exchange.appendToOutgoing(t);
             } else {
-                this.subscription = subscription;
+                setSubscription(subscription);
             }
         }
 
@@ -259,7 +354,7 @@ public void onError(Throwable throwable) {
             if (complete)
                 return;
 
-            subscription.cancel();
+            cancelSubscription();
             http1Exchange.appendToOutgoing(throwable);
         }
 
@@ -282,23 +377,24 @@ public void onComplete() {
         }
     }
 
-    class FixedContentSubscriber extends Http1BodySubscriber {
+    final class FixedContentSubscriber extends Http1BodySubscriber {
 
         private volatile long contentWritten;
+        FixedContentSubscriber() { super(debug); }
 
         @Override
         public void onSubscribe(Flow.Subscription subscription) {
-            if (this.subscription != null) {
+            if (isSubscribed()) {
                 Throwable t = new IllegalStateException("already subscribed");
                 http1Exchange.appendToOutgoing(t);
             } else {
-                this.subscription = subscription;
+                setSubscription(subscription);
             }
         }
 
         @Override
         public void onNext(ByteBuffer item) {
-            debug.log(Level.DEBUG, "onNext");
+            if (debug.on()) debug.log("onNext");
             Objects.requireNonNull(item);
             if (complete) {
                 Throwable t = new IllegalStateException("subscription already completed");
@@ -308,7 +404,7 @@ public void onNext(ByteBuffer item) {
                 long written = (contentWritten += writing);
 
                 if (written > contentLength) {
-                    subscription.cancel();
+                    cancelSubscription();
                     String msg = connection.getConnectionFlow()
                                   + " [" + Thread.currentThread().getName() +"] "
                                   + "Too many bytes in request body. Expected: "
@@ -322,17 +418,17 @@ public void onNext(ByteBuffer item) {
 
         @Override
         public void onError(Throwable throwable) {
-            debug.log(Level.DEBUG, "onError");
+            if (debug.on()) debug.log("onError");
             if (complete)  // TODO: error?
                 return;
 
-            subscription.cancel();
+            cancelSubscription();
             http1Exchange.appendToOutgoing(throwable);
         }
 
         @Override
         public void onComplete() {
-            debug.log(Level.DEBUG, "onComplete");
+            if (debug.on()) debug.log("onComplete");
             if (complete) {
                 Throwable t = new IllegalStateException("subscription already completed");
                 http1Exchange.appendToOutgoing(t);
@@ -340,7 +436,7 @@ public void onComplete() {
                 complete = true;
                 long written = contentWritten;
                 if (contentLength > written) {
-                    subscription.cancel();
+                    cancelSubscription();
                     Throwable t = new IOException(connection.getConnectionFlow()
                                          + " [" + Thread.currentThread().getName() +"] "
                                          + "Too few bytes returned by the publisher ("
@@ -368,7 +464,6 @@ private static ByteBuffer getHeader(int size) {
         return ByteBuffer.wrap(header);
     }
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final System.Logger  debug = Utils.getDebugLogger(this::toString, DEBUG);
+    final Logger debug = Utils.getDebugLogger(this::toString, Utils.DEBUG);
 
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Response.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
similarity index 56%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Response.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
index 7e948649185..bd50c4465f3 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Response.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,22 +23,30 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.EOFException;
 import java.lang.System.Logger.Level;
 import java.nio.ByteBuffer;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
-import java.util.function.BiConsumer;
+import java.util.concurrent.Flow;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import jdk.incubator.http.ResponseContent.BodyParser;
-import jdk.incubator.http.internal.common.Log;
-import static jdk.incubator.http.HttpClient.Version.HTTP_1_1;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpResponse;
+import jdk.internal.net.http.ResponseContent.BodyParser;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.Utils;
+
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import static java.net.http.HttpResponse.BodySubscribers.discarding;
 
 /**
  * Handles a HTTP/1.1 response (headers + body).
@@ -64,9 +72,10 @@ class Http1Response<T> {
     // Revisit: can we get rid of this?
     static enum State {INITIAL, READING_HEADERS, READING_BODY, DONE}
     private volatile State readProgress = State.INITIAL;
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final System.Logger  debug = Utils.getDebugLogger(this.getClass()::getSimpleName, DEBUG);
 
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
+    final static AtomicLong responseCount = new AtomicLong();
+    final long id = responseCount.incrementAndGet();
 
     Http1Response(HttpConnection conn,
                   Http1Exchange<T> exchange,
@@ -80,9 +89,71 @@ static enum State {INITIAL, READING_HEADERS, READING_BODY, DONE}
         bodyReader = new BodyReader(this::advance);
     }
 
-   public CompletableFuture<Response> readHeadersAsync(Executor executor) {
-        debug.log(Level.DEBUG, () -> "Reading Headers: (remaining: "
-                + asyncReceiver.remaining() +") "  + readProgress);
+    String dbgTag;
+    private String dbgString() {
+        String dbg = dbgTag;
+        if (dbg == null) {
+            String cdbg = connection.dbgTag;
+            if (cdbg != null) {
+                dbgTag = dbg = "Http1Response(id=" + id + ", " + cdbg + ")";
+            } else {
+                dbg = "Http1Response(id=" + id + ")";
+            }
+        }
+        return dbg;
+    }
+
+    // The ClientRefCountTracker is used to track the state
+    // of a pending operation. Altough there usually is a single
+    // point where the operation starts, it may terminate at
+    // different places.
+    private final class ClientRefCountTracker {
+        final HttpClientImpl client = connection.client();
+        // state & 0x01 != 0 => acquire called
+        // state & 0x02 != 0 => tryRelease called
+        byte state;
+
+        public synchronized void acquire() {
+            if (state == 0) {
+                // increment the reference count on the HttpClientImpl
+                // to prevent the SelectorManager thread from exiting
+                // until our operation is complete.
+                if (debug.on())
+                    debug.log("Operation started: incrementing ref count for %s", client);
+                client.reference();
+                state = 0x01;
+            } else {
+                if (debug.on())
+                    debug.log("Operation ref count for %s is already %s",
+                              client, ((state & 0x2) == 0x2) ? "released." : "incremented!" );
+                assert (state & 0x01) == 0 : "reference count already incremented";
+            }
+        }
+
+        public synchronized void tryRelease() {
+            if (state == 0x01) {
+                // decrement the reference count on the HttpClientImpl
+                // to allow the SelectorManager thread to exit if no
+                // other operation is pending and the facade is no
+                // longer referenced.
+                if (debug.on())
+                    debug.log("Operation finished: decrementing ref count for %s", client);
+                client.unreference();
+            } else if (state == 0) {
+                if (debug.on())
+                    debug.log("Operation finished: releasing ref count for %s", client);
+            } else if ((state & 0x02) == 0x02) {
+                if (debug.on())
+                    debug.log("ref count for %s already released", client);
+            }
+            state |= 0x02;
+        }
+    }
+
+    public CompletableFuture<Response> readHeadersAsync(Executor executor) {
+        if (debug.on())
+            debug.log("Reading Headers: (remaining: "
+                      + asyncReceiver.remaining() +") "  + readProgress);
         // with expect continue we will resume reading headers + body.
         asyncReceiver.unsubscribe(bodyReader);
         bodyReader.reset();
@@ -95,9 +166,9 @@ public CompletableFuture<Response> readHeadersAsync(Executor executor) {
 
         Function<State, Response> lambda = (State completed) -> {
                 assert completed == State.READING_HEADERS;
-                debug.log(Level.DEBUG, () ->
-                            "Reading Headers: creating Response object;"
-                            + " state is now " + readProgress);
+                if (debug.on())
+                    debug.log("Reading Headers: creating Response object;"
+                              + " state is now " + readProgress);
                 asyncReceiver.unsubscribe(headersReader);
                 responseCode = hd.responseCode();
                 headers = hd.headers();
@@ -105,8 +176,16 @@ public CompletableFuture<Response> readHeadersAsync(Executor executor) {
                 response = new Response(request,
                                         exchange.getExchange(),
                                         headers,
+                                        connection,
                                         responseCode,
                                         HTTP_1_1);
+
+                if (Log.headers()) {
+                    StringBuilder sb = new StringBuilder("RESPONSE HEADERS:\n");
+                    Log.dumpHeaders(sb, "    ", headers);
+                    Log.logHeaders(sb.toString());
+                }
+
                 return response;
             };
 
@@ -150,7 +229,109 @@ public CompletableFuture<Void> ignoreBody(Executor executor) {
             connection.close();
             return MinimalFuture.completedFuture(null); // not treating as error
         } else {
-            return readBody(HttpResponse.BodySubscriber.discard((Void)null), true, executor);
+            return readBody(discarding(), true, executor);
+        }
+    }
+
+    static final Flow.Subscription NOP = new Flow.Subscription() {
+        @Override
+        public void request(long n) { }
+        public void cancel() { }
+    };
+
+    /**
+     * The Http1AsyncReceiver ensures that all calls to
+     * the subscriber, including onSubscribe, occur sequentially.
+     * There could however be some race conditions that could happen
+     * in case of unexpected errors thrown at unexpected places, which
+     * may cause onError to be called multiple times.
+     * The Http1BodySubscriber will ensure that the user subscriber
+     * is actually completed only once - and only after it is
+     * subscribed.
+     * @param <U> The type of response.
+     */
+    final static class Http1BodySubscriber<U> implements HttpResponse.BodySubscriber<U> {
+        final HttpResponse.BodySubscriber<U> userSubscriber;
+        final AtomicBoolean completed = new AtomicBoolean();
+        volatile Throwable withError;
+        volatile boolean subscribed;
+        Http1BodySubscriber(HttpResponse.BodySubscriber<U> userSubscriber) {
+            this.userSubscriber = userSubscriber;
+        }
+
+        // propagate the error to the user subscriber, even if not
+        // subscribed yet.
+        private void propagateError(Throwable t) {
+            assert t != null;
+            try {
+                // if unsubscribed at this point, it will not
+                // get subscribed later - so do it now and
+                // propagate the error
+                if (subscribed == false) {
+                    subscribed = true;
+                    userSubscriber.onSubscribe(NOP);
+                }
+            } finally  {
+                // if onError throws then there is nothing to do
+                // here: let the caller deal with it by logging
+                // and closing the connection.
+                userSubscriber.onError(t);
+            }
+        }
+
+        // complete the subscriber, either normally or exceptionally
+        // ensure that the subscriber is completed only once.
+        private void complete(Throwable t) {
+            if (completed.compareAndSet(false, true)) {
+                t  = withError = Utils.getCompletionCause(t);
+                if (t == null) {
+                    assert subscribed;
+                    try {
+                        userSubscriber.onComplete();
+                    } catch (Throwable x) {
+                        propagateError(t = withError = Utils.getCompletionCause(x));
+                        // rethrow and let the caller deal with it.
+                        // (i.e: log and close the connection)
+                        // arguably we could decide to not throw and let the
+                        // connection be reused since we should have received and
+                        // parsed all the bytes when we reach here.
+                        throw x;
+                    }
+                } else {
+                    propagateError(t);
+                }
+            }
+        }
+
+        @Override
+        public CompletionStage<U> getBody() {
+            return userSubscriber.getBody();
+        }
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            if (!subscribed) {
+                subscribed = true;
+                userSubscriber.onSubscribe(subscription);
+            } else {
+                // could be already subscribed and completed
+                // if an unexpected error occurred before the actual
+                // subscription - though that's not supposed
+                // happen.
+                assert completed.get();
+            }
+        }
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            assert !completed.get();
+            userSubscriber.onNext(item);
+        }
+        @Override
+        public void onError(Throwable throwable) {
+            complete(throwable);
+        }
+        @Override
+        public void onComplete() {
+            complete(null);
         }
     }
 
@@ -158,9 +339,9 @@ public <U> CompletableFuture<U> readBody(HttpResponse.BodySubscriber<U> p,
                                          boolean return2Cache,
                                          Executor executor) {
         this.return2Cache = return2Cache;
-        final HttpResponse.BodySubscriber<U> pusher = p;
-        final CompletionStage<U> bodyCF = p.getBody();
-        final CompletableFuture<U> cf = MinimalFuture.of(bodyCF);
+        final Http1BodySubscriber<U> subscriber = new Http1BodySubscriber<>(p);
+
+        final CompletableFuture<U> cf = new MinimalFuture<>();
 
         int clen0 = (int)headers.firstValueAsLong("Content-Length").orElse(-1);
 
@@ -170,12 +351,15 @@ public <U> CompletableFuture<U> readBody(HttpResponse.BodySubscriber<U> p,
         // if we reach here, we must reset the headersReader state.
         asyncReceiver.unsubscribe(headersReader);
         headersReader.reset();
+        ClientRefCountTracker refCountTracker = new ClientRefCountTracker();
 
+        // We need to keep hold on the client facade until the
+        // tracker has been incremented.
+        connection.client().reference();
         executor.execute(() -> {
             try {
-                HttpClientImpl client = connection.client();
                 content = new ResponseContent(
-                        connection, clen, headers, pusher,
+                        connection, clen, headers, subscriber,
                         this::onFinished
                 );
                 if (cf.isCompletedExceptionally()) {
@@ -186,22 +370,16 @@ public <U> CompletableFuture<U> readBody(HttpResponse.BodySubscriber<U> p,
                 // increment the reference count on the HttpClientImpl
                 // to prevent the SelectorManager thread from exiting until
                 // the body is fully read.
-                client.reference();
+                refCountTracker.acquire();
                 bodyReader.start(content.getBodyParser(
                     (t) -> {
                         try {
                             if (t != null) {
-                                pusher.onError(t);
+                                subscriber.onError(t);
                                 connection.close();
-                                if (!cf.isDone())
-                                    cf.completeExceptionally(t);
+                                cf.completeExceptionally(t);
                             }
                         } finally {
-                            // decrement the reference count on the HttpClientImpl
-                            // to allow the SelectorManager thread to exit if no
-                            // other operation is pending and the facade is no
-                            // longer referenced.
-                            client.unreference();
                             bodyReader.onComplete(t);
                         }
                     }));
@@ -213,34 +391,61 @@ public <U> CompletableFuture<U> readBody(HttpResponse.BodySubscriber<U> p,
                 CompletableFuture<?> trailingOp = bodyReaderCF.whenComplete((s,t) ->  {
                     t = Utils.getCompletionCause(t);
                     try {
-                        if (t != null) {
-                            debug.log(Level.DEBUG, () ->
-                                    "Finished reading body: " + s);
+                        if (t == null) {
+                            if (debug.on()) debug.log("Finished reading body: " + s);
                             assert s == State.READING_BODY;
                         }
-                        if (t != null && !cf.isDone()) {
-                            pusher.onError(t);
+                        if (t != null) {
+                            subscriber.onError(t);
                             cf.completeExceptionally(t);
                         }
                     } catch (Throwable x) {
                         // not supposed to happen
                         asyncReceiver.onReadError(x);
+                    } finally {
+                        // we're done: release the ref count for
+                        // the current operation.
+                        refCountTracker.tryRelease();
                     }
                 });
                 connection.addTrailingOperation(trailingOp);
             } catch (Throwable t) {
-               debug.log(Level.DEBUG, () -> "Failed reading body: " + t);
+               if (debug.on()) debug.log("Failed reading body: " + t);
                 try {
-                    if (!cf.isDone()) {
-                        pusher.onError(t);
-                        cf.completeExceptionally(t);
-                    }
+                    subscriber.onError(t);
+                    cf.completeExceptionally(t);
                 } finally {
                     asyncReceiver.onReadError(t);
                 }
+            } finally {
+                connection.client().unreference();
+            }
+        });
+        try {
+            p.getBody().whenComplete((U u, Throwable t) -> {
+                if (t == null)
+                    cf.complete(u);
+                else
+                    cf.completeExceptionally(t);
+            });
+        } catch (Throwable t) {
+            cf.completeExceptionally(t);
+            asyncReceiver.setRetryOnError(false);
+            asyncReceiver.onReadError(t);
+        }
+
+        return cf.whenComplete((s,t) -> {
+            if (t != null) {
+                // If an exception occurred, release the
+                // ref count for the current operation, as
+                // it may never be triggered otherwise
+                // (BodySubscriber ofInputStream)
+                // If there was no exception then the
+                // ref count will be/have been released when
+                // the last byte of the response is/was received
+                refCountTracker.tryRelease();
             }
         });
-        return cf;
     }
 
 
@@ -252,8 +457,8 @@ private void onFinished() {
             // connection.setAsyncCallbacks(null, null, null);
 
             // don't return the connection to the cache if EOF happened.
-            debug.log(Level.DEBUG, () -> connection.getConnectionFlow()
-                                   + ": return to HTTP/1.1 pool");
+            if (debug.on())
+                debug.log(connection.getConnectionFlow() + ": return to HTTP/1.1 pool");
             connection.closeOrReturnToCache(eof == null ? headers : null);
         }
     }
@@ -282,8 +487,11 @@ void onReadError(Throwable t) {
                 + (cf == null  ? "null"
                 : (cf.isDone() ? "already completed"
                                : "not yet completed")));
-        if (cf != null && !cf.isDone()) cf.completeExceptionally(t);
-        else { debug.log(Level.DEBUG, "onReadError", t); }
+        if (cf != null) {
+            cf.completeExceptionally(t);
+        } else {
+            debug.log(Level.DEBUG, "onReadError", t);
+        }
         debug.log(Level.DEBUG, () -> "closing connection: cause is " + t);
         connection.close();
     }
@@ -411,21 +619,36 @@ final void handle(ByteBuffer b,
             assert parser != null : "no parser";
             try {
                 count += b.remaining();
-                debug.log(Level.DEBUG, () -> "Sending " + b.remaining()
-                        + "/" + b.capacity() + " bytes to header parser");
+                if (debug.on())
+                    debug.log("Sending " + b.remaining() + "/" + b.capacity()
+                              + " bytes to header parser");
                 if (parser.parse(b)) {
                     count -= b.remaining();
-                    debug.log(Level.DEBUG, () ->
-                            "Parsing headers completed. bytes=" + count);
+                    if (debug.on())
+                        debug.log("Parsing headers completed. bytes=" + count);
                     onComplete.accept(State.READING_HEADERS);
                     cf.complete(State.READING_HEADERS);
                 }
             } catch (Throwable t) {
-                debug.log(Level.DEBUG,
-                        () -> "Header parser failed to handle buffer: " + t);
+                if (debug.on())
+                    debug.log("Header parser failed to handle buffer: " + t);
                 cf.completeExceptionally(t);
             }
         }
+
+        @Override
+        public void close(Throwable error) {
+            // if there's no error nothing to do: the cf should/will
+            // be completed.
+            if (error != null) {
+                CompletableFuture<State> cf = this.cf;
+                if (cf != null) {
+                    if (debug.on())
+                        debug.log("close: completing header parser CF with " + error);
+                    cf.completeExceptionally(error);
+                }
+            }
+        }
     }
 
     // Invoked with each new ByteBuffer when reading bodies...
@@ -475,7 +698,12 @@ public AbstractSubscription subscription() {
         @Override
         public void onSubscribe(AbstractSubscription s) {
             this.subscription = s;
-            parser.onSubscribe(s);
+            try {
+                parser.onSubscribe(s);
+            } catch (Throwable t) {
+                cf.completeExceptionally(t);
+                throw t;
+            }
         }
 
         @Override
@@ -485,12 +713,13 @@ final void handle(ByteBuffer b,
             assert cf != null : "parsing not started";
             assert parser != null : "no parser";
             try {
-                debug.log(Level.DEBUG, () -> "Sending " + b.remaining()
-                        + "/" + b.capacity() + " bytes to body parser");
+                if (debug.on())
+                    debug.log("Sending " + b.remaining() + "/" + b.capacity()
+                              + " bytes to body parser");
                 parser.accept(b);
             } catch (Throwable t) {
-                debug.log(Level.DEBUG,
-                        () -> "Body parser failed to handle buffer: " + t);
+                if (debug.on())
+                    debug.log("Body parser failed to handle buffer: " + t);
                 if (!cf.isDone()) {
                     cf.completeExceptionally(t);
                 }
@@ -507,10 +736,28 @@ final void onComplete(Throwable closedExceptionally) {
             }
         }
 
+        @Override
+        public final void close(Throwable error) {
+            CompletableFuture<State> cf = this.cf;
+            if (cf != null && !cf.isDone()) {
+                // we want to make sure dependent actions are triggered
+                // in order to make sure the client reference count
+                // is decremented
+                if (error != null) {
+                    if (debug.on())
+                        debug.log("close: completing body parser CF with " + error);
+                    cf.completeExceptionally(error);
+                } else {
+                    if (debug.on())
+                        debug.log("close: completing body parser CF");
+                    cf.complete(State.READING_BODY);
+                }
+            }
+        }
+
         @Override
         public String toString() {
             return super.toString() + "/parser=" + String.valueOf(parser);
         }
-
     }
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
similarity index 78%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
index ee4907e22cd..ed7867cfece 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2ClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,38 +23,35 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
-import java.lang.System.Logger.Level;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CompletableFuture;
-
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.Utils;
-import jdk.incubator.http.internal.frame.SettingsFrame;
-import static jdk.incubator.http.internal.frame.SettingsFrame.INITIAL_WINDOW_SIZE;
-import static jdk.incubator.http.internal.frame.SettingsFrame.ENABLE_PUSH;
-import static jdk.incubator.http.internal.frame.SettingsFrame.HEADER_TABLE_SIZE;
-import static jdk.incubator.http.internal.frame.SettingsFrame.MAX_CONCURRENT_STREAMS;
-import static jdk.incubator.http.internal.frame.SettingsFrame.MAX_FRAME_SIZE;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.frame.SettingsFrame;
+import static jdk.internal.net.http.frame.SettingsFrame.INITIAL_WINDOW_SIZE;
+import static jdk.internal.net.http.frame.SettingsFrame.ENABLE_PUSH;
+import static jdk.internal.net.http.frame.SettingsFrame.HEADER_TABLE_SIZE;
+import static jdk.internal.net.http.frame.SettingsFrame.MAX_CONCURRENT_STREAMS;
+import static jdk.internal.net.http.frame.SettingsFrame.MAX_FRAME_SIZE;
 
 /**
  *  Http2 specific aspects of HttpClientImpl
  */
 class Http2ClientImpl {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final static System.Logger debug =
-            Utils.getDebugLogger("Http2ClientImpl"::toString, DEBUG);
+    final static Logger debug =
+            Utils.getDebugLogger("Http2ClientImpl"::toString, Utils.DEBUG);
 
     private final HttpClientImpl client;
 
@@ -97,13 +94,23 @@ CompletableFuture<Http2Connection> getConnectionFor(HttpRequestImpl req) {
 
         synchronized (this) {
             Http2Connection connection = connections.get(key);
-            if (connection != null) { // fast path if connection already exists
-                return CompletableFuture.completedFuture(connection);
+            if (connection != null) {
+                if (connection.closed) {
+                    if (debug.on())
+                        debug.log("removing found closed connection: %s", connection);
+                    connections.remove(key);
+                } else {
+                    // fast path if connection already exists
+                    if (debug.on())
+                        debug.log("found connection in the pool: %s", connection);
+                    return MinimalFuture.completedFuture(connection);
+                }
             }
 
             if (!req.secure() || failures.contains(key)) {
                 // secure: negotiate failed before. Use http/1.1
                 // !secure: no connection available in cache. Attempt upgrade
+                if (debug.on()) debug.log("not found in connection pool");
                 return MinimalFuture.completedFuture(null);
             }
         }
@@ -130,21 +137,40 @@ CompletableFuture<Http2Connection> getConnectionFor(HttpRequestImpl req) {
      * has not been sent as part of the initial alpn negotiation
      */
     boolean offerConnection(Http2Connection c) {
-        String key = c.key();
-        Http2Connection c1 = connections.putIfAbsent(key, c);
-        if (c1 != null) {
-            c.setSingleStream(true);
+        if (debug.on()) debug.log("offering to the connection pool: %s", c);
+        if (c.closed) {
+            if (debug.on())
+                debug.log("skipping offered closed connection: %s", c);
             return false;
         }
-        return true;
+
+        String key = c.key();
+        synchronized(this) {
+            Http2Connection c1 = connections.putIfAbsent(key, c);
+            if (c1 != null) {
+                c.setSingleStream(true);
+                if (debug.on())
+                    debug.log("existing entry in connection pool for %s", key);
+                return false;
+            }
+            if (debug.on())
+                debug.log("put in the connection pool: %s", c);
+            return true;
+        }
     }
 
     void deleteConnection(Http2Connection c) {
-        connections.remove(c.key());
+        if (debug.on())
+            debug.log("removing from the connection pool: %s", c);
+        synchronized (this) {
+            connections.remove(c.key());
+            if (debug.on())
+                debug.log("removed from the connection pool: %s", c);
+        }
     }
 
     void stop() {
-        debug.log(Level.DEBUG, "stopping");
+        if (debug.on()) debug.log("stopping");
         connections.values().forEach(this::close);
         connections.clear();
     }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
similarity index 79%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
index 7931b140211..40cf3e4e8fe 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
@@ -23,10 +23,11 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.EOFException;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.System.Logger.Level;
 import java.net.InetSocketAddress;
 import java.net.URI;
@@ -35,7 +36,9 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.ArrayList;
 import java.util.Objects;
@@ -45,35 +48,39 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import javax.net.ssl.SSLEngine;
-import jdk.incubator.http.HttpConnection.HttpPublisher;
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.FlowTube.TubeSubscriber;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-import jdk.incubator.http.internal.common.Utils;
-import jdk.incubator.http.internal.frame.ContinuationFrame;
-import jdk.incubator.http.internal.frame.DataFrame;
-import jdk.incubator.http.internal.frame.ErrorFrame;
-import jdk.incubator.http.internal.frame.FramesDecoder;
-import jdk.incubator.http.internal.frame.FramesEncoder;
-import jdk.incubator.http.internal.frame.GoAwayFrame;
-import jdk.incubator.http.internal.frame.HeaderFrame;
-import jdk.incubator.http.internal.frame.HeadersFrame;
-import jdk.incubator.http.internal.frame.Http2Frame;
-import jdk.incubator.http.internal.frame.MalformedFrame;
-import jdk.incubator.http.internal.frame.OutgoingHeaders;
-import jdk.incubator.http.internal.frame.PingFrame;
-import jdk.incubator.http.internal.frame.PushPromiseFrame;
-import jdk.incubator.http.internal.frame.ResetFrame;
-import jdk.incubator.http.internal.frame.SettingsFrame;
-import jdk.incubator.http.internal.frame.WindowUpdateFrame;
-import jdk.incubator.http.internal.hpack.Encoder;
-import jdk.incubator.http.internal.hpack.Decoder;
-import jdk.incubator.http.internal.hpack.DecodingCallback;
-
-import static jdk.incubator.http.internal.frame.SettingsFrame.*;
+import javax.net.ssl.SSLException;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import jdk.internal.net.http.HttpConnection.HttpPublisher;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.FlowTube.TubeSubscriber;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.SequentialScheduler;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.frame.ContinuationFrame;
+import jdk.internal.net.http.frame.DataFrame;
+import jdk.internal.net.http.frame.ErrorFrame;
+import jdk.internal.net.http.frame.FramesDecoder;
+import jdk.internal.net.http.frame.FramesEncoder;
+import jdk.internal.net.http.frame.GoAwayFrame;
+import jdk.internal.net.http.frame.HeaderFrame;
+import jdk.internal.net.http.frame.HeadersFrame;
+import jdk.internal.net.http.frame.Http2Frame;
+import jdk.internal.net.http.frame.MalformedFrame;
+import jdk.internal.net.http.frame.OutgoingHeaders;
+import jdk.internal.net.http.frame.PingFrame;
+import jdk.internal.net.http.frame.PushPromiseFrame;
+import jdk.internal.net.http.frame.ResetFrame;
+import jdk.internal.net.http.frame.SettingsFrame;
+import jdk.internal.net.http.frame.WindowUpdateFrame;
+import jdk.internal.net.http.hpack.Encoder;
+import jdk.internal.net.http.hpack.Decoder;
+import jdk.internal.net.http.hpack.DecodingCallback;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static jdk.internal.net.http.frame.SettingsFrame.*;
 
 
 /**
@@ -107,13 +114,11 @@
  */
 class Http2Connection  {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    static final boolean DEBUG_HPACK = Utils.DEBUG_HPACK; // Revisit: temporary dev flag.
-    final System.Logger  debug = Utils.getDebugLogger(this::dbgString, DEBUG);
-    final static System.Logger  DEBUG_LOGGER =
-            Utils.getDebugLogger("Http2Connection"::toString, DEBUG);
-    private final System.Logger debugHpack =
-                  Utils.getHpackLogger(this::dbgString, DEBUG_HPACK);
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
+    final static Logger DEBUG_LOGGER =
+            Utils.getDebugLogger("Http2Connection"::toString, Utils.DEBUG);
+    private final Logger debugHpack =
+            Utils.getHpackLogger(this::dbgString, Utils.DEBUG_HPACK);
     static final ByteBuffer EMPTY_TRIGGER = ByteBuffer.allocate(0);
 
     private boolean singleStream; // used only for stream 1, then closed
@@ -158,15 +163,16 @@ boolean processReceivedData(FramesDecoder decoder, ByteBuffer buf)
         {
             // if preface is not sent, buffers data in the pending list
             if (!prefaceSent) {
-                debug.log(Level.DEBUG, "Preface is not sent: buffering %d",
-                          buf.remaining());
+                if (debug.on())
+                    debug.log("Preface not sent: buffering %d", buf.remaining());
                 synchronized (this) {
                     if (!prefaceSent) {
                         if (pending == null) pending = new ArrayList<>();
                         pending.add(buf);
-                        debug.log(Level.DEBUG, () -> "there are now "
-                              + Utils.remaining(pending)
-                              + " bytes buffered waiting for preface to be sent");
+                        if (debug.on())
+                            debug.log("there are now %d bytes buffered waiting for preface to be sent"
+                                    + Utils.remaining(pending)
+                            );
                         return false;
                     }
                 }
@@ -183,7 +189,7 @@ boolean processReceivedData(FramesDecoder decoder, ByteBuffer buf)
             this.pending = null;
             if (pending != null) {
                 // flush pending data
-                debug.log(Level.DEBUG, () -> "Processing buffered data: "
+                if (debug.on()) debug.log(() -> "Processing buffered data: "
                       + Utils.remaining(pending));
                 for (ByteBuffer b : pending) {
                     decoder.decode(b);
@@ -191,7 +197,7 @@ boolean processReceivedData(FramesDecoder decoder, ByteBuffer buf)
             }
             // push the received buffer to the frames decoder.
             if (buf != EMPTY_TRIGGER) {
-                debug.log(Level.DEBUG, "Processing %d", buf.remaining());
+                if (debug.on()) debug.log("Processing %d", buf.remaining());
                 decoder.decode(buf);
             }
             return true;
@@ -254,9 +260,11 @@ private Http2Connection(HttpConnection connection,
         this.serverSettings = SettingsFrame.getDefaultSettings();
         this.hpackOut = new Encoder(serverSettings.getParameter(HEADER_TABLE_SIZE));
         this.hpackIn = new Decoder(clientSettings.getParameter(HEADER_TABLE_SIZE));
-        debugHpack.log(Level.DEBUG, () -> "For the record:" + super.toString());
-        debugHpack.log(Level.DEBUG, "Decoder created: %s", hpackIn);
-        debugHpack.log(Level.DEBUG, "Encoder created: %s", hpackOut);
+        if (debugHpack.on()) {
+            debugHpack.log("For the record:" + super.toString());
+            debugHpack.log("Decoder created: %s", hpackIn);
+            debugHpack.log("Encoder created: %s", hpackOut);
+        }
         this.windowUpdater = new ConnectionWindowUpdateSender(this,
                 client2.getConnectionWindowSize(clientSettings));
     }
@@ -368,7 +376,7 @@ private static CompletableFuture<?> checkSSLConfig(AbstractAsyncSSLConnection ac
             SSLEngine engine = aconn.getEngine();
             assert Objects.equals(alpn, engine.getApplicationProtocol());
 
-            DEBUG_LOGGER.log(Level.DEBUG, "checkSSLConfig: alpn: %s", alpn );
+            DEBUG_LOGGER.log("checkSSLConfig: alpn: %s", alpn );
 
             if (alpn == null || !alpn.equals("h2")) {
                 String msg;
@@ -395,7 +403,15 @@ private static CompletableFuture<?> checkSSLConfig(AbstractAsyncSSLConnection ac
             return cf;
         };
 
-        return aconn.getALPN().thenCompose(checkAlpnCF);
+        return aconn.getALPN()
+                .whenComplete((r,t) -> {
+                    if (t != null && t instanceof SSLException) {
+                        // something went wrong during the initial handshake
+                        // close the connection
+                        aconn.close();
+                    }
+                })
+                .thenCompose(checkAlpnCF);
     }
 
     synchronized boolean singleStream() {
@@ -407,7 +423,7 @@ synchronized void setSingleStream(boolean use) {
     }
 
     static String keyFor(HttpConnection connection) {
-        boolean isProxy = connection.isProxied();
+        boolean isProxy = connection.isProxied(); // tunnel or plain clear connection through proxy
         boolean isSecure = connection.isSecure();
         InetSocketAddress addr = connection.address();
 
@@ -421,10 +437,16 @@ static String keyFor(URI uri, InetSocketAddress proxy) {
         String host;
         int port;
 
-        if (proxy != null) {
+        if (proxy != null && !isSecure) {
+            // clear connection through proxy: use
+            // proxy host / proxy port
             host = proxy.getHostString();
             port = proxy.getPort();
         } else {
+            // either secure tunnel connection through proxy
+            // or direct connection to host, but in either
+            // case only that host can be reached through
+            // the connection: use target host / target port
             host = uri.getHost();
             port = uri.getPort();
         }
@@ -460,7 +482,7 @@ private HttpPublisher publisher() {
     private void decodeHeaders(HeaderFrame frame, DecodingCallback decoder)
             throws IOException
     {
-        debugHpack.log(Level.DEBUG, "decodeHeaders(%s)", decoder);
+        if (debugHpack.on()) debugHpack.log("decodeHeaders(%s)", decoder);
 
         boolean endOfHeaders = frame.getFlag(HeaderFrame.END_HEADERS);
 
@@ -478,7 +500,9 @@ final int getInitialSendWindowSize() {
 
     void close() {
         Log.logTrace("Closing HTTP/2 connection: to {0}", connection.address());
-        GoAwayFrame f = new GoAwayFrame(0, ErrorFrame.NO_ERROR, "Requested by user".getBytes());
+        GoAwayFrame f = new GoAwayFrame(0,
+                                        ErrorFrame.NO_ERROR,
+                                        "Requested by user".getBytes(UTF_8));
         // TODO: set last stream. For now zero ok.
         sendFrame(f);
     }
@@ -506,8 +530,8 @@ final void asyncReceive(ByteBuffer buffer) {
                 ByteBuffer b = bs.get();
                 if (b.hasRemaining()) {
                     long c = ++count;
-                    debug.log(Level.DEBUG, () -> "H2 Receiving Initial("
-                        + c +"): " + b.remaining());
+                    if (debug.on())
+                        debug.log(() -> "H2 Receiving Initial(" + c +"): " + b.remaining());
                     framesController.processReceivedData(framesDecoder, b);
                 }
             }
@@ -515,18 +539,19 @@ final void asyncReceive(ByteBuffer buffer) {
             // the Http2TubeSubscriber scheduler ensures that the order of incoming
             // buffers is preserved.
             if (b == EMPTY_TRIGGER) {
-                debug.log(Level.DEBUG, "H2 Received EMPTY_TRIGGER");
+                if (debug.on()) debug.log("H2 Received EMPTY_TRIGGER");
                 boolean prefaceSent = framesController.prefaceSent;
                 assert prefaceSent;
                 // call framesController.processReceivedData to potentially
                 // trigger the processing of all the data buffered there.
                 framesController.processReceivedData(framesDecoder, buffer);
-                debug.log(Level.DEBUG, "H2 processed buffered data");
+                if (debug.on()) debug.log("H2 processed buffered data");
             } else {
                 long c = ++count;
-                debug.log(Level.DEBUG, "H2 Receiving(%d): %d", c, b.remaining());
+                if (debug.on())
+                    debug.log("H2 Receiving(%d): %d", c, b.remaining());
                 framesController.processReceivedData(framesDecoder, buffer);
-                debug.log(Level.DEBUG, "H2 processed(%d)", c);
+                if (debug.on()) debug.log("H2 processed(%d)", c);
             }
         } catch (Throwable e) {
             String msg = Utils.stackTrace(e);
@@ -540,7 +565,7 @@ Throwable getRecordedCause() {
     }
 
     void shutdown(Throwable t) {
-        debug.log(Level.DEBUG, () -> "Shutting down h2c (closed="+closed+"): " + t);
+        if (debug.on()) debug.log(() -> "Shutting down h2c (closed="+closed+"): " + t);
         if (closed == true) return;
         synchronized (this) {
             if (closed == true) return;
@@ -562,7 +587,7 @@ void shutdown(Throwable t) {
      * identifiers; those initiated by the server MUST use even-numbered
      * stream identifiers.
      */
-    private static final boolean isSeverInitiatedStream(int streamid) {
+    private static final boolean isServerInitiatedStream(int streamid) {
         return (streamid & 0x1) == 0;
     }
 
@@ -583,8 +608,8 @@ void processFrame(Http2Frame frame) throws IOException {
                 protocolError(((MalformedFrame) frame).getErrorCode(),
                         ((MalformedFrame) frame).getMessage());
             } else {
-                debug.log(Level.DEBUG, () -> "Reset stream: "
-                          + ((MalformedFrame) frame).getMessage());
+                if (debug.on())
+                    debug.log(() -> "Reset stream: " + ((MalformedFrame) frame).getMessage());
                 resetStream(streamid, ((MalformedFrame) frame).getErrorCode());
             }
             return;
@@ -607,12 +632,17 @@ void processFrame(Http2Frame frame) throws IOException {
                 if (frame instanceof HeaderFrame) {
                     // always decode the headers as they may affect
                     // connection-level HPACK decoding state
-                    HeaderDecoder decoder = new LoggingHeaderDecoder(new HeaderDecoder());
-                    decodeHeaders((HeaderFrame) frame, decoder);
+                    DecodingCallback decoder = new ValidatingHeadersConsumer();
+                    try {
+                        decodeHeaders((HeaderFrame) frame, decoder);
+                    } catch (UncheckedIOException e) {
+                        protocolError(ResetFrame.PROTOCOL_ERROR, e.getMessage());
+                        return;
+                    }
                 }
 
                 if (!(frame instanceof ResetFrame)) {
-                    if (isSeverInitiatedStream(streamid)) {
+                    if (isServerInitiatedStream(streamid)) {
                         if (streamid < nextPushStream) {
                             // trailing data on a cancelled push promise stream,
                             // reset will already have been sent, ignore
@@ -629,10 +659,20 @@ void processFrame(Http2Frame frame) throws IOException {
             }
             if (frame instanceof PushPromiseFrame) {
                 PushPromiseFrame pp = (PushPromiseFrame)frame;
-                handlePushPromise(stream, pp);
+                try {
+                    handlePushPromise(stream, pp);
+                } catch (UncheckedIOException e) {
+                    protocolError(ResetFrame.PROTOCOL_ERROR, e.getMessage());
+                    return;
+                }
             } else if (frame instanceof HeaderFrame) {
                 // decode headers (or continuation)
-                decodeHeaders((HeaderFrame) frame, stream.rspHeadersConsumer());
+                try {
+                    decodeHeaders((HeaderFrame) frame, stream.rspHeadersConsumer());
+                } catch (UncheckedIOException e) {
+                    protocolError(ResetFrame.PROTOCOL_ERROR, e.getMessage());
+                    return;
+                }
                 stream.incoming(frame);
             } else {
                 stream.incoming(frame);
@@ -645,7 +685,7 @@ private <T> void handlePushPromise(Stream<T> parent, PushPromiseFrame pp)
     {
         // always decode the headers as they may affect connection-level HPACK
         // decoding state
-        HeaderDecoder decoder = new LoggingHeaderDecoder(new HeaderDecoder());
+        HeaderDecoder decoder = new HeaderDecoder();
         decodeHeaders(pp, decoder);
 
         HttpRequestImpl parentReq = parent.request;
@@ -660,7 +700,7 @@ private <T> void handlePushPromise(Stream<T> parent, PushPromiseFrame pp)
         HttpHeadersImpl headers = decoder.headers();
         HttpRequestImpl pushReq = HttpRequestImpl.createPushRequest(parentReq, headers);
         Exchange<T> pushExch = new Exchange<>(pushReq, parent.exchange.multi);
-        Stream.PushedStream<?,T> pushStream = createPushStream(parent, pushExch);
+        Stream.PushedStream<T> pushStream = createPushStream(parent, pushExch);
         pushExch.exchImpl = pushStream;
         pushStream.registerStream(promisedStreamid);
         parent.incoming_pushPromise(pushReq, pushStream);
@@ -697,14 +737,14 @@ void resetStream(int streamid, int code) throws IOException {
     }
 
     void closeStream(int streamid) {
-        debug.log(Level.DEBUG, "Closed stream %d", streamid);
+        if (debug.on()) debug.log("Closed stream %d", streamid);
         Stream<?> s = streams.remove(streamid);
         if (s != null) {
             // decrement the reference count on the HttpClientImpl
             // to allow the SelectorManager thread to exit if no
             // other operation is pending and the facade is no
             // longer referenced.
-            client().unreference();
+            client().streamUnreference();
         }
         // ## Remove s != null. It is a hack for delayed cancellation,reset
         if (s != null && !(s instanceof Stream.PushedStream)) {
@@ -756,13 +796,16 @@ private void handleSettings(SettingsFrame frame)
     {
         assert frame.streamid() == 0;
         if (!frame.getFlag(SettingsFrame.ACK)) {
-            int oldWindowSize = serverSettings.getParameter(INITIAL_WINDOW_SIZE);
             int newWindowSize = frame.getParameter(INITIAL_WINDOW_SIZE);
-            int diff = newWindowSize - oldWindowSize;
-            if (diff != 0) {
-                windowController.adjustActiveStreams(diff);
+            if (newWindowSize != -1) {
+                int oldWindowSize = serverSettings.getParameter(INITIAL_WINDOW_SIZE);
+                int diff = newWindowSize - oldWindowSize;
+                if (diff != 0) {
+                    windowController.adjustActiveStreams(diff);
+                }
             }
-            serverSettings = frame;
+
+            serverSettings.update(frame);
             sendFrame(new SettingsFrame(SettingsFrame.ACK));
         }
     }
@@ -819,7 +862,7 @@ private void sendConnectionPreface() throws IOException {
         Log.logFrames(sf, "OUT");
         // send preface bytes and SettingsFrame together
         HttpPublisher publisher = publisher();
-        publisher.enqueue(List.of(buf));
+        publisher.enqueueUnordered(List.of(buf));
         publisher.signalEnqueued();
         // mark preface sent.
         framesController.markPrefaceSent();
@@ -836,8 +879,9 @@ private void sendConnectionPreface() throws IOException {
         // cause any pending data stored before the preface was sent to be
         // flushed (see PrefaceController).
         Log.logTrace("finished sending connection preface");
-        debug.log(Level.DEBUG, "Triggering processing of buffered data"
-                  + " after sending connection preface");
+        if (debug.on())
+            debug.log("Triggering processing of buffered data"
+                      + " after sending connection preface");
         subscriber.onNext(List.of(EMPTY_TRIGGER));
     }
 
@@ -857,8 +901,8 @@ final <T> Stream<T> createStream(Exchange<T> exchange) {
         return stream;
     }
 
-    <T> Stream.PushedStream<?,T> createPushStream(Stream<T> parent, Exchange<T> pushEx) {
-        PushGroup<?,T> pg = parent.exchange.getPushGroup();
+    <T> Stream.PushedStream<T> createPushStream(Stream<T> parent, Exchange<T> pushEx) {
+        PushGroup<T> pg = parent.exchange.getPushGroup();
         return new Stream.PushedStream<>(pg, this, pushEx);
     }
 
@@ -866,7 +910,7 @@ <T> void putStream(Stream<T> stream, int streamid) {
         // increment the reference count on the HttpClientImpl
         // to prevent the SelectorManager thread from exiting until
         // the stream is closed.
-        client().reference();
+        client().streamReference();
         streams.put(streamid, stream);
     }
 
@@ -921,7 +965,7 @@ private List<ByteBuffer> encodeHeadersImpl(int maxFrameSize, HttpHeaders... head
         List<ByteBuffer> buffers = new ArrayList<>();
         for(HttpHeaders header : headers) {
             for (Map.Entry<String, List<String>> e : header.map().entrySet()) {
-                String lKey = e.getKey().toLowerCase();
+                String lKey = e.getKey().toLowerCase(Locale.US);
                 List<String> values = e.getValue();
                 for (String value : values) {
                     hpackOut.header(lKey, value);
@@ -1048,9 +1092,9 @@ final void processQueue() {
             try {
                 while (!queue.isEmpty() && !scheduler.isStopped()) {
                     ByteBuffer buffer = queue.poll();
-                    debug.log(Level.DEBUG,
-                              "sending %d to Http2Connection.asyncReceive",
-                              buffer.remaining());
+                    if (debug.on())
+                        debug.log("sending %d to Http2Connection.asyncReceive",
+                                  buffer.remaining());
                     asyncReceive(buffer);
                 }
             } catch (Throwable t) {
@@ -1059,14 +1103,14 @@ final void processQueue() {
             } finally {
                 Throwable x = error;
                 if (x != null) {
-                    debug.log(Level.DEBUG, "Stopping scheduler", x);
+                    if (debug.on()) debug.log("Stopping scheduler", x);
                     scheduler.stop();
                     Http2Connection.this.shutdown(x);
                 }
             }
         }
 
-
+        @Override
         public void onSubscribe(Flow.Subscription subscription) {
             // supports being called multiple time.
             // doesn't cancel the previous subscription, since that is
@@ -1076,39 +1120,41 @@ public void onSubscribe(Flow.Subscription subscription) {
             dropped = false;
             // TODO FIXME: request(1) should be done by the delegate.
             if (!completed) {
-                debug.log(Level.DEBUG, "onSubscribe: requesting Long.MAX_VALUE for reading");
+                if (debug.on())
+                    debug.log("onSubscribe: requesting Long.MAX_VALUE for reading");
                 subscription.request(Long.MAX_VALUE);
             } else {
-                debug.log(Level.DEBUG, "onSubscribe: already completed");
+                if (debug.on()) debug.log("onSubscribe: already completed");
             }
         }
 
         @Override
         public void onNext(List<ByteBuffer> item) {
-            debug.log(Level.DEBUG, () -> "onNext: got " + Utils.remaining(item)
+            if (debug.on()) debug.log(() -> "onNext: got " + Utils.remaining(item)
                     + " bytes in " + item.size() + " buffers");
             queue.addAll(item);
-            scheduler.deferOrSchedule(client().theExecutor());
+            scheduler.runOrSchedule(client().theExecutor());
         }
 
         @Override
         public void onError(Throwable throwable) {
-            debug.log(Level.DEBUG, () -> "onError: " + throwable);
+            if (debug.on()) debug.log(() -> "onError: " + throwable);
             error = throwable;
             completed = true;
-            scheduler.deferOrSchedule(client().theExecutor());
+            scheduler.runOrSchedule(client().theExecutor());
         }
 
         @Override
         public void onComplete() {
-            debug.log(Level.DEBUG, "EOF");
+            if (debug.on()) debug.log("EOF");
             error = new EOFException("EOF reached while reading");
             completed = true;
-            scheduler.deferOrSchedule(client().theExecutor());
+            scheduler.runOrSchedule(client().theExecutor());
         }
 
+        @Override
         public void dropSubscription() {
-            debug.log(Level.DEBUG, "dropSubscription");
+            if (debug.on()) debug.log("dropSubscription");
             // we could probably set subscription to null here...
             // then we might not need the 'dropped' boolean?
             dropped = true;
@@ -1125,120 +1171,73 @@ final String dbgString() {
                     + connection.getConnectionFlow() + ")";
     }
 
-    final class LoggingHeaderDecoder extends HeaderDecoder {
+    static class HeaderDecoder extends ValidatingHeadersConsumer {
 
-        private final HeaderDecoder delegate;
-        private final System.Logger debugHpack =
-                Utils.getHpackLogger(this::dbgString, DEBUG_HPACK);
-
-        LoggingHeaderDecoder(HeaderDecoder delegate) {
-            this.delegate = delegate;
-        }
+        HttpHeadersImpl headers;
 
-        String dbgString() {
-            return Http2Connection.this.dbgString() + "/LoggingHeaderDecoder";
+        HeaderDecoder() {
+            this.headers = new HttpHeadersImpl();
         }
 
         @Override
         public void onDecoded(CharSequence name, CharSequence value) {
-            delegate.onDecoded(name, value);
-        }
-
-        @Override
-        public void onIndexed(int index,
-                              CharSequence name,
-                              CharSequence value) {
-            debugHpack.log(Level.DEBUG, "onIndexed(%s, %s, %s)%n",
-                           index, name, value);
-            delegate.onIndexed(index, name, value);
-        }
-
-        @Override
-        public void onLiteral(int index,
-                              CharSequence name,
-                              CharSequence value,
-                              boolean valueHuffman) {
-            debugHpack.log(Level.DEBUG, "onLiteral(%s, %s, %s, %s)%n",
-                              index, name, value, valueHuffman);
-            delegate.onLiteral(index, name, value, valueHuffman);
-        }
-
-        @Override
-        public void onLiteral(CharSequence name,
-                              boolean nameHuffman,
-                              CharSequence value,
-                              boolean valueHuffman) {
-            debugHpack.log(Level.DEBUG, "onLiteral(%s, %s, %s, %s)%n",
-                           name, nameHuffman, value, valueHuffman);
-            delegate.onLiteral(name, nameHuffman, value, valueHuffman);
-        }
-
-        @Override
-        public void onLiteralNeverIndexed(int index,
-                                          CharSequence name,
-                                          CharSequence value,
-                                          boolean valueHuffman) {
-            debugHpack.log(Level.DEBUG, "onLiteralNeverIndexed(%s, %s, %s, %s)%n",
-                           index, name, value, valueHuffman);
-            delegate.onLiteralNeverIndexed(index, name, value, valueHuffman);
-        }
-
-        @Override
-        public void onLiteralNeverIndexed(CharSequence name,
-                                          boolean nameHuffman,
-                                          CharSequence value,
-                                          boolean valueHuffman) {
-            debugHpack.log(Level.DEBUG, "onLiteralNeverIndexed(%s, %s, %s, %s)%n",
-                           name, nameHuffman, value, valueHuffman);
-            delegate.onLiteralNeverIndexed(name, nameHuffman, value, valueHuffman);
-        }
-
-        @Override
-        public void onLiteralWithIndexing(int index,
-                                          CharSequence name,
-                                          CharSequence value,
-                                          boolean valueHuffman) {
-            debugHpack.log(Level.DEBUG, "onLiteralWithIndexing(%s, %s, %s, %s)%n",
-                           index, name, value, valueHuffman);
-            delegate.onLiteralWithIndexing(index, name, value, valueHuffman);
+            String n = name.toString();
+            String v = value.toString();
+            super.onDecoded(n, v);
+            headers.addHeader(n, v);
         }
 
-        @Override
-        public void onLiteralWithIndexing(CharSequence name,
-                                          boolean nameHuffman,
-                                          CharSequence value,
-                                          boolean valueHuffman) {
-            debugHpack.log(Level.DEBUG, "onLiteralWithIndexing(%s, %s, %s, %s)%n",
-                              name, nameHuffman, value, valueHuffman);
-            delegate.onLiteralWithIndexing(name, nameHuffman, value, valueHuffman);
-        }
-
-        @Override
-        public void onSizeUpdate(int capacity) {
-            debugHpack.log(Level.DEBUG, "onSizeUpdate(%s)%n", capacity);
-            delegate.onSizeUpdate(capacity);
-        }
-
-        @Override
         HttpHeadersImpl headers() {
-            return delegate.headers();
+            return headers;
         }
     }
 
-    static class HeaderDecoder implements DecodingCallback {
-        HttpHeadersImpl headers;
+    /*
+     * Checks RFC 7540 rules (relaxed) compliance regarding pseudo-headers.
+     */
+    static class ValidatingHeadersConsumer implements DecodingCallback {
 
-        HeaderDecoder() {
-            this.headers = new HttpHeadersImpl();
+        private static final Set<String> PSEUDO_HEADERS =
+                Set.of(":authority", ":method", ":path", ":scheme", ":status");
+
+        /** Used to check that if there are pseudo-headers, they go first */
+        private boolean pseudoHeadersEnded;
+
+        /**
+         * Called when END_HEADERS was received. This consumer may be invoked
+         * again after reset() is called, but for a whole new set of headers.
+         */
+        void reset() {
+            pseudoHeadersEnded = false;
         }
 
         @Override
-        public void onDecoded(CharSequence name, CharSequence value) {
-            headers.addHeader(name.toString(), value.toString());
+        public void onDecoded(CharSequence name, CharSequence value)
+                throws UncheckedIOException
+        {
+            String n = name.toString();
+            if (n.startsWith(":")) {
+                if (pseudoHeadersEnded) {
+                    throw newException("Unexpected pseudo-header '%s'", n);
+                } else if (!PSEUDO_HEADERS.contains(n)) {
+                    throw newException("Unknown pseudo-header '%s'", n);
+                }
+            } else {
+                pseudoHeadersEnded = true;
+                if (!Utils.isValidName(n)) {
+                    throw newException("Bad header name '%s'", n);
+                }
+            }
+            String v = value.toString();
+            if (!Utils.isValidValue(v)) {
+                throw newException("Bad header value '%s'", v);
+            }
         }
 
-        HttpHeadersImpl headers() {
-            return headers;
+        private UncheckedIOException newException(String message, String header)
+        {
+            return new UncheckedIOException(
+                    new IOException(String.format(message, header)));
         }
     }
 
@@ -1261,8 +1260,8 @@ int getStreamId() {
      * Thrown when https handshake negotiates http/1.1 alpn instead of h2
      */
     static final class ALPNException extends IOException {
-        private static final long serialVersionUID = 23138275393635783L;
-        final AbstractAsyncSSLConnection connection;
+        private static final long serialVersionUID = 0L;
+        final transient AbstractAsyncSSLConnection connection;
 
         ALPNException(String msg, AbstractAsyncSSLConnection connection) {
             super(msg);
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientBuilderImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientBuilderImpl.java
similarity index 93%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientBuilderImpl.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/HttpClientBuilderImpl.java
index 98a838a58ed..1b505293b1c 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientBuilderImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.net.Authenticator;
 import java.net.CookieHandler;
@@ -31,10 +31,11 @@
 import java.util.concurrent.Executor;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpClient;
+import jdk.internal.net.http.common.Utils;
 import static java.util.Objects.requireNonNull;
 
-class HttpClientBuilderImpl extends HttpClient.Builder {
+public class HttpClientBuilderImpl implements HttpClient.Builder {
 
     CookieHandler cookieHandler;
     HttpClient.Redirect followRedirects;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientFacade.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientFacade.java
similarity index 79%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientFacade.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/HttpClientFacade.java
index 449cc9830df..bab3d825cd1 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientFacade.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,25 +23,32 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.ref.Reference;
 import java.net.Authenticator;
 import java.net.CookieHandler;
 import java.net.ProxySelector;
-import java.net.URI;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.net.http.WebSocket;
+import jdk.internal.net.http.common.OperationTrackers.Trackable;
+import jdk.internal.net.http.common.OperationTrackers.Tracker;
 
 /**
  * An HttpClientFacade is a simple class that wraps an HttpClient implementation
  * and delegates everything to its implementation delegate.
  */
-final class HttpClientFacade extends HttpClient {
+final class HttpClientFacade extends HttpClient implements Trackable {
 
     final HttpClientImpl impl;
 
@@ -52,6 +59,11 @@ final class HttpClientFacade extends HttpClient {
         this.impl = impl;
     }
 
+    @Override // for tests
+    public Tracker getOperationsTracker() {
+        return impl.getOperationsTracker();
+    }
+
     @Override
     public Optional<CookieHandler> cookieHandler() {
         return impl.cookieHandler();
@@ -115,10 +127,12 @@ public Optional<Executor> executor() {
     }
 
     @Override
-    public <U, T> CompletableFuture<U>
-    sendAsync(HttpRequest req, HttpResponse.MultiSubscriber<U, T> multiSubscriber) {
+    public <T> CompletableFuture<HttpResponse<T>>
+    sendAsync(HttpRequest req,
+              BodyHandler<T> responseBodyHandler,
+              PushPromiseHandler<T> pushPromiseHandler){
         try {
-            return impl.sendAsync(req, multiSubscriber);
+            return impl.sendAsync(req, responseBodyHandler, pushPromiseHandler);
         } finally {
             Reference.reachabilityFence(this);
         }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
similarity index 77%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
index f46e53e4e37..06258e4b028 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,12 +23,13 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
 import java.io.IOException;
 import java.lang.System.Logger.Level;
+import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.net.Authenticator;
 import java.net.CookieHandler;
@@ -46,9 +47,12 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
@@ -60,12 +64,19 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Stream;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.HttpResponse.MultiSubscriber;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.Pair;
-import jdk.incubator.http.internal.common.Utils;
-import jdk.incubator.http.internal.websocket.BuilderImpl;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.net.http.WebSocket;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Pair;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.common.OperationTrackers.Trackable;
+import jdk.internal.net.http.common.OperationTrackers.Tracker;
+import jdk.internal.net.http.websocket.BuilderImpl;
 import jdk.internal.misc.InnocuousThread;
 
 /**
@@ -73,14 +84,13 @@
  * the selector manager thread which allows async events to be registered
  * and delivered when they occur. See AsyncEvent.
  */
-class HttpClientImpl extends HttpClient {
-
-    static final boolean DEBUG = Utils.DEBUG;  // Revisit: temporary dev flag.
-    static final boolean DEBUGELAPSED = Utils.TESTING || DEBUG;  // Revisit: temporary dev flag.
-    static final boolean DEBUGTIMEOUT = false; // Revisit: temporary dev flag.
-    final System.Logger  debug = Utils.getDebugLogger(this::dbgString, DEBUG);
-    final System.Logger  debugelapsed = Utils.getDebugLogger(this::dbgString, DEBUGELAPSED);
-    final System.Logger  debugtimeout = Utils.getDebugLogger(this::dbgString, DEBUGTIMEOUT);
+final class HttpClientImpl extends HttpClient implements Trackable {
+
+    static final boolean DEBUGELAPSED = Utils.TESTING || Utils.DEBUG;  // dev flag
+    static final boolean DEBUGTIMEOUT = false; // dev flag
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
+    final Logger debugelapsed = Utils.getDebugLogger(this::dbgString, DEBUGELAPSED);
+    final Logger debugtimeout = Utils.getDebugLogger(this::dbgString, DEBUGTIMEOUT);
     static final AtomicLong CLIENT_IDS = new AtomicLong();
 
     // Define the default factory as a static inner class
@@ -170,6 +180,7 @@ public Thread newThread(Runnable r) {
     private final AtomicLong pendingOperationCount = new AtomicLong();
     private final AtomicLong pendingWebSocketCount = new AtomicLong();
     private final AtomicLong pendingHttpRequestCount = new AtomicLong();
+    private final AtomicLong pendingHttp2StreamCount = new AtomicLong();
 
     /** A Set of, deadline first, ordered timeout events. */
     private final TreeSet<TimeoutEvent> timeouts;
@@ -233,8 +244,9 @@ private HttpClientImpl(HttpClientBuilderImpl builder,
         this.userProxySelector = Optional.ofNullable(builder.proxy);
         this.proxySelector = userProxySelector
                 .orElseGet(HttpClientImpl::getDefaultProxySelector);
-        debug.log(Level.DEBUG, "proxySelector is %s (user-supplied=%s)",
-                this.proxySelector, userProxySelector.isPresent());
+        if (debug.on())
+            debug.log("proxySelector is %s (user-supplied=%s)",
+                      this.proxySelector, userProxySelector.isPresent());
         authenticator = builder.authenticator;
         if (builder.version == null) {
             version = HttpClient.Version.HTTP_2;
@@ -303,11 +315,35 @@ final long reference() {
     final long unreference() {
         final long count = pendingOperationCount.decrementAndGet();
         final long httpCount = pendingHttpRequestCount.decrementAndGet();
+        final long http2Count = pendingHttp2StreamCount.get();
+        final long webSocketCount = pendingWebSocketCount.get();
+        if (count == 0 && facade() == null) {
+            selmgr.wakeupSelector();
+        }
+        assert httpCount >= 0 : "count of HTTP/1.1 operations < 0";
+        assert http2Count >= 0 : "count of HTTP/2 operations < 0";
+        assert webSocketCount >= 0 : "count of WS operations < 0";
+        assert count >= 0 : "count of pending operations < 0";
+        return count;
+    }
+
+    // Increments the pendingOperationCount.
+    final long streamReference() {
+        pendingHttp2StreamCount.incrementAndGet();
+        return pendingOperationCount.incrementAndGet();
+    }
+
+    // Decrements the pendingOperationCount.
+    final long streamUnreference() {
+        final long count = pendingOperationCount.decrementAndGet();
+        final long http2Count = pendingHttp2StreamCount.decrementAndGet();
+        final long httpCount = pendingHttpRequestCount.get();
         final long webSocketCount = pendingWebSocketCount.get();
         if (count == 0 && facade() == null) {
             selmgr.wakeupSelector();
         }
-        assert httpCount >= 0 : "count of HTTP operations < 0";
+        assert httpCount >= 0 : "count of HTTP/1.1 operations < 0";
+        assert http2Count >= 0 : "count of HTTP/2 operations < 0";
         assert webSocketCount >= 0 : "count of WS operations < 0";
         assert count >= 0 : "count of pending operations < 0";
         return count;
@@ -324,10 +360,12 @@ final long webSocketClose() {
         final long count = pendingOperationCount.decrementAndGet();
         final long webSocketCount = pendingWebSocketCount.decrementAndGet();
         final long httpCount = pendingHttpRequestCount.get();
+        final long http2Count = pendingHttp2StreamCount.get();
         if (count == 0 && facade() == null) {
             selmgr.wakeupSelector();
         }
-        assert httpCount >= 0 : "count of HTTP operations < 0";
+        assert httpCount >= 0 : "count of HTTP/1.1 operations < 0";
+        assert http2Count >= 0 : "count of HTTP/2 operations < 0";
         assert webSocketCount >= 0 : "count of WS operations < 0";
         assert count >= 0 : "count of pending operations < 0";
         return count;
@@ -338,6 +376,59 @@ final long referenceCount() {
         return pendingOperationCount.get();
     }
 
+    final static class HttpClientTracker implements Tracker {
+        final AtomicLong httpCount;
+        final AtomicLong http2Count;
+        final AtomicLong websocketCount;
+        final AtomicLong operationsCount;
+        final Reference<?> reference;
+        final String name;
+        HttpClientTracker(AtomicLong http,
+                          AtomicLong http2,
+                          AtomicLong ws,
+                          AtomicLong ops,
+                          Reference<?> ref,
+                          String name) {
+            this.httpCount = http;
+            this.http2Count = http2;
+            this.websocketCount = ws;
+            this.operationsCount = ops;
+            this.reference = ref;
+            this.name = name;
+        }
+        @Override
+        public long getOutstandingOperations() {
+            return operationsCount.get();
+        }
+        @Override
+        public long getOutstandingHttpOperations() {
+            return httpCount.get();
+        }
+        @Override
+        public long getOutstandingHttp2Streams() { return http2Count.get(); }
+        @Override
+        public long getOutstandingWebSocketOperations() {
+            return websocketCount.get();
+        }
+        @Override
+        public boolean isFacadeReferenced() {
+            return reference.get() != null;
+        }
+        @Override
+        public String getName() {
+            return name;
+        }
+    }
+
+    public Tracker getOperationsTracker() {
+        return new HttpClientTracker(pendingHttpRequestCount,
+                pendingHttp2StreamCount,
+                pendingWebSocketCount,
+                pendingOperationCount,
+                facadeRef,
+                dbgTag);
+    }
+
     // Called by the SelectorManager thread to figure out whether it's time
     // to terminate.
     final boolean isReferenced() {
@@ -359,14 +450,6 @@ void registerEvent(AsyncEvent exchange) throws IOException {
         selmgr.register(exchange);
     }
 
-    /**
-     * Only used from RawChannel to disconnect the channel from
-     * the selector
-     */
-    void cancelRegistration(SocketChannel s) {
-        selmgr.cancel(s);
-    }
-
     /**
      * Allows an AsyncEvent to modify its interestOps.
      * @param event The modified event.
@@ -385,8 +468,8 @@ Http2ClientImpl client2() {
     }
 
     private void debugCompleted(String tag, long startNanos, HttpRequest req) {
-        if (debugelapsed.isLoggable(Level.DEBUG)) {
-            debugelapsed.log(Level.DEBUG, () -> tag + " elapsed "
+        if (debugelapsed.on()) {
+            debugelapsed.log(tag + " elapsed "
                     + (System.nanoTime() - startNanos)/1000_000L
                     + " millis for " + req.method()
                     + " to " + req.uri());
@@ -399,7 +482,7 @@ private void debugCompleted(String tag, long startNanos, HttpRequest req) {
         throws IOException, InterruptedException
     {
         try {
-            return sendAsync(req, responseHandler).get();
+            return sendAsync(req, responseHandler, null).get();
         } catch (ExecutionException e) {
             Throwable t = e.getCause();
             if (t instanceof Error)
@@ -417,24 +500,43 @@ else if (t instanceof IOException)
     public <T> CompletableFuture<HttpResponse<T>>
     sendAsync(HttpRequest userRequest, BodyHandler<T> responseHandler)
     {
+        return sendAsync(userRequest, responseHandler, null);
+    }
+
+
+    @Override
+    public <T> CompletableFuture<HttpResponse<T>>
+    sendAsync(HttpRequest userRequest,
+              BodyHandler<T> responseHandler,
+              PushPromiseHandler<T> pushPromiseHandler)
+    {
+        Objects.requireNonNull(userRequest);
+        Objects.requireNonNull(responseHandler);
+
         AccessControlContext acc = null;
         if (System.getSecurityManager() != null)
             acc = AccessController.getContext();
 
         // Clone the, possibly untrusted, HttpRequest
-        HttpRequestImpl requestImpl = new HttpRequestImpl(userRequest, proxySelector, acc);
+        HttpRequestImpl requestImpl = new HttpRequestImpl(userRequest, proxySelector);
         if (requestImpl.method().equals("CONNECT"))
             throw new IllegalArgumentException("Unsupported method CONNECT");
 
         long start = DEBUGELAPSED ? System.nanoTime() : 0;
         reference();
         try {
-            debugelapsed.log(Level.DEBUG, "ClientImpl (async) send %s", userRequest);
+            if (debugelapsed.on())
+                debugelapsed.log("ClientImpl (async) send %s", userRequest);
+
+            Executor executor = acc == null
+                    ? this.executor
+                    : new PrivilegedExecutor(this.executor, acc);
 
-            MultiExchange<Void,T> mex = new MultiExchange<>(userRequest,
+            MultiExchange<T> mex = new MultiExchange<>(userRequest,
                                                             requestImpl,
                                                             this,
                                                             responseHandler,
+                                                            pushPromiseHandler,
                                                             acc);
             CompletableFuture<HttpResponse<T>> res =
                     mex.responseAsync().whenComplete((b,t) -> unreference());
@@ -442,53 +544,9 @@ else if (t instanceof IOException)
                 res = res.whenComplete(
                         (b,t) -> debugCompleted("ClientImpl (async)", start, userRequest));
             }
-            // makes sure that any dependent actions happen in the executor
-            if (acc != null) {
-                res.whenCompleteAsync((r, t) -> { /* do nothing */},
-                                      new PrivilegedExecutor(executor, acc));
-            }
 
-            return res;
-        } catch(Throwable t) {
-            unreference();
-            debugCompleted("ClientImpl (async)", start, userRequest);
-            throw t;
-        }
-    }
-
-    @Override
-    public <U, T> CompletableFuture<U>
-    sendAsync(HttpRequest userRequest, MultiSubscriber<U, T> responseHandler) {
-        AccessControlContext acc = null;
-        if (System.getSecurityManager() != null)
-            acc = AccessController.getContext();
-
-        // Clone the, possibly untrusted, HttpRequest
-        HttpRequestImpl requestImpl = new HttpRequestImpl(userRequest, proxySelector, acc);
-        if (requestImpl.method().equals("CONNECT"))
-            throw new IllegalArgumentException("Unsupported method CONNECT");
-
-        long start = DEBUGELAPSED ? System.nanoTime() : 0;
-        reference();
-        try {
-            debugelapsed.log(Level.DEBUG, "ClientImpl (async) send multi %s", userRequest);
-
-            MultiExchange<U,T> mex = new MultiExchange<>(userRequest,
-                                                         requestImpl,
-                                                         this,
-                                                         responseHandler,
-                                                         acc);
-            CompletableFuture<U> res = mex.multiResponseAsync()
-                      .whenComplete((b,t) -> unreference());
-            if (DEBUGELAPSED) {
-                res = res.whenComplete(
-                        (b,t) -> debugCompleted("ClientImpl (async)", start, userRequest));
-            }
             // makes sure that any dependent actions happen in the executor
-            if (acc != null) {
-                res.whenCompleteAsync((r, t) -> { /* do nothing */},
-                                      new PrivilegedExecutor(executor, acc));
-            }
+            res = res.whenCompleteAsync((r, t) -> { /* do nothing */}, executor);
 
             return res;
         } catch(Throwable t) {
@@ -511,15 +569,15 @@ private final static class SelectorManager extends Thread {
         // To avoid misuse of the property, the delay that can be specified
         // is comprised between [MIN_NODEADLINE, MAX_NODEADLINE], and its default
         // value if unspecified (or <= 0) is DEF_NODEADLINE = 3000ms
-        // The property is -Djdk.httpclient.internal.selector.timeout=<millis>
+        // The property is -Djdk.internal.httpclient.selectorTimeout=<millis>
         private static final int MIN_NODEADLINE = 1000; // ms
         private static final int MAX_NODEADLINE = 1000 * 1200; // ms
         private static final int DEF_NODEADLINE = 3000; // ms
         private static final long NODEADLINE; // default is DEF_NODEADLINE ms
         static {
             // ensure NODEADLINE is initialized with some valid value.
-            long deadline =  Utils.getIntegerNetProperty(
-                "jdk.httpclient.internal.selector.timeout",
+            long deadline =  Utils.getIntegerProperty(
+                "jdk.internal.httpclient.selectorTimeout",
                 DEF_NODEADLINE); // millis
             if (deadline <= 0) deadline = DEF_NODEADLINE;
             deadline = Math.max(deadline, MIN_NODEADLINE);
@@ -529,26 +587,40 @@ private final static class SelectorManager extends Thread {
         private final Selector selector;
         private volatile boolean closed;
         private final List<AsyncEvent> registrations;
-        private final System.Logger debug;
-        private final System.Logger debugtimeout;
+        private final List<AsyncTriggerEvent> deregistrations;
+        private final Logger debug;
+        private final Logger debugtimeout;
         HttpClientImpl owner;
         ConnectionPool pool;
 
         SelectorManager(HttpClientImpl ref) throws IOException {
-            super(null, null, "HttpClient-" + ref.id + "-SelectorManager", 0, false);
+            super(null, null,
+                  "HttpClient-" + ref.id + "-SelectorManager",
+                  0, false);
             owner = ref;
             debug = ref.debug;
             debugtimeout = ref.debugtimeout;
             pool = ref.connectionPool();
             registrations = new ArrayList<>();
+            deregistrations = new ArrayList<>();
             selector = Selector.open();
         }
 
         void eventUpdated(AsyncEvent e) throws ClosedChannelException {
             if (Thread.currentThread() == this) {
                 SelectionKey key = e.channel().keyFor(selector);
-                SelectorAttachment sa = (SelectorAttachment) key.attachment();
-                if (sa != null) sa.register(e);
+                if (key != null && key.isValid()) {
+                    SelectorAttachment sa = (SelectorAttachment) key.attachment();
+                    sa.register(e);
+                } else if (e.interestOps() != 0){
+                    // We don't care about paused events.
+                    // These are actually handled by
+                    // SelectorAttachment::resetInterestOps later on.
+                    // But if we reach here when trying to resume an
+                    // event then it's better to fail fast.
+                    if (debug.on()) debug.log("No key for channel");
+                    e.abort(new IOException("No key for channel"));
+                }
             } else {
                 register(e);
             }
@@ -574,7 +646,7 @@ void wakeupSelector() {
         }
 
         synchronized void shutdown() {
-            debug.log(Level.DEBUG, "SelectorManager shutting down");
+            if (debug.on()) debug.log("SelectorManager shutting down");
             closed = true;
             try {
                 selector.close();
@@ -588,11 +660,17 @@ synchronized void shutdown() {
         public void run() {
             List<Pair<AsyncEvent,IOException>> errorList = new ArrayList<>();
             List<AsyncEvent> readyList = new ArrayList<>();
+            List<Runnable> resetList = new ArrayList<>();
             try {
                 while (!Thread.currentThread().isInterrupted()) {
                     synchronized (this) {
                         assert errorList.isEmpty();
                         assert readyList.isEmpty();
+                        assert resetList.isEmpty();
+                        for (AsyncTriggerEvent event : deregistrations) {
+                            event.handle();
+                        }
+                        deregistrations.clear();
                         for (AsyncEvent event : registrations) {
                             if (event instanceof AsyncTriggerEvent) {
                                 readyList.add(event);
@@ -621,10 +699,9 @@ public void run() {
                                 }
                             } catch (IOException e) {
                                 Log.logTrace("HttpClientImpl: " + e);
-                                debug.log(Level.DEBUG, () ->
-                                        "Got " + e.getClass().getName()
-                                                 + " while handling"
-                                                 + " registration events");
+                                if (debug.on())
+                                    debug.log("Got " + e.getClass().getName()
+                                              + " while handling registration events");
                                 chan.close();
                                 // let the event abort deal with it
                                 errorList.add(new Pair<>(event, e));
@@ -660,13 +737,15 @@ public void run() {
                     // Timeouts will have milliseconds granularity. It is important
                     // to handle them in a timely fashion.
                     long nextTimeout = owner.purgeTimeoutsAndReturnNextDeadline();
-                    debugtimeout.log(Level.DEBUG, "next timeout: %d", nextTimeout);
+                    if (debugtimeout.on())
+                        debugtimeout.log("next timeout: %d", nextTimeout);
 
                     // Keep-alive have seconds granularity. It's not really an
                     // issue if we keep connections linger a bit more in the keep
                     // alive cache.
                     long nextExpiry = pool.purgeExpiredConnectionsAndReturnNextDeadline();
-                    debugtimeout.log(Level.DEBUG, "next expired: %d", nextExpiry);
+                    if (debugtimeout.on())
+                        debugtimeout.log("next expired: %d", nextExpiry);
 
                     assert nextTimeout >= 0;
                     assert nextExpiry >= 0;
@@ -684,8 +763,9 @@ public void run() {
                     // takes the least of the two.
                     long millis = Math.min(nextExpiry, nextTimeout);
 
-                    debugtimeout.log(Level.DEBUG, "Next deadline is %d",
-                                     (millis == 0 ? NODEADLINE : millis));
+                    if (debugtimeout.on())
+                        debugtimeout.log("Next deadline is %d",
+                                         (millis == 0 ? NODEADLINE : millis));
                     //debugPrint(selector);
                     int n = selector.select(millis == 0 ? NODEADLINE : millis);
                     if (n == 0) {
@@ -698,9 +778,10 @@ public void run() {
                         owner.purgeTimeoutsAndReturnNextDeadline();
                         continue;
                     }
-                    Set<SelectionKey> keys = selector.selectedKeys();
 
+                    Set<SelectionKey> keys = selector.selectedKeys();
                     assert errorList.isEmpty();
+
                     for (SelectionKey key : keys) {
                         SelectorAttachment sa = (SelectorAttachment) key.attachment();
                         if (!key.isValid()) {
@@ -722,17 +803,24 @@ public void run() {
                             continue;
                         }
                         sa.events(eventsOccurred).forEach(readyList::add);
-                        sa.resetInterestOps(eventsOccurred);
+                        resetList.add(() -> sa.resetInterestOps(eventsOccurred));
                     }
+
                     selector.selectNow(); // complete cancellation
                     selector.selectedKeys().clear();
 
-                    for (AsyncEvent event : readyList) {
-                        handleEvent(event, null); // will be delegated to executor
-                    }
+                    // handle selected events
+                    readyList.forEach((e) -> handleEvent(e, null));
                     readyList.clear();
+
+                    // handle errors (closed channels etc...)
                     errorList.forEach((p) -> handleEvent(p.first, p.second));
                     errorList.clear();
+
+                    // reset interest ops for selected channels
+                    resetList.forEach(r -> r.run());
+                    resetList.clear();
+
                 }
             } catch (Throwable e) {
                 //e.printStackTrace();
@@ -741,8 +829,8 @@ public void run() {
                     String err = Utils.stackTrace(e);
                     Log.logError("HttpClientImpl: fatal error: " + err);
                 }
-                debug.log(Level.DEBUG, "shutting down", e);
-                if (Utils.ASSERTIONSENABLED && !debug.isLoggable(Level.DEBUG)) {
+                if (debug.on()) debug.log("shutting down", e);
+                if (Utils.ASSERTIONSENABLED && !debug.on()) {
                     e.printStackTrace(System.err); // always print the stack
                 }
             } finally {
@@ -771,6 +859,20 @@ void handleEvent(AsyncEvent event, IOException ioe) {
         }
     }
 
+    final String debugInterestOps(SelectableChannel channel) {
+        try {
+            SelectionKey key = channel.keyFor(selmgr.selector);
+            if (key == null) return "channel not registered with selector";
+            String keyInterestOps = key.isValid()
+                    ? "key.interestOps=" + key.interestOps() : "invalid key";
+            return String.format("channel registered with selector, %s, sa.interestOps=%s",
+                                 keyInterestOps,
+                                 ((SelectorAttachment)key.attachment()).interestOps);
+        } catch (Throwable t) {
+            return String.valueOf(t);
+        }
+    }
+
     /**
      * Tracks multiple user level registrations associated with one NIO
      * registration (SelectionKey). In this implementation, registrations
@@ -785,8 +887,8 @@ private static class SelectorAttachment {
         private final SelectableChannel chan;
         private final Selector selector;
         private final Set<AsyncEvent> pending;
-        private final static System.Logger debug =
-                Utils.getDebugLogger("SelectorAttachment"::toString, DEBUG);
+        private final static Logger debug =
+                Utils.getDebugLogger("SelectorAttachment"::toString, Utils.DEBUG);
         private int interestOps;
 
         SelectorAttachment(SelectableChannel chan, Selector selector) {
@@ -797,12 +899,23 @@ private static class SelectorAttachment {
 
         void register(AsyncEvent e) throws ClosedChannelException {
             int newOps = e.interestOps();
+            // re register interest if we are not already interested
+            // in the event. If the event is paused, then the pause will
+            // be taken into account later when resetInterestOps is called.
             boolean reRegister = (interestOps & newOps) != newOps;
             interestOps |= newOps;
             pending.add(e);
+            if (debug.on())
+                debug.log("Registering %s for %d (%s)", e, newOps, reRegister);
             if (reRegister) {
                 // first time registration happens here also
-                chan.register(selector, interestOps, this);
+                try {
+                    chan.register(selector, interestOps, this);
+                } catch (Throwable x) {
+                    abortPending(x);
+                }
+            } else if (!chan.isOpen()) {
+                abortPending(new ClosedChannelException());
             }
         }
 
@@ -839,14 +952,23 @@ void resetInterestOps(int interestOps) {
 
             this.interestOps = newOps;
             SelectionKey key = chan.keyFor(selector);
-            if (newOps == 0 && pending.isEmpty()) {
+            if (newOps == 0 && key != null && pending.isEmpty()) {
                 key.cancel();
             } else {
                 try {
+                    if (key == null || !key.isValid()) {
+                        throw new CancelledKeyException();
+                    }
                     key.interestOps(newOps);
+                    // double check after
+                    if (!chan.isOpen()) {
+                        abortPending(new ClosedChannelException());
+                        return;
+                    }
+                    assert key.interestOps() == newOps;
                 } catch (CancelledKeyException x) {
                     // channel may have been closed
-                    debug.log(Level.DEBUG, "key cancelled for " + chan);
+                    if (debug.on()) debug.log("key cancelled for " + chan);
                     abortPending(x);
                 }
             }
@@ -922,8 +1044,8 @@ public WebSocket.Builder newWebSocketBuilder() {
         // Make sure to pass the HttpClientFacade to the WebSocket builder.
         // This will ensure that the facade is not released before the
         // WebSocket has been created, at which point the pendingOperationCount
-        // will have been incremented by the DetachedConnectionChannel
-        // (see PlainHttpConnection.detachChannel())
+        // will have been incremented by the RawChannelTube.
+        // See RawChannelTube.
         return new BuilderImpl(this.facade(), proxySelector);
     }
 
@@ -955,7 +1077,7 @@ private void addFilter(Class<? extends HeaderFilter> f) {
         filters.addFilter(f);
     }
 
-    final List<HeaderFilter> filterChain() {
+    final LinkedList<HeaderFilter> filterChain() {
         return filters.getFilterChain();
     }
 
@@ -1005,7 +1127,7 @@ private long purgeTimeoutsAndReturnNextDeadline() {
         // can be useful for debugging
         if (toHandle != null && Log.trace()) {
             Log.logTrace("purgeTimeoutsAndReturnNextDeadline: handling "
-                    + (toHandle == null ? 0 : toHandle.size()) + " events, "
+                    +  toHandle.size() + " events, "
                     + "remaining " + remaining
                     + ", next deadline: " + (diff < 0 ? 0L : diff));
         }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
similarity index 62%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpConnection.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
index 66542f57587..f18da10d976 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -31,21 +31,28 @@
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
+import java.util.Arrays;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.Flow;
-import jdk.incubator.http.HttpClient.Version;
-import jdk.incubator.http.internal.common.Demand;
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-import jdk.incubator.http.internal.common.SequentialScheduler.DeferredCompleter;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.Utils;
-import static jdk.incubator.http.HttpClient.Version.HTTP_2;
+import java.util.function.BiPredicate;
+import java.util.function.Predicate;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpHeaders;
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.SequentialScheduler;
+import jdk.internal.net.http.common.SequentialScheduler.DeferredCompleter;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Utils;
+import static java.net.http.HttpClient.Version.HTTP_2;
 
 /**
  * Wraps socket channel layer and takes care of SSL also.
@@ -59,10 +66,9 @@
  */
 abstract class HttpConnection implements Closeable {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final System.Logger  debug = Utils.getDebugLogger(this::dbgString, DEBUG);
-    final static System.Logger DEBUG_LOGGER = Utils.getDebugLogger(
-            () -> "HttpConnection(SocketTube(?))", DEBUG);
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
+    final static Logger DEBUG_LOGGER = Utils.getDebugLogger(
+            () -> "HttpConnection(SocketTube(?))", Utils.DEBUG);
 
     /** The address this connection is connected to. Could be a server or a proxy. */
     final InetSocketAddress address;
@@ -113,7 +119,11 @@ final HttpClientImpl client() {
     /** Tells whether, or not, this connection is secure ( over SSL ) */
     abstract boolean isSecure();
 
-    /** Tells whether, or not, this connection is proxied. */
+    /**
+     * Tells whether, or not, this connection is proxied.
+     * Returns true for tunnel connections, or clear connection to
+     * any host through proxy.
+     */
     abstract boolean isProxied();
 
     /** Tells whether, or not, this connection is open. */
@@ -134,6 +144,23 @@ interface HttpPublisher extends FlowTube.TubePublisher {
      */
     abstract HttpPublisher publisher();
 
+    // HTTP/2 MUST use TLS version 1.2 or higher for HTTP/2 over TLS
+    private static final Predicate<String> testRequiredHTTP2TLSVersion = proto ->
+            proto.equals("TLSv1.2") || proto.equals("TLSv1.3");
+
+   /**
+    * Returns true if the given client's SSL parameter protocols contains at
+    * least one TLS version that HTTP/2 requires.
+    */
+   private static final boolean hasRequiredHTTP2TLSVersion(HttpClient client) {
+       String[] protos = client.sslParameters().getProtocols();
+       if (protos != null) {
+           return Arrays.stream(protos).filter(testRequiredHTTP2TLSVersion).findAny().isPresent();
+       } else {
+           return false;
+       }
+   }
+
     /**
      * Factory for retrieving HttpConnections. A connection can be retrieved
      * from the connection pool, or a new one created if none available.
@@ -152,13 +179,10 @@ public static HttpConnection getConnection(InetSocketAddress addr,
                                                HttpClientImpl client,
                                                HttpRequestImpl request,
                                                Version version) {
+        // The default proxy selector may select a proxy whose  address is
+        // unresolved. We must resolve the address before connecting to it.
+        InetSocketAddress proxy = Utils.resolveAddress(request.proxy());
         HttpConnection c = null;
-        InetSocketAddress proxy = request.proxy();
-        if (proxy != null && proxy.isUnresolved()) {
-            // The default proxy selector may select a proxy whose  address is
-            // unresolved. We must resolve the address before connecting to it.
-            proxy = new InetSocketAddress(proxy.getHostString(), proxy.getPort());
-        }
         boolean secure = request.secure();
         ConnectionPool pool = client.connectionPool();
 
@@ -166,8 +190,9 @@ public static HttpConnection getConnection(InetSocketAddress addr,
             c = pool.getConnection(false, addr, proxy);
             if (c != null && c.isOpen() /* may have been eof/closed when in the pool */) {
                 final HttpConnection conn = c;
-                DEBUG_LOGGER.log(Level.DEBUG, () -> conn.getConnectionFlow()
-                            + ": plain connection retrieved from HTTP/1.1 pool");
+                if (DEBUG_LOGGER.on())
+                    DEBUG_LOGGER.log(conn.getConnectionFlow()
+                                     + ": plain connection retrieved from HTTP/1.1 pool");
                 return c;
             } else {
                 return getPlainConnection(addr, proxy, request, client);
@@ -178,15 +203,16 @@ public static HttpConnection getConnection(InetSocketAddress addr,
             }
             if (c != null && c.isOpen()) {
                 final HttpConnection conn = c;
-                DEBUG_LOGGER.log(Level.DEBUG, () -> conn.getConnectionFlow()
-                            + ": SSL connection retrieved from HTTP/1.1 pool");
+                if (DEBUG_LOGGER.on())
+                    DEBUG_LOGGER.log(conn.getConnectionFlow()
+                                     + ": SSL connection retrieved from HTTP/1.1 pool");
                 return c;
             } else {
                 String[] alpn = null;
-                if (version == HTTP_2) {
+                if (version == HTTP_2 && hasRequiredHTTP2TLSVersion(client)) {
                     alpn = new String[] { "h2", "http/1.1" };
                 }
-                return getSSLConnection(addr, proxy, alpn, client);
+                return getSSLConnection(addr, proxy, alpn, request, client);
             }
         }
     }
@@ -194,13 +220,74 @@ public static HttpConnection getConnection(InetSocketAddress addr,
     private static HttpConnection getSSLConnection(InetSocketAddress addr,
                                                    InetSocketAddress proxy,
                                                    String[] alpn,
+                                                   HttpRequestImpl request,
                                                    HttpClientImpl client) {
         if (proxy != null)
-            return new AsyncSSLTunnelConnection(addr, client, alpn, proxy);
+            return new AsyncSSLTunnelConnection(addr, client, alpn, proxy,
+                                                proxyTunnelHeaders(request));
         else
             return new AsyncSSLConnection(addr, client, alpn);
     }
 
+    /**
+     * This method is used to build a filter that will accept or
+     * veto (header-name, value) tuple for transmission on the
+     * wire.
+     * The filter is applied to the headers when sending the headers
+     * to the remote party.
+     * Which tuple is accepted/vetoed depends on:
+     * <pre>
+     *    - whether the connection is a tunnel connection
+     *      [talking to a server through a proxy tunnel]
+     *    - whether the method is CONNECT
+     *      [establishing a CONNECT tunnel through a proxy]
+     *    - whether the request is using a proxy
+     *      (and the connection is not a tunnel)
+     *      [talking to a server through a proxy]
+     *    - whether the request is a direct connection to
+     *      a server (no tunnel, no proxy).
+     * </pre>
+     * @param request
+     * @return
+     */
+    BiPredicate<String,List<String>> headerFilter(HttpRequestImpl request) {
+        if (isTunnel()) {
+            // talking to a server through a proxy tunnel
+            // don't send proxy-* headers to a plain server
+            assert !request.isConnect();
+            return Utils.NO_PROXY_HEADERS_FILTER;
+        } else if (request.isConnect()) {
+            // establishing a proxy tunnel
+            // check for proxy tunnel disabled schemes
+            // assert !this.isTunnel();
+            assert request.proxy() == null;
+            return Utils.PROXY_TUNNEL_FILTER;
+        } else if (request.proxy() != null) {
+            // talking to a server through a proxy (no tunnel)
+            // check for proxy disabled schemes
+            // assert !isTunnel() && !request.isConnect();
+            return Utils.PROXY_FILTER;
+        } else {
+            // talking to a server directly (no tunnel, no proxy)
+            // don't send proxy-* headers to a plain server
+            // assert request.proxy() == null && !request.isConnect();
+            return Utils.NO_PROXY_HEADERS_FILTER;
+        }
+    }
+
+    // Composes a new immutable HttpHeaders that combines the
+    // user and system header but only keeps those headers that
+    // start with "proxy-"
+    private static HttpHeaders proxyTunnelHeaders(HttpRequestImpl request) {
+        Map<String, List<String>> combined = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        combined.putAll(request.getSystemHeaders().map());
+        combined.putAll(request.headers().map()); // let user override system
+
+        // keep only proxy-* - and also strip authorization headers
+        // for disabled schemes
+        return ImmutableHeaders.of(combined, Utils.PROXY_TUNNEL_FILTER);
+    }
+
     /* Returns either a plain HTTP connection or a plain tunnelling connection
      * for proxied WebSocket */
     private static HttpConnection getPlainConnection(InetSocketAddress addr,
@@ -208,7 +295,8 @@ private static HttpConnection getPlainConnection(InetSocketAddress addr,
                                                      HttpRequestImpl request,
                                                      HttpClientImpl client) {
         if (request.isWebSocket() && proxy != null)
-            return new PlainTunnelingConnection(addr, proxy, client);
+            return new PlainTunnelingConnection(addr, proxy, client,
+                                                proxyTunnelHeaders(request));
 
         if (proxy == null)
             return new PlainHttpConnection(addr, client);
@@ -243,6 +331,9 @@ void closeOrReturnToCache(HttpHeaders hdrs) {
         }
     }
 
+    /* Tells whether or not this connection is a tunnel through a proxy */
+    boolean isTunnel() { return false; }
+
     abstract SocketChannel channel();
 
     final InetSocketAddress address() {
@@ -251,51 +342,17 @@ final InetSocketAddress address() {
 
     abstract ConnectionPool.CacheKey cacheKey();
 
-//    // overridden in SSL only
-//    SSLParameters sslParameters() {
-//        return null;
-//    }
-
     /**
      * Closes this connection, by returning the socket to its connection pool.
      */
     @Override
     public abstract void close();
 
-    abstract void shutdownInput() throws IOException;
-
-    abstract void shutdownOutput() throws IOException;
-
-    // Support for WebSocket/RawChannelImpl which unfortunately
-    // still depends on synchronous read/writes.
-    // It should be removed when RawChannelImpl moves to using asynchronous APIs.
-    abstract static class DetachedConnectionChannel implements Closeable {
-        DetachedConnectionChannel() {}
-        abstract SocketChannel channel();
-        abstract long write(ByteBuffer[] buffers, int start, int number)
-                throws IOException;
-        abstract void shutdownInput() throws IOException;
-        abstract void shutdownOutput() throws IOException;
-        abstract ByteBuffer read() throws IOException;
-        @Override
-        public abstract void close();
-        @Override
-        public String toString() {
-            return this.getClass().getSimpleName() + ": " + channel().toString();
-        }
-    }
-
-    // Support for WebSocket/RawChannelImpl which unfortunately
-    // still depends on synchronous read/writes.
-    // It should be removed when RawChannelImpl moves to using asynchronous APIs.
-    abstract DetachedConnectionChannel detachChannel();
-
     abstract FlowTube getConnectionFlow();
 
     /**
-     * A publisher that makes it possible to publish (write)
-     * ordered (normal priority) and unordered (high priority)
-     * buffers downstream.
+     * A publisher that makes it possible to publish (write) ordered (normal
+     * priority) and unordered (high priority) buffers downstream.
      */
     final class PlainHttpPublisher implements HttpPublisher {
         final Object reading;
@@ -306,6 +363,7 @@ final class PlainHttpPublisher implements HttpPublisher {
             this.reading = readingLock;
         }
         final ConcurrentLinkedDeque<List<ByteBuffer>> queue = new ConcurrentLinkedDeque<>();
+        final ConcurrentLinkedDeque<List<ByteBuffer>> priority = new ConcurrentLinkedDeque<>();
         volatile Flow.Subscriber<? super List<ByteBuffer>> subscriber;
         volatile HttpWriteSubscription subscription;
         final SequentialScheduler writeScheduler =
@@ -345,25 +403,35 @@ final class HttpWriteSubscription implements Flow.Subscription {
             public void request(long n) {
                 if (n <= 0) throw new IllegalArgumentException("non-positive request");
                 demand.increase(n);
-                debug.log(Level.DEBUG, () -> "HttpPublisher: got request of "
-                            + n + " from "
-                            + getConnectionFlow());
+                if (debug.on())
+                    debug.log("HttpPublisher: got request of "  + n + " from "
+                               + getConnectionFlow());
                 writeScheduler.runOrSchedule();
             }
 
             @Override
             public void cancel() {
-                debug.log(Level.DEBUG, () -> "HttpPublisher: cancelled by "
-                          + getConnectionFlow());
+                if (debug.on())
+                    debug.log("HttpPublisher: cancelled by " + getConnectionFlow());
+            }
+
+            private boolean isEmpty() {
+                return queue.isEmpty() && priority.isEmpty();
+            }
+
+            private List<ByteBuffer> poll() {
+                List<ByteBuffer> elem = priority.poll();
+                return elem == null ? queue.poll() : elem;
             }
 
             void flush() {
-                while (!queue.isEmpty() && demand.tryDecrement()) {
-                    List<ByteBuffer> elem = queue.poll();
-                    debug.log(Level.DEBUG, () -> "HttpPublisher: sending "
-                                + Utils.remaining(elem) + " bytes ("
-                                + elem.size() + " buffers) to "
-                                + getConnectionFlow());
+                while (!isEmpty() && demand.tryDecrement()) {
+                    List<ByteBuffer> elem = poll();
+                    if (debug.on())
+                        debug.log("HttpPublisher: sending "
+                                    + Utils.remaining(elem) + " bytes ("
+                                    + elem.size() + " buffers) to "
+                                    + getConnectionFlow());
                     subscriber.onNext(elem);
                 }
             }
@@ -373,25 +441,25 @@ void flush() {
         public void enqueue(List<ByteBuffer> buffers) throws IOException {
             queue.add(buffers);
             int bytes = buffers.stream().mapToInt(ByteBuffer::remaining).sum();
-            debug.log(Level.DEBUG, "added %d bytes to the write queue", bytes);
+            debug.log("added %d bytes to the write queue", bytes);
         }
 
         @Override
         public void enqueueUnordered(List<ByteBuffer> buffers) throws IOException {
             // Unordered frames are sent before existing frames.
             int bytes = buffers.stream().mapToInt(ByteBuffer::remaining).sum();
-            queue.addFirst(buffers);
-            debug.log(Level.DEBUG, "inserted %d bytes in the write queue", bytes);
+            priority.add(buffers);
+            debug.log("added %d bytes in the priority write queue", bytes);
         }
 
         @Override
         public void signalEnqueued() throws IOException {
-            debug.log(Level.DEBUG, "signalling the publisher of the write queue");
+            debug.log("signalling the publisher of the write queue");
             signal();
         }
     }
 
-    String dbgTag = null;
+    String dbgTag;
     final String dbgString() {
         FlowTube flow = getConnectionFlow();
         String tag = dbgTag;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestBuilderImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
similarity index 82%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestBuilderImpl.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
index 44d47beb672..29696d818e5 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestBuilderImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,19 +23,24 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.net.URI;
 import java.time.Duration;
+import java.util.Locale;
 import java.util.Optional;
-import jdk.incubator.http.HttpRequest.BodyPublisher;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublisher;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.Utils;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static jdk.incubator.http.internal.common.Utils.isValidName;
-import static jdk.incubator.http.internal.common.Utils.isValidValue;
+import static jdk.internal.net.http.common.Utils.isValidName;
+import static jdk.internal.net.http.common.Utils.isValidValue;
+import static jdk.internal.net.http.common.Utils.newIAE;
 
-class HttpRequestBuilderImpl extends HttpRequest.Builder {
+public class HttpRequestBuilderImpl implements HttpRequest.Builder {
 
     private HttpHeadersImpl userHeaders;
     private URI uri;
@@ -68,15 +73,11 @@ public HttpRequestBuilderImpl uri(URI uri) {
         return this;
     }
 
-    private static IllegalArgumentException newIAE(String message, Object... args) {
-        return new IllegalArgumentException(format(message, args));
-    }
-
-    private static void checkURI(URI uri) {
+    static void checkURI(URI uri) {
         String scheme = uri.getScheme();
         if (scheme == null)
             throw newIAE("URI with undefined scheme");
-        scheme = scheme.toLowerCase();
+        scheme = scheme.toLowerCase(Locale.US);
         if (!(scheme.equals("https") || scheme.equals("http"))) {
             throw newIAE("invalid URI scheme %s", scheme);
         }
@@ -87,7 +88,8 @@ private static void checkURI(URI uri) {
 
     @Override
     public HttpRequestBuilderImpl copy() {
-        HttpRequestBuilderImpl b = new HttpRequestBuilderImpl(this.uri);
+        HttpRequestBuilderImpl b = new HttpRequestBuilderImpl();
+        b.uri = this.uri;
         b.userHeaders = this.userHeaders.deepCopy();
         b.method = this.method;
         b.expectContinue = this.expectContinue;
@@ -102,10 +104,13 @@ private void checkNameAndValue(String name, String value) {
         requireNonNull(name, "name");
         requireNonNull(value, "value");
         if (!isValidName(name)) {
-            throw newIAE("invalid header name:", name);
+            throw newIAE("invalid header name: \"%s\"", name);
+        }
+        if (!Utils.ALLOWED_HEADERS.test(name)) {
+            throw newIAE("restricted header name: \"%s\"", name);
         }
         if (!isValidValue(value)) {
-            throw newIAE("invalid header value:%s", value);
+            throw newIAE("invalid header value: \"%s\"", value);
         }
     }
 
@@ -173,8 +178,8 @@ public HttpRequest.Builder POST(BodyPublisher body) {
     }
 
     @Override
-    public HttpRequest.Builder DELETE(BodyPublisher body) {
-        return method0("DELETE", requireNonNull(body));
+    public HttpRequest.Builder DELETE() {
+        return method0("DELETE", null);
     }
 
     @Override
@@ -189,12 +194,17 @@ public HttpRequest.Builder method(String method, BodyPublisher body) {
             throw newIAE("illegal method <empty string>");
         if (method.equals("CONNECT"))
             throw newIAE("method CONNECT is not supported");
+        if (!Utils.isValidName(method))
+            throw newIAE("illegal method \""
+                    + method.replace("\n","\\n")
+                    .replace("\r", "\\r")
+                    .replace("\t", "\\t")
+                    + "\"");
         return method0(method, requireNonNull(body));
     }
 
     private HttpRequest.Builder method0(String method, BodyPublisher body) {
         assert method != null;
-        assert !method.equals("GET") ? body != null : true;
         assert !method.equals("");
         this.method = method;
         this.bodyPublisher = body;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java
similarity index 76%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestImpl.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java
index 9ebb29c5e24..b3ecdb06ae8 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,10 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
-
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
-import jdk.incubator.http.internal.websocket.WebSocketRequest;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -39,23 +36,30 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Optional;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.websocket.WebSocketRequest;
 
-import static jdk.incubator.http.internal.common.Utils.ALLOWED_HEADERS;
+import static jdk.internal.net.http.common.Utils.ALLOWED_HEADERS;
 
 class HttpRequestImpl extends HttpRequest implements WebSocketRequest {
 
     private final HttpHeaders userHeaders;
     private final HttpHeadersImpl systemHeaders;
     private final URI uri;
-    private Proxy proxy;
-    private InetSocketAddress authority; // only used when URI not specified
+    private volatile Proxy proxy; // ensure safe publishing
+    private final InetSocketAddress authority; // only used when URI not specified
     private final String method;
     final BodyPublisher requestPublisher;
     final boolean secure;
     final boolean expectContinue;
-    private boolean isWebSocket;
-    private AccessControlContext acc;
+    private volatile boolean isWebSocket;
+    private volatile AccessControlContext acc;
     private final Duration timeout;  // may be null
     private final Optional<HttpClient.Version> version;
 
@@ -84,23 +88,40 @@ public HttpRequestImpl(HttpRequestBuilderImpl builder) {
         this.requestPublisher = builder.bodyPublisher();  // may be null
         this.timeout = builder.timeout();
         this.version = builder.version();
+        this.authority = null;
     }
 
     /**
      * Creates an HttpRequestImpl from the given request.
      */
-    public HttpRequestImpl(HttpRequest request, ProxySelector ps, AccessControlContext acc) {
+    public HttpRequestImpl(HttpRequest request, ProxySelector ps) {
         String method = request.method();
+        if (method != null && !Utils.isValidName(method))
+            throw new IllegalArgumentException("illegal method \""
+                    + method.replace("\n","\\n")
+                    .replace("\r", "\\r")
+                    .replace("\t", "\\t")
+                    + "\"");
+        URI requestURI = Objects.requireNonNull(request.uri(),
+                "uri must be non null");
+        Duration timeout = request.timeout().orElse(null);
         this.method = method == null ? "GET" : method;
-        this.userHeaders = request.headers();
+        this.userHeaders = ImmutableHeaders.validate(request.headers());
         if (request instanceof HttpRequestImpl) {
-            this.systemHeaders = ((HttpRequestImpl) request).systemHeaders;
+            // all cases exception WebSocket should have a new system headers
             this.isWebSocket = ((HttpRequestImpl) request).isWebSocket;
+            if (isWebSocket) {
+                this.systemHeaders = ((HttpRequestImpl) request).systemHeaders;
+            } else {
+                this.systemHeaders = new HttpHeadersImpl();
+            }
         } else {
+            HttpRequestBuilderImpl.checkURI(requestURI);
+            checkTimeout(timeout);
             this.systemHeaders = new HttpHeadersImpl();
         }
         this.systemHeaders.setHeader("User-Agent", USER_AGENT);
-        this.uri = request.uri();
+        this.uri = requestURI;
         if (isWebSocket) {
             // WebSocket determines and sets the proxy itself
             this.proxy = ((HttpRequestImpl) request).proxy;
@@ -113,22 +134,43 @@ public HttpRequestImpl(HttpRequest request, ProxySelector ps, AccessControlConte
         this.expectContinue = request.expectContinue();
         this.secure = uri.getScheme().toLowerCase(Locale.US).equals("https");
         this.requestPublisher = request.bodyPublisher().orElse(null);
-        if (acc != null && requestPublisher instanceof RequestPublishers.FilePublisher) {
-            // Restricts the file publisher with the senders ACC, if any
-            ((RequestPublishers.FilePublisher)requestPublisher).setAccessControlContext(acc);
-        }
-        this.timeout = request.timeout().orElse(null);
+        this.timeout = timeout;
         this.version = request.version();
+        this.authority = null;
+    }
+
+    private static void checkTimeout(Duration duration) {
+        if (duration != null) {
+            if (duration.isNegative() || Duration.ZERO.equals(duration))
+                throw new IllegalArgumentException("Invalid duration: " + duration);
+        }
+    }
+
+    /** Returns a new instance suitable for redirection. */
+    public static HttpRequestImpl newInstanceForRedirection(URI uri,
+                                                            String method,
+                                                            HttpRequestImpl other) {
+        return new HttpRequestImpl(uri, method, other);
     }
 
-    /** Creates a HttpRequestImpl using fields of an existing request impl. */
-    public HttpRequestImpl(URI uri,
-                           String method,
-                           HttpRequestImpl other) {
+    /** Returns a new instance suitable for authentication. */
+    public static HttpRequestImpl newInstanceForAuthentication(HttpRequestImpl other) {
+        return new HttpRequestImpl(other.uri(), other.method(), other);
+    }
+
+    /**
+     * Creates a HttpRequestImpl using fields of an existing request impl.
+     * The newly created HttpRequestImpl does not copy the system headers.
+     */
+    private HttpRequestImpl(URI uri,
+                            String method,
+                            HttpRequestImpl other) {
+        assert method == null || Utils.isValidName(method);
         this.method = method == null? "GET" : method;
         this.userHeaders = other.userHeaders;
         this.isWebSocket = other.isWebSocket;
-        this.systemHeaders = other.systemHeaders;
+        this.systemHeaders = new HttpHeadersImpl();
+        this.systemHeaders.setHeader("User-Agent", USER_AGENT);
         this.uri = uri;
         this.proxy = other.proxy;
         this.expectContinue = other.expectContinue;
@@ -137,16 +179,18 @@ public HttpRequestImpl(URI uri,
         this.acc = other.acc;
         this.timeout = other.timeout;
         this.version = other.version();
+        this.authority = null;
     }
 
     /* used for creating CONNECT requests  */
-    HttpRequestImpl(String method, InetSocketAddress authority) {
+    HttpRequestImpl(String method, InetSocketAddress authority, HttpHeaders headers) {
         // TODO: isWebSocket flag is not specified, but the assumption is that
         // such a request will never be made on a connection that will be returned
         // to the connection pool (we might need to revisit this constructor later)
+        assert "CONNECT".equalsIgnoreCase(method);
         this.method = method;
         this.systemHeaders = new HttpHeadersImpl();
-        this.userHeaders = ImmutableHeaders.empty();
+        this.userHeaders = ImmutableHeaders.of(headers);
         this.uri = URI.create("socket://" + authority.getHostString() + ":"
                               + Integer.toString(authority.getPort()) + "/");
         this.proxy = null;
@@ -164,6 +208,10 @@ public HttpRequestImpl(URI uri,
         this.version = Optional.of(HttpClient.Version.HTTP_1_1);
     }
 
+    final boolean isConnect() {
+        return "CONNECT".equalsIgnoreCase(method);
+    }
+
     /**
      * Creates a HttpRequestImpl from the given set of Headers and the associated
      * "parent" request. Fields not taken from the headers are taken from the
@@ -200,6 +248,7 @@ private HttpRequestImpl(HttpRequestImpl parent, HttpHeadersImpl headers)
         this.acc = parent.acc;
         this.timeout = parent.timeout;
         this.version = parent.version;
+        this.authority = null;
     }
 
     @Override
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponseImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpResponseImpl.java
similarity index 77%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponseImpl.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/HttpResponseImpl.java
index 589eec2f533..ebda364a71b 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponseImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpResponseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.net.URI;
@@ -31,20 +31,24 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
-import javax.net.ssl.SSLParameters;
-import jdk.incubator.http.internal.websocket.RawChannel;
+import javax.net.ssl.SSLSession;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import jdk.internal.net.http.websocket.RawChannel;
 
 /**
  * The implementation class for HttpResponse
  */
-class HttpResponseImpl<T> extends HttpResponse<T> implements RawChannel.Provider {
+class HttpResponseImpl<T> implements HttpResponse<T>, RawChannel.Provider {
 
     final int responseCode;
     final Exchange<T> exchange;
     final HttpRequest initialRequest;
     final Optional<HttpResponse<T>> previousResponse;
     final HttpHeaders headers;
-    final SSLParameters sslParameters;
+    final Optional<SSLSession> sslSession;
     final URI uri;
     final HttpClient.Version version;
     RawChannel rawchan;
@@ -63,34 +67,21 @@ public HttpResponseImpl(HttpRequest initialRequest,
         this.previousResponse = Optional.ofNullable(previousResponse);
         this.headers = response.headers();
         //this.trailers = trailers;
-        this.sslParameters = exch.client().sslParameters();
+        this.sslSession = Optional.ofNullable(response.getSSLSession());
         this.uri = response.request().uri();
         this.version = response.version();
-        this.connection = exch.exchImpl.connection();
+        this.connection = connection(exch);
         this.stream = null;
         this.body = body;
     }
 
-//    // A response to a PUSH_PROMISE
-//    public HttpResponseImpl(Response response,
-//                            HttpRequestImpl pushRequest,
-//                            ImmutableHeaders headers,
-//                            Stream<T> stream,
-//                            SSLParameters sslParameters,
-//                            T body) {
-//        this.responseCode = response.statusCode();
-//        this.exchange = null;
-//        this.initialRequest = null; // ## fix this
-//        this.finalRequest = pushRequest;
-//        this.headers = headers;
-//        //this.trailers = null;
-//        this.sslParameters = sslParameters;
-//        this.uri = finalRequest.uri(); // TODO: take from headers
-//        this.version = HttpClient.Version.HTTP_2;
-//        this.connection = stream.connection();
-//        this.stream = stream;
-//        this.body = body;
-//    }
+    private HttpConnection connection(Exchange<?> exch) {
+        if (exch == null || exch.exchImpl == null) {
+            assert responseCode == 407;
+            return null; // case of Proxy 407
+        }
+        return exch.exchImpl.connection();
+    }
 
     private ExchangeImpl<?> exchangeImpl() {
         return exchange != null ? exchange.exchImpl : stream;
@@ -122,8 +113,8 @@ public T body() {
     }
 
     @Override
-    public SSLParameters sslParameters() {
-        return sslParameters;
+    public Optional<SSLSession> sslSession() {
+        return sslSession;
     }
 
     @Override
@@ -164,7 +155,7 @@ public synchronized RawChannel rawChannel() throws IOException {
             // Http1Exchange may have some remaining bytes in its
             // internal buffer.
             Supplier<ByteBuffer> initial = ((Http1Exchange<?>)exchImpl)::drainLeftOverBytes;
-            rawchan = new RawChannelImpl(exchange.client(), connection, initial);
+            rawchan = new RawChannelTube(connection, initial);
         }
         return rawchan;
     }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ImmutableHeaders.java b/src/java.net.http/share/classes/jdk/internal/net/http/ImmutableHeaders.java
similarity index 51%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ImmutableHeaders.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/ImmutableHeaders.java
index 0c23f8d4ab8..825963b296a 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ImmutableHeaders.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ImmutableHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,13 +23,18 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
+import java.util.function.BiPredicate;
 import java.util.function.Predicate;
+import java.net.http.HttpHeaders;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.Utils;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Collections.unmodifiableMap;
@@ -47,27 +52,63 @@ public static ImmutableHeaders of(Map<String, List<String>> src) {
         return of(src, x -> true);
     }
 
+    public static ImmutableHeaders of(HttpHeaders headers) {
+        return (headers instanceof ImmutableHeaders)
+                ? (ImmutableHeaders)headers
+                : of(headers.map());
+    }
+
+    static ImmutableHeaders validate(HttpHeaders headers) {
+        if (headers instanceof ImmutableHeaders) {
+            return of(headers);
+        }
+        if (headers instanceof HttpHeadersImpl) {
+            return of(headers);
+        }
+        Map<String, List<String>> map = headers.map();
+        return new ImmutableHeaders(map, Utils.VALIDATE_USER_HEADER);
+    }
+
     public static ImmutableHeaders of(Map<String, List<String>> src,
                                       Predicate<? super String> keyAllowed) {
         requireNonNull(src, "src");
         requireNonNull(keyAllowed, "keyAllowed");
-        return new ImmutableHeaders(src, keyAllowed);
+        return new ImmutableHeaders(src, headerAllowed(keyAllowed));
+    }
+
+    public static ImmutableHeaders of(Map<String, List<String>> src,
+                                      BiPredicate<? super String, ? super List<String>> headerAllowed) {
+        requireNonNull(src, "src");
+        requireNonNull(headerAllowed, "headerAllowed");
+        return new ImmutableHeaders(src, headerAllowed);
     }
 
     private ImmutableHeaders(Map<String, List<String>> src,
-                             Predicate<? super String> keyAllowed) {
+                             BiPredicate<? super String, ? super List<String>> headerAllowed) {
         Map<String, List<String>> m = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         src.entrySet().stream()
-                .filter(e -> keyAllowed.test(e.getKey()))
-                .forEach(e ->
-                        {
-                            List<String> values = new ArrayList<>(e.getValue());
-                            m.put(e.getKey(), unmodifiableList(values));
-                        }
-                );
+                .forEach(e -> addIfAllowed(e, headerAllowed, m));
         this.map = unmodifiableMap(m);
     }
 
+    private static void addIfAllowed(Map.Entry<String, List<String>> e,
+                                     BiPredicate<? super String, ? super List<String>> headerAllowed,
+                                     Map<String, List<String>> map) {
+        String key = e.getKey();
+        List<String> values = unmodifiableValues(e.getValue());
+        if (headerAllowed.test(key, values)) {
+            map.put(key, values);
+        }
+    }
+
+    private static List<String> unmodifiableValues(List<String> values) {
+        return unmodifiableList(new ArrayList<>(Objects.requireNonNull(values)));
+    }
+
+    private static BiPredicate<String, List<String>> headerAllowed(Predicate<? super String> keyAllowed) {
+        return (n,v) -> keyAllowed.test(n);
+    }
+
     @Override
     public Map<String, List<String>> map() {
         return map;
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/LineSubscriberAdapter.java b/src/java.net.http/share/classes/jdk/internal/net/http/LineSubscriberAdapter.java
new file mode 100644
index 00000000000..f0a78f3624d
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/LineSubscriberAdapter.java
@@ -0,0 +1,466 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http;
+
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
+import java.util.concurrent.Flow.Subscription;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import jdk.internal.net.http.common.Demand;
+import java.net.http.HttpResponse.BodySubscriber;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.SequentialScheduler;
+
+/** An adapter between {@code BodySubscriber} and {@code Flow.Subscriber<String>}. */
+public final class LineSubscriberAdapter<S extends Subscriber<? super String>,R>
+        implements BodySubscriber<R> {
+    private final CompletableFuture<R> cf = new MinimalFuture<>();
+    private final S subscriber;
+    private final Function<? super S, ? extends R> finisher;
+    private final Charset charset;
+    private final String eol;
+    private volatile LineSubscription downstream;
+
+    private LineSubscriberAdapter(S subscriber,
+                                  Function<? super S, ? extends R> finisher,
+                                  Charset charset,
+                                  String eol) {
+        if (eol != null && eol.isEmpty())
+            throw new IllegalArgumentException("empty line separator");
+        this.subscriber = Objects.requireNonNull(subscriber);
+        this.finisher = Objects.requireNonNull(finisher);
+        this.charset = Objects.requireNonNull(charset);
+        this.eol = eol;
+    }
+
+    @Override
+    public void onSubscribe(Subscription subscription) {
+        downstream = LineSubscription.create(subscription,
+                                             charset,
+                                             eol,
+                                             subscriber,
+                                             cf);
+        subscriber.onSubscribe(downstream);
+    }
+
+    @Override
+    public void onNext(List<ByteBuffer> item) {
+        try {
+            downstream.submit(item);
+        } catch (Throwable t) {
+            onError(t);
+        }
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+        try {
+            downstream.signalError(throwable);
+        } finally {
+            cf.completeExceptionally(throwable);
+        }
+    }
+
+    @Override
+    public void onComplete() {
+        try {
+            downstream.signalComplete();
+        } finally {
+            cf.complete(finisher.apply(subscriber));
+        }
+    }
+
+    @Override
+    public CompletionStage<R> getBody() {
+        return cf;
+    }
+
+    public static <S extends Subscriber<? super String>, R> LineSubscriberAdapter<S, R>
+    create(S subscriber, Function<? super S, ? extends R> finisher, Charset charset, String eol)
+    {
+        if (eol != null && eol.isEmpty())
+            throw new IllegalArgumentException("empty line separator");
+        return new LineSubscriberAdapter<>(Objects.requireNonNull(subscriber),
+                Objects.requireNonNull(finisher),
+                Objects.requireNonNull(charset),
+                eol);
+    }
+
+    static final class LineSubscription implements Flow.Subscription {
+        final Flow.Subscription upstreamSubscription;
+        final CharsetDecoder decoder;
+        final String newline;
+        final Demand downstreamDemand;
+        final ConcurrentLinkedDeque<ByteBuffer> queue;
+        final SequentialScheduler scheduler;
+        final Flow.Subscriber<? super String> upstream;
+        final CompletableFuture<?> cf;
+        private final AtomicReference<Throwable> errorRef = new AtomicReference<>();
+        private final AtomicLong demanded = new AtomicLong();
+        private volatile boolean completed;
+        private volatile boolean cancelled;
+
+        private final char[] chars = new char[1024];
+        private final ByteBuffer leftover = ByteBuffer.wrap(new byte[64]);
+        private final CharBuffer buffer = CharBuffer.wrap(chars);
+        private final StringBuilder builder = new StringBuilder();
+        private String nextLine;
+
+        private LineSubscription(Flow.Subscription s,
+                                 CharsetDecoder dec,
+                                 String separator,
+                                 Flow.Subscriber<? super String> subscriber,
+                                 CompletableFuture<?> completion) {
+            downstreamDemand = new Demand();
+            queue = new ConcurrentLinkedDeque<>();
+            upstreamSubscription = Objects.requireNonNull(s);
+            decoder = Objects.requireNonNull(dec);
+            newline = separator;
+            upstream = Objects.requireNonNull(subscriber);
+            cf = Objects.requireNonNull(completion);
+            scheduler = SequentialScheduler.synchronizedScheduler(this::loop);
+        }
+
+        @Override
+        public void request(long n) {
+            if (cancelled) return;
+            if (downstreamDemand.increase(n)) {
+                scheduler.runOrSchedule();
+            }
+        }
+
+        @Override
+        public void cancel() {
+            cancelled = true;
+            upstreamSubscription.cancel();
+        }
+
+        public void submit(List<ByteBuffer> list) {
+            queue.addAll(list);
+            demanded.decrementAndGet();
+            scheduler.runOrSchedule();
+        }
+
+        public void signalComplete() {
+            completed = true;
+            scheduler.runOrSchedule();
+        }
+
+        public void signalError(Throwable error) {
+            if (errorRef.compareAndSet(null,
+                    Objects.requireNonNull(error))) {
+                scheduler.runOrSchedule();
+            }
+        }
+
+        // This method looks at whether some bytes where left over (in leftover)
+        // from decoding the previous buffer when the previous buffer was in
+        // underflow. If so, it takes bytes one by one from the new buffer 'in'
+        // and combines them with the leftover bytes until 'in' is exhausted or a
+        // character was produced in 'out', resolving the previous underflow.
+        // Returns true if the buffer is still in underflow, false otherwise.
+        // However, in both situation some chars might have been produced in 'out'.
+        private boolean isUnderFlow(ByteBuffer in, CharBuffer out, boolean endOfInput)
+                throws CharacterCodingException {
+            int limit = leftover.position();
+            if (limit == 0) {
+                // no leftover
+                return false;
+            } else {
+                CoderResult res = null;
+                while (in.hasRemaining()) {
+                    leftover.position(limit);
+                    leftover.limit(++limit);
+                    leftover.put(in.get());
+                    leftover.position(0);
+                    res = decoder.decode(leftover, out,
+                            endOfInput && !in.hasRemaining());
+                    int remaining = leftover.remaining();
+                    if (remaining > 0) {
+                        assert leftover.position() == 0;
+                        leftover.position(remaining);
+                    } else {
+                        leftover.position(0);
+                    }
+                    leftover.limit(leftover.capacity());
+                    if (res.isUnderflow() && remaining > 0 && in.hasRemaining()) {
+                        continue;
+                    }
+                    if (res.isError()) {
+                        res.throwException();
+                    }
+                    assert !res.isOverflow();
+                    return false;
+                }
+                return !endOfInput;
+            }
+        }
+
+        // extract characters from start to end and remove them from
+        // the StringBuilder
+        private static String take(StringBuilder b, int start, int end) {
+            assert start == 0;
+            String line;
+            if (end == start) return "";
+            line = b.substring(start, end);
+            b.delete(start, end);
+            return line;
+        }
+
+        // finds end of line, returns -1 if not found, or the position after
+        // the line delimiter if found, removing the delimiter in the process.
+        private static int endOfLine(StringBuilder b, String eol, boolean endOfInput) {
+            int len = b.length();
+            if (eol != null) { // delimiter explicitly specified
+                int i = b.indexOf(eol);
+                if (i >= 0) {
+                    // remove the delimiter and returns the position
+                    // of the char after it.
+                    b.delete(i, i + eol.length());
+                    return i;
+                }
+            } else { // no delimiter specified, behaves as BufferedReader::readLine
+                boolean crfound = false;
+                for (int i = 0; i < len; i++) {
+                    char c = b.charAt(i);
+                    if (c == '\n') {
+                        // '\n' or '\r\n' found.
+                        // remove the delimiter and returns the position
+                        // of the char after it.
+                        b.delete(crfound ? i - 1 : i, i + 1);
+                        return crfound ? i - 1 : i;
+                    } else if (crfound) {
+                        // previous char was '\r', c != '\n'
+                        assert i != 0;
+                        // remove the delimiter and returns the position
+                        // of the char after it.
+                        b.delete(i - 1, i);
+                        return i - 1;
+                    }
+                    crfound = c == '\r';
+                }
+                if (crfound && endOfInput) {
+                    // remove the delimiter and returns the position
+                    // of the char after it.
+                    b.delete(len - 1, len);
+                    return len - 1;
+                }
+            }
+            return endOfInput && len > 0 ? len : -1;
+        }
+
+        // Looks at whether the StringBuilder contains a line.
+        // Returns null if more character are needed.
+        private static String nextLine(StringBuilder b, String eol, boolean endOfInput) {
+            int next = endOfLine(b, eol, endOfInput);
+            return (next > -1) ? take(b, 0, next) : null;
+        }
+
+        // Attempts to read the next line. Returns the next line if
+        // the delimiter was found, null otherwise. The delimiters are
+        // consumed.
+        private String nextLine()
+                throws CharacterCodingException {
+            assert nextLine == null;
+            LINES:
+            while (nextLine == null) {
+                boolean endOfInput = completed && queue.isEmpty();
+                nextLine = nextLine(builder, newline,
+                        endOfInput && leftover.position() == 0);
+                if (nextLine != null) return nextLine;
+                ByteBuffer b;
+                BUFFERS:
+                while ((b = queue.peek()) != null) {
+                    if (!b.hasRemaining()) {
+                        queue.poll();
+                        continue BUFFERS;
+                    }
+                    BYTES:
+                    while (b.hasRemaining()) {
+                        buffer.position(0);
+                        buffer.limit(buffer.capacity());
+                        boolean endofInput = completed && queue.size() <= 1;
+                        if (isUnderFlow(b, buffer, endofInput)) {
+                            assert !b.hasRemaining();
+                            if (buffer.position() > 0) {
+                                buffer.flip();
+                                builder.append(buffer);
+                            }
+                            continue BUFFERS;
+                        }
+                        CoderResult res = decoder.decode(b, buffer, endofInput);
+                        if (res.isError()) res.throwException();
+                        if (buffer.position() > 0) {
+                            buffer.flip();
+                            builder.append(buffer);
+                            continue LINES;
+                        }
+                        if (res.isUnderflow() && b.hasRemaining()) {
+                            //System.out.println("underflow: adding " + b.remaining() + " bytes");
+                            leftover.put(b);
+                            assert !b.hasRemaining();
+                            continue BUFFERS;
+                        }
+                    }
+                }
+
+                assert queue.isEmpty();
+                if (endOfInput) {
+                    // Time to cleanup: there may be some undecoded leftover bytes
+                    // We need to flush them out.
+                    // The decoder has been configured to replace malformed/unmappable
+                    // chars with some replacement, in order to behave like
+                    // InputStreamReader.
+                    leftover.flip();
+                    buffer.position(0);
+                    buffer.limit(buffer.capacity());
+
+                    // decode() must be called just before flush, even if there
+                    // is nothing to decode. We must do this even if leftover
+                    // has no remaining bytes.
+                    CoderResult res = decoder.decode(leftover, buffer, endOfInput);
+                    if (buffer.position() > 0) {
+                        buffer.flip();
+                        builder.append(buffer);
+                    }
+                    if (res.isError()) res.throwException();
+
+                    // Now call decoder.flush()
+                    buffer.position(0);
+                    buffer.limit(buffer.capacity());
+                    res = decoder.flush(buffer);
+                    if (buffer.position() > 0) {
+                        buffer.flip();
+                        builder.append(buffer);
+                    }
+                    if (res.isError()) res.throwException();
+
+                    // It's possible that we reach here twice - just for the
+                    // purpose of checking that no bytes were left over, so
+                    // we reset leftover/decoder to make the function reentrant.
+                    leftover.position(0);
+                    leftover.limit(leftover.capacity());
+                    decoder.reset();
+
+                    // if some chars were produced then this call will
+                    // return them.
+                    return nextLine = nextLine(builder, newline, endOfInput);
+                }
+                return null;
+            }
+            return null;
+        }
+
+        // The main sequential scheduler loop.
+        private void loop() {
+            try {
+                while (!cancelled) {
+                    Throwable error = errorRef.get();
+                    if (error != null) {
+                        cancelled = true;
+                        scheduler.stop();
+                        upstream.onError(error);
+                        cf.completeExceptionally(error);
+                        return;
+                    }
+                    if (nextLine == null) nextLine = nextLine();
+                    if (nextLine == null) {
+                        if (completed) {
+                            scheduler.stop();
+                            if (leftover.position() != 0) {
+                                // Underflow: not all bytes could be
+                                // decoded, but no more bytes will be coming.
+                                // This should not happen as we should already
+                                // have got a MalformedInputException, or
+                                // replaced the unmappable chars.
+                                errorRef.compareAndSet(null,
+                                        new IllegalStateException(
+                                                "premature end of input ("
+                                                        + leftover.position()
+                                                        + " undecoded bytes)"));
+                                continue;
+                            } else {
+                                upstream.onComplete();
+                            }
+                            return;
+                        } else if (demanded.get() == 0
+                                && !downstreamDemand.isFulfilled()) {
+                            long incr = Math.max(1, downstreamDemand.get());
+                            demanded.addAndGet(incr);
+                            upstreamSubscription.request(incr);
+                            continue;
+                        } else return;
+                    }
+                    assert nextLine != null;
+                    assert newline != null && !nextLine.endsWith(newline)
+                            || !nextLine.endsWith("\n") || !nextLine.endsWith("\r");
+                    if (downstreamDemand.tryDecrement()) {
+                        String forward = nextLine;
+                        nextLine = null;
+                        upstream.onNext(forward);
+                    } else return; // no demand: come back later
+                }
+            } catch (Throwable t) {
+                try {
+                    upstreamSubscription.cancel();
+                } finally {
+                    signalError(t);
+                }
+            }
+        }
+
+        static LineSubscription create(Flow.Subscription s,
+                                       Charset charset,
+                                       String lineSeparator,
+                                       Flow.Subscriber<? super String> upstream,
+                                       CompletableFuture<?> cf) {
+            return new LineSubscription(Objects.requireNonNull(s),
+                    Objects.requireNonNull(charset).newDecoder()
+                            // use the same decoder configuration than
+                            // java.io.InputStreamReader
+                            .onMalformedInput(CodingErrorAction.REPLACE)
+                            .onUnmappableCharacter(CodingErrorAction.REPLACE),
+                    lineSeparator,
+                    Objects.requireNonNull(upstream),
+                    Objects.requireNonNull(cf));
+        }
+    }
+}
+
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiExchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
similarity index 69%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiExchange.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
index 4c5da8ccf4a..e822886f5e9 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiExchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,12 +23,13 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.System.Logger.Level;
 import java.time.Duration;
-import java.util.List;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.security.AccessControlContext;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -36,13 +37,19 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
-import jdk.incubator.http.HttpResponse.UntrustedBodyHandler;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.ConnectionExpiredException;
-import jdk.incubator.http.internal.common.Utils;
-import static jdk.incubator.http.internal.common.MinimalFuture.completedFuture;
-import static jdk.incubator.http.internal.common.MinimalFuture.failedFuture;
+
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.net.http.HttpTimeoutException;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.ConnectionExpiredException;
+import jdk.internal.net.http.common.Utils;
+import static jdk.internal.net.http.common.MinimalFuture.completedFuture;
+import static jdk.internal.net.http.common.MinimalFuture.failedFuture;
 
 /**
  * Encapsulates multiple Exchanges belonging to one HttpRequestImpl.
@@ -52,11 +59,10 @@
  *
  * Creates a new Exchange for each request/response interaction
  */
-class MultiExchange<U,T> {
+class MultiExchange<T> {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    static final System.Logger DEBUG_LOGGER =
-            Utils.getDebugLogger("MultiExchange"::toString, DEBUG);
+    static final Logger debug =
+            Utils.getDebugLogger("MultiExchange"::toString, Utils.DEBUG);
 
     private final HttpRequest userRequest; // the user request
     private final HttpRequestImpl request; // a copy of the user request
@@ -64,9 +70,9 @@ class MultiExchange<U,T> {
     final HttpClientImpl client;
     final HttpResponse.BodyHandler<T> responseHandler;
     final Executor executor;
-    final HttpResponse.MultiSubscriber<U,T> multiResponseSubscriber;
     final AtomicInteger attempts = new AtomicInteger();
-    HttpRequestImpl currentreq; // used for async only
+    HttpRequestImpl currentreq; // used for retries & redirect
+    HttpRequestImpl previousreq; // used for retries & redirect
     Exchange<T> exchange; // the current exchange
     Exchange<T> previous;
     volatile Throwable retryCause;
@@ -81,10 +87,10 @@ class MultiExchange<U,T> {
             "jdk.httpclient.redirects.retrylimit", DEFAULT_MAX_ATTEMPTS
     );
 
-    private final List<HeaderFilter> filters;
+    private final LinkedList<HeaderFilter> filters;
     TimedEvent timedEvent;
     volatile boolean cancelled;
-    final PushGroup<U,T> pushGroup;
+    final PushGroup<T> pushGroup;
 
     /**
      * Filter fields. These are attached as required by filters
@@ -103,52 +109,31 @@ class MultiExchange<U,T> {
                   HttpRequestImpl requestImpl,
                   HttpClientImpl client,
                   HttpResponse.BodyHandler<T> responseHandler,
+                  PushPromiseHandler<T> pushPromiseHandler,
                   AccessControlContext acc) {
         this.previous = null;
         this.userRequest = userRequest;
         this.request = requestImpl;
         this.currentreq = request;
+        this.previousreq = null;
         this.client = client;
         this.filters = client.filterChain();
         this.acc = acc;
         this.executor = client.theExecutor();
         this.responseHandler = responseHandler;
-        if (acc != null) {
-            // Restricts the file publisher with the senders ACC, if any
-            if (responseHandler instanceof UntrustedBodyHandler)
-                ((UntrustedBodyHandler)this.responseHandler).setAccessControlContext(acc);
+
+        if (pushPromiseHandler != null) {
+            Executor executor = acc == null
+                    ? this.executor
+                    : new PrivilegedExecutor(this.executor, acc);
+            this.pushGroup = new PushGroup<>(pushPromiseHandler, request, executor);
+        } else {
+            pushGroup = null;
         }
-        this.exchange = new Exchange<>(request, this);
-        this.multiResponseSubscriber = null;
-        this.pushGroup = null;
-    }
 
-    /**
-     * MultiExchange with multiple responses (HTTP/2 server pushes).
-     */
-    MultiExchange(HttpRequest userRequest,
-                  HttpRequestImpl requestImpl,
-                  HttpClientImpl client,
-                  HttpResponse.MultiSubscriber<U, T> multiResponseSubscriber,
-                  AccessControlContext acc) {
-        this.previous = null;
-        this.userRequest = userRequest;
-        this.request = requestImpl;
-        this.currentreq = request;
-        this.client = client;
-        this.filters = client.filterChain();
-        this.acc = acc;
-        this.executor = client.theExecutor();
-        this.multiResponseSubscriber = multiResponseSubscriber;
-        this.pushGroup = new PushGroup<>(multiResponseSubscriber, request, acc);
         this.exchange = new Exchange<>(request, this);
-        this.responseHandler = pushGroup.mainResponseHandler();
     }
 
-//    CompletableFuture<Void> multiCompletionCF() {
-//        return pushGroup.groupResult();
-//    }
-
     private synchronized Exchange<T> getExchange() {
         return exchange;
     }
@@ -157,12 +142,11 @@ HttpClientImpl client() {
         return client;
     }
 
-//    HttpClient.Redirect followRedirects() {
-//        return client.followRedirects();
-//    }
-
     HttpClient.Version version() {
-        return request.version().orElse(client.version());
+        HttpClient.Version vers = request.version().orElse(client.version());
+        if (vers == HttpClient.Version.HTTP_2 && !request.secure() && request.proxy() != null)
+            vers = HttpClient.Version.HTTP_1_1;
+        return vers;
     }
 
     private synchronized void setExchange(Exchange<T> exchange) {
@@ -190,7 +174,9 @@ private void requestFilters(HttpRequestImpl r) throws IOException {
     private HttpRequestImpl responseFilters(Response response) throws IOException
     {
         Log.logTrace("Applying response filters");
-        for (HeaderFilter filter : filters) {
+        Iterator<HeaderFilter> reverseItr = filters.descendingIterator();
+        while (reverseItr.hasNext()) {
+            HeaderFilter filter = reverseItr.next();
             Log.logTrace("Applying {0}", filter);
             HttpRequestImpl newreq = filter.response(response);
             if (newreq != null) {
@@ -202,11 +188,6 @@ private HttpRequestImpl responseFilters(Response response) throws IOException
         return null;
     }
 
-//    public void cancel() {
-//        cancelled = true;
-//        getExchange().cancel();
-//    }
-
     public void cancel(IOException cause) {
         cancelled = true;
         getExchange().cancel(cause);
@@ -227,27 +208,12 @@ public CompletableFuture<HttpResponse<T>> responseAsync() {
                         return exch.readBodyAsync(responseHandler)
                             .thenApply((T body) -> {
                                 this.response =
-                                    new HttpResponseImpl<>(userRequest, r, this.response, body, exch);
+                                    new HttpResponseImpl<>(r.request(), r, this.response, body, exch);
                                 return this.response;
                             });
                     });
     }
 
-    CompletableFuture<U> multiResponseAsync() {
-        CompletableFuture<Void> start = new MinimalFuture<>();
-        CompletableFuture<HttpResponse<T>> cf = responseAsync0(start);
-        CompletableFuture<HttpResponse<T>> mainResponse =
-                cf.thenApply(b -> {
-                        multiResponseSubscriber.onResponse(b);
-                        pushGroup.noMorePushes(true);
-                        return b; });
-        pushGroup.setMainResponse(mainResponse);
-        CompletableFuture<U> res = multiResponseSubscriber.completion(pushGroup.groupResult(),
-                                                                      pushGroup.pushesCF());
-        start.completeAsync( () -> null, executor); // trigger execution
-        return res;
-    }
-
     private CompletableFuture<Response> responseAsyncImpl() {
         CompletableFuture<Response> cf;
         if (attempts.incrementAndGet() > max_attempts) {
@@ -259,7 +225,13 @@ private CompletableFuture<Response> responseAsyncImpl() {
             }
             try {
                 // 1. apply request filters
-                requestFilters(currentreq);
+                // if currentreq == previousreq the filters have already
+                // been applied once. Applying them a second time might
+                // cause some headers values to be added twice: for
+                // instance, the same cookie might be added again.
+                if (currentreq != previousreq) {
+                    requestFilters(currentreq);
+                }
             } catch (IOException e) {
                 return failedFuture(e);
             }
@@ -285,6 +257,7 @@ private CompletableFuture<Response> responseAsyncImpl() {
                                 new HttpResponseImpl<>(currentreq, response, this.response, null, exch);
                             Exchange<T> oldExch = exch;
                             return exch.ignoreBody().handle((r,t) -> {
+                                previousreq = currentreq;
                                 currentreq = newrequest;
                                 expiredOnce = false;
                                 setExchange(new Exchange<>(currentreq, this, acc));
@@ -310,6 +283,37 @@ private CompletableFuture<Response> responseAsyncImpl() {
         return cf;
     }
 
+    private static boolean retryPostValue() {
+        String s = Utils.getNetProperty("jdk.httpclient.enableAllMethodRetry");
+        if (s == "" || "true".equals(s))
+            return true;
+        return false;
+    }
+
+    /** True if ALL ( even non-idempotent ) requests can be automatic retried. */
+    private static final boolean RETRY_ALWAYS = retryPostValue();
+
+    /** Returns true is given request has an idempotent method. */
+    private static boolean isIdempotentRequest(HttpRequest request) {
+        String method = request.method();
+        switch (method) {
+            case "GET" :
+            case "HEAD" :
+                return true;
+            default :
+                return false;
+        }
+    }
+
+    /** Returns true if the given request can be automatically retried. */
+    private static boolean canRetryRequest(HttpRequest request) {
+        if (isIdempotentRequest(request))
+            return true;
+        if (RETRY_ALWAYS)
+            return true;
+        return false;
+    }
+
     /**
      * Takes a Throwable and returns a suitable CompletableFuture that is
      * completed exceptionally, or null.
@@ -323,19 +327,31 @@ private CompletableFuture<Response> getExceptionalCF(Throwable t) {
         if (cancelled && t instanceof IOException) {
             t = new HttpTimeoutException("request timed out");
         } else if (t instanceof ConnectionExpiredException) {
+            Throwable cause = t;
+            if (t.getCause() != null) {
+                cause = t.getCause(); // unwrap the ConnectionExpiredException
+            }
+
+            if (!canRetryRequest(currentreq)) {
+                return failedFuture(cause); // fails with original cause
+            }
+
             // allow the retry mechanism to do its work
-            // ####: method (GET,HEAD, not POST?), no bytes written or read ( differentiate? )
-            if (t.getCause() != null) retryCause = t.getCause();
+            retryCause = cause;
             if (!expiredOnce) {
-                DEBUG_LOGGER.log(Level.DEBUG,
-                    "MultiExchange: ConnectionExpiredException (async): retrying...",
-                    t);
+                if (debug.on())
+                    debug.log("ConnectionExpiredException (async): retrying...", t);
                 expiredOnce = true;
+                // The connection was abruptly closed.
+                // We return null to retry the same request a second time.
+                // The request filters have already been applied to the
+                // currentreq, so we set previousreq = currentreq to
+                // prevent them from being applied again.
+                previousreq = currentreq;
                 return null;
             } else {
-                DEBUG_LOGGER.log(Level.DEBUG,
-                    "MultiExchange: ConnectionExpiredException (async): already retried once.",
-                    t);
+                if (debug.on())
+                    debug.log("ConnectionExpiredException (async): already retried once.", t);
                 if (t.getCause() != null) t = t.getCause();
             }
         }
@@ -348,9 +364,9 @@ class TimedEvent extends TimeoutEvent {
         }
         @Override
         public void handle() {
-            DEBUG_LOGGER.log(Level.DEBUG,
-                    "Cancelling MultiExchange due to timeout for request %s",
-                     request);
+            if (debug.on())
+                debug.log("Cancelling MultiExchange due to timeout for request %s",
+                          request);
             cancel(new HttpTimeoutException("request timed out"));
         }
     }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/PlainHttpConnection.java
similarity index 59%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/PlainHttpConnection.java
index 528b8dea035..4d01c103eb1 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/PlainHttpConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.System.Logger.Level;
@@ -37,10 +37,10 @@
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.concurrent.CompletableFuture;
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.Utils;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * Plain raw TCP connection direct to destination.
@@ -51,7 +51,7 @@ class PlainHttpConnection extends HttpConnection {
 
     private final Object reading = new Object();
     protected final SocketChannel chan;
-    private final FlowTube tube;
+    private final SocketTube tube; // need SocketTube to call signalClosed().
     private final PlainHttpPublisher writePublisher = new PlainHttpPublisher(reading);
     private volatile boolean connected;
     private boolean closed;
@@ -80,11 +80,13 @@ public void handle() {
             try {
                 assert !connected : "Already connected";
                 assert !chan.isBlocking() : "Unexpected blocking channel";
-                debug.log(Level.DEBUG, "ConnectEvent: finishing connect");
+                if (debug.on())
+                    debug.log("ConnectEvent: finishing connect");
                 boolean finished = chan.finishConnect();
                 assert finished : "Expected channel to be connected";
-                debug.log(Level.DEBUG,
-                          "ConnectEvent: connect finished: %s Local addr: %s", finished, chan.getLocalAddress());
+                if (debug.on())
+                    debug.log("ConnectEvent: connect finished: %s Local addr: %s",
+                              finished, chan.getLocalAddress());
                 connected = true;
                 // complete async since the event runs on the SelectorManager thread
                 cf.completeAsync(() -> null, client().theExecutor());
@@ -107,18 +109,19 @@ public CompletableFuture<Void> connectAsync() {
             assert !connected : "Already connected";
             assert !chan.isBlocking() : "Unexpected blocking channel";
             boolean finished = false;
-            PrivilegedExceptionAction<Boolean> pa = () -> chan.connect(address);
+            PrivilegedExceptionAction<Boolean> pa =
+                    () -> chan.connect(Utils.resolveAddress(address));
             try {
                  finished = AccessController.doPrivileged(pa);
             } catch (PrivilegedActionException e) {
                 cf.completeExceptionally(e.getCause());
             }
             if (finished) {
-                debug.log(Level.DEBUG, "connect finished without blocking");
+                if (debug.on()) debug.log("connect finished without blocking");
                 connected = true;
                 cf.complete(null);
             } else {
-                debug.log(Level.DEBUG, "registering connect event");
+                if (debug.on()) debug.log("registering connect event");
                 client().registerEvent(new ConnectEvent(cf));
             }
         } catch (Throwable throwable) {
@@ -157,11 +160,14 @@ final FlowTube getConnectionFlow() {
     private boolean trySetReceiveBufferSize(int bufsize) {
         try {
             chan.setOption(StandardSocketOptions.SO_RCVBUF, bufsize);
+            if (debug.on())
+                debug.log("Receive buffer size is %s",
+                          chan.getOption(StandardSocketOptions.SO_RCVBUF));
             return true;
         } catch(IOException x) {
-            debug.log(Level.DEBUG,
-                    "Failed to set receive buffer size to %d on %s",
-                    bufsize, chan);
+            if (debug.on())
+                debug.log("Failed to set receive buffer size to %d on %s",
+                          bufsize, chan);
         }
         return false;
     }
@@ -179,28 +185,24 @@ public String toString() {
      * Closes this connection
      */
     @Override
-    public synchronized void close() {
-        if (closed) {
-            return;
+    public void close() {
+        synchronized (this) {
+            if (closed) {
+                return;
+            }
+            closed = true;
         }
-        closed = true;
         try {
             Log.logTrace("Closing: " + toString());
+            if (debug.on())
+                debug.log("Closing channel: " + client().debugInterestOps(chan));
             chan.close();
-        } catch (IOException e) {}
-    }
-
-    @Override
-    void shutdownInput() throws IOException {
-        debug.log(Level.DEBUG, "Shutting down input");
-        chan.shutdownInput();
+            tube.signalClosed();
+        } catch (IOException e) {
+            Log.logTrace("Closing resulted in " + e);
+        }
     }
 
-    @Override
-    void shutdownOutput() throws IOException {
-        debug.log(Level.DEBUG, "Shutting down output");
-        chan.shutdownOutput();
-    }
 
     @Override
     ConnectionPool.CacheKey cacheKey() {
@@ -223,91 +225,4 @@ boolean isProxied() {
         return false;
     }
 
-    // Support for WebSocket/RawChannelImpl which unfortunately
-    // still depends on synchronous read/writes.
-    // It should be removed when RawChannelImpl moves to using asynchronous APIs.
-    private static final class PlainDetachedChannel
-            extends DetachedConnectionChannel {
-        final PlainHttpConnection plainConnection;
-        boolean closed;
-        PlainDetachedChannel(PlainHttpConnection conn) {
-            // We're handing the connection channel over to a web socket.
-            // We need the selector manager's thread to stay alive until
-            // the WebSocket is closed.
-            conn.client().webSocketOpen();
-            this.plainConnection = conn;
-        }
-
-        @Override
-        SocketChannel channel() {
-            return plainConnection.channel();
-        }
-
-        @Override
-        ByteBuffer read() throws IOException {
-            ByteBuffer dst = ByteBuffer.allocate(8192);
-            int n = readImpl(dst);
-            if (n > 0) {
-                return dst;
-            } else if (n == 0) {
-                return Utils.EMPTY_BYTEBUFFER;
-            } else {
-                return null;
-            }
-        }
-
-        @Override
-        public void close() {
-            HttpClientImpl client = plainConnection.client();
-            try {
-                plainConnection.close();
-            } finally {
-                // notify the HttpClientImpl that the websocket is no
-                // no longer operating.
-                synchronized(this) {
-                    if (closed == true) return;
-                    closed = true;
-                }
-                client.webSocketClose();
-            }
-        }
-
-        @Override
-        public long write(ByteBuffer[] buffers, int start, int number)
-                throws IOException
-        {
-            return channel().write(buffers, start, number);
-        }
-
-        @Override
-        public void shutdownInput() throws IOException {
-            plainConnection.shutdownInput();
-        }
-
-        @Override
-        public void shutdownOutput() throws IOException {
-            plainConnection.shutdownOutput();
-        }
-
-        private int readImpl(ByteBuffer buf) throws IOException {
-            int mark = buf.position();
-            int n;
-            n = channel().read(buf);
-            if (n == -1) {
-                return -1;
-            }
-            Utils.flipToMark(buf, mark);
-            return n;
-        }
-    }
-
-    // Support for WebSocket/RawChannelImpl which unfortunately
-    // still depends on synchronous read/writes.
-    // It should be removed when RawChannelImpl moves to using asynchronous APIs.
-    @Override
-    DetachedConnectionChannel detachChannel() {
-        client().cancelRegistration(channel());
-        return new PlainDetachedChannel(this);
-    }
-
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainProxyConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/PlainProxyConnection.java
similarity index 90%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainProxyConnection.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/PlainProxyConnection.java
index 97ed4d05165..3864a7ee08b 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainProxyConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/PlainProxyConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.net.InetSocketAddress;
 
@@ -37,4 +37,7 @@ class PlainProxyConnection extends PlainHttpConnection {
     ConnectionPool.CacheKey cacheKey() {
         return new ConnectionPool.CacheKey(null, address);
     }
+
+    @Override
+    public boolean isProxied() { return true; }
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java b/src/java.net.http/share/classes/jdk/internal/net/http/PlainTunnelingConnection.java
similarity index 68%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/PlainTunnelingConnection.java
index 98eea0c9818..54ff88678c7 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/PlainTunnelingConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.System.Logger.Level;
@@ -31,9 +31,11 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 import java.util.concurrent.CompletableFuture;
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
+import java.util.function.Function;
+import java.net.http.HttpHeaders;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.MinimalFuture;
+import static java.net.http.HttpResponse.BodyHandlers.discarding;
 
 /**
  * A plain text socket tunnel through a proxy. Uses "CONNECT" but does not
@@ -43,35 +45,50 @@
 final class PlainTunnelingConnection extends HttpConnection {
 
     final PlainHttpConnection delegate;
-    protected final InetSocketAddress proxyAddr;
+    final HttpHeaders proxyHeaders;
+    final InetSocketAddress proxyAddr;
     private volatile boolean connected;
 
     protected PlainTunnelingConnection(InetSocketAddress addr,
                                        InetSocketAddress proxy,
-                                       HttpClientImpl client) {
+                                       HttpClientImpl client,
+                                       HttpHeaders proxyHeaders) {
         super(addr, client);
         this.proxyAddr = proxy;
+        this.proxyHeaders = proxyHeaders;
         delegate = new PlainHttpConnection(proxy, client);
     }
 
     @Override
     public CompletableFuture<Void> connectAsync() {
-        debug.log(Level.DEBUG, "Connecting plain connection");
+        if (debug.on()) debug.log("Connecting plain connection");
         return delegate.connectAsync()
             .thenCompose((Void v) -> {
-                debug.log(Level.DEBUG, "sending HTTP/1.1 CONNECT");
+                if (debug.on()) debug.log("sending HTTP/1.1 CONNECT");
                 HttpClientImpl client = client();
                 assert client != null;
-                HttpRequestImpl req = new HttpRequestImpl("CONNECT", address);
-                MultiExchange<Void,Void> mulEx = new MultiExchange<>(null, req, client, discard(null), null);
+                HttpRequestImpl req = new HttpRequestImpl("CONNECT", address, proxyHeaders);
+                MultiExchange<Void> mulEx = new MultiExchange<>(null, req,
+                        client, discarding(), null, null);
                 Exchange<Void> connectExchange = new Exchange<>(req, mulEx);
 
                 return connectExchange
                         .responseAsyncImpl(delegate)
                         .thenCompose((Response resp) -> {
                             CompletableFuture<Void> cf = new MinimalFuture<>();
-                            debug.log(Level.DEBUG, "got response: %d", resp.statusCode());
-                            if (resp.statusCode() != 200) {
+                            if (debug.on()) debug.log("got response: %d", resp.statusCode());
+                            if (resp.statusCode() == 407) {
+                                return connectExchange.ignoreBody().handle((r,t) -> {
+                                    // close delegate after reading body: we won't
+                                    // be reusing that connection anyway.
+                                    delegate.close();
+                                    ProxyAuthenticationRequired authenticationRequired =
+                                            new ProxyAuthenticationRequired(resp);
+                                    cf.completeExceptionally(authenticationRequired);
+                                    return cf;
+                                }).thenCompose(Function.identity());
+                            } else if (resp.statusCode() != 200) {
+                                delegate.close();
                                 cf.completeExceptionally(new IOException(
                                         "Tunnel failed, got: "+ resp.statusCode()));
                             } else {
@@ -87,6 +104,9 @@ public CompletableFuture<Void> connectAsync() {
             });
     }
 
+    @Override
+    boolean isTunnel() { return true; }
+
     @Override
     HttpPublisher publisher() { return delegate.publisher(); }
 
@@ -116,16 +136,6 @@ public void close() {
         connected = false;
     }
 
-    @Override
-    void shutdownInput() throws IOException {
-        delegate.shutdownInput();
-    }
-
-    @Override
-    void shutdownOutput() throws IOException {
-        delegate.shutdownOutput();
-    }
-
     @Override
     boolean isSecure() {
         return false;
@@ -136,11 +146,4 @@ boolean isProxied() {
         return true;
     }
 
-    // Support for WebSocket/RawChannelImpl which unfortunately
-    // still depends on synchronous read/writes.
-    // It should be removed when RawChannelImpl moves to using asynchronous APIs.
-    @Override
-    DetachedConnectionChannel detachChannel() {
-        return delegate.detachChannel();
-    }
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PrivilegedExecutor.java b/src/java.net.http/share/classes/jdk/internal/net/http/PrivilegedExecutor.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PrivilegedExecutor.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/PrivilegedExecutor.java
index da91dc0ae09..ade3af8d793 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PrivilegedExecutor.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/PrivilegedExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.security.AccessControlContext;
 import java.security.AccessController;
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/ProxyAuthenticationRequired.java b/src/java.net.http/share/classes/jdk/internal/net/http/ProxyAuthenticationRequired.java
new file mode 100644
index 00000000000..72f5cc8635f
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ProxyAuthenticationRequired.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http;
+
+import java.io.IOException;
+
+/**
+ * Signals that a proxy has refused a CONNECT request with a
+ * 407 error code.
+ */
+final class ProxyAuthenticationRequired extends IOException {
+    private static final long serialVersionUID = 0;
+    final transient Response proxyResponse;
+
+    /**
+     * Constructs a {@code ProxyAuthenticationRequired} with the specified detail
+     * message and cause.
+     *
+     * @param   proxyResponse the response from the proxy
+     */
+    public ProxyAuthenticationRequired(Response proxyResponse) {
+        super("Proxy Authentication Required");
+        assert proxyResponse.statusCode() == 407;
+        this.proxyResponse = proxyResponse;
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PullPublisher.java b/src/java.net.http/share/classes/jdk/internal/net/http/PullPublisher.java
similarity index 95%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PullPublisher.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/PullPublisher.java
index 89ed515172a..9ebd874e924 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PullPublisher.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/PullPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,12 +23,12 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.util.Iterator;
 import java.util.concurrent.Flow;
-import jdk.incubator.http.internal.common.Demand;
-import jdk.incubator.http.internal.common.SequentialScheduler;
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.SequentialScheduler;
 
 /**
  * A Publisher that publishes items obtained from the given Iterable. Each new
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/PushGroup.java b/src/java.net.http/share/classes/jdk/internal/net/http/PushGroup.java
new file mode 100644
index 00000000000..f5995065263
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/PushGroup.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2016, 2018, 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.internal.net.http;
+
+import java.security.AccessControlContext;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.util.concurrent.Executor;
+
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.Log;
+
+/**
+ * One PushGroup object is associated with the parent Stream of the pushed
+ * Streams. This keeps track of all common state associated with the pushes.
+ */
+class PushGroup<T> {
+    private final HttpRequest initiatingRequest;
+
+    final CompletableFuture<Void> noMorePushesCF;
+
+    volatile Throwable error; // any exception that occurred during pushes
+
+    // user's subscriber object
+    final PushPromiseHandler<T> pushPromiseHandler;
+
+    private final Executor executor;
+
+    int numberOfPushes;
+    int remainingPushes;
+    boolean noMorePushes = false;
+
+    PushGroup(PushPromiseHandler<T> pushPromiseHandler,
+              HttpRequestImpl initiatingRequest,
+              Executor executor) {
+        this(pushPromiseHandler, initiatingRequest, new MinimalFuture<>(), executor);
+    }
+
+    // Check mainBodyHandler before calling nested constructor.
+    private PushGroup(HttpResponse.PushPromiseHandler<T> pushPromiseHandler,
+                      HttpRequestImpl initiatingRequest,
+                      CompletableFuture<HttpResponse<T>> mainResponse,
+                      Executor executor) {
+        this.noMorePushesCF = new MinimalFuture<>();
+        this.pushPromiseHandler = pushPromiseHandler;
+        this.initiatingRequest = initiatingRequest;
+        this.executor = executor;
+    }
+
+    interface Acceptor<T> {
+        BodyHandler<T> bodyHandler();
+        CompletableFuture<HttpResponse<T>> cf();
+        boolean accepted();
+    }
+
+    private static class AcceptorImpl<T> implements Acceptor<T> {
+        private final Executor executor;
+        private volatile HttpResponse.BodyHandler<T> bodyHandler;
+        private volatile CompletableFuture<HttpResponse<T>> cf;
+
+        AcceptorImpl(Executor executor) {
+            this.executor = executor;
+        }
+
+        CompletableFuture<HttpResponse<T>> accept(BodyHandler<T> bodyHandler) {
+            Objects.requireNonNull(bodyHandler);
+            if (this.bodyHandler != null)
+                throw new IllegalStateException("non-null bodyHandler");
+            this.bodyHandler = bodyHandler;
+            cf = new MinimalFuture<>();
+            return cf.whenCompleteAsync((r,t) -> {}, executor);
+        }
+
+        @Override public BodyHandler<T> bodyHandler() { return bodyHandler; }
+
+        @Override public CompletableFuture<HttpResponse<T>> cf() { return cf; }
+
+        @Override public boolean accepted() { return cf != null; }
+    }
+
+    Acceptor<T> acceptPushRequest(HttpRequest pushRequest) {
+        AcceptorImpl<T> acceptor = new AcceptorImpl<>(executor);
+        try {
+            pushPromiseHandler.applyPushPromise(initiatingRequest, pushRequest, acceptor::accept);
+        } catch (Throwable t) {
+            if (acceptor.accepted()) {
+                CompletableFuture<?> cf = acceptor.cf();
+                cf.completeExceptionally(t);
+            }
+            throw t;
+        }
+
+        synchronized (this) {
+            if (acceptor.accepted()) {
+                numberOfPushes++;
+                remainingPushes++;
+            }
+            return acceptor;
+        }
+    }
+
+    // This is called when the main body response completes because it means
+    // no more PUSH_PROMISEs are possible
+
+    synchronized void noMorePushes(boolean noMore) {
+        noMorePushes = noMore;
+        checkIfCompleted();
+        noMorePushesCF.complete(null);
+    }
+
+    synchronized CompletableFuture<Void> pushesCF() {
+        return noMorePushesCF;
+    }
+
+    synchronized boolean noMorePushes() {
+        return noMorePushes;
+    }
+
+    synchronized void pushCompleted() {
+        remainingPushes--;
+        checkIfCompleted();
+    }
+
+    synchronized void checkIfCompleted() {
+        if (Log.trace()) {
+            Log.logTrace("PushGroup remainingPushes={0} error={1} noMorePushes={2}",
+                         remainingPushes,
+                         (error==null)?error:error.getClass().getSimpleName(),
+                         noMorePushes);
+        }
+        if (remainingPushes == 0 && error == null && noMorePushes) {
+            if (Log.trace()) {
+                Log.logTrace("push completed");
+            }
+        }
+    }
+
+    synchronized void pushError(Throwable t) {
+        if (t == null) {
+            return;
+        }
+        this.error = t;
+    }
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/RawChannelTube.java b/src/java.net.http/share/classes/jdk/internal/net/http/RawChannelTube.java
new file mode 100644
index 00000000000..598bb663726
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/RawChannelTube.java
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http;
+
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.websocket.RawChannel;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.lang.ref.Cleaner;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.SelectionKey;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Flow;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+import java.lang.System.Logger.Level;
+
+/*
+ * I/O abstraction used to implement WebSocket.
+ *
+ */
+public class RawChannelTube implements RawChannel {
+
+    final HttpConnection connection;
+    final FlowTube tube;
+    final WritePublisher writePublisher;
+    final ReadSubscriber readSubscriber;
+    final Supplier<ByteBuffer> initial;
+    final AtomicBoolean inited = new AtomicBoolean();
+    final AtomicBoolean outputClosed = new AtomicBoolean();
+    final AtomicBoolean inputClosed = new AtomicBoolean();
+    final AtomicBoolean closed = new AtomicBoolean();
+    final String dbgTag;
+    final Logger debug;
+    private static final Cleaner cleaner =
+            Utils.ASSERTIONSENABLED  && Utils.DEBUG_WS ? Cleaner.create() : null;
+
+    RawChannelTube(HttpConnection connection,
+                   Supplier<ByteBuffer> initial) {
+        this.connection = connection;
+        this.tube = connection.getConnectionFlow();
+        this.initial = initial;
+        this.writePublisher = new WritePublisher();
+        this.readSubscriber = new ReadSubscriber();
+        dbgTag = "[WebSocket] RawChannelTube(" + tube.toString() +")";
+        debug = Utils.getWebSocketLogger(dbgTag::toString, Utils.DEBUG_WS);
+        connection.client().webSocketOpen();
+        connectFlows();
+        if (Utils.ASSERTIONSENABLED && Utils.DEBUG_WS) {
+            // this is just for debug...
+            cleaner.register(this, new CleanupChecker(closed, debug));
+        }
+    }
+
+    // Make sure no back reference to RawChannelTube can exist
+    // from this class. In particular it would be dangerous
+    // to reference connection, since connection has a reference
+    // to SocketTube with which a RawChannelTube is registered.
+    // Ditto for HttpClientImpl, which might have a back reference
+    // to the connection.
+    static final class CleanupChecker implements Runnable {
+        final AtomicBoolean closed;
+        final System.Logger debug;
+        CleanupChecker(AtomicBoolean closed, System.Logger debug) {
+            this.closed = closed;
+            this.debug = debug;
+        }
+
+        @Override
+        public void run() {
+            if (!closed.get()) {
+                debug.log(Level.DEBUG,
+                         "RawChannelTube was not closed before being released");
+            }
+        }
+    }
+
+    private void connectFlows() {
+        if (debug.on()) debug.log("connectFlows");
+        tube.connectFlows(writePublisher, readSubscriber);
+    }
+
+    class WriteSubscription implements Flow.Subscription {
+        final Flow.Subscriber<? super List<ByteBuffer>> subscriber;
+        final Demand demand = new Demand();
+        volatile boolean cancelled;
+        WriteSubscription(Flow.Subscriber<? super List<ByteBuffer>> subscriber) {
+            this.subscriber = subscriber;
+        }
+        @Override
+        public void request(long n) {
+            if (debug.on()) debug.log("WriteSubscription::request %d", n);
+            demand.increase(n);
+            RawEvent event;
+            while ((event = writePublisher.events.poll()) != null) {
+                if (debug.on()) debug.log("WriteSubscriber: handling event");
+                event.handle();
+                if (demand.isFulfilled()) break;
+            }
+        }
+        @Override
+        public void cancel() {
+            cancelled = true;
+            if (debug.on()) debug.log("WriteSubscription::cancel");
+            shutdownOutput();
+            RawEvent event;
+            while ((event = writePublisher.events.poll()) != null) {
+                if (debug.on()) debug.log("WriteSubscriber: handling event");
+                event.handle();
+            }
+        }
+    }
+
+    class WritePublisher implements FlowTube.TubePublisher {
+        final ConcurrentLinkedQueue<RawEvent> events = new ConcurrentLinkedQueue<>();
+        volatile WriteSubscription writeSubscription;
+        @Override
+        public void subscribe(Flow.Subscriber<? super List<ByteBuffer>> subscriber) {
+            if (debug.on()) debug.log("WritePublisher::subscribe");
+            WriteSubscription subscription = new WriteSubscription(subscriber);
+            subscriber.onSubscribe(subscription);
+            writeSubscription = subscription;
+        }
+    }
+
+    class ReadSubscriber implements  FlowTube.TubeSubscriber {
+
+        volatile Flow.Subscription readSubscription;
+        volatile boolean completed;
+        long initialRequest;
+        final ConcurrentLinkedQueue<RawEvent> events = new ConcurrentLinkedQueue<>();
+        final ConcurrentLinkedQueue<ByteBuffer> buffers = new ConcurrentLinkedQueue<>();
+        final AtomicReference<Throwable> errorRef = new AtomicReference<>();
+
+        void checkEvents() {
+            Flow.Subscription subscription = readSubscription;
+            if (subscription != null) {
+                Throwable error = errorRef.get();
+                while (!buffers.isEmpty() || error != null || closed.get() || completed) {
+                    RawEvent event = events.poll();
+                    if (event == null) break;
+                    if (debug.on()) debug.log("ReadSubscriber: handling event");
+                    event.handle();
+                }
+            }
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            //buffers.add(initial.get());
+            long n;
+            synchronized (this) {
+                readSubscription = subscription;
+                n = initialRequest;
+                initialRequest = 0;
+            }
+            if (debug.on()) debug.log("ReadSubscriber::onSubscribe");
+            if (n > 0) {
+                Throwable error = errorRef.get();
+                if (error == null && !closed.get() && !completed) {
+                    if (debug.on()) debug.log("readSubscription: requesting " + n);
+                    subscription.request(n);
+                }
+            }
+            checkEvents();
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            if (debug.on()) debug.log(() -> "ReadSubscriber::onNext "
+                    + Utils.remaining(item) + " bytes");
+            buffers.addAll(item);
+            checkEvents();
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            if (closed.get() || errorRef.compareAndSet(null, throwable)) {
+                if (debug.on()) debug.log("ReadSubscriber::onError", throwable);
+                if (buffers.isEmpty()) {
+                    checkEvents();
+                    shutdownInput();
+                }
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            if (debug.on()) debug.log("ReadSubscriber::onComplete");
+            completed = true;
+            if (buffers.isEmpty()) {
+                checkEvents();
+                shutdownInput();
+            }
+        }
+    }
+
+
+    /*
+     * Registers given event whose callback will be called once only (i.e.
+     * register new event for each callback).
+     *
+     * Memory consistency effects: actions in a thread calling registerEvent
+     * happen-before any subsequent actions in the thread calling event.handle
+     */
+    public void registerEvent(RawEvent event) throws IOException {
+        int interestOps = event.interestOps();
+        if ((interestOps & SelectionKey.OP_WRITE) != 0) {
+            if (debug.on()) debug.log("register write event");
+            if (outputClosed.get()) throw new IOException("closed output");
+            writePublisher.events.add(event);
+            WriteSubscription writeSubscription = writePublisher.writeSubscription;
+            if (writeSubscription != null) {
+                while (!writeSubscription.demand.isFulfilled()) {
+                    event = writePublisher.events.poll();
+                    if (event == null) break;
+                    event.handle();
+                }
+            }
+        }
+        if ((interestOps & SelectionKey.OP_READ) != 0) {
+            if (debug.on()) debug.log("register read event");
+            if (inputClosed.get()) throw new IOException("closed input");
+            readSubscriber.events.add(event);
+            readSubscriber.checkEvents();
+            if (readSubscriber.buffers.isEmpty()
+                    && !readSubscriber.events.isEmpty()) {
+                Flow.Subscription readSubscription =
+                        readSubscriber.readSubscription;
+                if (readSubscription == null) {
+                    synchronized (readSubscriber) {
+                        readSubscription = readSubscriber.readSubscription;
+                        if (readSubscription == null) {
+                            readSubscriber.initialRequest = 1;
+                            return;
+                        }
+                    }
+                }
+                assert  readSubscription != null;
+                if (debug.on()) debug.log("readSubscription: requesting 1");
+                readSubscription.request(1);
+            }
+        }
+    }
+
+    /**
+     * Hands over the initial bytes. Once the bytes have been returned they are
+     * no longer available and the method will throw an {@link
+     * IllegalStateException} on each subsequent invocation.
+     *
+     * @return the initial bytes
+     * @throws IllegalStateException
+     *         if the method has been already invoked
+     */
+    public ByteBuffer initialByteBuffer() throws IllegalStateException {
+        if (inited.compareAndSet(false, true)) {
+            return initial.get();
+        } else throw new IllegalStateException("initial buffer already drained");
+    }
+
+    /*
+     * Returns a ByteBuffer with the data read or null if EOF is reached. Has no
+     * remaining bytes if no data available at the moment.
+     */
+    public ByteBuffer read() throws IOException {
+        if (debug.on()) debug.log("read");
+        Flow.Subscription readSubscription = readSubscriber.readSubscription;
+        if (readSubscription == null) return Utils.EMPTY_BYTEBUFFER;
+        ByteBuffer buffer = readSubscriber.buffers.poll();
+        if (buffer != null) {
+            if (debug.on()) debug.log("read: " + buffer.remaining());
+            return buffer;
+        }
+        Throwable error = readSubscriber.errorRef.get();
+        if (error != null) error = Utils.getIOException(error);
+        if (error instanceof EOFException) {
+            if (debug.on()) debug.log("read: EOFException");
+            shutdownInput();
+            return null;
+        }
+        if (error != null) {
+            if (debug.on()) debug.log("read: " + error);
+            if (closed.get()) {
+                return null;
+            }
+            shutdownInput();
+            throw Utils.getIOException(error);
+        }
+        if (readSubscriber.completed) {
+            if (debug.on()) debug.log("read: EOF");
+            shutdownInput();
+            return null;
+        }
+        if (inputClosed.get()) {
+            if (debug.on()) debug.log("read: CLOSED");
+            throw new IOException("closed output");
+        }
+        if (debug.on()) debug.log("read: nothing to read");
+        return Utils.EMPTY_BYTEBUFFER;
+    }
+
+    /*
+     * Writes a sequence of bytes to this channel from a subsequence of the
+     * given buffers.
+     */
+    public long write(ByteBuffer[] srcs, int offset, int length) throws IOException {
+        if (outputClosed.get()) {
+            if (debug.on()) debug.log("write: CLOSED");
+            throw new IOException("closed output");
+        }
+        WriteSubscription writeSubscription =  writePublisher.writeSubscription;
+        if (writeSubscription == null) {
+            if (debug.on()) debug.log("write: unsubscribed: 0");
+            return 0;
+        }
+        if (writeSubscription.cancelled) {
+            if (debug.on()) debug.log("write: CANCELLED");
+            shutdownOutput();
+            throw new IOException("closed output");
+        }
+        if (writeSubscription.demand.tryDecrement()) {
+            List<ByteBuffer> buffers = copy(srcs, offset, length);
+            long res = Utils.remaining(buffers);
+            if (debug.on()) debug.log("write: writing %d", res);
+            writeSubscription.subscriber.onNext(buffers);
+            return res;
+        } else {
+            if (debug.on()) debug.log("write: no demand: 0");
+            return 0;
+        }
+    }
+
+    /**
+     * Shutdown the connection for reading without closing the channel.
+     *
+     * <p> Once shutdown for reading then further reads on the channel will
+     * return {@code null}, the end-of-stream indication. If the input side of
+     * the connection is already shutdown then invoking this method has no
+     * effect.
+     *
+     * @throws ClosedChannelException
+     *         If this channel is closed
+     * @throws IOException
+     *         If some other I/O error occurs
+     */
+    public void shutdownInput() {
+        if (inputClosed.compareAndSet(false, true)) {
+            if (debug.on()) debug.log("shutdownInput");
+            // TransportImpl will eventually call RawChannel::close.
+            // We must not call it here as this would close the socket
+            // and can cause an exception to back fire before
+            // TransportImpl and WebSocketImpl have updated their state.
+        }
+    }
+
+    /**
+     * Shutdown the connection for writing without closing the channel.
+     *
+     * <p> Once shutdown for writing then further attempts to write to the
+     * channel will throw {@link ClosedChannelException}. If the output side of
+     * the connection is already shutdown then invoking this method has no
+     * effect.
+     *
+     * @throws ClosedChannelException
+     *         If this channel is closed
+     * @throws IOException
+     *         If some other I/O error occurs
+     */
+    public void shutdownOutput() {
+        if (outputClosed.compareAndSet(false, true)) {
+            if (debug.on()) debug.log("shutdownOutput");
+            // TransportImpl will eventually call RawChannel::close.
+            // We must not call it here as this would close the socket
+            // and can cause an exception to back fire before
+            // TransportImpl and WebSocketImpl have updated their state.
+        }
+    }
+
+    /**
+     * Closes this channel.
+     *
+     * @throws IOException
+     *         If an I/O error occurs
+     */
+    @Override
+    public void close() {
+        if (closed.compareAndSet(false, true)) {
+            if (debug.on()) debug.log("close");
+            connection.client().webSocketClose();
+            connection.close();
+        }
+    }
+
+    private static List<ByteBuffer> copy(ByteBuffer[] src, int offset, int len) {
+        int count = Math.min(len, src.length - offset);
+        if (count <= 0) return Utils.EMPTY_BB_LIST;
+        if (count == 1) return List.of(Utils.copy(src[offset]));
+        if (count == 2) return List.of(Utils.copy(src[offset]), Utils.copy(src[offset+1]));
+        List<ByteBuffer> list = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            list.add(Utils.copy(src[offset + i]));
+        }
+        return list;
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RedirectFilter.java b/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java
similarity index 72%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RedirectFilter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java
index e6bce3c5049..8abe66e0493 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RedirectFilter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,12 +23,15 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Utils;
 
 class RedirectFilter implements HeaderFilter {
 
@@ -36,7 +39,7 @@ class RedirectFilter implements HeaderFilter {
     HttpClientImpl client;
     HttpClient.Redirect policy;
     String method;
-    MultiExchange<?,?> exchange;
+    MultiExchange<?> exchange;
     static final int DEFAULT_MAX_REDIRECTS = 5;
     URI uri;
 
@@ -48,7 +51,7 @@ class RedirectFilter implements HeaderFilter {
     public RedirectFilter() {}
 
     @Override
-    public synchronized void request(HttpRequestImpl r, MultiExchange<?,?> e) throws IOException {
+    public synchronized void request(HttpRequestImpl r, MultiExchange<?> e) throws IOException {
         this.request = r;
         this.client = e.client();
         this.policy = client.followRedirects();
@@ -63,8 +66,24 @@ public synchronized HttpRequestImpl response(Response r) throws IOException {
         return handleResponse(r);
     }
 
+    private static String redirectedMethod(int statusCode, String orig) {
+        switch (statusCode) {
+            case 301:
+            case 302:
+                return orig.equals("POST") ? "GET" : orig;
+            case 303:
+                return "GET";
+            case 307:
+            case 308:
+                return orig;
+            default:
+                // unexpected but return orig
+                return orig;
+        }
+    }
+
     /**
-     * checks to see if new request needed and returns it.
+     * Checks to see if a new request is needed and returns it.
      * Null means response is ok to return to user.
      */
     private HttpRequestImpl handleResponse(Response r) {
@@ -74,11 +93,13 @@ private HttpRequestImpl handleResponse(Response r) {
         }
         if (rcode >= 300 && rcode <= 399) {
             URI redir = getRedirectedURI(r.headers());
+            String newMethod = redirectedMethod(rcode, method);
+            Log.logTrace("response code: {0}, redirected URI: {1}", rcode, redir);
             if (canRedirect(redir) && ++exchange.numberOfRedirects < max_redirects) {
-                //System.out.println("Redirecting to: " + redir);
-                return new HttpRequestImpl(redir, method, request);
+                Log.logTrace("redirect to: {0} with method: {1}", redir, newMethod);
+                return HttpRequestImpl.newInstanceForRedirection(redir, newMethod, request);
             } else {
-                //System.out.println("Redirect: giving up");
+                Log.logTrace("not redirecting");
                 return null;
             }
         }
@@ -106,10 +127,9 @@ private boolean canRedirect(URI redir) {
                 return true;
             case NEVER:
                 return false;
-            case SECURE:
-                return newScheme.equalsIgnoreCase("https");
-            case SAME_PROTOCOL:
-                return newScheme.equalsIgnoreCase(oldScheme);
+            case NORMAL:
+                return newScheme.equalsIgnoreCase(oldScheme)
+                        || newScheme.equalsIgnoreCase("https");
             default:
                 throw new InternalError();
         }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestPublishers.java b/src/java.net.http/share/classes/jdk/internal/net/http/RequestPublishers.java
similarity index 72%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestPublishers.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/RequestPublishers.java
index dacfb1b8a79..5d3fa4e91e6 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestPublishers.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/RequestPublishers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,15 +23,18 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FilePermission;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.AccessControlContext;
 import java.security.AccessController;
@@ -48,23 +51,25 @@
 import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Publisher;
 import java.util.function.Supplier;
-import jdk.incubator.http.HttpRequest.BodyPublisher;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpRequest.BodyPublisher;
+import jdk.internal.net.http.common.Utils;
 
-class RequestPublishers {
+public final class RequestPublishers {
 
-    static class ByteArrayPublisher implements HttpRequest.BodyPublisher {
+    private RequestPublishers() { }
+
+    public static class ByteArrayPublisher implements BodyPublisher {
         private volatile Flow.Publisher<ByteBuffer> delegate;
         private final int length;
         private final byte[] content;
         private final int offset;
         private final int bufSize;
 
-        ByteArrayPublisher(byte[] content) {
+        public ByteArrayPublisher(byte[] content) {
             this(content, 0, content.length);
         }
 
-        ByteArrayPublisher(byte[] content, int offset, int length) {
+        public ByteArrayPublisher(byte[] content, int offset, int length) {
             this(content, offset, length, Utils.BUFSIZE);
         }
 
@@ -105,12 +110,12 @@ public long contentLength() {
     }
 
     // This implementation has lots of room for improvement.
-    static class IterablePublisher implements HttpRequest.BodyPublisher {
+    public static class IterablePublisher implements BodyPublisher {
         private volatile Flow.Publisher<ByteBuffer> delegate;
         private final Iterable<byte[]> content;
         private volatile long contentLength;
 
-        IterablePublisher(Iterable<byte[]> content) {
+        public IterablePublisher(Iterable<byte[]> content) {
             this.content = Objects.requireNonNull(content);
         }
 
@@ -194,13 +199,13 @@ public long contentLength() {
         }
     }
 
-    static class StringPublisher extends ByteArrayPublisher {
+    public static class StringPublisher extends ByteArrayPublisher {
         public StringPublisher(String content, Charset charset) {
             super(content.getBytes(charset));
         }
     }
 
-    static class EmptyPublisher implements HttpRequest.BodyPublisher {
+    public static class EmptyPublisher implements BodyPublisher {
         private final Flow.Publisher<ByteBuffer> delegate =
                 new PullPublisher<ByteBuffer>(Collections.emptyList(), null);
 
@@ -215,31 +220,72 @@ public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
         }
     }
 
-    static class FilePublisher implements BodyPublisher  {
+    /**
+     * Publishes the content of a given file.
+     *
+     * Privileged actions are performed within a limited doPrivileged that only
+     * asserts the specific, read, file permission that was checked during the
+     * construction of this FilePublisher.
+     */
+    public static class FilePublisher implements BodyPublisher  {
+
+        private static final FilePermission[] EMPTY_FILE_PERMISSIONS = new FilePermission[0];
+
         private final File file;
-        private volatile AccessControlContext acc;
+        private final FilePermission[] filePermissions;
 
-        FilePublisher(Path name) {
-            file = name.toFile();
+        private static String pathForSecurityCheck(Path path) {
+            return path.toFile().getPath();
         }
 
-        void setAccessControlContext(AccessControlContext acc) {
-            this.acc = acc;
+        /**
+         * Factory for creating FilePublisher.
+         *
+         * Permission checks are performed here before construction of the
+         * FilePublisher. Permission checking and construction are deliberately
+         * and tightly co-located.
+         */
+        public static FilePublisher create(Path path) throws FileNotFoundException {
+            FilePermission filePermission = null;
+            SecurityManager sm = System.getSecurityManager();
+            if (sm != null) {
+                String fn = pathForSecurityCheck(path);
+                FilePermission readPermission = new FilePermission(fn, "read");
+                sm.checkPermission(readPermission);
+                filePermission = readPermission;
+            }
+
+            // existence check must be after permission checks
+            if (Files.notExists(path))
+                throw new FileNotFoundException(path + " not found");
+
+            return new FilePublisher(path, filePermission);
+        }
+
+        private FilePublisher(Path name, FilePermission filePermission) {
+            assert filePermission != null ? filePermission.getActions().equals("read") : true;
+            file = name.toFile();
+            this.filePermissions = filePermission == null ? EMPTY_FILE_PERMISSIONS
+                    : new FilePermission[] { filePermission };
         }
 
         @Override
         public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
-            if (System.getSecurityManager() != null && acc == null)
-                throw new InternalError(
-                        "Unexpected null acc when security manager has been installed");
-
             InputStream is;
-            try {
-                PrivilegedExceptionAction<FileInputStream> pa =
-                        () -> new FileInputStream(file);
-                is = AccessController.doPrivileged(pa, acc);
-            } catch (PrivilegedActionException pae) {
-                throw new UncheckedIOException((IOException)pae.getCause());
+            if (System.getSecurityManager() == null) {
+                try {
+                    is = new FileInputStream(file);
+                } catch (IOException ioe) {
+                    throw new UncheckedIOException(ioe);
+                }
+            } else {
+                try {
+                    PrivilegedExceptionAction<FileInputStream> pa =
+                            () -> new FileInputStream(file);
+                    is = AccessController.doPrivileged(pa, null, filePermissions);
+                } catch (PrivilegedActionException pae) {
+                    throw new UncheckedIOException((IOException) pae.getCause());
+                }
             }
             PullPublisher<ByteBuffer> publisher =
                     new PullPublisher<>(() -> new StreamIterator(is));
@@ -248,16 +294,19 @@ public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
 
         @Override
         public long contentLength() {
-            assert System.getSecurityManager() != null ? acc != null: true;
-            PrivilegedAction<Long> pa = () -> file.length();
-            return AccessController.doPrivileged(pa, acc);
+            if (System.getSecurityManager() == null) {
+                return file.length();
+            } else {
+                PrivilegedAction<Long> pa = () -> file.length();
+                return AccessController.doPrivileged(pa, null, filePermissions);
+            }
         }
     }
 
     /**
      * Reads one buffer ahead all the time, blocking in hasNext()
      */
-    static class StreamIterator implements Iterator<ByteBuffer> {
+    public static class StreamIterator implements Iterator<ByteBuffer> {
         final InputStream is;
         final Supplier<? extends ByteBuffer> bufSupplier;
         volatile ByteBuffer nextBuffer;
@@ -321,10 +370,10 @@ public synchronized ByteBuffer next() {
 
     }
 
-    static class InputStreamPublisher implements BodyPublisher {
+    public static class InputStreamPublisher implements BodyPublisher {
         private final Supplier<? extends InputStream> streamSupplier;
 
-        InputStreamPublisher(Supplier<? extends InputStream> streamSupplier) {
+        public InputStreamPublisher(Supplier<? extends InputStream> streamSupplier) {
             this.streamSupplier = Objects.requireNonNull(streamSupplier);
         }
 
@@ -351,12 +400,12 @@ public long contentLength() {
         }
     }
 
-    static final class PublisherAdapter implements BodyPublisher {
+    public static final class PublisherAdapter implements BodyPublisher {
 
         private final Publisher<? extends ByteBuffer> publisher;
         private final long contentLength;
 
-        PublisherAdapter(Publisher<? extends ByteBuffer> publisher,
+        public PublisherAdapter(Publisher<? extends ByteBuffer> publisher,
                          long contentLength) {
             this.publisher = Objects.requireNonNull(publisher);
             this.contentLength = contentLength;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Response.java b/src/java.net.http/share/classes/jdk/internal/net/http/Response.java
similarity index 55%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Response.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Response.java
index 817af717206..fc150004d83 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Response.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Response.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,9 +23,16 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.net.URI;
+import java.io.IOException;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.InetSocketAddress;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSession;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * Response headers and status code.
@@ -36,17 +43,52 @@ class Response {
     final HttpRequestImpl request;
     final Exchange<?> exchange;
     final HttpClient.Version version;
+    final boolean isConnectResponse;
+    final SSLSession sslSession;
+    final InetSocketAddress localAddress;
 
     Response(HttpRequestImpl req,
              Exchange<?> exchange,
              HttpHeaders headers,
+             HttpConnection connection,
              int statusCode,
              HttpClient.Version version) {
-        this.headers = headers;
+        this(req, exchange, headers, connection, statusCode, version,
+                "CONNECT".equalsIgnoreCase(req.method()));
+    }
+
+    Response(HttpRequestImpl req,
+             Exchange<?> exchange,
+             HttpHeaders headers,
+             HttpConnection connection,
+             int statusCode,
+             HttpClient.Version version,
+             boolean isConnectResponse) {
+        this.headers = ImmutableHeaders.of(headers);
         this.request = req;
         this.version = version;
         this.exchange = exchange;
         this.statusCode = statusCode;
+        this.isConnectResponse = isConnectResponse;
+        if (connection != null) {
+            InetSocketAddress a;
+            try {
+                a = (InetSocketAddress)connection.channel().getLocalAddress();
+            } catch (IOException e) {
+                a = null;
+            }
+            this.localAddress = a;
+            if (connection instanceof AbstractAsyncSSLConnection) {
+                AbstractAsyncSSLConnection cc = (AbstractAsyncSSLConnection)connection;
+                SSLEngine engine = cc.getEngine();
+                sslSession = Utils.immutableSession(engine.getSession());
+            } else {
+                sslSession = null;
+            }
+        } else {
+            sslSession = null;
+            localAddress = null;
+        }
     }
 
     HttpRequestImpl request() {
@@ -61,14 +103,14 @@ HttpHeaders headers() {
         return headers;
     }
 
-//    Exchange<?> exchange() {
-//        return exchange;
-//    }
-
     int statusCode() {
         return statusCode;
     }
 
+    SSLSession getSSLSession() {
+        return sslSession;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -81,6 +123,9 @@ public String toString() {
           .append(uristring)
           .append(") ")
           .append(statusCode());
+        sb.append(" ").append(version);
+        if (localAddress != null)
+            sb.append(" Local port:  ").append(localAddress.getPort());
         return sb.toString();
     }
 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/ResponseBodyHandlers.java b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseBodyHandlers.java
new file mode 100644
index 00000000000..1ebcfca9f62
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseBodyHandlers.java
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http;
+
+import java.io.File;
+import java.io.FilePermission;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.ResponseInfo;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import jdk.internal.net.http.ResponseSubscribers.PathSubscriber;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
+public final class ResponseBodyHandlers {
+
+    private ResponseBodyHandlers() { }
+
+    private static final String pathForSecurityCheck(Path path) {
+        return path.toFile().getPath();
+    }
+
+    /**
+     * A Path body handler.
+     */
+    public static class PathBodyHandler implements BodyHandler<Path>{
+        private final Path file;
+        private final List<OpenOption> openOptions;  // immutable list
+        private final FilePermission filePermission;
+
+        /**
+         * Factory for creating PathBodyHandler.
+         *
+         * Permission checks are performed here before construction of the
+         * PathBodyHandler. Permission checking and construction are
+         * deliberately and tightly co-located.
+         */
+        public static PathBodyHandler create(Path file,
+                                             List<OpenOption> openOptions) {
+            FilePermission filePermission = null;
+            SecurityManager sm = System.getSecurityManager();
+            if (sm != null) {
+                String fn = pathForSecurityCheck(file);
+                FilePermission writePermission = new FilePermission(fn, "write");
+                sm.checkPermission(writePermission);
+                filePermission = writePermission;
+            }
+            return new PathBodyHandler(file, openOptions, filePermission);
+        }
+
+        private PathBodyHandler(Path file,
+                                List<OpenOption> openOptions,
+                                FilePermission filePermission) {
+            this.file = file;
+            this.openOptions = openOptions;
+            this.filePermission = filePermission;
+        }
+
+        @Override
+        public BodySubscriber<Path> apply(ResponseInfo responseInfo) {
+            return new PathSubscriber(file, openOptions, filePermission);
+        }
+    }
+
+    /** With push promise Map implementation */
+    public static class PushPromisesHandlerWithMap<T>
+        implements HttpResponse.PushPromiseHandler<T>
+    {
+        private final ConcurrentMap<HttpRequest,CompletableFuture<HttpResponse<T>>> pushPromisesMap;
+        private final Function<HttpRequest,BodyHandler<T>> pushPromiseHandler;
+
+        public PushPromisesHandlerWithMap(Function<HttpRequest,BodyHandler<T>> pushPromiseHandler,
+                                          ConcurrentMap<HttpRequest,CompletableFuture<HttpResponse<T>>> pushPromisesMap) {
+            this.pushPromiseHandler = pushPromiseHandler;
+            this.pushPromisesMap = pushPromisesMap;
+        }
+
+        @Override
+        public void applyPushPromise(
+                HttpRequest initiatingRequest, HttpRequest pushRequest,
+                Function<BodyHandler<T>,CompletableFuture<HttpResponse<T>>> acceptor)
+        {
+            URI initiatingURI = initiatingRequest.uri();
+            URI pushRequestURI = pushRequest.uri();
+            if (!initiatingURI.getHost().equalsIgnoreCase(pushRequestURI.getHost()))
+                return;
+
+            int initiatingPort = initiatingURI.getPort();
+            if (initiatingPort == -1 ) {
+                if ("https".equalsIgnoreCase(initiatingURI.getScheme()))
+                    initiatingPort = 443;
+                else
+                    initiatingPort = 80;
+            }
+            int pushPort = pushRequestURI.getPort();
+            if (pushPort == -1 ) {
+                if ("https".equalsIgnoreCase(pushRequestURI.getScheme()))
+                    pushPort = 443;
+                else
+                    pushPort = 80;
+            }
+            if (initiatingPort != pushPort)
+                return;
+
+            CompletableFuture<HttpResponse<T>> cf =
+                    acceptor.apply(pushPromiseHandler.apply(pushRequest));
+            pushPromisesMap.put(pushRequest, cf);
+        }
+    }
+
+    // Similar to Path body handler, but for file download.
+    public static class FileDownloadBodyHandler implements BodyHandler<Path> {
+        private final Path directory;
+        private final List<OpenOption> openOptions;
+        private final FilePermission[] filePermissions;  // may be null
+
+        /**
+         * Factory for creating FileDownloadBodyHandler.
+         *
+         * Permission checks are performed here before construction of the
+         * FileDownloadBodyHandler. Permission checking and construction are
+         * deliberately and tightly co-located.
+         */
+        public static FileDownloadBodyHandler create(Path directory,
+                                                     List<OpenOption> openOptions) {
+            FilePermission filePermissions[] = null;
+            SecurityManager sm = System.getSecurityManager();
+            if (sm != null) {
+                String fn = pathForSecurityCheck(directory);
+                FilePermission writePermission = new FilePermission(fn, "write");
+                String writePathPerm = fn + File.separatorChar + "*";
+                FilePermission writeInDirPermission = new FilePermission(writePathPerm, "write");
+                sm.checkPermission(writeInDirPermission);
+                FilePermission readPermission = new FilePermission(fn, "read");
+                sm.checkPermission(readPermission);
+
+                // read permission is only needed before determine the below checks
+                // only write permission is required when downloading to the file
+                filePermissions = new FilePermission[] { writePermission, writeInDirPermission };
+            }
+
+            // existence, etc, checks must be after permission checks
+            if (Files.notExists(directory))
+                throw new IllegalArgumentException("non-existent directory: " + directory);
+            if (!Files.isDirectory(directory))
+                throw new IllegalArgumentException("not a directory: " + directory);
+            if (!Files.isWritable(directory))
+                throw new IllegalArgumentException("non-writable directory: " + directory);
+
+            return new FileDownloadBodyHandler(directory, openOptions, filePermissions);
+
+        }
+
+        private FileDownloadBodyHandler(Path directory,
+                                       List<OpenOption> openOptions,
+                                       FilePermission... filePermissions) {
+            this.directory = directory;
+            this.openOptions = openOptions;
+            this.filePermissions = filePermissions;
+        }
+
+        /** The "attachment" disposition-type and separator. */
+        static final String DISPOSITION_TYPE = "attachment;";
+
+        /** The "filename" parameter. */
+        static final Pattern FILENAME = Pattern.compile("filename\\s*=", CASE_INSENSITIVE);
+
+        static final List<String> PROHIBITED = List.of(".", "..", "", "~" , "|");
+
+        static final UncheckedIOException unchecked(ResponseInfo rinfo,
+                                                    String msg) {
+            String s = String.format("%s in response [%d, %s]", msg, rinfo.statusCode(), rinfo.headers());
+            return new UncheckedIOException(new IOException(s));
+        }
+
+        @Override
+        public BodySubscriber<Path> apply(ResponseInfo responseInfo) {
+            String dispoHeader = responseInfo.headers().firstValue("Content-Disposition")
+                    .orElseThrow(() -> unchecked(responseInfo, "No Content-Disposition header"));
+
+            if (!dispoHeader.regionMatches(true, // ignoreCase
+                                           0, DISPOSITION_TYPE,
+                                           0, DISPOSITION_TYPE.length())) {
+                throw unchecked(responseInfo, "Unknown Content-Disposition type");
+            }
+
+            Matcher matcher = FILENAME.matcher(dispoHeader);
+            if (!matcher.find()) {
+                throw unchecked(responseInfo, "Bad Content-Disposition filename parameter");
+            }
+            int n = matcher.end();
+
+            int semi = dispoHeader.substring(n).indexOf(";");
+            String filenameParam;
+            if (semi < 0) {
+                filenameParam = dispoHeader.substring(n);
+            } else {
+                filenameParam = dispoHeader.substring(n, n + semi);
+            }
+
+            // strip all but the last path segment
+            int x = filenameParam.lastIndexOf("/");
+            if (x != -1) {
+                filenameParam = filenameParam.substring(x+1);
+            }
+            x = filenameParam.lastIndexOf("\\");
+            if (x != -1) {
+                filenameParam = filenameParam.substring(x+1);
+            }
+
+            filenameParam = filenameParam.trim();
+
+            if (filenameParam.startsWith("\"")) {  // quoted-string
+                if (!filenameParam.endsWith("\"") || filenameParam.length() == 1) {
+                    throw unchecked(responseInfo,
+                            "Badly quoted Content-Disposition filename parameter");
+                }
+                filenameParam = filenameParam.substring(1, filenameParam.length() -1 );
+            } else {  // token,
+                if (filenameParam.contains(" ")) {  // space disallowed
+                    throw unchecked(responseInfo,
+                            "unquoted space in Content-Disposition filename parameter");
+                }
+            }
+
+            if (PROHIBITED.contains(filenameParam)) {
+                throw unchecked(responseInfo,
+                        "Prohibited Content-Disposition filename parameter:"
+                                + filenameParam);
+            }
+
+            Path file = Paths.get(directory.toString(), filenameParam);
+
+            if (!file.startsWith(directory)) {
+                throw unchecked(responseInfo,
+                        "Resulting file, " + file.toString() + ", outside of given directory");
+            }
+
+            return new PathSubscriber(file, openOptions, filePermissions);
+        }
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseContent.java
similarity index 85%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/ResponseContent.java
index eca5957bc0d..3ff2bb6a60d 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseContent.java
@@ -23,15 +23,20 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.System.Logger.Level;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpResponse;
+
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * Implements chunked/fixed transfer encodings of HTTP/1.1 responses.
@@ -41,8 +46,6 @@
  */
 class ResponseContent {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-
     final HttpResponse.BodySubscriber<?> pusher;
     final int contentLength;
     final HttpHeaders headers;
@@ -115,7 +118,7 @@ static enum ChunkState {READING_LENGTH, READING_DATA, DONE}
     class ChunkedBodyParser implements BodyParser {
         final ByteBuffer READMORE = Utils.EMPTY_BYTEBUFFER;
         final Consumer<Throwable> onComplete;
-        final System.Logger debug = Utils.getDebugLogger(this::dbgString, DEBUG);
+        final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
         final String dbgTag = ResponseContent.this.dbgTag + "/ChunkedBodyParser";
 
         volatile Throwable closedExceptionally;
@@ -136,16 +139,16 @@ String dbgString() {
 
         @Override
         public void onSubscribe(AbstractSubscription sub) {
-            debug.log(Level.DEBUG, () ->  "onSubscribe: "
-                        + pusher.getClass().getName());
+            if (debug.on())
+                debug.log("onSubscribe: "  + pusher.getClass().getName());
             pusher.onSubscribe(this.sub = sub);
         }
 
         @Override
         public void accept(ByteBuffer b) {
             if (closedExceptionally != null) {
-                debug.log(Level.DEBUG, () ->  "already closed: "
-                            + closedExceptionally);
+                if (debug.on())
+                    debug.log("already closed: " + closedExceptionally);
                 return;
             }
             boolean completed = false;
@@ -161,13 +164,15 @@ public void accept(ByteBuffer b) {
                             // demand.
                             boolean hasDemand = sub.demand().tryDecrement();
                             assert hasDemand;
-                            pusher.onNext(out);
+                            pusher.onNext(Collections.unmodifiableList(out));
+                            if (debug.on()) debug.log("Chunks sent");
                         }
-                        debug.log(Level.DEBUG, () ->  "done!");
+                        if (debug.on()) debug.log("done!");
                         assert closedExceptionally == null;
                         assert state == ChunkState.DONE;
                         onFinished.run();
                         pusher.onComplete();
+                        if (debug.on()) debug.log("subscriber completed");
                         completed = true;
                         onComplete.accept(closedExceptionally); // should be null
                         break;
@@ -183,10 +188,13 @@ public void accept(ByteBuffer b) {
                     // demand.
                     boolean hasDemand = sub.demand().tryDecrement();
                     assert hasDemand;
-                    pusher.onNext(out);
+                    pusher.onNext(Collections.unmodifiableList(out));
+                    if (debug.on()) debug.log("Chunk sent");
                 }
                 assert state == ChunkState.DONE || !b.hasRemaining();
             } catch(Throwable t) {
+                if (debug.on())
+                    debug.log("Error while processing buffer: %s", (Object)t );
                 closedExceptionally = t;
                 if (!completed) onComplete.accept(t);
             }
@@ -259,11 +267,11 @@ ByteBuffer tryReadOneHunk(ByteBuffer chunk) throws IOException {
             int toconsume = bytesToConsume;
             ChunkState st = state;
             if (st == ChunkState.READING_LENGTH && chunklen == -1) {
-                debug.log(Level.DEBUG, () ->  "Trying to read chunk len"
+                if (debug.on()) debug.log(() ->  "Trying to read chunk len"
                         + " (remaining in buffer:"+chunk.remaining()+")");
                 int clen = chunklen = tryReadChunkLen(chunk);
                 if (clen == -1) return READMORE;
-                debug.log(Level.DEBUG, "Got chunk len %d", clen);
+                if (debug.on()) debug.log("Got chunk len %d", clen);
                 cr = false; partialChunklen = 0;
                 unfulfilled = bytesremaining =  clen;
                 if (clen == 0) toconsume = bytesToConsume = 2; // that was the last chunk
@@ -271,9 +279,9 @@ ByteBuffer tryReadOneHunk(ByteBuffer chunk) throws IOException {
             }
 
             if (toconsume > 0) {
-                debug.log(Level.DEBUG,
-                        "Trying to consume bytes: %d (remaining in buffer: %s)",
-                        toconsume, chunk.remaining());
+                if (debug.on())
+                    debug.log("Trying to consume bytes: %d (remaining in buffer: %s)",
+                              toconsume, chunk.remaining());
                 if (tryConsumeBytes(chunk) > 0) {
                     return READMORE;
                 }
@@ -288,7 +296,7 @@ ByteBuffer tryReadOneHunk(ByteBuffer chunk) throws IOException {
                 // consumed the trailing CRLF
                 int clen = chunklen;
                 assert clen == 0;
-                debug.log(Level.DEBUG, "No more chunks: %d", clen);
+                if (debug.on()) debug.log("No more chunks: %d", clen);
                 // the DONE state is not really needed but it helps with
                 // assertions...
                 state = ChunkState.DONE;
@@ -302,12 +310,14 @@ ByteBuffer tryReadOneHunk(ByteBuffer chunk) throws IOException {
             ByteBuffer returnBuffer = READMORE; // May be a hunk or a chunk
             if (unfulfilled > 0) {
                 int bytesread = chunk.remaining();
-                debug.log(Level.DEBUG, "Reading chunk: available %d, needed %d",
-                          bytesread, unfulfilled);
+                if (debug.on())
+                    debug.log("Reading chunk: available %d, needed %d",
+                              bytesread, unfulfilled);
 
                 int bytes2return = Math.min(bytesread, unfulfilled);
-                debug.log(Level.DEBUG,  "Returning chunk bytes: %d", bytes2return);
-                returnBuffer = Utils.sliceWithLimitedCapacity(chunk, bytes2return);
+                if (debug.on())
+                    debug.log( "Returning chunk bytes: %d", bytes2return);
+                returnBuffer = Utils.sliceWithLimitedCapacity(chunk, bytes2return).asReadOnlyBuffer();
                 unfulfilled = bytesremaining -= bytes2return;
                 if (unfulfilled == 0) bytesToConsume = 2;
             }
@@ -315,9 +325,9 @@ ByteBuffer tryReadOneHunk(ByteBuffer chunk) throws IOException {
             assert unfulfilled >= 0;
 
             if (unfulfilled == 0) {
-                debug.log(Level.DEBUG,
-                        "No more bytes to read - %d yet to consume.",
-                        unfulfilled);
+                if (debug.on())
+                    debug.log("No more bytes to read - %d yet to consume.",
+                              unfulfilled);
                 // check whether the trailing CRLF is consumed, try to
                 // consume it if not. If tryConsumeBytes needs more bytes
                 // then we will come back here later - skipping the block
@@ -330,11 +340,11 @@ ByteBuffer tryReadOneHunk(ByteBuffer chunk) throws IOException {
                     partialChunklen = 0;
                     cr = false;
                     state = ChunkState.READING_LENGTH;
-                    debug.log(Level.DEBUG, "Ready to read next chunk");
+                    if (debug.on()) debug.log("Ready to read next chunk");
                 }
             }
             if (returnBuffer == READMORE) {
-                debug.log(Level.DEBUG, "Need more data");
+                if (debug.on()) debug.log("Need more data");
             }
             return returnBuffer;
         }
@@ -350,10 +360,9 @@ private boolean tryPushOneHunk(ByteBuffer b, List<ByteBuffer> out)
             if (b1 != null) {
                 //assert b1.hasRemaining() || b1 == READMORE;
                 if (b1.hasRemaining()) {
-                    debug.log(Level.DEBUG, "Sending chunk to consumer (%d)",
-                              b1.remaining());
+                    if (debug.on())
+                        debug.log("Sending chunk to consumer (%d)", b1.remaining());
                     out.add(b1);
-                    debug.log(Level.DEBUG, "Chunk sent.");
                 }
                 return false; // we haven't parsed the final chunk yet.
             } else {
@@ -379,7 +388,7 @@ private int toDigit(int b) throws IOException {
     class FixedLengthBodyParser implements BodyParser {
         final int contentLength;
         final Consumer<Throwable> onComplete;
-        final System.Logger debug = Utils.getDebugLogger(this::dbgString, DEBUG);
+        final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
         final String dbgTag = ResponseContent.this.dbgTag + "/FixedLengthBodyParser";
         volatile int remaining;
         volatile Throwable closedExceptionally;
@@ -395,9 +404,9 @@ String dbgString() {
 
         @Override
         public void onSubscribe(AbstractSubscription sub) {
-            debug.log(Level.DEBUG, () -> "length="
-                        + contentLength +", onSubscribe: "
-                        + pusher.getClass().getName());
+            if (debug.on())
+                debug.log("length=" + contentLength +", onSubscribe: "
+                           + pusher.getClass().getName());
             pusher.onSubscribe(this.sub = sub);
             try {
                 if (contentLength == 0) {
@@ -418,15 +427,16 @@ public void onSubscribe(AbstractSubscription sub) {
         @Override
         public void accept(ByteBuffer b) {
             if (closedExceptionally != null) {
-                debug.log(Level.DEBUG, () -> "already closed: "
-                            + closedExceptionally);
+                if (debug.on())
+                    debug.log("already closed: " + closedExceptionally);
                 return;
             }
             boolean completed = false;
             try {
                 int unfulfilled = remaining;
-                debug.log(Level.DEBUG, "Parser got %d bytes (%d remaining / %d)",
-                        b.remaining(), unfulfilled, contentLength);
+                if (debug.on())
+                    debug.log("Parser got %d bytes (%d remaining / %d)",
+                              b.remaining(), unfulfilled, contentLength);
                 assert unfulfilled != 0 || contentLength == 0 || b.remaining() == 0;
 
                 if (unfulfilled == 0 && contentLength > 0) return;
@@ -440,10 +450,12 @@ public void accept(ByteBuffer b) {
                     int amount = Math.min(b.remaining(), unfulfilled);
                     unfulfilled = remaining -= amount;
                     ByteBuffer buffer = Utils.sliceWithLimitedCapacity(b, amount);
-                    pusher.onNext(List.of(buffer));
+                    pusher.onNext(List.of(buffer.asReadOnlyBuffer()));
                 }
                 if (unfulfilled == 0) {
                     // We're done! All data has been received.
+                    if (debug.on())
+                        debug.log("Parser got all expected bytes: completing");
                     assert closedExceptionally == null;
                     onFinished.run();
                     pusher.onComplete();
@@ -453,7 +465,7 @@ public void accept(ByteBuffer b) {
                     assert b.remaining() == 0;
                 }
             } catch (Throwable t) {
-                debug.log(Level.DEBUG, "Unexpected exception", t);
+                if (debug.on()) debug.log("Unexpected exception", t);
                 closedExceptionally = t;
                 if (!completed) {
                     onComplete.accept(t);
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/ResponseInfoImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseInfoImpl.java
new file mode 100644
index 00000000000..4548e370f27
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseInfoImpl.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http;
+
+import java.net.http.HttpResponse.ResponseInfo;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpClient;
+
+class ResponseInfoImpl implements ResponseInfo {
+    private final int statusCode;
+    private final HttpHeaders headers;
+    private final HttpClient.Version version;
+
+    ResponseInfoImpl(Response response) {
+        this.statusCode = response.statusCode();
+        this.headers = response.headers();
+        this.version = response.version();
+    }
+
+    ResponseInfoImpl(int statusCode, HttpHeaders headers, HttpClient.Version version) {
+        this.statusCode = statusCode;
+        this.headers = headers;
+        this.version = version;
+    }
+
+    /**
+     * Provides the response status code
+     * @return the response status code
+     */
+    public int statusCode() {
+        return statusCode;
+    }
+
+    /**
+     * Provides the response headers
+     * @return the response headers
+     */
+    public HttpHeaders headers() {
+        return headers;
+    }
+
+    /**
+     * provides the response protocol version
+     * @return the response protocol version
+     */
+    public HttpClient.Version version() {
+        return version;
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseSubscribers.java
similarity index 53%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/ResponseSubscribers.java
index af90923f7f4..1c54ee07243 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseSubscribers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,16 +23,21 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
+import java.io.BufferedReader;
+import java.io.FilePermission;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.lang.System.Logger.Level;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
 import java.nio.file.OpenOption;
 import java.nio.file.Path;
-import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -45,25 +50,30 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
 import java.util.concurrent.Flow.Subscription;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.Utils;
+import java.util.stream.Stream;
+import java.net.http.HttpResponse.BodySubscriber;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.Utils;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
-class ResponseSubscribers {
+public class ResponseSubscribers {
 
-    static class ConsumerSubscriber implements HttpResponse.BodySubscriber<Void> {
+    public static class ConsumerSubscriber implements BodySubscriber<Void> {
         private final Consumer<Optional<byte[]>> consumer;
         private Flow.Subscription subscription;
         private final CompletableFuture<Void> result = new MinimalFuture<>();
         private final AtomicBoolean subscribed = new AtomicBoolean();
 
-        ConsumerSubscriber(Consumer<Optional<byte[]>> consumer) {
+        public ConsumerSubscriber(Consumer<Optional<byte[]>> consumer) {
             this.consumer = Objects.requireNonNull(consumer);
         }
 
@@ -105,41 +115,80 @@ public void onComplete() {
 
     }
 
-    static class PathSubscriber implements HttpResponse.BodySubscriber<Path> {
+    /**
+     * A Subscriber that writes the flow of data to a given file.
+     *
+     * Privileged actions are performed within a limited doPrivileged that only
+     * asserts the specific, write, file permissions that were checked during
+     * the construction of this PathSubscriber.
+     */
+    public static class PathSubscriber implements BodySubscriber<Path> {
+
+        private static final FilePermission[] EMPTY_FILE_PERMISSIONS = new FilePermission[0];
 
         private final Path file;
+        private final OpenOption[] options;
+        private final FilePermission[] filePermissions;
         private final CompletableFuture<Path> result = new MinimalFuture<>();
 
         private volatile Flow.Subscription subscription;
         private volatile FileChannel out;
-        private volatile AccessControlContext acc;
-        private final OpenOption[] options;
 
-        PathSubscriber(Path file, OpenOption... options) {
-            this.file = file;
-            this.options = options;
+        private static final String pathForSecurityCheck(Path path) {
+            return path.toFile().getPath();
+        }
+
+        /**
+         * Factory for creating PathSubscriber.
+         *
+         * Permission checks are performed here before construction of the
+         * PathSubscriber. Permission checking and construction are deliberately
+         * and tightly co-located.
+         */
+        public static PathSubscriber create(Path file,
+                                            List<OpenOption> options) {
+            FilePermission filePermission = null;
+            SecurityManager sm = System.getSecurityManager();
+            if (sm != null) {
+                String fn = pathForSecurityCheck(file);
+                FilePermission writePermission = new FilePermission(fn, "write");
+                sm.checkPermission(writePermission);
+                filePermission = writePermission;
+            }
+            return new PathSubscriber(file, options, filePermission);
         }
 
-        void setAccessControlContext(AccessControlContext acc) {
-            this.acc = acc;
+        // pp so handler implementations in the same package can construct
+        /*package-private*/ PathSubscriber(Path file,
+                                           List<OpenOption> options,
+                                           FilePermission... filePermissions) {
+            this.file = file;
+            this.options = options.stream().toArray(OpenOption[]::new);
+            this.filePermissions =
+                    filePermissions == null ? EMPTY_FILE_PERMISSIONS : filePermissions;
         }
 
         @Override
         public void onSubscribe(Flow.Subscription subscription) {
-            if (System.getSecurityManager() != null && acc == null)
-                throw new InternalError(
-                        "Unexpected null acc when security manager has been installed");
-
             this.subscription = subscription;
-            try {
-                PrivilegedExceptionAction<FileChannel> pa =
-                        () -> FileChannel.open(file, options);
-                out = AccessController.doPrivileged(pa, acc);
-            } catch (PrivilegedActionException pae) {
-                Throwable t = pae.getCause() != null ? pae.getCause() : pae;
-                result.completeExceptionally(t);
-                subscription.cancel();
-                return;
+            if (System.getSecurityManager() == null) {
+                try {
+                    out = FileChannel.open(file, options);
+                } catch (IOException ioe) {
+                    result.completeExceptionally(ioe);
+                    return;
+                }
+            } else {
+                try {
+                    PrivilegedExceptionAction<FileChannel> pa =
+                            () -> FileChannel.open(file, options);
+                    out = AccessController.doPrivileged(pa, null, filePermissions);
+                } catch (PrivilegedActionException pae) {
+                    Throwable t = pae.getCause() != null ? pae.getCause() : pae;
+                    result.completeExceptionally(t);
+                    subscription.cancel();
+                    return;
+                }
             }
             subscription.request(1);
         }
@@ -174,14 +223,14 @@ public CompletionStage<Path> getBody() {
         }
     }
 
-    static class ByteArraySubscriber<T> implements HttpResponse.BodySubscriber<T> {
+    public static class ByteArraySubscriber<T> implements BodySubscriber<T> {
         private final Function<byte[], T> finisher;
         private final CompletableFuture<T> result = new MinimalFuture<>();
         private final List<ByteBuffer> received = new ArrayList<>();
 
         private volatile Flow.Subscription subscription;
 
-        ByteArraySubscriber(Function<byte[],T> finisher) {
+        public ByteArraySubscriber(Function<byte[],T> finisher) {
             this.finisher = finisher;
         }
 
@@ -202,7 +251,7 @@ public void onNext(List<ByteBuffer> items) {
             // and won't be used anywhere except this place.
             // So it's free simply to store them for further processing.
             assert Utils.hasRemaining(items);
-            Utils.accumulateBuffers(received, items);
+            received.addAll(items);
         }
 
         @Override
@@ -242,17 +291,16 @@ public CompletionStage<T> getBody() {
     /**
      * An InputStream built on top of the Flow API.
      */
-    static class HttpResponseInputStream extends InputStream
-        implements HttpResponse.BodySubscriber<InputStream>
+    public static class HttpResponseInputStream extends InputStream
+        implements BodySubscriber<InputStream>
     {
-        final static boolean DEBUG = Utils.DEBUG;
         final static int MAX_BUFFERS_IN_QUEUE = 1;  // lock-step with the producer
 
         // An immutable ByteBuffer sentinel to mark that the last byte was received.
         private static final ByteBuffer LAST_BUFFER = ByteBuffer.wrap(new byte[0]);
         private static final List<ByteBuffer> LAST_LIST = List.of(LAST_BUFFER);
-        private static final System.Logger DEBUG_LOGGER =
-                Utils.getDebugLogger("HttpResponseInputStream"::toString, DEBUG);
+        private static final Logger debug =
+                Utils.getDebugLogger("HttpResponseInputStream"::toString, Utils.DEBUG);
 
         // A queue of yet unprocessed ByteBuffers received from the flow API.
         private final BlockingQueue<List<ByteBuffer>> buffers;
@@ -263,7 +311,7 @@ static class HttpResponseInputStream extends InputStream
         private volatile ByteBuffer currentBuffer;
         private final AtomicBoolean subscribed = new AtomicBoolean();
 
-        HttpResponseInputStream() {
+        public HttpResponseInputStream() {
             this(MAX_BUFFERS_IN_QUEUE);
         }
 
@@ -277,7 +325,7 @@ static class HttpResponseInputStream extends InputStream
         public CompletionStage<InputStream> getBody() {
             // Returns the stream immediately, before the
             // response body is received.
-            // This makes it possible for senAsync().get().body()
+            // This makes it possible for sendAsync().get().body()
             // to complete before the response body is received.
             return CompletableFuture.completedStage(this);
         }
@@ -300,10 +348,10 @@ private ByteBuffer current() throws IOException {
                         // Take a new list of buffers from the queue, blocking
                         // if none is available yet...
 
-                        DEBUG_LOGGER.log(Level.DEBUG, "Taking list of Buffers");
+                        if (debug.on()) debug.log("Taking list of Buffers");
                         List<ByteBuffer> lb = buffers.take();
                         currentListItr = lb.iterator();
-                        DEBUG_LOGGER.log(Level.DEBUG, "List of Buffers Taken");
+                        if (debug.on()) debug.log("List of Buffers Taken");
 
                         // Check whether an exception was encountered upstream
                         if (closed || failed != null)
@@ -319,7 +367,7 @@ private ByteBuffer current() throws IOException {
                         // Request another upstream item ( list of buffers )
                         Flow.Subscription s = subscription;
                         if (s != null) {
-                            DEBUG_LOGGER.log(Level.DEBUG, "Increased demand by 1");
+                            if (debug.on()) debug.log("Increased demand by 1");
                             s.request(1);
                         }
                         assert currentListItr != null;
@@ -327,7 +375,7 @@ private ByteBuffer current() throws IOException {
                     }
                     assert currentListItr != null;
                     assert currentListItr.hasNext();
-                    DEBUG_LOGGER.log(Level.DEBUG, "Next Buffer");
+                    if (debug.on()) debug.log("Next Buffer");
                     currentBuffer = currentListItr.next();
                 } catch (InterruptedException ex) {
                     // continue
@@ -382,8 +430,9 @@ public void onSubscribe(Flow.Subscription s) {
                         return;
                     }
                     assert buffers.remainingCapacity() > 1; // should contain at least 2
-                    DEBUG_LOGGER.log(Level.DEBUG, () -> "onSubscribe: requesting "
-                            + Math.max(1, buffers.remainingCapacity() - 1));
+                    if (debug.on())
+                        debug.log("onSubscribe: requesting "
+                                  + Math.max(1, buffers.remainingCapacity() - 1));
                     s.request(Math.max(1, buffers.remainingCapacity() - 1));
                 }
             } catch (Throwable t) {
@@ -402,11 +451,11 @@ public void onSubscribe(Flow.Subscription s) {
         public void onNext(List<ByteBuffer> t) {
             Objects.requireNonNull(t);
             try {
-                DEBUG_LOGGER.log(Level.DEBUG, "next item received");
+                if (debug.on()) debug.log("next item received");
                 if (!buffers.offer(t)) {
                     throw new IllegalStateException("queue is full");
                 }
-                DEBUG_LOGGER.log(Level.DEBUG, "item offered");
+                if (debug.on()) debug.log("item offered");
             } catch (Throwable ex) {
                 failed = ex;
                 try {
@@ -461,69 +510,30 @@ public void close() throws IOException {
 
     }
 
-    static class MultiSubscriberImpl<V>
-        implements HttpResponse.MultiSubscriber<MultiMapResult<V>,V>
-    {
-        private final MultiMapResult<V> results;
-        private final Function<HttpRequest,Optional<HttpResponse.BodyHandler<V>>> pushHandler;
-        private final Function<HttpRequest,HttpResponse.BodyHandler<V>> requestHandler;
-        private final boolean completion; // aggregate completes on last PP received or overall completion
-
-        MultiSubscriberImpl(
-                Function<HttpRequest,HttpResponse.BodyHandler<V>> requestHandler,
-                Function<HttpRequest,Optional<HttpResponse.BodyHandler<V>>> pushHandler, boolean completion) {
-            this.results = new MultiMapResult<>(new ConcurrentHashMap<>());
-            this.requestHandler = requestHandler;
-            this.pushHandler = pushHandler;
-            this.completion = completion;
-        }
-
-        @Override
-        public HttpResponse.BodyHandler<V> onRequest(HttpRequest request) {
-            CompletableFuture<HttpResponse<V>> cf = MinimalFuture.newMinimalFuture();
-            results.put(request, cf);
-            return requestHandler.apply(request);
-        }
-
-        @Override
-        public Optional<HttpResponse.BodyHandler<V>> onPushPromise(HttpRequest push) {
-            CompletableFuture<HttpResponse<V>> cf = MinimalFuture.newMinimalFuture();
-            results.put(push, cf);
-            return pushHandler.apply(push);
-        }
-
-        @Override
-        public void onResponse(HttpResponse<V> response) {
-            CompletableFuture<HttpResponse<V>> cf = results.get(response.request());
-            cf.complete(response);
-        }
-
-        @Override
-        public void onError(HttpRequest request, Throwable t) {
-            CompletableFuture<HttpResponse<V>> cf = results.get(request);
-            cf.completeExceptionally(t);
-        }
+    public static BodySubscriber<Stream<String>> createLineStream() {
+        return createLineStream(UTF_8);
+    }
 
-        @Override
-        public CompletableFuture<MultiMapResult<V>> completion(
-                CompletableFuture<Void> onComplete, CompletableFuture<Void> onFinalPushPromise) {
-            if (completion)
-                return onComplete.thenApply((ignored)-> results);
-            else
-                return onFinalPushPromise.thenApply((ignored) -> results);
-        }
+    public static BodySubscriber<Stream<String>> createLineStream(Charset charset) {
+        Objects.requireNonNull(charset);
+        BodySubscriber<InputStream> s = new HttpResponseInputStream();
+        return new MappingSubscriber<InputStream,Stream<String>>(s,
+            (InputStream stream) -> {
+                return new BufferedReader(new InputStreamReader(stream, charset))
+                            .lines().onClose(() -> Utils.close(stream));
+            });
     }
 
     /**
      * Currently this consumes all of the data and ignores it
      */
-    static class NullSubscriber<T> implements HttpResponse.BodySubscriber<T> {
+    public static class NullSubscriber<T> implements BodySubscriber<T> {
 
         private final CompletableFuture<T> cf = new MinimalFuture<>();
         private final Optional<T> result;
         private final AtomicBoolean subscribed = new AtomicBoolean();
 
-        NullSubscriber(Optional<T> result) {
+        public NullSubscriber(Optional<T> result) {
             this.result = result;
         }
 
@@ -562,15 +572,15 @@ public CompletionStage<T> getBody() {
     }
 
     /** An adapter between {@code BodySubscriber} and {@code Flow.Subscriber}. */
-    static final class SubscriberAdapter<S extends Subscriber<? super List<ByteBuffer>>,R>
-        implements HttpResponse.BodySubscriber<R>
+    public static final class SubscriberAdapter<S extends Subscriber<? super List<ByteBuffer>>,R>
+        implements BodySubscriber<R>
     {
         private final CompletableFuture<R> cf = new MinimalFuture<>();
         private final S subscriber;
-        private final Function<S,R> finisher;
+        private final Function<? super S,? extends R> finisher;
         private volatile Subscription subscription;
 
-        SubscriberAdapter(S subscriber, Function<S,R> finisher) {
+        public SubscriberAdapter(S subscriber, Function<? super S,? extends R> finisher) {
             this.subscriber = Objects.requireNonNull(subscriber);
             this.finisher = Objects.requireNonNull(finisher);
         }
@@ -625,4 +635,263 @@ public CompletionStage<R> getBody() {
             return cf;
         }
     }
+
+    /**
+     * A body subscriber which receives input from an upstream subscriber
+     * and maps that subscriber's body type to a new type. The upstream subscriber
+     * delegates all flow operations directly to this object. The
+     * {@link CompletionStage} returned by {@link #getBody()}} takes the output
+     * of the upstream {@code getBody()} and applies the mapper function to
+     * obtain the new {@code CompletionStage} type.
+     *
+     * @param <T> the upstream body type
+     * @param <U> this subscriber's body type
+     */
+    public static class MappingSubscriber<T,U> implements BodySubscriber<U> {
+        private final BodySubscriber<T> upstream;
+        private final Function<? super T,? extends U> mapper;
+
+        public MappingSubscriber(BodySubscriber<T> upstream,
+                                 Function<? super T,? extends U> mapper) {
+            this.upstream = Objects.requireNonNull(upstream);
+            this.mapper = Objects.requireNonNull(mapper);
+        }
+
+        @Override
+        public CompletionStage<U> getBody() {
+            return upstream.getBody().thenApply(mapper);
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            upstream.onSubscribe(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            upstream.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            upstream.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            upstream.onComplete();
+        }
+    }
+
+    // A BodySubscriber that returns a Publisher<List<ByteBuffer>>
+    static class PublishingBodySubscriber
+            implements BodySubscriber<Flow.Publisher<List<ByteBuffer>>> {
+        private final MinimalFuture<Flow.Subscription>
+                subscriptionCF = new MinimalFuture<>();
+        private final MinimalFuture<SubscriberRef>
+                subscribedCF = new MinimalFuture<>();
+        private AtomicReference<SubscriberRef>
+                subscriberRef = new AtomicReference<>();
+        private final CompletionStage<Flow.Publisher<List<ByteBuffer>>> body =
+                subscriptionCF.thenCompose(
+                        (s) -> MinimalFuture.completedFuture(this::subscribe));
+
+        // We use the completionCF to ensure that only one of
+        // onError or onComplete is ever called.
+        private final MinimalFuture<Void> completionCF;
+        private PublishingBodySubscriber() {
+            completionCF = new MinimalFuture<>();
+            completionCF.whenComplete(
+                    (r,t) -> subscribedCF.thenAccept( s -> complete(s, t)));
+        }
+
+        // An object that holds a reference to a Flow.Subscriber.
+        // The reference is cleared when the subscriber is completed - either
+        // normally or exceptionally, or when the subscription is cancelled.
+        static final class SubscriberRef {
+            volatile Flow.Subscriber<? super List<ByteBuffer>> ref;
+            SubscriberRef(Flow.Subscriber<? super List<ByteBuffer>> subscriber) {
+                ref = subscriber;
+            }
+            Flow.Subscriber<? super List<ByteBuffer>> get() {
+                return ref;
+            }
+            Flow.Subscriber<? super List<ByteBuffer>> clear() {
+                Flow.Subscriber<? super List<ByteBuffer>> res = ref;
+                ref = null;
+                return res;
+            }
+        }
+
+        // A subscription that wraps an upstream subscription and
+        // holds a reference to a subscriber. The subscriber reference
+        // is cleared when the subscription is cancelled
+        final static class SubscriptionRef implements Flow.Subscription {
+            final Flow.Subscription subscription;
+            final SubscriberRef subscriberRef;
+            SubscriptionRef(Flow.Subscription subscription,
+                            SubscriberRef subscriberRef) {
+                this.subscription = subscription;
+                this.subscriberRef = subscriberRef;
+            }
+            @Override
+            public void request(long n) {
+                if (subscriberRef.get() != null) {
+                    subscription.request(n);
+                }
+            }
+            @Override
+            public void cancel() {
+                subscription.cancel();
+                subscriberRef.clear();
+            }
+
+            void subscribe() {
+                Subscriber<?> subscriber = subscriberRef.get();
+                if (subscriber != null) {
+                    subscriber.onSubscribe(this);
+                }
+            }
+
+            @Override
+            public String toString() {
+                return "SubscriptionRef/"
+                        + subscription.getClass().getName()
+                        + "@"
+                        + System.identityHashCode(subscription);
+            }
+        }
+
+        // This is a callback for the subscribedCF.
+        // Do not call directly!
+        private void complete(SubscriberRef ref, Throwable t) {
+            assert ref != null;
+            Subscriber<?> s = ref.clear();
+            // maybe null if subscription was cancelled
+            if (s == null) return;
+            if (t == null) {
+                try {
+                    s.onComplete();
+                } catch (Throwable x) {
+                    s.onError(x);
+                }
+            } else {
+                s.onError(t);
+            }
+        }
+
+        private void signalError(Throwable err) {
+            if (err == null) {
+                err = new NullPointerException("null throwable");
+            }
+            completionCF.completeExceptionally(err);
+        }
+
+        private void signalComplete() {
+            completionCF.complete(null);
+        }
+
+        private void subscribe(Flow.Subscriber<? super List<ByteBuffer>> subscriber) {
+            Objects.requireNonNull(subscriber, "subscriber must not be null");
+            SubscriberRef ref = new SubscriberRef(subscriber);
+            if (subscriberRef.compareAndSet(null, ref)) {
+                subscriptionCF.thenAccept((s) -> {
+                    SubscriptionRef subscription = new SubscriptionRef(s,ref);
+                    try {
+                        subscription.subscribe();
+                        subscribedCF.complete(ref);
+                    } catch (Throwable t) {
+                        if (Log.errors()) {
+                            Log.logError("Failed to call onSubscribe: " +
+                                    "cancelling subscription: " + t);
+                            Log.logError(t);
+                        }
+                        subscription.cancel();
+                    }
+                });
+            } else {
+                subscriber.onSubscribe(new Flow.Subscription() {
+                    @Override public void request(long n) { }
+                    @Override public void cancel() { }
+                });
+                subscriber.onError(new IllegalStateException(
+                        "This publisher has already one subscriber"));
+            }
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            subscriptionCF.complete(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            try {
+                // cannot be called before onSubscribe()
+                assert subscriptionCF.isDone();
+                SubscriberRef ref = subscriberRef.get();
+                // cannot be called before subscriber calls request(1)
+                assert ref != null;
+                Flow.Subscriber<? super List<ByteBuffer>>
+                        subscriber = ref.get();
+                if (subscriber != null) {
+                    // may be null if subscription was cancelled.
+                    subscriber.onNext(item);
+                }
+            } catch (Throwable err) {
+                signalError(err);
+                subscriptionCF.thenAccept(s -> s.cancel());
+            }
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            // cannot be called before onSubscribe();
+            assert suppress(subscriptionCF.isDone(),
+                    "onError called before onSubscribe",
+                    throwable);
+            // onError can be called before request(1), and therefore can
+            // be called before subscriberRef is set.
+            signalError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            // cannot be called before onSubscribe()
+            if (!subscriptionCF.isDone()) {
+                signalError(new InternalError(
+                        "onComplete called before onSubscribed"));
+            } else {
+                // onComplete can be called before request(1),
+                // and therefore can be called before subscriberRef
+                // is set.
+                signalComplete();
+            }
+        }
+
+        @Override
+        public CompletionStage<Flow.Publisher<List<ByteBuffer>>> getBody() {
+            return body;
+        }
+
+        private boolean suppress(boolean condition,
+                                 String assertion,
+                                 Throwable carrier) {
+            if (!condition) {
+                if (carrier != null) {
+                    carrier.addSuppressed(new AssertionError(assertion));
+                } else if (Log.errors()) {
+                    Log.logError(new AssertionError(assertion));
+                }
+            }
+            return true;
+        }
+
+    }
+
+    public static BodySubscriber<Flow.Publisher<List<ByteBuffer>>>
+    createPublisher() {
+        return new PublishingBodySubscriber();
+    }
+
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SocketTube.java b/src/java.net.http/share/classes/jdk/internal/net/http/SocketTube.java
similarity index 69%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SocketTube.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/SocketTube.java
index 546ed617121..bb348245ba4 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SocketTube.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/SocketTube.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,9 +23,8 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.lang.System.Logger.Level;
 import java.nio.ByteBuffer;
@@ -40,23 +39,22 @@
 import java.util.ArrayList;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-
-import jdk.incubator.http.internal.common.Demand;
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-import jdk.incubator.http.internal.common.SequentialScheduler.DeferredCompleter;
-import jdk.incubator.http.internal.common.SequentialScheduler.RestartableTask;
-import jdk.incubator.http.internal.common.Utils;
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.SequentialScheduler;
+import jdk.internal.net.http.common.SequentialScheduler.DeferredCompleter;
+import jdk.internal.net.http.common.SequentialScheduler.RestartableTask;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * A SocketTube is a terminal tube plugged directly into the socket.
  * The read subscriber should call {@code subscribe} on the SocketTube before
- * the SocketTube can be subscribed to the write publisher.
+ * the SocketTube is subscribed to the write publisher.
  */
 final class SocketTube implements FlowTube {
 
-    static final boolean DEBUG = Utils.DEBUG; // revisit: temporary developer's flag
-    final System.Logger  debug = Utils.getDebugLogger(this::dbgString, DEBUG);
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
     static final AtomicLong IDS = new AtomicLong();
 
     private final HttpClientImpl client;
@@ -77,13 +75,6 @@ public SocketTube(HttpClientImpl client, SocketChannel channel,
         this.writeSubscriber = new InternalWriteSubscriber();
     }
 
-//    private static Flow.Subscription nopSubscription() {
-//        return new Flow.Subscription() {
-//            @Override public void request(long n) { }
-//            @Override public void cancel() { }
-//        };
-//    }
-
     /**
      * Returns {@code true} if this flow is finished.
      * This happens when this flow internal read subscription is completed,
@@ -154,6 +145,13 @@ public void onComplete() {
     //                           Events                                      //
     // ======================================================================//
 
+    void signalClosed() {
+        // Ensures that the subscriber will be terminated and that future
+        // subscribers will be notified when the connection is closed.
+        readPublisher.subscriptionImpl.signalError(
+                new IOException("connection closed locally"));
+    }
+
     /**
      * A restartable task used to process tasks in sequence.
      */
@@ -176,13 +174,12 @@ public final void run(DeferredCompleter taskCompleter) {
         }
     }
 
-    // This is best effort - there's no guarantee that the printed set
-    // of values is consistent. It should only be considered as
-    // weakly accurate - in particular in what concerns the events states,
-    // especially when displaying a read event state from a write event
-    // callback and conversely.
+    // This is best effort - there's no guarantee that the printed set of values
+    // is consistent. It should only be considered as weakly accurate - in
+    // particular in what concerns the events states, especially when displaying
+    // a read event state from a write event callback and conversely.
     void debugState(String when) {
-        if (debug.isLoggable(Level.DEBUG)) {
+        if (debug.on()) {
             StringBuilder state = new StringBuilder();
 
             InternalReadPublisher.InternalReadSubscription sub =
@@ -192,7 +189,7 @@ void debugState(String when) {
             Demand rdemand = sub == null ? null : sub.demand;
             InternalWriteSubscriber.WriteEvent writeEvent =
                     writeSubscriber.writeEvent;
-            AtomicLong wdemand = writeSubscriber.writeDemand;
+            Demand wdemand = writeSubscriber.writeDemand;
             int rops = readEvent == null ? 0 : readEvent.interestOps();
             long rd = rdemand == null ? 0 : rdemand.get();
             int wops = writeEvent == null ? 0 : writeEvent.interestOps();
@@ -205,16 +202,15 @@ void debugState(String when) {
                     .append("], Writing: [ops=").append(wops)
                     .append(", demand=").append(wd)
                     .append("]");
-            debug.log(Level.DEBUG, state.toString());
+            debug.log(state.toString());
         }
     }
 
     /**
-     * A repeatable event that can be paused or resumed by changing
-     * its interestOps.
-     * When the event is fired, it is first paused before being signaled.
-     * It is the responsibility of the code triggered by {@code signalEvent}
-     * to resume the event if required.
+     * A repeatable event that can be paused or resumed by changing its
+     * interestOps. When the event is fired, it is first paused before being
+     * signaled. It is the responsibility of the code triggered by
+     * {@code signalEvent} to resume the event if required.
      */
     private static abstract class SocketFlowEvent extends AsyncEvent {
         final SocketChannel channel;
@@ -244,56 +240,65 @@ public final void handle() {
         }
         @Override
         public final void abort(IOException error) {
-            debug().log(Level.DEBUG, () -> "abort: " + error);
+            debug().log(() -> "abort: " + error);
             pause();              // pause, then signal
             signalError(error);   // should not be resumed after abort (not checked)
         }
 
         protected abstract void signalEvent();
         protected abstract void signalError(Throwable error);
-        abstract System.Logger debug();
+        abstract Logger debug();
     }
 
     // ===================================================================== //
     //                              Writing                                  //
     // ======================================================================//
 
-    // This class makes the assumption that the publisher will call
-    // onNext sequentially, and that onNext won't be called if the demand
-    // has not been incremented by request(1).
+    // This class makes the assumption that the publisher will call onNext
+    // sequentially, and that onNext won't be called if the demand has not been
+    // incremented by request(1).
     // It has a 'queue of 1' meaning that it will call request(1) in
     // onSubscribe, and then only after its 'current' buffer list has been
     // fully written and current set to null;
     private final class InternalWriteSubscriber
             implements Flow.Subscriber<List<ByteBuffer>> {
 
-        volatile Flow.Subscription subscription;
+        volatile WriteSubscription subscription;
         volatile List<ByteBuffer> current;
         volatile boolean completed;
+        final AsyncTriggerEvent startSubscription =
+                new AsyncTriggerEvent(this::signalError, this::startSubscription);
         final WriteEvent writeEvent = new WriteEvent(channel, this);
-        final AtomicLong writeDemand = new AtomicLong();
+        final Demand writeDemand = new Demand();
 
         @Override
         public void onSubscribe(Flow.Subscription subscription) {
-            Flow.Subscription previous = this.subscription;
-            this.subscription = subscription;
-            debug.log(Level.DEBUG, "subscribed for writing");
-            if (current == null) {
-                if (previous == subscription || previous == null) {
-                    if (writeDemand.compareAndSet(0, 1)) {
-                        subscription.request(1);
+            WriteSubscription previous = this.subscription;
+            if (debug.on()) debug.log("subscribed for writing");
+            try {
+                boolean needEvent = current == null;
+                if (needEvent) {
+                    if (previous != null && previous.upstreamSubscription != subscription) {
+                        previous.dropSubscription();
                     }
-                } else {
-                    writeDemand.set(1);
-                    subscription.request(1);
                 }
+                this.subscription = new WriteSubscription(subscription);
+                if (needEvent) {
+                    if (debug.on())
+                        debug.log("write: registering startSubscription event");
+                    client.registerEvent(startSubscription);
+                }
+            } catch (Throwable t) {
+                signalError(t);
             }
         }
 
         @Override
         public void onNext(List<ByteBuffer> bufs) {
-            assert current == null; // this is a queue of 1.
-            assert subscription != null;
+            assert current == null : dbgString() // this is a queue of 1.
+                    + "w.onNext current: " + current;
+            assert subscription != null : dbgString()
+                    + "w.onNext: subscription is null";
             current = bufs;
             tryFlushCurrent(client.isSelectorThread()); // may be in selector thread
             // For instance in HTTP/2, a received SETTINGS frame might trigger
@@ -306,18 +311,19 @@ public void onNext(List<ByteBuffer> bufs) {
             debugState("leaving w.onNext");
         }
 
-        // we don't use a SequentialScheduler here: we rely on
-        // onNext() being called sequentially, and not being called
-        // if we haven't call request(1)
-        // onNext is usually called from within a user/executor thread.
-        // we will perform the initial writing in that thread.
-        // if for some reason, not all data can be written, the writeEvent
-        // will be resumed, and the rest of the data will be written from
-        // the selector manager thread when the writeEvent is fired.
-        // If we are in the selector manager thread, then we will use the executor
-        // to call request(1), ensuring that onNext() won't be called from
-        // within the selector thread.
-        // If we are not in the selector manager thread, then we don't care.
+        // Don't use a SequentialScheduler here: rely on onNext() being invoked
+        // sequentially, and not being invoked if there is no demand, request(1).
+        // onNext is usually called from within a user / executor thread.
+        // Initial writing will be performed in that thread. If for some reason,
+        // not all the data can be written, a writeEvent will be registered, and
+        // writing will resume in the the selector manager thread when the
+        // writeEvent is fired.
+        //
+        // If this method is invoked in the selector manager thread (because of
+        // a writeEvent), then the executor will be used to invoke request(1),
+        // ensuring that onNext() won't be invoked from within the selector
+        // thread. If not in the selector manager thread, then request(1) is
+        // invoked directly.
         void tryFlushCurrent(boolean inSelectorThread) {
             List<ByteBuffer> bufs = current;
             if (bufs == null) return;
@@ -326,24 +332,22 @@ void tryFlushCurrent(boolean inSelectorThread) {
                        "should " + (inSelectorThread ? "" : "not ")
                         + " be in the selector thread";
                 long remaining = Utils.remaining(bufs);
-                debug.log(Level.DEBUG, "trying to write: %d", remaining);
+                if (debug.on()) debug.log("trying to write: %d", remaining);
                 long written = writeAvailable(bufs);
-                debug.log(Level.DEBUG, "wrote: %d", remaining);
-                if (written == -1) {
-                    signalError(new EOFException("EOF reached while writing"));
-                    return;
-                }
+                if (debug.on()) debug.log("wrote: %d", written);
+                assert written >= 0 : "negative number of bytes written:" + written;
                 assert written <= remaining;
                 if (remaining - written == 0) {
                     current = null;
-                    writeDemand.decrementAndGet();
-                    Runnable requestMore = this::requestMore;
-                    if (inSelectorThread) {
-                        assert client.isSelectorThread();
-                        client.theExecutor().execute(requestMore);
-                    } else {
-                        assert !client.isSelectorThread();
-                        requestMore.run();
+                    if (writeDemand.tryDecrement()) {
+                        Runnable requestMore = this::requestMore;
+                        if (inSelectorThread) {
+                            assert client.isSelectorThread();
+                            client.theExecutor().execute(requestMore);
+                        } else {
+                            assert !client.isSelectorThread();
+                            requestMore.run();
+                        }
                     }
                 } else {
                     resumeWriteEvent(inSelectorThread);
@@ -354,26 +358,27 @@ void tryFlushCurrent(boolean inSelectorThread) {
             }
         }
 
-        void requestMore() {
+        // Kick off the initial request:1 that will start the writing side.
+        // Invoked in the selector manager thread.
+        void startSubscription() {
             try {
-                if (completed) return;
-                long d =  writeDemand.get();
-                if (writeDemand.compareAndSet(0,1)) {
-                    debug.log(Level.DEBUG, "write: requesting more...");
-                    subscription.request(1);
-                } else {
-                    debug.log(Level.DEBUG, "write: no need to request more: %d", d);
-                }
-            } catch (Throwable t) {
-                debug.log(Level.DEBUG, () ->
-                        "write: error while requesting more: " + t);
+                if (debug.on()) debug.log("write: starting subscription");
+                assert client.isSelectorThread();
+                // make sure read registrations are handled before;
+                readPublisher.subscriptionImpl.handlePending();
+                if (debug.on()) debug.log("write: offloading requestMore");
+                // start writing;
+                client.theExecutor().execute(this::requestMore);
+            } catch(Throwable t) {
                 signalError(t);
-                subscription.cancel();
-            } finally {
-                debugState("leaving requestMore: ");
             }
         }
 
+        void requestMore() {
+           WriteSubscription subscription = this.subscription;
+           subscription.requestMore();
+        }
+
         @Override
         public void onError(Throwable throwable) {
             signalError(throwable);
@@ -386,27 +391,23 @@ public void onComplete() {
             // be paused if there is nothing more to write.
             List<ByteBuffer> bufs = current;
             long remaining = bufs == null ? 0 : Utils.remaining(bufs);
-            debug.log(Level.DEBUG,  "write completed, %d yet to send", remaining);
+            if (debug.on())
+                debug.log( "write completed, %d yet to send", remaining);
             debugState("InternalWriteSubscriber::onComplete");
         }
 
         void resumeWriteEvent(boolean inSelectorThread) {
-            debug.log(Level.DEBUG, "scheduling write event");
+            if (debug.on()) debug.log("scheduling write event");
             resumeEvent(writeEvent, this::signalError);
         }
 
-//        void pauseWriteEvent() {
-//            debug.log(Level.DEBUG, "pausing write event");
-//            pauseEvent(writeEvent, this::signalError);
-//        }
-
         void signalWritable() {
-            debug.log(Level.DEBUG, "channel is writable");
+            if (debug.on()) debug.log("channel is writable");
             tryFlushCurrent(true);
         }
 
         void signalError(Throwable error) {
-            debug.log(Level.DEBUG, () -> "write error: " + error);
+            debug.log(() -> "write error: " + error);
             completed = true;
             readPublisher.signalError(error);
         }
@@ -435,12 +436,66 @@ protected void signalError(Throwable error) {
             }
 
             @Override
-            System.Logger debug() {
-                return debug;
+            Logger debug() { return debug; }
+        }
+
+        final class WriteSubscription implements Flow.Subscription {
+            final Flow.Subscription upstreamSubscription;
+            volatile boolean cancelled;
+            WriteSubscription(Flow.Subscription subscription) {
+                this.upstreamSubscription = subscription;
             }
 
-        }
+            @Override
+            public void request(long n) {
+                if (cancelled) return;
+                upstreamSubscription.request(n);
+            }
+
+            @Override
+            public void cancel() {
+                dropSubscription();
+                upstreamSubscription.cancel();
+            }
+
+            void dropSubscription() {
+                synchronized (InternalWriteSubscriber.this) {
+                    cancelled = true;
+                    if (debug.on()) debug.log("write: resetting demand to 0");
+                    writeDemand.reset();
+                }
+            }
 
+            void requestMore() {
+                try {
+                    if (completed || cancelled) return;
+                    boolean requestMore;
+                    long d;
+                    // don't fiddle with demand after cancel.
+                    // see dropSubscription.
+                    synchronized (InternalWriteSubscriber.this) {
+                        if (cancelled) return;
+                        d = writeDemand.get();
+                        requestMore = writeDemand.increaseIfFulfilled();
+                    }
+                    if (requestMore) {
+                        if (debug.on()) debug.log("write: requesting more...");
+                        upstreamSubscription.request(1);
+                    } else {
+                        if (debug.on())
+                            debug.log("write: no need to request more: %d", d);
+                    }
+                } catch (Throwable t) {
+                    if (debug.on())
+                        debug.log("write: error while requesting more: " + t);
+                    cancelled = true;
+                    signalError(t);
+                    subscription.cancel();
+                } finally {
+                    debugState("leaving requestMore: ");
+                }
+            }
+        }
     }
 
     // ===================================================================== //
@@ -480,9 +535,9 @@ public void subscribe(Flow.Subscriber<? super List<ByteBuffer>> s) {
             ReadSubscription previous = pendingSubscription.getAndSet(target);
 
             if (previous != null && previous != target) {
-                debug.log(Level.DEBUG,
-                        () -> "read publisher: dropping pending subscriber: "
-                        + previous.subscriber);
+                if (debug.on())
+                    debug.log("read publisher: dropping pending subscriber: "
+                              + previous.subscriber);
                 previous.errorRef.compareAndSet(null, errorRef.get());
                 previous.signalOnSubscribe();
                 if (subscriptionImpl.completed) {
@@ -492,12 +547,13 @@ public void subscribe(Flow.Subscriber<? super List<ByteBuffer>> s) {
                 }
             }
 
-            debug.log(Level.DEBUG, "read publisher got subscriber");
+            if (debug.on()) debug.log("read publisher got subscriber");
             subscriptionImpl.signalSubscribe();
             debugState("leaving read.subscribe: ");
         }
 
         void signalError(Throwable error) {
+            if (debug.on()) debug.log("error signalled " + error);
             if (!errorRef.compareAndSet(null, error)) {
                 return;
             }
@@ -528,8 +584,8 @@ public void request(long n) {
                 if (!cancelled) {
                     impl.request(n);
                 } else {
-                    debug.log(Level.DEBUG,
-                              "subscription cancelled, ignoring request %d", n);
+                    if (debug.on())
+                        debug.log("subscription cancelled, ignoring request %d", n);
                 }
             }
 
@@ -542,12 +598,11 @@ void signalCompletion() {
                 }
                 Throwable error = errorRef.get();
                 if (error != null) {
-                    debug.log(Level.DEBUG, () ->
-                        "forwarding error to subscriber: "
-                        + error);
+                    if (debug.on())
+                        debug.log("forwarding error to subscriber: " + error);
                     subscriber.onError(error);
                 } else {
-                    debug.log(Level.DEBUG, "completing subscriber");
+                    if (debug.on()) debug.log("completing subscriber");
                     subscriber.onComplete();
                 }
             }
@@ -559,7 +614,7 @@ void signalOnSubscribe() {
                     subscribed = true;
                 }
                 subscriber.onSubscribe(this);
-                debug.log(Level.DEBUG, "onSubscribe called");
+                if (debug.on()) debug.log("onSubscribe called");
                 if (errorRef.get() != null) {
                     signalCompletion();
                 }
@@ -588,13 +643,12 @@ final void signalSubscribe() {
                 if (readScheduler.isStopped() || completed) {
                     // if already completed or stopped we can handle any
                     // pending connection directly from here.
-                    debug.log(Level.DEBUG,
-                              "handling pending subscription while completed");
+                    if (debug.on())
+                        debug.log("handling pending subscription while completed");
                     handlePending();
                 } else {
                     try {
-                        debug.log(Level.DEBUG,
-                                  "registering subscribe event");
+                        if (debug.on()) debug.log("registering subscribe event");
                         client.registerEvent(subscribeEvent);
                     } catch (Throwable t) {
                         signalError(t);
@@ -605,13 +659,13 @@ final void signalSubscribe() {
 
             final void handleSubscribeEvent() {
                 assert client.isSelectorThread();
-                debug.log(Level.DEBUG, "subscribe event raised");
+                debug.log("subscribe event raised");
                 readScheduler.runOrSchedule();
                 if (readScheduler.isStopped() || completed) {
                     // if already completed or stopped we can handle any
                     // pending connection directly from here.
-                    debug.log(Level.DEBUG,
-                              "handling pending subscription when completed");
+                    if (debug.on())
+                        debug.log("handling pending subscription when completed");
                     handlePending();
                 }
             }
@@ -622,15 +676,14 @@ final void handleSubscribeEvent() {
              * to not require it to be as such. It's a responsibility of the
              * subscriber to signal demand in a thread-safe manner.
              *
-             * https://github.com/reactive-streams/reactive-streams-jvm/blob/dd24d2ab164d7de6c316f6d15546f957bec29eaa/README.md
-             * (rules 2.7 and 3.4)
+             * See Reactive Streams specification, rules 2.7 and 3.4.
              */
             @Override
             public final void request(long n) {
                 if (n > 0L) {
                     boolean wasFulfilled = demand.increase(n);
                     if (wasFulfilled) {
-                        debug.log(Level.DEBUG, "got some demand for reading");
+                        if (debug.on()) debug.log("got some demand for reading");
                         resumeReadEvent();
                         // if demand has been changed from fulfilled
                         // to unfulfilled register read event;
@@ -648,12 +701,12 @@ public final void cancel() {
             }
 
             private void resumeReadEvent() {
-                debug.log(Level.DEBUG, "resuming read event");
+                if (debug.on()) debug.log("resuming read event");
                 resumeEvent(readEvent, this::signalError);
             }
 
             private void pauseReadEvent() {
-                debug.log(Level.DEBUG, "pausing read event");
+                if (debug.on()) debug.log("pausing read event");
                 pauseEvent(readEvent, this::signalError);
             }
 
@@ -667,7 +720,7 @@ final void signalError(Throwable error) {
                 if (!errorRef.compareAndSet(null, error)) {
                     return;
                 }
-                debug.log(Level.DEBUG, () -> "got read error: " + error);
+                if (debug.on()) debug.log("got read error: " + error);
                 readScheduler.runOrSchedule();
             }
 
@@ -689,7 +742,8 @@ final void read() {
 
                         // make sure we have a subscriber
                         if (handlePending()) {
-                            debug.log(Level.DEBUG, "pending subscriber subscribed");
+                            if (debug.on())
+                                debug.log("pending subscriber subscribed");
                             return;
                         }
 
@@ -697,14 +751,22 @@ final void read() {
                         // the selector thread, and that is OK, because we
                         // will just call onError and return.
                         ReadSubscription current = subscription;
-                        TubeSubscriber subscriber = current.subscriber;
                         Throwable error = errorRef.get();
+                        if (current == null)  {
+                            assert error != null;
+                            if (debug.on())
+                                debug.log("error raised before subscriber subscribed: %s",
+                                          (Object)error);
+                            return;
+                        }
+                        TubeSubscriber subscriber = current.subscriber;
                         if (error != null) {
                             completed = true;
                             // safe to pause here because we're finished anyway.
                             pauseReadEvent();
-                            debug.log(Level.DEBUG, () -> "Sending error " + error
-                                  + " to subscriber " + subscriber);
+                            if (debug.on())
+                                debug.log("Sending error " + error
+                                          + " to subscriber " + subscriber);
                             current.errorRef.compareAndSet(null, error);
                             current.signalCompletion();
                             readScheduler.stop();
@@ -720,7 +782,7 @@ final void read() {
                                 List<ByteBuffer> bytes = readAvailable();
                                 if (bytes == EOF) {
                                     if (!completed) {
-                                        debug.log(Level.DEBUG, "got read EOF");
+                                        if (debug.on()) debug.log("got read EOF");
                                         completed = true;
                                         // safe to pause here because we're finished
                                         // anyway.
@@ -733,8 +795,8 @@ final void read() {
                                 } else if (Utils.remaining(bytes) > 0) {
                                     // the subscriber is responsible for offloading
                                     // to another thread if needed.
-                                    debug.log(Level.DEBUG, () -> "read bytes: "
-                                            + Utils.remaining(bytes));
+                                    if (debug.on())
+                                        debug.log("read bytes: " + Utils.remaining(bytes));
                                     assert !current.completed;
                                     subscriber.onNext(bytes);
                                     // we could continue looping until the demand
@@ -749,7 +811,7 @@ final void read() {
                                     return;
                                 } else {
                                     // nothing available!
-                                    debug.log(Level.DEBUG, "no more bytes available");
+                                    if (debug.on()) debug.log("no more bytes available");
                                     // re-increment the demand and resume the read
                                     // event. This ensures that this loop is
                                     // executed again when the socket becomes
@@ -764,7 +826,7 @@ final void read() {
                                 continue;
                             }
                         } else {
-                            debug.log(Level.DEBUG, "no more demand for reading");
+                            if (debug.on()) debug.log("no more demand for reading");
                             // the event is paused just after firing, so it should
                             // still be paused here, unless the demand was just
                             // incremented from 0 to n, in which case, the
@@ -779,7 +841,7 @@ final void read() {
                         }
                     }
                 } catch (Throwable t) {
-                    debug.log(Level.DEBUG, "Unexpected exception in read loop", t);
+                    if (debug.on()) debug.log("Unexpected exception in read loop", t);
                     signalError(t);
                 } finally {
                     handlePending();
@@ -789,21 +851,22 @@ final void read() {
             boolean handlePending() {
                 ReadSubscription pending = pendingSubscription.getAndSet(null);
                 if (pending == null) return false;
-                debug.log(Level.DEBUG, "handling pending subscription for %s",
-                          pending.subscriber);
+                if (debug.on())
+                    debug.log("handling pending subscription for %s",
+                            pending.subscriber);
                 ReadSubscription current = subscription;
                 if (current != null && current != pending && !completed) {
                     current.subscriber.dropSubscription();
                 }
-                debug.log(Level.DEBUG, "read demand reset to 0");
+                if (debug.on()) debug.log("read demand reset to 0");
                 subscriptionImpl.demand.reset(); // subscriber will increase demand if it needs to.
                 pending.errorRef.compareAndSet(null, errorRef.get());
                 if (!readScheduler.isStopped()) {
                     subscription = pending;
                 } else {
-                    debug.log(Level.DEBUG, "socket tube is already stopped");
+                    if (debug.on()) debug.log("socket tube is already stopped");
                 }
-                debug.log(Level.DEBUG, "calling onSubscribe");
+                if (debug.on()) debug.log("calling onSubscribe");
                 pending.signalOnSubscribe();
                 if (completed) {
                     pending.errorRef.compareAndSet(null, errorRef.get());
@@ -838,11 +901,8 @@ protected final void signalError(Throwable error) {
             }
 
             @Override
-            System.Logger debug() {
-                return debug;
-            }
+            Logger debug() { return debug; }
         }
-
     }
 
     // ===================================================================== //
@@ -850,58 +910,115 @@ System.Logger debug() {
     // ===================================================================== //
     static final int MAX_BUFFERS = 3;
     static final List<ByteBuffer> EOF = List.of();
-
+    static final List<ByteBuffer> NOTHING = List.of(Utils.EMPTY_BYTEBUFFER);
+
+    // readAvailable() will read bytes into the 'current' ByteBuffer until
+    // the ByteBuffer is full, or 0 or -1 (EOF) is returned by read().
+    // When that happens, a slice of the data that has been read so far
+    // is inserted into the returned buffer list, and if the current buffer
+    // has remaining space, that space will be used to read more data when
+    // the channel becomes readable again.
+    private volatile ByteBuffer current;
     private List<ByteBuffer> readAvailable() throws IOException {
-        ByteBuffer buf = buffersSource.get();
+        ByteBuffer buf = current;
+        buf = (buf == null || !buf.hasRemaining())
+                ? (current = buffersSource.get()) : buf;
         assert buf.hasRemaining();
 
         int read;
         int pos = buf.position();
         List<ByteBuffer> list = null;
         while (buf.hasRemaining()) {
-            while ((read = channel.read(buf)) > 0) {
-               if (!buf.hasRemaining()) break;
+            try {
+                while ((read = channel.read(buf)) > 0) {
+                    if (!buf.hasRemaining())
+                        break;
+                }
+            } catch (IOException x) {
+                if (buf.position() == pos && list == null) {
+                    // no bytes have been read, just throw...
+                    throw x;
+                } else {
+                    // some bytes have been read, return them and fail next time
+                    errorRef.compareAndSet(null, x);
+                    read = 0; // ensures outer loop will exit
+                }
             }
 
             // nothing read;
             if (buf.position() == pos) {
-                // An empty list signal the end of data, and should only be
-                // returned if read == -1.
-                // If we already read some data, then we must return what we have
-                // read, and -1 will be returned next time the caller attempts to
-                // read something.
-                if (list == null && read == -1) {  // eof
-                    list = EOF;
-                    break;
+                // An empty list signals the end of data, and should only be
+                // returned if read == -1. If some data has already been read,
+                // then it must be returned. -1 will be returned next time
+                // the caller attempts to read something.
+                if (list == null) {
+                    // nothing read - list was null - return EOF or NOTHING
+                    list = read == -1 ? EOF : NOTHING;
                 }
+                break;
             }
+
+            // check whether this buffer has still some free space available.
+            // if so, we will keep it for the next round.
+            final boolean hasRemaining = buf.hasRemaining();
+
+            // creates a slice to add to the list
+            int limit = buf.limit();
             buf.limit(buf.position());
             buf.position(pos);
-            if (list == null) {
-                list = List.of(buf);
-            } else {
-                if (!(list instanceof ArrayList)) {
-                    list = new ArrayList<>(list);
-                }
-                list.add(buf);
+            ByteBuffer slice = buf.slice();
+
+            // restore buffer state to what it was before creating the slice
+            buf.position(buf.limit());
+            buf.limit(limit);
+
+            // add the buffer to the list
+            list = addToList(list, slice.asReadOnlyBuffer());
+            if (read <= 0 || list.size() == MAX_BUFFERS) {
+                break;
             }
-            if (read <= 0 || list.size() == MAX_BUFFERS) break;
-            buf = buffersSource.get();
+
+            buf = hasRemaining ? buf : (current = buffersSource.get());
             pos = buf.position();
             assert buf.hasRemaining();
         }
         return list;
     }
 
+    private <T> List<T> addToList(List<T> list, T item) {
+        int size = list == null ? 0 : list.size();
+        switch (size) {
+            case 0: return List.of(item);
+            case 1: return List.of(list.get(0), item);
+            case 2: return List.of(list.get(0), list.get(1), item);
+            default: // slow path if MAX_BUFFERS > 3
+                ArrayList<T> res = new ArrayList<>(list);
+                res.add(item);
+                return res;
+        }
+    }
+
     private long writeAvailable(List<ByteBuffer> bytes) throws IOException {
         ByteBuffer[] srcs = bytes.toArray(Utils.EMPTY_BB_ARRAY);
         final long remaining = Utils.remaining(srcs);
         long written = 0;
         while (remaining > written) {
-            long w = channel.write(srcs);
-            if (w == -1 && written == 0) return -1;
-            if (w == 0) break;
-            written += w;
+            try {
+                long w = channel.write(srcs);
+                assert w >= 0 : "negative number of bytes written:" + w;
+                if (w == 0) {
+                    break;
+                }
+                written += w;
+            } catch (IOException x) {
+                if (written == 0) {
+                    // no bytes were written just throw
+                    throw x;
+                } else {
+                    // return how many bytes were written, will fail next time
+                    break;
+                }
+            }
         }
         return written;
     }
@@ -939,7 +1056,7 @@ private void pauseEvent(SocketFlowEvent event,
     @Override
     public void connectFlows(TubePublisher writePublisher,
                              TubeSubscriber readSubscriber) {
-        debug.log(Level.DEBUG, "connecting flows");
+        if (debug.on()) debug.log("connecting flows");
         this.subscribe(readSubscriber);
         writePublisher.subscribe(this);
     }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
similarity index 74%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
index 4556c839192..b90b8d96d2c 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
@@ -23,16 +23,16 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.System.Logger.Level;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -40,10 +40,15 @@
 import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscription;
 import java.util.concurrent.atomic.AtomicReference;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
-import jdk.incubator.http.internal.common.*;
-import jdk.incubator.http.internal.frame.*;
-import jdk.incubator.http.internal.hpack.DecodingCallback;
+import java.util.function.BiPredicate;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodySubscriber;
+import jdk.internal.net.http.common.*;
+import jdk.internal.net.http.frame.*;
+import jdk.internal.net.http.hpack.DecodingCallback;
 
 /**
  * Http/2 Stream handling.
@@ -90,13 +95,13 @@
  */
 class Stream<T> extends ExchangeImpl<T> {
 
-    final static boolean DEBUG = Utils.DEBUG; // Revisit: temporary developer's flag
-    final System.Logger  debug = Utils.getDebugLogger(this::dbgString, DEBUG);
+    final Logger debug = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
 
     final ConcurrentLinkedQueue<Http2Frame> inputQ = new ConcurrentLinkedQueue<>();
     final SequentialScheduler sched =
             SequentialScheduler.synchronizedScheduler(this::schedule);
-    final SubscriptionBase userSubscription = new SubscriptionBase(sched, this::cancel);
+    final SubscriptionBase userSubscription =
+            new SubscriptionBase(sched, this::cancel, this::onSubscriptionError);
 
     /**
      * This stream's identifier. Assigned lazily by the HTTP2Connection before
@@ -108,17 +113,20 @@ class Stream<T> extends ExchangeImpl<T> {
 
     final Http2Connection connection;
     final HttpRequestImpl request;
-    final DecodingCallback rspHeadersConsumer;
-    HttpHeadersImpl responseHeaders;
+    final HeadersConsumer rspHeadersConsumer;
+    final HttpHeadersImpl responseHeaders;
     final HttpHeadersImpl requestPseudoHeaders;
     volatile HttpResponse.BodySubscriber<T> responseSubscriber;
     final HttpRequest.BodyPublisher requestPublisher;
     volatile RequestSubscriber requestSubscriber;
     volatile int responseCode;
     volatile Response response;
-    volatile Throwable failed; // The exception with which this stream was canceled.
+    // The exception with which this stream was canceled.
+    private final AtomicReference<Throwable> errorRef = new AtomicReference<>();
     final CompletableFuture<Void> requestBodyCF = new MinimalFuture<>();
     volatile CompletableFuture<T> responseBodyCF;
+    volatile HttpResponse.BodySubscriber<T> pendingResponseSubscriber;
+    volatile boolean stopRequested;
 
     /** True if END_STREAM has been seen in a frame received on this stream. */
     private volatile boolean remotelyClosed;
@@ -146,53 +154,81 @@ HttpConnection connection() {
      * of after user subscription window has re-opened, from SubscriptionBase.request()
      */
     private void schedule() {
-        if (responseSubscriber == null)
-            // can't process anything yet
-            return;
-
-        while (!inputQ.isEmpty()) {
-            Http2Frame frame  = inputQ.peek();
-            if (frame instanceof ResetFrame) {
-                inputQ.remove();
-                handleReset((ResetFrame)frame);
-                return;
+        boolean onCompleteCalled = false;
+        HttpResponse.BodySubscriber<T> subscriber = responseSubscriber;
+        try {
+            if (subscriber == null) {
+                subscriber = responseSubscriber = pendingResponseSubscriber;
+                if (subscriber == null) {
+                    // can't process anything yet
+                    return;
+                } else {
+                    if (debug.on()) debug.log("subscribing user subscriber");
+                    subscriber.onSubscribe(userSubscription);
+                }
             }
-            DataFrame df = (DataFrame)frame;
-            boolean finished = df.getFlag(DataFrame.END_STREAM);
-
-            List<ByteBuffer> buffers = df.getData();
-            List<ByteBuffer> dsts = Collections.unmodifiableList(buffers);
-            int size = Utils.remaining(dsts, Integer.MAX_VALUE);
-            if (size == 0 && finished) {
-                inputQ.remove();
-                Log.logTrace("responseSubscriber.onComplete");
-                debug.log(Level.DEBUG, "incoming: onComplete");
-                sched.stop();
-                responseSubscriber.onComplete();
-                setEndStreamReceived();
-                return;
-            } else if (userSubscription.tryDecrement()) {
-                inputQ.remove();
-                Log.logTrace("responseSubscriber.onNext {0}", size);
-                debug.log(Level.DEBUG, "incoming: onNext(%d)", size);
-                responseSubscriber.onNext(dsts);
-                if (consumed(df)) {
+            while (!inputQ.isEmpty()) {
+                Http2Frame frame = inputQ.peek();
+                if (frame instanceof ResetFrame) {
+                    inputQ.remove();
+                    handleReset((ResetFrame)frame);
+                    return;
+                }
+                DataFrame df = (DataFrame)frame;
+                boolean finished = df.getFlag(DataFrame.END_STREAM);
+
+                List<ByteBuffer> buffers = df.getData();
+                List<ByteBuffer> dsts = Collections.unmodifiableList(buffers);
+                int size = Utils.remaining(dsts, Integer.MAX_VALUE);
+                if (size == 0 && finished) {
+                    inputQ.remove();
                     Log.logTrace("responseSubscriber.onComplete");
-                    debug.log(Level.DEBUG, "incoming: onComplete");
+                    if (debug.on()) debug.log("incoming: onComplete");
                     sched.stop();
-                    responseSubscriber.onComplete();
+                    subscriber.onComplete();
+                    onCompleteCalled = true;
                     setEndStreamReceived();
                     return;
+                } else if (userSubscription.tryDecrement()) {
+                    inputQ.remove();
+                    Log.logTrace("responseSubscriber.onNext {0}", size);
+                    if (debug.on()) debug.log("incoming: onNext(%d)", size);
+                    subscriber.onNext(dsts);
+                    if (consumed(df)) {
+                        Log.logTrace("responseSubscriber.onComplete");
+                        if (debug.on()) debug.log("incoming: onComplete");
+                        sched.stop();
+                        subscriber.onComplete();
+                        onCompleteCalled = true;
+                        setEndStreamReceived();
+                        return;
+                    }
+                } else {
+                    if (stopRequested) break;
+                    return;
                 }
-            } else {
-                return;
             }
+        } catch (Throwable throwable) {
+            errorRef.compareAndSet(null, throwable);
         }
-        Throwable t = failed;
+
+        Throwable t = errorRef.get();
         if (t != null) {
             sched.stop();
-            responseSubscriber.onError(t);
-            close();
+            try {
+                if (!onCompleteCalled) {
+                    if (debug.on())
+                        debug.log("calling subscriber.onError: %s", (Object)t);
+                    subscriber.onError(t);
+                } else {
+                    if (debug.on())
+                        debug.log("already completed: dropping error %s", (Object)t);
+                }
+            } catch (Throwable x) {
+                Log.logError("Subscriber::onError threw exception: {0}", (Object)t);
+            } finally {
+                cancelImpl(t);
+            }
         }
     }
 
@@ -220,16 +256,22 @@ CompletableFuture<T> readBodyAsync(HttpResponse.BodyHandler<T> handler,
                                        boolean returnConnectionToPool,
                                        Executor executor)
     {
-        Log.logTrace("Reading body on stream {0}", streamid);
-        BodySubscriber<T> bodySubscriber = handler.apply(responseCode, responseHeaders);
-        CompletableFuture<T> cf = receiveData(bodySubscriber);
-
-        PushGroup<?,?> pg = exchange.getPushGroup();
-        if (pg != null) {
-            // if an error occurs make sure it is recorded in the PushGroup
-            cf = cf.whenComplete((t,e) -> pg.pushError(e));
+        try {
+            Log.logTrace("Reading body on stream {0}", streamid);
+            BodySubscriber<T> bodySubscriber = handler.apply(new ResponseInfoImpl(response));
+            CompletableFuture<T> cf = receiveData(bodySubscriber, executor);
+
+            PushGroup<?> pg = exchange.getPushGroup();
+            if (pg != null) {
+                // if an error occurs make sure it is recorded in the PushGroup
+                cf = cf.whenComplete((t, e) -> pg.pushError(e));
+            }
+            return cf;
+        } catch (Throwable t) {
+            // may be thrown by handler.apply
+            cancelImpl(t);
+            return MinimalFuture.failedFuture(t);
         }
-        return cf;
     }
 
     @Override
@@ -253,19 +295,30 @@ private void receiveResetFrame(ResetFrame frame) {
 
     // pushes entire response body into response subscriber
     // blocking when required by local or remote flow control
-    CompletableFuture<T> receiveData(BodySubscriber<T> bodySubscriber) {
-        responseBodyCF = MinimalFuture.of(bodySubscriber.getBody());
+    CompletableFuture<T> receiveData(BodySubscriber<T> bodySubscriber, Executor executor) {
+        responseBodyCF = new MinimalFuture<>();
+        // We want to allow the subscriber's getBody() method to block so it
+        // can work with InputStreams. So, we offload execution.
+        executor.execute(() -> {
+            try {
+                bodySubscriber.getBody().whenComplete((T body, Throwable t) -> {
+                    if (t == null)
+                        responseBodyCF.complete(body);
+                    else
+                        responseBodyCF.completeExceptionally(t);
+                });
+            } catch(Throwable t) {
+                cancelImpl(t);
+            }
+        });
 
         if (isCanceled()) {
             Throwable t = getCancelCause();
             responseBodyCF.completeExceptionally(t);
         } else {
-            bodySubscriber.onSubscribe(userSubscription);
+            pendingResponseSubscriber = bodySubscriber;
+            sched.runOrSchedule(); // in case data waiting already to be processed
         }
-        // Set the responseSubscriber field now that onSubscribe has been called.
-        // This effectively allows the scheduler to start invoking the callbacks.
-        responseSubscriber = bodySubscriber;
-        sched.runOrSchedule(); // in case data waiting already to be processed
         return responseBodyCF;
     }
 
@@ -285,13 +338,7 @@ CompletableFuture<ExchangeImpl<T>> sendBodyAsync() {
         this.request = e.request();
         this.requestPublisher = request.requestPublisher;  // may be null
         responseHeaders = new HttpHeadersImpl();
-        rspHeadersConsumer = (name, value) -> {
-            responseHeaders.addHeader(name.toString(), value.toString());
-            if (Log.headers() && Log.trace()) {
-                Log.logTrace("RECEIVED HEADER (streamid={0}): {1}: {2}",
-                             streamid, name, value);
-            }
-        };
+        rspHeadersConsumer = new HeadersConsumer();
         this.requestPseudoHeaders = new HttpHeadersImpl();
         // NEW
         this.windowUpdater = new StreamWindowUpdateSender(connection);
@@ -303,7 +350,7 @@ CompletableFuture<ExchangeImpl<T>> sendBodyAsync() {
      * Data frames will be removed by response body thread.
      */
     void incoming(Http2Frame frame) throws IOException {
-        debug.log(Level.DEBUG, "incoming: %s", frame);
+        if (debug.on()) debug.log("incoming: %s", frame);
         if ((frame instanceof HeaderFrame)) {
             HeaderFrame hframe = (HeaderFrame)frame;
             if (hframe.endHeaders()) {
@@ -349,7 +396,7 @@ protected void handleResponse() throws IOException {
                 .orElseThrow(() -> new IOException("no statuscode in response"));
 
         response = new Response(
-                request, exchange, responseHeaders,
+                request, exchange, responseHeaders, connection(),
                 responseCode, HttpClient.Version.HTTP_2);
 
         /* TODO: review if needs to be removed
@@ -364,6 +411,9 @@ protected void handleResponse() throws IOException {
             Log.logHeaders(sb.toString());
         }
 
+        // this will clear the response headers
+        rspHeadersConsumer.reset();
+
         completeResponse(response);
     }
 
@@ -420,14 +470,14 @@ private void incoming_windowUpdate(WindowUpdateFrame frame)
         }
     }
 
-    void incoming_pushPromise(HttpRequestImpl pushReq,
-                              PushedStream<?,T> pushStream)
+    void incoming_pushPromise(HttpRequestImpl pushRequest,
+                              PushedStream<T> pushStream)
         throws IOException
     {
         if (Log.requests()) {
-            Log.logRequest("PUSH_PROMISE: " + pushReq.toString());
+            Log.logRequest("PUSH_PROMISE: " + pushRequest.toString());
         }
-        PushGroup<?,T> pushGroup = exchange.getPushGroup();
+        PushGroup<T> pushGroup = exchange.getPushGroup();
         if (pushGroup == null) {
             Log.logTrace("Rejecting push promise stream " + streamid);
             connection.resetStream(pushStream.streamid, ResetFrame.REFUSED_STREAM);
@@ -435,30 +485,37 @@ void incoming_pushPromise(HttpRequestImpl pushReq,
             return;
         }
 
-        HttpResponse.MultiSubscriber<?,T> proc = pushGroup.subscriber();
-
-        CompletableFuture<HttpResponse<T>> cf = pushStream.responseCF();
-
-        Optional<HttpResponse.BodyHandler<T>> bpOpt =
-                pushGroup.handlerForPushRequest(pushReq);
-
-        if (!bpOpt.isPresent()) {
-            IOException ex = new IOException("Stream "
-                 + streamid + " cancelled by user");
+        PushGroup.Acceptor<T> acceptor = null;
+        boolean accepted = false;
+        try {
+            acceptor = pushGroup.acceptPushRequest(pushRequest);
+            accepted = acceptor.accepted();
+        } catch (Throwable t) {
+            if (debug.on())
+                debug.log("PushPromiseHandler::applyPushPromise threw exception %s",
+                          (Object)t);
+        }
+        if (!accepted) {
+            // cancel / reject
+            IOException ex = new IOException("Stream " + streamid + " cancelled by users handler");
             if (Log.trace()) {
-                Log.logTrace("No body subscriber for {0}: {1}", pushReq,
-                            ex.getMessage());
+                Log.logTrace("No body subscriber for {0}: {1}", pushRequest,
+                        ex.getMessage());
             }
             pushStream.cancelImpl(ex);
-            cf.completeExceptionally(ex);
             return;
         }
 
-        pushGroup.addPush();
+        assert accepted && acceptor != null;
+        CompletableFuture<HttpResponse<T>> pushResponseCF = acceptor.cf();
+        HttpResponse.BodyHandler<T> pushHandler = acceptor.bodyHandler();
+        assert pushHandler != null;
+
         pushStream.requestSent();
-        pushStream.setPushHandler(bpOpt.get());
+        pushStream.setPushHandler(pushHandler);  // TODO: could wrap the handler to throw on acceptPushPromise ?
         // setup housekeeping for when the push is received
         // TODO: deal with ignoring of CF anti-pattern
+        CompletableFuture<HttpResponse<T>> cf = pushStream.responseCF();
         cf.whenComplete((HttpResponse<T> resp, Throwable t) -> {
             t = Utils.getCompletionCause(t);
             if (Log.trace()) {
@@ -468,9 +525,9 @@ void incoming_pushPromise(HttpRequestImpl pushReq,
             }
             if (t != null) {
                 pushGroup.pushError(t);
-                proc.onError(pushReq, t);
+                pushResponseCF.completeExceptionally(t);
             } else {
-                proc.onResponse(resp);
+                pushResponseCF.complete(resp);
             }
             pushGroup.pushCompleted();
         });
@@ -483,7 +540,9 @@ private OutgoingHeaders<Stream<T>> headerFrame(long contentLength) {
             h.setHeader("content-length", Long.toString(contentLength));
         }
         setPseudoHeaderFields();
-        OutgoingHeaders<Stream<T>> f = new OutgoingHeaders<>(h, request.getUserHeaders(), this);
+        HttpHeaders sysh = filter(h);
+        HttpHeaders userh = filter(request.getUserHeaders());
+        OutgoingHeaders<Stream<T>> f = new OutgoingHeaders<>(sysh, userh, this);
         if (contentLength == 0) {
             f.setFlag(HeadersFrame.END_STREAM);
             endStreamSent = true;
@@ -491,6 +550,49 @@ private OutgoingHeaders<Stream<T>> headerFrame(long contentLength) {
         return f;
     }
 
+    private boolean hasProxyAuthorization(HttpHeaders headers) {
+        return headers.firstValue("proxy-authorization")
+                      .isPresent();
+    }
+
+    // Determines whether we need to build a new HttpHeader object.
+    //
+    // Ideally we should pass the filter to OutgoingHeaders refactor the
+    // code that creates the HeaderFrame to honor the filter.
+    // We're not there yet - so depending on the filter we need to
+    // apply and the content of the header we will try to determine
+    //  whether anything might need to be filtered.
+    // If nothing needs filtering then we can just use the
+    // original headers.
+    private boolean needsFiltering(HttpHeaders headers,
+                                   BiPredicate<String, List<String>> filter) {
+        if (filter == Utils.PROXY_TUNNEL_FILTER || filter == Utils.PROXY_FILTER) {
+            // we're either connecting or proxying
+            // slight optimization: we only need to filter out
+            // disabled schemes, so if there are none just
+            // pass through.
+            return Utils.proxyHasDisabledSchemes(filter == Utils.PROXY_TUNNEL_FILTER)
+                    && hasProxyAuthorization(headers);
+        } else {
+            // we're talking to a server, either directly or through
+            // a tunnel.
+            // Slight optimization: we only need to filter out
+            // proxy authorization headers, so if there are none just
+            // pass through.
+            return hasProxyAuthorization(headers);
+        }
+    }
+
+    private HttpHeaders filter(HttpHeaders headers) {
+        HttpConnection conn = connection();
+        BiPredicate<String, List<String>> filter =
+                conn.headerFilter(request);
+        if (needsFiltering(headers, filter)) {
+            return ImmutableHeaders.of(headers.map(), filter);
+        }
+        return headers;
+    }
+
     private void setPseudoHeaderFields() {
         HttpHeadersImpl hdrs = requestPseudoHeaders;
         String method = request.method();
@@ -500,8 +602,8 @@ private void setPseudoHeaderFields() {
         // TODO: userinfo deprecated. Needs to be removed
         hdrs.setHeader(":authority", uri.getAuthority());
         // TODO: ensure header names beginning with : not in user headers
-        String query = uri.getQuery();
-        String path = uri.getPath();
+        String query = uri.getRawQuery();
+        String path = uri.getRawPath();
         if (path == null || path.isEmpty()) {
             if (method.equalsIgnoreCase("OPTIONS")) {
                 path = "*";
@@ -534,7 +636,7 @@ private boolean endStreamReceived() {
 
     @Override
     CompletableFuture<ExchangeImpl<T>> sendHeadersAsync() {
-        debug.log(Level.DEBUG, "sendHeadersOnly()");
+        if (debug.on()) debug.log("sendHeadersOnly()");
         if (Log.requests() && request != null) {
             Log.logRequest(request.toString());
         }
@@ -553,11 +655,11 @@ CompletableFuture<ExchangeImpl<T>> sendHeadersAsync() {
     @Override
     void released() {
         if (streamid > 0) {
-            debug.log(Level.DEBUG, "Released stream %d", streamid);
+            if (debug.on()) debug.log("Released stream %d", streamid);
             // remove this stream from the Http2Connection map.
             connection.closeStream(streamid);
         } else {
-            debug.log(Level.DEBUG, "Can't release stream %d", streamid);
+            if (debug.on()) debug.log("Can't release stream %d", streamid);
         }
     }
 
@@ -570,13 +672,13 @@ void completed() {
     void registerStream(int id) {
         this.streamid = id;
         connection.putStream(this, streamid);
-        debug.log(Level.DEBUG, "Registered stream %d", id);
+        if (debug.on()) debug.log("Registered stream %d", id);
     }
 
     void signalWindowUpdate() {
         RequestSubscriber subscriber = requestSubscriber;
         assert subscriber != null;
-        debug.log(Level.DEBUG, "Signalling window update");
+        if (debug.on()) debug.log("Signalling window update");
         subscriber.sendScheduler.runOrSchedule();
     }
 
@@ -613,13 +715,15 @@ public void onSubscribe(Flow.Subscription subscription) {
                 throw new IllegalStateException("already subscribed");
             }
             this.subscription = subscription;
-            debug.log(Level.DEBUG, "RequestSubscriber: onSubscribe, request 1");
+            if (debug.on())
+                debug.log("RequestSubscriber: onSubscribe, request 1");
             subscription.request(1);
         }
 
         @Override
         public void onNext(ByteBuffer item) {
-            debug.log(Level.DEBUG, "RequestSubscriber: onNext(%d)", item.remaining());
+            if (debug.on())
+                debug.log("RequestSubscriber: onNext(%d)", item.remaining());
             int size = outgoing.size();
             assert size == 0 : "non-zero size: " + size;
             onNextImpl(item);
@@ -639,7 +743,8 @@ private void onNextImpl(ByteBuffer item) {
 
         @Override
         public void onError(Throwable throwable) {
-            debug.log(Level.DEBUG, () -> "RequestSubscriber: onError: " + throwable);
+            if (debug.on())
+                debug.log(() -> "RequestSubscriber: onError: " + throwable);
             // ensure that errors are handled within the flow.
             if (errorRef.compareAndSet(null, throwable)) {
                 sendScheduler.runOrSchedule();
@@ -648,7 +753,7 @@ public void onError(Throwable throwable) {
 
         @Override
         public void onComplete() {
-            debug.log(Level.DEBUG, "RequestSubscriber: onComplete");
+            if (debug.on()) debug.log("RequestSubscriber: onComplete");
             int size = outgoing.size();
             assert size == 0 || size == 1 : "non-zero or one size: " + size;
             // last byte of request body has been obtained.
@@ -669,6 +774,7 @@ void trySend() {
                     if (requestBodyCF.isDone()) return;
                     subscription.cancel();
                     requestBodyCF.completeExceptionally(t);
+                    cancelImpl(t);
                     return;
                 }
 
@@ -684,12 +790,12 @@ else if (item == COMPLETED) {
 
                     // handle bytes to send downstream
                     while (item.hasRemaining()) {
-                        debug.log(Level.DEBUG, "trySend: %d", item.remaining());
+                        if (debug.on()) debug.log("trySend: %d", item.remaining());
                         assert !endStreamSent : "internal error, send data after END_STREAM flag";
                         DataFrame df = getDataFrame(item);
                         if (df == null) {
-                            debug.log(Level.DEBUG, "trySend: can't send yet: %d",
-                                    item.remaining());
+                            if (debug.on())
+                                debug.log("trySend: can't send yet: %d", item.remaining());
                             return; // the send window is exhausted: come back later
                         }
 
@@ -709,7 +815,8 @@ else if (item == COMPLETED) {
                                 endStreamSent = true;
                             }
                         }
-                        debug.log(Level.DEBUG, "trySend: sending: %d", df.getDataLength());
+                        if (debug.on())
+                            debug.log("trySend: sending: %d", df.getDataLength());
                         connection.sendDataFrame(df);
                     }
                     assert !item.hasRemaining();
@@ -717,13 +824,18 @@ else if (item == COMPLETED) {
                     assert b == item;
                 } while (outgoing.peekFirst() != null);
 
-                debug.log(Level.DEBUG, "trySend: request 1");
+                if (debug.on()) debug.log("trySend: request 1");
                 subscription.request(1);
             } catch (Throwable ex) {
-                debug.log(Level.DEBUG, "trySend: ", ex);
+                if (debug.on()) debug.log("trySend: ", ex);
                 sendScheduler.stop();
                 subscription.cancel();
                 requestBodyCF.completeExceptionally(ex);
+                // need to cancel the stream to 1. tell the server
+                // we don't want to receive any more data and
+                // 2. ensure that the operation ref count will be
+                // decremented on the HttpClient.
+                cancelImpl(ex);
             }
         }
 
@@ -812,7 +924,7 @@ CompletableFuture<Response> getResponseAsync(Executor executor) {
             cf = cf.thenApplyAsync(r -> r, executor);
         }
         Log.logTrace("Response future (stream={0}) is: {1}", streamid, cf);
-        PushGroup<?,?> pg = exchange.getPushGroup();
+        PushGroup<?> pg = exchange.getPushGroup();
         if (pg != null) {
             // if an error occurs make sure it is recorded in the PushGroup
             cf = cf.whenComplete((t,e) -> pg.pushError(Utils.getCompletionCause(e)));
@@ -882,13 +994,18 @@ void completeResponseExceptionally(Throwable t) {
 
     CompletableFuture<Void> sendBodyImpl() {
         requestBodyCF.whenComplete((v, t) -> requestSent());
-        if (requestPublisher != null) {
-            final RequestSubscriber subscriber = new RequestSubscriber(requestContentLen);
-            requestPublisher.subscribe(requestSubscriber = subscriber);
-        } else {
-            // there is no request body, therefore the request is complete,
-            // END_STREAM has already sent with outgoing headers
-            requestBodyCF.complete(null);
+        try {
+            if (requestPublisher != null) {
+                final RequestSubscriber subscriber = new RequestSubscriber(requestContentLen);
+                requestPublisher.subscribe(requestSubscriber = subscriber);
+            } else {
+                // there is no request body, therefore the request is complete,
+                // END_STREAM has already sent with outgoing headers
+                requestBodyCF.complete(null);
+            }
+        } catch (Throwable t) {
+            cancelImpl(t);
+            requestBodyCF.completeExceptionally(t);
         }
         return requestBodyCF;
     }
@@ -898,6 +1015,19 @@ void cancel() {
         cancel(new IOException("Stream " + streamid + " cancelled"));
     }
 
+    void onSubscriptionError(Throwable t) {
+        errorRef.compareAndSet(null, t);
+        if (debug.on()) debug.log("Got subscription error: %s", (Object)t);
+        // This is the special case where the subscriber
+        // has requested an illegal number of items.
+        // In this case, the error doesn't come from
+        // upstream, but from downstream, and we need to
+        // handle the error without waiting for the inputQ
+        // to be exhausted.
+        stopRequested = true;
+        sched.runOrSchedule();
+    }
+
     @Override
     void cancel(IOException cause) {
         cancelImpl(cause);
@@ -905,29 +1035,29 @@ void cancel(IOException cause) {
 
     // This method sends a RST_STREAM frame
     void cancelImpl(Throwable e) {
-        debug.log(Level.DEBUG, "cancelling stream {0}: {1}", streamid, e);
+        errorRef.compareAndSet(null, e);
+        if (debug.on()) debug.log("cancelling stream {0}: {1}", streamid, e);
         if (Log.trace()) {
             Log.logTrace("cancelling stream {0}: {1}\n", streamid, e);
         }
         boolean closing;
         if (closing = !closed) { // assigning closing to !closed
             synchronized (this) {
-                failed = e;
                 if (closing = !closed) { // assigning closing to !closed
                     closed=true;
                 }
             }
         }
         if (closing) { // true if the stream has not been closed yet
-            if (responseSubscriber != null)
+            if (responseSubscriber != null || pendingResponseSubscriber != null)
                 sched.runOrSchedule();
         }
         completeResponseExceptionally(e);
         if (!requestBodyCF.isDone()) {
-            requestBodyCF.completeExceptionally(e); // we may be sending the body..
+            requestBodyCF.completeExceptionally(errorRef.get()); // we may be sending the body..
         }
         if (responseBodyCF != null) {
-            responseBodyCF.completeExceptionally(e);
+            responseBodyCF.completeExceptionally(errorRef.get());
         }
         try {
             // will send a RST_STREAM frame
@@ -951,16 +1081,16 @@ void close() {
         Log.logTrace("Stream {0} closed", streamid);
     }
 
-    static class PushedStream<U,T> extends Stream<T> {
-        final PushGroup<U,T> pushGroup;
+    static class PushedStream<T> extends Stream<T> {
+        final PushGroup<T> pushGroup;
         // push streams need the response CF allocated up front as it is
         // given directly to user via the multi handler callback function.
         final CompletableFuture<Response> pushCF;
-        final CompletableFuture<HttpResponse<T>> responseCF;
+        CompletableFuture<HttpResponse<T>> responseCF;
         final HttpRequestImpl pushReq;
         HttpResponse.BodyHandler<T> pushHandler;
 
-        PushedStream(PushGroup<U,T> pushGroup,
+        PushedStream(PushGroup<T> pushGroup,
                      Http2Connection connection,
                      Exchange<T> pushReq) {
             // ## no request body possible, null window controller
@@ -969,6 +1099,7 @@ static class PushedStream<U,T> extends Stream<T> {
             this.pushReq = pushReq.request();
             this.pushCF = new MinimalFuture<>();
             this.responseCF = new MinimalFuture<>();
+
         }
 
         CompletableFuture<HttpResponse<T>> responseCF() {
@@ -1062,7 +1193,7 @@ protected void handleResponse() {
             }
 
             this.response = new Response(
-                pushReq, exchange, responseHeaders,
+                pushReq, exchange, responseHeaders, connection(),
                 responseCode, HttpClient.Version.HTTP_2);
 
             /* TODO: review if needs to be removed
@@ -1073,11 +1204,13 @@ protected void handleResponse() {
 
             if (Log.headers()) {
                 StringBuilder sb = new StringBuilder("RESPONSE HEADERS");
-                sb.append(" (streamid=").append(streamid).append("): ");
+                sb.append(" (streamid=").append(streamid).append("):\n");
                 Log.dumpHeaders(sb, "    ", responseHeaders);
                 Log.logHeaders(sb.toString());
             }
 
+            rspHeadersConsumer.reset();
+
             // different implementations for normal streams and pushed streams
             completeResponse(response);
         }
@@ -1100,7 +1233,7 @@ int getStreamId() {
      * @return true if this exchange was canceled.
      */
     synchronized boolean isCanceled() {
-        return failed != null;
+        return errorRef.get() != null;
     }
 
     /**
@@ -1108,10 +1241,32 @@ synchronized boolean isCanceled() {
      * @return the cause for which this exchange was canceled, if available.
      */
     synchronized Throwable getCancelCause() {
-        return failed;
+        return errorRef.get();
     }
 
     final String dbgString() {
         return connection.dbgString() + "/Stream("+streamid+")";
     }
+
+    private class HeadersConsumer extends Http2Connection.ValidatingHeadersConsumer {
+
+        void reset() {
+            super.reset();
+            responseHeaders.clear();
+        }
+
+        @Override
+        public void onDecoded(CharSequence name, CharSequence value)
+                throws UncheckedIOException
+        {
+            String n = name.toString();
+            String v = value.toString();
+            super.onDecoded(n, v);
+            responseHeaders.addHeader(n, v);
+            if (Log.headers() && Log.trace()) {
+                Log.logTrace("RECEIVED HEADER (streamid={0}): {1}: {2}",
+                             streamid, n, v);
+            }
+        }
+    }
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/TimeoutEvent.java b/src/java.net.http/share/classes/jdk/internal/net/http/TimeoutEvent.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/TimeoutEvent.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/TimeoutEvent.java
index 7d8610b0580..1203eecba97 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/TimeoutEvent.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/TimeoutEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowController.java b/src/java.net.http/share/classes/jdk/internal/net/http/WindowController.java
similarity index 82%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowController.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/WindowController.java
index 765f9386a46..e78480c1597 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowController.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/WindowController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.lang.System.Logger.Level;
 import java.util.ArrayList;
@@ -33,7 +33,9 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
-import jdk.incubator.http.internal.common.Utils;
+
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
 
 /**
  * A Send Window Flow-Controller that is used to control outgoing Connection
@@ -49,9 +51,8 @@
  */
 final class WindowController {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary developer's flag
-    static final System.Logger DEBUG_LOGGER =
-            Utils.getDebugLogger("WindowController"::toString, DEBUG);
+    static final Logger debug =
+            Utils.getDebugLogger("WindowController"::toString, Utils.DEBUG);
 
     /**
      * Default initial connection Flow-Control Send Window size, as per HTTP/2.
@@ -102,7 +103,7 @@ void removeStream(int streamid) {
             // Odd stream numbers (client streams) should have been registered.
             // Even stream numbers (server streams - aka Push Streams) should
             // not be registered
-            final boolean isClientStream = (streamid % 2) == 1;
+            final boolean isClientStream = (streamid & 0x1) == 1;
             if (old == null && isClientStream) {
                 throw new InternalError("Expected entry for streamid: " + streamid);
             } else if (old != null && !isClientStream) {
@@ -140,10 +141,10 @@ int tryAcquire(int requestAmount, int streamid, Stream<?> stream) {
                              Math.min(streamSize, connectionWindowSize));
 
             if (x <= 0)  { // stream window size may be negative
-                DEBUG_LOGGER.log(Level.DEBUG,
-                        "Stream %d requesting %d but only %d available (stream: %d, connection: %d)",
-                      streamid, requestAmount, Math.min(streamSize, connectionWindowSize),
-                      streamSize, connectionWindowSize);
+                if (debug.on())
+                    debug.log("Stream %d requesting %d but only %d available (stream: %d, connection: %d)",
+                              streamid, requestAmount, Math.min(streamSize, connectionWindowSize),
+                              streamSize, connectionWindowSize);
                 // If there's not enough window size available, put the
                 // caller in a pending list.
                 pending.put(streamid, Map.entry(stream, requestAmount));
@@ -157,10 +158,10 @@ int tryAcquire(int requestAmount, int streamid, Stream<?> stream) {
             streamSize -= x;
             streams.put(streamid, streamSize);
             connectionWindowSize -= x;
-            DEBUG_LOGGER.log(Level.DEBUG,
-                  "Stream %d amount allocated %d, now %d available (stream: %d, connection: %d)",
-                  streamid, x, Math.min(streamSize, connectionWindowSize),
-                  streamSize, connectionWindowSize);
+            if (debug.on())
+                debug.log("Stream %d amount allocated %d, now %d available (stream: %d, connection: %d)",
+                          streamid, x, Math.min(streamSize, connectionWindowSize),
+                          streamSize, connectionWindowSize);
             return x;
         } finally {
             controllerLock.unlock();
@@ -186,7 +187,9 @@ boolean increaseConnectionWindow(int amount) {
             if (size < 0)
                 return false;
             connectionWindowSize = size;
-            DEBUG_LOGGER.log(Level.DEBUG, "Connection window size is now %d", size);
+            if (debug.on())
+                debug.log("Connection window size is now %d (amount added %d)",
+                          size, amount);
 
             // Notify waiting streams, until the new increased window size is
             // effectively exhausted.
@@ -237,24 +240,30 @@ boolean increaseStreamWindow(int amount, int streamid) {
         controllerLock.lock();
         try {
             Integer size = streams.get(streamid);
-            if (size == null)
-                throw new InternalError("Expected entry for streamid: " + streamid);
-            size += amount;
-            if (size < 0)
-                return false;
-            streams.put(streamid, size);
-            DEBUG_LOGGER.log(Level.DEBUG,
-                             "Stream %s window size is now %s", streamid, size);
+            if (size == null) {
+                // The stream may have been cancelled.
+                if (debug.on())
+                    debug.log("WARNING: No entry found for streamid: %s. May be cancelled?",
+                              streamid);
+            } else {
+                size += amount;
+                if (size < 0)
+                    return false;
+                streams.put(streamid, size);
+                if (debug.on())
+                    debug.log("Stream %s window size is now %s (amount added %d)",
+                              streamid, size, amount);
 
-            Map.Entry<Stream<?>,Integer> p = pending.get(streamid);
-            if (p != null) {
-                int minAmount = 1;
-                // only wakes up the pending stream if there is at least
-                // 1 byte of space in both windows
-                if (size >= minAmount
-                        && connectionWindowSize >= minAmount) {
-                     pending.remove(streamid);
-                     s = p.getKey();
+                Map.Entry<Stream<?>, Integer> p = pending.get(streamid);
+                if (p != null) {
+                    int minAmount = 1;
+                    // only wakes up the pending stream if there is at least
+                    // 1 byte of space in both windows
+                    if (size >= minAmount
+                            && connectionWindowSize >= minAmount) {
+                        pending.remove(streamid);
+                        s = p.getKey();
+                    }
                 }
             }
         } finally {
@@ -285,8 +294,9 @@ void adjustActiveStreams(int adjustAmount) {
                     Integer size = entry.getValue();
                     size += adjustAmount;
                     streams.put(streamid, size);
-                    DEBUG_LOGGER.log(Level.DEBUG,
-                        "Stream %s window size is now %s", streamid, size);
+                    if (debug.on())
+                        debug.log("Stream %s window size is now %s (adjusting amount %d)",
+                                  streamid, size, adjustAmount);
                 }
             }
         } finally {
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java b/src/java.net.http/share/classes/jdk/internal/net/http/WindowUpdateSender.java
similarity index 80%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/WindowUpdateSender.java
index ad60abf232d..e814fdd5c72 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/WindowUpdateSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,20 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http;
 
-import java.lang.System.Logger.Level;
-import jdk.incubator.http.internal.frame.SettingsFrame;
-import jdk.incubator.http.internal.frame.WindowUpdateFrame;
-import jdk.incubator.http.internal.common.Utils;
+package jdk.internal.net.http;
 
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.frame.SettingsFrame;
+import jdk.internal.net.http.frame.WindowUpdateFrame;
+import jdk.internal.net.http.common.Utils;
 import java.util.concurrent.atomic.AtomicInteger;
 
 abstract class WindowUpdateSender {
 
-    final static boolean DEBUG = Utils.DEBUG;
-    final System.Logger debug =
-            Utils.getDebugLogger(this::dbgString, DEBUG);
+    final Logger debug =
+            Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
 
     final int limit;
     final Http2Connection connection;
@@ -59,14 +58,15 @@ abstract class WindowUpdateSender {
         //   or
         // - remaining window size reached max frame size.
         limit = Math.min(v0, v1);
-        debug.log(Level.DEBUG, "maxFrameSize=%d, initWindowSize=%d, limit=%d",
-                maxFrameSize, initWindowSize, limit);
+        if (debug.on())
+            debug.log("maxFrameSize=%d, initWindowSize=%d, limit=%d",
+                      maxFrameSize, initWindowSize, limit);
     }
 
     abstract int getStreamId();
 
     void update(int delta) {
-        debug.log(Level.DEBUG, "update: %d", delta);
+        if (debug.on()) debug.log("update: %d", delta);
         if (received.addAndGet(delta) > limit) {
             synchronized (this) {
                 int tosend = received.get();
@@ -79,7 +79,7 @@ void update(int delta) {
     }
 
     void sendWindowUpdate(int delta) {
-        debug.log(Level.DEBUG, "sending window update: %d", delta);
+        if (debug.on()) debug.log("sending window update: %d", delta);
         connection.sendUnorderedFrame(new WindowUpdateFrame(getStreamId(), delta));
     }
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferPool.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferPool.java
similarity index 95%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferPool.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferPool.java
index a8f9e5c4b8a..08f1a5e4f18 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferPool.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import java.nio.ByteBuffer;
 import java.util.concurrent.ConcurrentLinkedQueue;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferReference.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferReference.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferReference.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferReference.java
index 365dc6d4f9c..4e5a61b4f6f 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferReference.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import java.nio.ByteBuffer;
 import java.util.Objects;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ConnectionExpiredException.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/ConnectionExpiredException.java
similarity index 93%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ConnectionExpiredException.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/ConnectionExpiredException.java
index 23f3fb2fab8..5deb907e134 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ConnectionExpiredException.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/ConnectionExpiredException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import java.io.IOException;
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/DebugLogger.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/DebugLogger.java
similarity index 85%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/DebugLogger.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/DebugLogger.java
index 583fc86d9f6..bed4423a9d1 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/DebugLogger.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/DebugLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,40 +22,42 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.common;
+
+package jdk.internal.net.http.common;
 
 import java.io.PrintStream;
 import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.function.Supplier;
-import java.lang.System.Logger;
 
 /**
  * A {@code System.Logger} that forwards all messages to an underlying
- * {@code System.Logger}, after adding some decoration.
- * The logger also has the ability to additionally send the logged messages
- * to System.err or System.out, whether the underlying logger is activated or not.
- * In addition instance of {@code DebugLogger} support both
- * {@link String#format(String, Object...)} and
+ * {@code System.Logger}, after adding some decoration. The logger also has the
+ * ability to additionally send the logged messages to System.err or System.out,
+ * whether the underlying logger is activated or not. In addition instance of
+ * {@code DebugLogger} support both {@link String#format(String, Object...)} and
  * {@link java.text.MessageFormat#format(String, Object...)} formatting.
- * String-like formatting is enabled by the presence of "%s" or "%d" in the format
- * string. MessageFormat-like formatting is enabled by the presence of "{0" or "{1".
- * <p>
- * See {@link Utils#getDebugLogger(Supplier, boolean)} and
+ * String-like formatting is enabled by the presence of "%s" or "%d" in the
+ * format string. MessageFormat-like formatting is enabled by the presence of
+ * "{0" or "{1".
+ *
+ * <p> See {@link Utils#getDebugLogger(Supplier, boolean)} and
  * {@link Utils#getHpackLogger(Supplier, boolean)}.
  */
-class DebugLogger implements Logger {
+final class DebugLogger implements Logger {
     // deliberately not in the same subtree than standard loggers.
     final static String HTTP_NAME  = "jdk.internal.httpclient.debug";
+    final static String WS_NAME  = "jdk.internal.httpclient.websocket.debug";
     final static String HPACK_NAME = "jdk.internal.httpclient.hpack.debug";
-    final static Logger HTTP = System.getLogger(HTTP_NAME);
-    final static Logger HPACK = System.getLogger(HPACK_NAME);
+    final static System.Logger HTTP = System.getLogger(HTTP_NAME);
+    final static System.Logger WS = System.getLogger(WS_NAME);
+    final static System.Logger HPACK = System.getLogger(HPACK_NAME);
     final static long START_NANOS = System.nanoTime();
 
     private final Supplier<String> dbgTag;
     private final Level errLevel;
     private final Level outLevel;
-    private final Logger logger;
+    private final System.Logger logger;
     private final boolean debugOn;
     private final boolean traceOn;
 
@@ -91,7 +93,7 @@ class DebugLogger implements Logger {
      *
      * @return A logger for HTTP internal debug traces
      */
-    private DebugLogger(Logger logger,
+    private DebugLogger(System.Logger logger,
                 Supplier<String> dbgTag,
                 Level outLevel,
                 Level errLevel) {
@@ -117,6 +119,11 @@ private boolean isEnabled(Level level) {
                 || logger.isLoggable(level);
     }
 
+    @Override
+    public final boolean on() {
+        return debugOn;
+    }
+
     @Override
     public boolean isLoggable(Level level) {
         // fast path, we assume these guys never change.
@@ -241,11 +248,21 @@ private StringBuilder format(StringBuilder sb, String format, Object[] params) {
         }
     }
 
-    public static DebugLogger createHttpLogger(Supplier<String> dbgTag, Level outLevel, Level errLevel) {
+    public static DebugLogger createHttpLogger(Supplier<String> dbgTag,
+                                               Level outLevel,
+                                               Level errLevel) {
         return new DebugLogger(HTTP, dbgTag, outLevel, errLevel);
     }
 
-    public static DebugLogger createHpackLogger(Supplier<String> dbgTag, Level outLevel, Level errLevel) {
+    public static DebugLogger createWebSocketLogger(Supplier<String> dbgTag,
+                                                    Level outLevel,
+                                                    Level errLevel) {
+        return new DebugLogger(WS, dbgTag, outLevel, errLevel);
+    }
+
+    public static DebugLogger createHpackLogger(Supplier<String> dbgTag,
+                                                Level outLevel,
+                                                Level errLevel) {
         return new DebugLogger(HPACK, dbgTag, outLevel, errLevel);
     }
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Demand.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Demand.java
similarity index 90%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Demand.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/Demand.java
index 5eb498018e0..bd77c62914f 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Demand.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Demand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -53,6 +53,14 @@ public boolean increase(long n) {
         return prev == 0;
     }
 
+    /**
+     * Increases this demand by 1 but only if it is fulfilled.
+     * @return true if the demand was increased, false otherwise.
+     */
+    public boolean increaseIfFulfilled() {
+        return val.compareAndSet(0, 1);
+    }
+
     /**
      * Tries to decrease this demand by the specified positive value.
      *
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/FlowTube.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/FlowTube.java
similarity index 98%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/FlowTube.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/FlowTube.java
index 7230ac158ce..9187fa2e3e4 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/FlowTube.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/FlowTube.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import java.nio.ByteBuffer;
 import java.util.List;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpHeadersImpl.java
similarity index 59%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/HttpHeadersImpl.java
index 3c7a52647b6..ebcfbfc0715 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpHeadersImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,22 +23,25 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
-import jdk.incubator.http.HttpHeaders;
+import java.net.http.HttpHeaders;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
 
 /**
  * Implementation of HttpHeaders.
+ *
+ * The public HttpHeaders API provides a read-only view, while the
+ * non-HttpHeaders members allow for implementation specific mutation, e.g.
+ * during creation, etc.
  */
 public class HttpHeadersImpl extends HttpHeaders {
 
-    private final TreeMap<String,List<String>> headers;
+    private final TreeMap<String, List<String>> headers;
 
     public HttpHeadersImpl() {
         headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
@@ -46,30 +49,41 @@ public HttpHeadersImpl() {
 
     @Override
     public Map<String, List<String>> map() {
-        return Collections.unmodifiableMap(headers);
+        return Collections.unmodifiableMap(headersMap());
     }
 
-    // package private mutators
+    // non-HttpHeaders private mutators
 
     public HttpHeadersImpl deepCopy() {
-        HttpHeadersImpl h1 = new HttpHeadersImpl();
-        Set<String> keys = headers.keySet();
-        for (String key : keys) {
-            List<String> vals = headers.get(key);
-            List<String> vals1 = new ArrayList<>(vals);
-            h1.headers.put(key, vals1);
+        HttpHeadersImpl h1 = newDeepCopy();
+        for (Map.Entry<String, List<String>> entry : headersMap().entrySet()) {
+            List<String> valuesCopy = new ArrayList<>(entry.getValue());
+            h1.headersMap().put(entry.getKey(), valuesCopy);
         }
         return h1;
     }
 
     public void addHeader(String name, String value) {
-        headers.computeIfAbsent(name, k -> new ArrayList<>(1))
-               .add(value);
+        headersMap().computeIfAbsent(name, k -> new ArrayList<>(1))
+                    .add(value);
     }
 
     public void setHeader(String name, String value) {
-        List<String> values = new ArrayList<>(1); // most headers has one value
+        // headers typically have one value
+        List<String> values = new ArrayList<>(1);
         values.add(value);
-        headers.put(name, values);
+        headersMap().put(name, values);
+    }
+
+    public void clear() {
+        headersMap().clear();
+    }
+
+    protected HttpHeadersImpl newDeepCopy() {
+        return new HttpHeadersImpl();
+    }
+
+    protected Map<String, List<String>> headersMap() {
+        return headers;
     }
 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableExtendedSSLSession.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableExtendedSSLSession.java
new file mode 100644
index 00000000000..db4b6dd60f4
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableExtendedSSLSession.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http.common;
+
+import java.security.Principal;
+import java.util.List;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.ExtendedSSLSession;
+import javax.net.ssl.SSLSessionContext;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SNIServerName;
+
+/**
+ * All mutating methods throw UnsupportedOperationException
+ */
+public class ImmutableExtendedSSLSession extends ExtendedSSLSession {
+    private final ExtendedSSLSession delegate;
+
+    ImmutableExtendedSSLSession(ExtendedSSLSession session) {
+        this.delegate = session;
+    }
+
+    public byte[] getId() {
+        return delegate.getId();
+    }
+
+    public SSLSessionContext getSessionContext() {
+        return delegate.getSessionContext();
+    }
+
+    public long getCreationTime() {
+        return delegate.getCreationTime();
+    }
+
+    public long getLastAccessedTime() {
+        return delegate.getLastAccessedTime();
+    }
+
+    public void invalidate() {
+        throw new UnsupportedOperationException("session is not mutable");
+    }
+
+    public boolean isValid() {
+        return delegate.isValid();
+    }
+
+    public void putValue(String name, Object value) {
+        throw new UnsupportedOperationException("session is not mutable");
+    }
+
+    public Object getValue(String name) {
+        return delegate.getValue(name);
+    }
+
+    public void removeValue(String name) {
+        throw new UnsupportedOperationException("session is not mutable");
+    }
+
+    public String [] getValueNames() {
+        return delegate.getValueNames();
+    }
+
+    public java.security.cert.Certificate [] getPeerCertificates()
+            throws SSLPeerUnverifiedException {
+        return delegate.getPeerCertificates();
+    }
+
+    public java.security.cert.Certificate [] getLocalCertificates() {
+        return delegate.getLocalCertificates();
+    }
+
+    @Deprecated
+    public javax.security.cert.X509Certificate [] getPeerCertificateChain()
+            throws SSLPeerUnverifiedException {
+        return delegate.getPeerCertificateChain();
+    }
+
+    public Principal getPeerPrincipal()
+            throws SSLPeerUnverifiedException {
+        return delegate.getPeerPrincipal();
+    }
+
+    public Principal getLocalPrincipal() {
+        return delegate.getLocalPrincipal();
+    }
+
+    public String getCipherSuite() {
+        return delegate.getCipherSuite();
+    }
+
+    public String getProtocol() {
+        return delegate.getProtocol();
+    }
+
+    public String getPeerHost() {
+        return delegate.getPeerHost();
+    }
+
+    public int getPeerPort() {
+        return delegate.getPeerPort();
+    }
+
+    public int getPacketBufferSize() {
+        return delegate.getPacketBufferSize();
+    }
+
+    public int getApplicationBufferSize() {
+        return delegate.getApplicationBufferSize();
+    }
+
+    public String[] getLocalSupportedSignatureAlgorithms() {
+        return delegate.getLocalSupportedSignatureAlgorithms();
+    }
+
+    public String[] getPeerSupportedSignatureAlgorithms() {
+        return delegate.getPeerSupportedSignatureAlgorithms();
+    }
+
+    public List<SNIServerName> getRequestedServerNames()  {
+        return delegate.getRequestedServerNames();
+    }
+
+    public List<byte[]> getStatusResponses() {
+        return delegate.getStatusResponses();
+    }
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableSSLSession.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableSSLSession.java
new file mode 100644
index 00000000000..ad6243c0895
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableSSLSession.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http.common;
+
+import java.security.Principal;
+import java.util.List;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSessionContext;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SNIServerName;
+
+/**
+ * All mutating methods throw UnsupportedOperationException
+ */
+public class ImmutableSSLSession implements SSLSession {
+    private final SSLSession delegate;
+
+    ImmutableSSLSession(SSLSession session) {
+        this.delegate = session;
+    }
+
+    public byte[] getId() {
+        return delegate.getId();
+    }
+
+    public SSLSessionContext getSessionContext() {
+        return delegate.getSessionContext();
+    }
+
+    public long getCreationTime() {
+        return delegate.getCreationTime();
+    }
+
+    public long getLastAccessedTime() {
+        return delegate.getLastAccessedTime();
+    }
+
+    public void invalidate() {
+        throw new UnsupportedOperationException("session is not mutable");
+    }
+
+    public boolean isValid() {
+        return delegate.isValid();
+    }
+
+    public void putValue(String name, Object value) {
+        throw new UnsupportedOperationException("session is not mutable");
+    }
+
+    public Object getValue(String name) {
+        return delegate.getValue(name);
+    }
+
+    public void removeValue(String name) {
+        throw new UnsupportedOperationException("session is not mutable");
+    }
+
+    public String [] getValueNames() {
+        return delegate.getValueNames();
+    }
+
+    public java.security.cert.Certificate [] getPeerCertificates()
+            throws SSLPeerUnverifiedException {
+        return delegate.getPeerCertificates();
+    }
+
+    public java.security.cert.Certificate [] getLocalCertificates() {
+        return delegate.getLocalCertificates();
+    }
+
+    @Deprecated
+    public javax.security.cert.X509Certificate [] getPeerCertificateChain()
+            throws SSLPeerUnverifiedException {
+        return delegate.getPeerCertificateChain();
+    }
+
+    public Principal getPeerPrincipal()
+            throws SSLPeerUnverifiedException {
+        return delegate.getPeerPrincipal();
+    }
+
+    public Principal getLocalPrincipal() {
+        return delegate.getLocalPrincipal();
+    }
+
+    public String getCipherSuite() {
+        return delegate.getCipherSuite();
+    }
+
+    public String getProtocol() {
+        return delegate.getProtocol();
+    }
+
+    public String getPeerHost() {
+        return delegate.getPeerHost();
+    }
+
+    public int getPeerPort() {
+        return delegate.getPeerPort();
+    }
+
+    public int getPacketBufferSize() {
+        return delegate.getPacketBufferSize();
+    }
+
+    public int getApplicationBufferSize() {
+        return delegate.getApplicationBufferSize();
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Log.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Log.java
similarity index 88%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Log.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/Log.java
index e042993634b..7ce03409ed5 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Log.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,9 +23,9 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
-import jdk.incubator.http.HttpHeaders;
+import java.net.http.HttpHeaders;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,9 +33,9 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
-import jdk.incubator.http.internal.frame.DataFrame;
-import jdk.incubator.http.internal.frame.Http2Frame;
-import jdk.incubator.http.internal.frame.WindowUpdateFrame;
+import jdk.internal.net.http.frame.DataFrame;
+import jdk.internal.net.http.frame.Http2Frame;
+import jdk.internal.net.http.frame.WindowUpdateFrame;
 
 import javax.net.ssl.SNIServerName;
 import javax.net.ssl.SSLParameters;
@@ -105,6 +105,8 @@ public abstract class Log implements System.Logger {
                     case "all":
                         logging |= CONTENT|HEADERS|REQUESTS|FRAMES|ERRORS|TRACE|SSL;
                         break;
+                    default:
+                        // ignore bad values
                 }
                 if (val.startsWith("frames")) {
                     logging |= FRAMES;
@@ -113,7 +115,7 @@ public abstract class Log implements System.Logger {
                         frametypes = CONTROL | DATA | WINDOW_UPDATES;
                     } else {
                         for (String type : types) {
-                            switch (type.toLowerCase()) {
+                            switch (type.toLowerCase(Locale.US)) {
                                 case "control":
                                     frametypes |= CONTROL;
                                     break;
@@ -126,6 +128,8 @@ public abstract class Log implements System.Logger {
                                 case "all":
                                     frametypes = ALL;
                                     break;
+                                default:
+                                    // ignore bad values
                             }
                         }
                     }
@@ -268,6 +272,12 @@ public static void logParams(SSLParameters p) {
             }
         }
 
+        if (p.getEndpointIdentificationAlgorithm() != null) {
+            sb.append("\n    endpointIdAlg: {")
+                .append(params.size()).append("}");
+            params.add(p.getEndpointIdentificationAlgorithm());
+        }
+
         if (p.getServerNames() != null) {
             for (SNIServerName sname : p.getServerNames()) {
                 sb.append("\n    server name: {")
@@ -284,15 +294,25 @@ public static void dumpHeaders(StringBuilder sb, String prefix, HttpHeaders head
         if (headers != null) {
             Map<String,List<String>> h = headers.map();
             Set<Map.Entry<String,List<String>>> entries = h.entrySet();
+            String sep = "";
             for (Map.Entry<String,List<String>> entry : entries) {
                 String key = entry.getKey();
                 List<String> values = entry.getValue();
-                sb.append(prefix).append(key).append(":");
+                if (values == null || values.isEmpty()) {
+                    // should not happen
+                    sb.append(sep);
+                    sb.append(prefix).append(key).append(':');
+                    sep = "\n";
+                    continue;
+                }
                 for (String value : values) {
+                    sb.append(sep);
+                    sb.append(prefix).append(key).append(':');
                     sb.append(' ').append(value);
+                    sep = "\n";
                 }
-                sb.append('\n');
             }
+            sb.append('\n');
         }
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/Logger.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Logger.java
new file mode 100644
index 00000000000..ed8e9e0197d
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Logger.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http.common;
+
+import java.util.function.Supplier;
+
+/**
+ * An internal {@code System.Logger} that is used for internal
+ * debugging purposes in the {@link java.net.http} module.
+ * <p>
+ * Though not enforced, this interface is designed for emitting
+ * debug messages with Level.DEBUG.
+ * <p>
+ * It defines {@code log} methods that default to {@code Level.DEBUG},
+ * so that they can be called in statements like:
+ * <pre>{@code debug.log("some %s with %d %s", message(), one(), params());}</pre>
+ *
+ * @implSpec
+ * This interface is implemented by loggers returned by
+ * {@link Utils#getDebugLogger(Supplier, boolean)},
+ * {@link Utils#getWebSocketLogger(Supplier, boolean)}and
+ * {@link Utils#getHpackLogger(Supplier, boolean)}.
+ * It is not designed to be implemented by any other
+ * loggers. Do not use outside of this module.
+ */
+public interface Logger extends System.Logger {
+    /**
+     * Tells whether this logger is on.
+     * @implSpec The default implementation for this method calls
+     * {@code this.isLoggable(Level.DEBUG);}
+     */
+    public default boolean on() {
+        return isLoggable(Level.DEBUG);
+    }
+
+    /**
+     * Logs a message.
+     *
+     * @implSpec The default implementation for this method calls
+     * {@code this.log(Level.DEBUG, msg);}
+     *
+     * @param msg the string message (or a key in the message catalog, if
+     * this logger is a {@link
+     * System.LoggerFinder#getLocalizedLogger(java.lang.String,
+     * java.util.ResourceBundle, java.lang.Module) localized logger});
+     * can be {@code null}.
+     */
+    public default void log(String msg) {
+        log(Level.DEBUG, msg);
+    }
+
+    /**
+     * Logs a lazily supplied message.
+     *
+     * @implSpec The default implementation for this method calls
+     * {@code this.log(Level.DEBUG, msgSupplier);}
+     *
+     * @param msgSupplier a supplier function that produces a message.
+     *
+     * @throws NullPointerException if {@code msgSupplier} is {@code null}.
+     */
+    public default void log(Supplier<String> msgSupplier) {
+        log(Level.DEBUG, msgSupplier);
+    }
+
+    /**
+     * Logs a message produced from the given object.
+     *
+     * @implSpec The default implementation for this method calls
+     * {@code this.log(Level.DEBUG, obj);}
+     *
+     * @param obj the object to log.
+     *
+     * @throws NullPointerException if {@code obj} is {@code null}.
+     */
+    public default void log(Object obj) {
+        log(Level.DEBUG,  obj);
+    }
+
+    /**
+     * Logs a message associated with a given throwable.
+     *
+     * @implSpec The default implementation for this method calls
+     * {@code this.log(Level.DEBUG, msg, thrown);}
+     *
+     * @param msg the string message (or a key in the message catalog, if
+     * this logger is a {@link
+     * System.LoggerFinder#getLocalizedLogger(java.lang.String,
+     * java.util.ResourceBundle, java.lang.Module) localized logger});
+     * can be {@code null}.
+     * @param thrown a {@code Throwable} associated with the log message;
+     *        can be {@code null}.
+     */
+    public default void log(String msg, Throwable thrown) {
+        this.log(Level.DEBUG, msg, thrown);
+    }
+
+    /**
+     * Logs a lazily supplied message associated with a given throwable.
+     *
+     * @implSpec The default implementation for this method calls
+     * {@code this.log(Level.DEBUG, msgSupplier, thrown);}
+     *
+     * @param msgSupplier a supplier function that produces a message.
+     * @param thrown a {@code Throwable} associated with log message;
+     *               can be {@code null}.
+     *
+     * @throws NullPointerException if {@code msgSupplier} is {@code null}.
+     */
+    public default void log(Supplier<String> msgSupplier, Throwable thrown) {
+        log(Level.DEBUG, msgSupplier, thrown);
+    }
+
+    /**
+     * Logs a message with an optional list of parameters.
+     *
+     * @implSpec The default implementation for this method calls
+     * {@code this.log(Level.DEBUG, format, params);}
+     *
+     * @param format the string message format in
+     * {@link String#format(String, Object...)} or {@link
+     * java.text.MessageFormat} format, (or a key in the message
+     * catalog, if this logger is a {@link
+     * System.LoggerFinder#getLocalizedLogger(java.lang.String,
+     * java.util.ResourceBundle, java.lang.Module) localized logger});
+     * can be {@code null}.
+     * @param params an optional list of parameters to the message (may be
+     * none).
+     */
+    public default void log(String format, Object... params) {
+        log(Level.DEBUG, format, params);
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/MinimalFuture.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/MinimalFuture.java
similarity index 52%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/MinimalFuture.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/MinimalFuture.java
index b50f24c8554..36d27736b6d 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/MinimalFuture.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/MinimalFuture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,13 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Executor;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
+import java.util.concurrent.atomic.AtomicLong;
 
 import static java.util.Objects.requireNonNull;
-import java.util.concurrent.atomic.AtomicLong;
 
 /*
  * A CompletableFuture which does not allow any obtrusion logic.
@@ -46,8 +42,8 @@ public interface ExceptionalSupplier<U> {
         U get() throws Throwable;
     }
 
-    final static AtomicLong TOKENS = new AtomicLong();
-    final long id;
+    private final static AtomicLong TOKENS = new AtomicLong();
+    private final long id;
 
     public static <U> MinimalFuture<U> completedFuture(U value) {
         MinimalFuture<U> f = new MinimalFuture<>();
@@ -73,73 +69,13 @@ public static <U> CompletableFuture<U> supply(ExceptionalSupplier<U> supplier) {
         return cf;
     }
 
-    public static <U> CompletableFuture<U> supply(ExceptionalSupplier<U> supplier, Executor executor) {
-        CompletableFuture<U> cf = new MinimalFuture<>();
-        cf.completeAsync( () -> {
-            try {
-                return supplier.get();
-            } catch (Throwable ex) {
-                throw new CompletionException(ex);
-            }
-        }, executor);
-        return cf;
-    }
-
     public MinimalFuture() {
         super();
         this.id = TOKENS.incrementAndGet();
     }
 
-    /**
-     * Creates a defensive copy of the given {@code CompletionStage}.
-     *
-     * <p> Might be useful both for producers and consumers of {@code
-     * CompletionStage}s.
-     *
-     * <p> Producers are protected from possible uncontrolled modifications
-     * (cancellation, completion, obtrusion, etc.) as well as from executing
-     * unknown potentially lengthy or faulty dependants in the given {@code
-     * CompletionStage}'s default execution facility or synchronously.
-     *
-     * <p> Consumers are protected from some of the aspects of misbehaving
-     * implementations (e.g. accepting results, applying functions, running
-     * tasks, etc. more than once or escape of a reference to their private
-     * executor, etc.) by providing a reliable proxy they use instead.
-     *
-     * @param src
-     *         the {@code CompletionStage} to make a copy from
-     * @param executor
-     *         the executor used to propagate the completion
-     * @param <T>
-     *         the type of the {@code CompletionStage}'s result
-     *
-     * @return a copy of the given stage
-     */
-    public static <T> MinimalFuture<T> copy(CompletionStage<T> src,
-                                            Executor executor) {
-        MinimalFuture<T> copy = new MinimalFuture<>();
-        BiConsumer<T, Throwable> relay =
-                (result, error) -> {
-                    if (error != null) {
-                        copy.completeExceptionally(error);
-                    } else {
-                        copy.complete(result);
-                    }
-                };
-
-        if (src.getClass() == CompletableFuture.class) {
-            // No subclasses! Strictly genuine CompletableFuture.
-            src.whenCompleteAsync(relay, executor);
-            return copy;
-        } else {
-            // Don't give our executor away to an unknown CS!
-            src.whenComplete(relay);
-            return (MinimalFuture<T>)
-                    copy.thenApplyAsync(Function.identity(), executor);
-        }
-    }
-
-    public static <U> MinimalFuture<U> newMinimalFuture() {
+    @Override
+    public <U> MinimalFuture<U> newIncompleteFuture() {
         return new MinimalFuture<>();
     }
 
@@ -159,7 +95,7 @@ public String toString() {
     }
 
     public static <U> MinimalFuture<U> of(CompletionStage<U> stage) {
-        MinimalFuture<U> cf = newMinimalFuture();
+        MinimalFuture<U> cf = new MinimalFuture<>();
         stage.whenComplete((r,t) -> complete(cf, r, t));
         return cf;
     }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/OperationTrackers.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/OperationTrackers.java
new file mode 100644
index 00000000000..0094d064532
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/OperationTrackers.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http.common;
+
+import java.net.http.HttpClient;
+
+/**
+ * A small class allowing to track how many operations are
+ * left outstanding on an instance of HttpClient.
+ */
+public final class OperationTrackers {
+    private OperationTrackers() {
+        throw new InternalError("not instantiable");
+    }
+
+    /**
+     * A tracker can return the current value of
+     * operation counters maintained by an instance
+     * of {@link Trackable}, such as an HttpClientImpl.
+     */
+    public interface Tracker {
+        // The total number of outstanding operations
+        long getOutstandingOperations();
+        // The number of outstanding HTTP/1.1 operations.
+        // A single HTTP/1.1 request may increment this counter
+        // multiple times, so the value returned will be >= to
+        // the number of active HTTP/1.1 connections, but will
+        // still be 0 if there are no active connections.
+        long getOutstandingHttpOperations();
+        // The number of active HTTP/2 streams
+        long getOutstandingHttp2Streams();
+        // The number of active WebSockets
+        long getOutstandingWebSocketOperations();
+        // Whether the facade returned to the
+        // user is still referenced
+        boolean isFacadeReferenced();
+        // The name of the object being tracked.
+        String getName();
+    }
+
+    /**
+     * Implemented by objects that maintain operation counters.
+     */
+    public interface Trackable {
+        Tracker getOperationsTracker();
+    }
+
+    /**
+     * Returns a tracker to track pending operations started on
+     * an HttpClient instance. May return null if this isn't
+     * an HttpClientImpl or HttpClientFacade.
+     * @param client the HttpClient instance to track.
+     * @return A tracker or null.
+     */
+    public static Tracker getTracker(HttpClient client) {
+        if (client instanceof Trackable) {
+            return ((Trackable)client).getOperationsTracker();
+        } else {
+            return null;
+        }
+    }
+
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Pair.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Pair.java
similarity index 94%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Pair.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/Pair.java
index c3bae587a7b..e19b9d55316 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Pair.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Pair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 /**
  * A simple paired value class
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLFlowDelegate.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java
similarity index 71%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLFlowDelegate.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java
index e4523bfe283..f9b14832e00 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLFlowDelegate.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,28 +23,29 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
+import jdk.internal.net.http.common.SubscriberWrapper.SchedulingAction;
+
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLEngineResult.Status;
+import javax.net.ssl.SSLException;
 import java.io.IOException;
 import java.lang.System.Logger.Level;
 import java.nio.ByteBuffer;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Flow;
-import java.util.concurrent.Flow.Subscriber;
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLEngineResult;
-import javax.net.ssl.SSLEngineResult.HandshakeStatus;
-import javax.net.ssl.SSLEngineResult.Status;
-import javax.net.ssl.SSLException;
-import jdk.incubator.http.internal.common.SubscriberWrapper.SchedulingAction;
 
 /**
  * Implements SSL using two SubscriberWrappers.
@@ -75,24 +76,29 @@
  *        <--------------- |                  | <--------------
  * supplied to constructor |                  | obtained from this
  *                         +------------------+
+ *
+ * Errors are reported to the downReader Flow.Subscriber
+ *
  * }
  * </pre>
  */
 public class SSLFlowDelegate {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final System.Logger debug =
-            Utils.getDebugLogger(this::dbgString, DEBUG);
+    final Logger debug =
+            Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
 
     final Executor exec;
     final Reader reader;
     final Writer writer;
     final SSLEngine engine;
     final String tubeName; // hack
-    final CompletableFuture<Void> cf;
     final CompletableFuture<String> alpnCF; // completes on initial handshake
     final static ByteBuffer SENTINEL = Utils.EMPTY_BYTEBUFFER;
     volatile boolean close_notify_received;
+    final CompletableFuture<Void> readerCF;
+    final CompletableFuture<Void> writerCF;
+    static AtomicInteger scount = new AtomicInteger(1);
+    final int id;
 
     /**
      * Creates an SSLFlowDelegate fed from two Flow.Subscribers. Each
@@ -104,14 +110,20 @@ public SSLFlowDelegate(SSLEngine engine,
                            Subscriber<? super List<ByteBuffer>> downReader,
                            Subscriber<? super List<ByteBuffer>> downWriter)
     {
+        this.id = scount.getAndIncrement();
         this.tubeName = String.valueOf(downWriter);
         this.reader = new Reader();
         this.writer = new Writer();
         this.engine = engine;
         this.exec = exec;
         this.handshakeState = new AtomicInteger(NOT_HANDSHAKING);
-        this.cf = CompletableFuture.allOf(reader.completion(), writer.completion())
-                                   .thenRun(this::normalStop);
+        this.readerCF = reader.completion();
+        this.writerCF = reader.completion();
+        readerCF.exceptionally(this::stopOnError);
+        writerCF.exceptionally(this::stopOnError);
+
+        CompletableFuture.allOf(reader.completion(), writer.completion())
+            .thenRun(this::normalStop);
         this.alpnCF = new MinimalFuture<>();
 
         // connect the Reader to the downReader and the
@@ -160,19 +172,18 @@ private void setALPN() {
         if (alpnCF.isDone())
             return;
         String alpn = engine.getApplicationProtocol();
-        debug.log(Level.DEBUG, "setALPN = %s", alpn);
+        if (debug.on()) debug.log("setALPN = %s", alpn);
         alpnCF.complete(alpn);
     }
 
     public String monitor() {
         StringBuilder sb = new StringBuilder();
-        sb.append("SSL: HS state: " + states(handshakeState));
+        sb.append("SSL: id ").append(id);
+        sb.append(" HS state: " + states(handshakeState));
         sb.append(" Engine state: " + engine.getHandshakeStatus().toString());
         sb.append(" LL : ");
-        synchronized(stateList) {
-            for (String s: stateList) {
-                sb.append(s).append(" ");
-            }
+        for (String s: stateList) {
+            sb.append(s).append(" ");
         }
         sb.append("\r\n");
         sb.append("Reader:: ").append(reader.toString());
@@ -206,10 +217,9 @@ class Reader extends SubscriberWrapper {
         final SequentialScheduler scheduler;
         static final int TARGET_BUFSIZE = 16 * 1024;
         volatile ByteBuffer readBuf;
-        volatile boolean completing = false;
+        volatile boolean completing;
         final Object readBufferLock = new Object();
-        final System.Logger debugr =
-            Utils.getDebugLogger(this::dbgString, DEBUG);
+        final Logger debugr = Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
 
         class ReaderDownstreamPusher implements Runnable {
             @Override public void run() { processData(); }
@@ -236,8 +246,9 @@ public final String dbgString() {
          */
         @Override
         public void incoming(List<ByteBuffer> buffers, boolean complete) {
-            debugr.log(Level.DEBUG, () -> "Adding " + Utils.remaining(buffers)
-                        + " bytes to read buffer");
+            if (debugr.on())
+                debugr.log("Adding %d bytes to read buffer",
+                           Utils.remaining(buffers));
             addToReadBuf(buffers, complete);
             scheduler.runOrSchedule();
         }
@@ -286,7 +297,7 @@ void schedule() {
         }
 
         void stop() {
-            debugr.log(Level.DEBUG, "stop");
+            if (debugr.on()) debugr.log("stop");
             scheduler.stop();
         }
 
@@ -295,10 +306,11 @@ void stop() {
         // work function where it all happens
         void processData() {
             try {
-                debugr.log(Level.DEBUG, () -> "processData: " + readBuf.remaining()
-                           + " bytes to unwrap "
-                           + states(handshakeState)
-                           + ", " + engine.getHandshakeStatus());
+                if (debugr.on())
+                    debugr.log("processData:"
+                           + " readBuf remaining:" + readBuf.remaining()
+                           + ", state:" + states(handshakeState)
+                           + ", engine handshake status:" + engine.getHandshakeStatus());
                 int len;
                 boolean complete = false;
                 while ((len = readBuf.remaining()) > 0) {
@@ -308,15 +320,17 @@ void processData() {
                         synchronized (readBufferLock) {
                             complete = this.completing;
                             result = unwrapBuffer(readBuf);
-                            debugr.log(Level.DEBUG, "Unwrapped: %s", result.result);
+                            if (debugr.on())
+                                debugr.log("Unwrapped: %s", result.result);
                         }
                         if (result.bytesProduced() > 0) {
-                            debugr.log(Level.DEBUG, "sending %d", result.bytesProduced());
+                            if (debugr.on())
+                                debugr.log("sending %d", result.bytesProduced());
                             count.addAndGet(result.bytesProduced());
                             outgoing(result.destBuffer, false);
                         }
                         if (result.status() == Status.BUFFER_UNDERFLOW) {
-                            debugr.log(Level.DEBUG, "BUFFER_UNDERFLOW");
+                            if (debugr.on()) debugr.log("BUFFER_UNDERFLOW");
                             // not enough data in the read buffer...
                             requestMore();
                             synchronized (readBufferLock) {
@@ -326,17 +340,18 @@ void processData() {
                             }
                         }
                         if (complete && result.status() == Status.CLOSED) {
-                            debugr.log(Level.DEBUG, "Closed: completing");
+                            if (debugr.on()) debugr.log("Closed: completing");
                             outgoing(Utils.EMPTY_BB_LIST, true);
                             return;
                         }
                         if (result.handshaking() && !complete) {
-                            debugr.log(Level.DEBUG, "handshaking");
-                            doHandshake(result, READER);
-                            resumeActivity();
+                            if (debugr.on()) debugr.log("handshaking");
+                            if (doHandshake(result, READER)) {
+                                resumeActivity();
+                            }
                             handshaking = true;
                         } else {
-                            if ((handshakeState.getAndSet(NOT_HANDSHAKING) & ~DOING_TASKS) == HANDSHAKING) {
+                            if ((handshakeState.getAndSet(NOT_HANDSHAKING)& ~DOING_TASKS) == HANDSHAKING) {
                                 setALPN();
                                 handshaking = false;
                                 resumeActivity();
@@ -355,7 +370,7 @@ void processData() {
                     }
                 }
                 if (complete) {
-                    debugr.log(Level.DEBUG, "completing");
+                    if (debugr.on()) debugr.log("completing");
                     // Complete the alpnCF, if not already complete, regardless of
                     // whether or not the ALPN is available, there will be no more
                     // activity.
@@ -367,16 +382,32 @@ void processData() {
                 handleError(ex);
             }
         }
-    }
 
-    /**
-     * Returns a CompletableFuture which completes after all activity
-     * in the delegate is terminated (whether normally or exceptionally).
-     *
-     * @return
-     */
-    public CompletableFuture<Void> completion() {
-        return cf;
+        EngineResult unwrapBuffer(ByteBuffer src) throws IOException {
+            ByteBuffer dst = getAppBuffer();
+            while (true) {
+                SSLEngineResult sslResult = engine.unwrap(src, dst);
+                switch (sslResult.getStatus()) {
+                    case BUFFER_OVERFLOW:
+                        // may happen only if app size buffer was changed.
+                        // get it again if app buffer size changed
+                        int appSize = engine.getSession().getApplicationBufferSize();
+                        ByteBuffer b = ByteBuffer.allocate(appSize + dst.position());
+                        dst.flip();
+                        b.put(dst);
+                        dst = b;
+                        break;
+                    case CLOSED:
+                        return doClosure(new EngineResult(sslResult));
+                    case BUFFER_UNDERFLOW:
+                        // handled implicitly by compaction/reallocation of readBuf
+                        return new EngineResult(sslResult);
+                    case OK:
+                        dst.flip();
+                        return new EngineResult(sslResult, dst);
+                }
+            }
+        }
     }
 
     public interface Monitorable {
@@ -409,16 +440,19 @@ public static void add(Monitorable o) {
         @Override
         public void run() {
             System.out.println("Monitor starting");
-            while (true) {
-                try {Thread.sleep(20*1000); } catch (Exception e) {}
-                synchronized (list) {
-                    for (Monitorable o : list) {
-                        System.out.println(o.getInfo());
-                        System.out.println("-------------------------");
+            try {
+                while (true) {
+                    Thread.sleep(20 * 1000);
+                    synchronized (list) {
+                        for (Monitorable o : list) {
+                            System.out.println(o.getInfo());
+                            System.out.println("-------------------------");
+                        }
                     }
+                    System.out.println("--o-o-o-o-o-o-o-o-o-o-o-o-o-o-");
                 }
-                System.out.println("--o-o-o-o-o-o-o-o-o-o-o-o-o-o-");
-
+            } catch (InterruptedException e) {
+                System.out.println("Monitor exiting with " + e);
             }
         }
     }
@@ -439,8 +473,7 @@ class Writer extends SubscriberWrapper {
         // queues of buffers received from upstream waiting
         // to be processed by the SSLEngine
         final List<ByteBuffer> writeList;
-        final System.Logger debugw =
-            Utils.getDebugLogger(this::dbgString, DEBUG);
+        final Logger debugw =  Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
         volatile boolean completing;
         boolean completed; // only accessed in processData
 
@@ -459,15 +492,16 @@ protected void incoming(List<ByteBuffer> buffers, boolean complete) {
             assert complete ? buffers ==  Utils.EMPTY_BB_LIST : true;
             assert buffers != Utils.EMPTY_BB_LIST ? complete == false : true;
             if (complete) {
-                debugw.log(Level.DEBUG, "adding SENTINEL");
+                if (debugw.on()) debugw.log("adding SENTINEL");
                 completing = true;
                 writeList.add(SENTINEL);
             } else {
                 writeList.addAll(buffers);
             }
-            debugw.log(Level.DEBUG, () -> "added " + buffers.size()
-                        + " (" + Utils.remaining(buffers)
-                        + " bytes) to the writeList");
+            if (debugw.on())
+                debugw.log("added " + buffers.size()
+                           + " (" + Utils.remaining(buffers)
+                           + " bytes) to the writeList");
             scheduler.runOrSchedule();
         }
 
@@ -476,8 +510,8 @@ public final String dbgString() {
         }
 
         protected void onSubscribe() {
-            doHandshake(EngineResult.INIT, INIT);
-            resumeActivity();
+            if (debugw.on()) debugw.log("onSubscribe initiating handshaking");
+            addData(HS_TRIGGER);  // initiates handshaking
         }
 
         void schedule() {
@@ -485,7 +519,7 @@ void schedule() {
         }
 
         void stop() {
-            debugw.log(Level.DEBUG, "stop");
+            if (debugw.on()) debugw.log("stop");
             scheduler.stop();
         }
 
@@ -519,14 +553,22 @@ private void processData() {
             boolean completing = isCompleting();
 
             try {
-                debugw.log(Level.DEBUG, () -> "processData(" + Utils.remaining(writeList) + ")");
-                while (Utils.remaining(writeList) > 0 || hsTriggered()
-                        || needWrap()) {
+                if (debugw.on())
+                    debugw.log("processData, writeList remaining:"
+                                + Utils.remaining(writeList) + ", hsTriggered:"
+                                + hsTriggered() + ", needWrap:" + needWrap());
+
+                while (Utils.remaining(writeList) > 0 || hsTriggered() || needWrap()) {
                     ByteBuffer[] outbufs = writeList.toArray(Utils.EMPTY_BB_ARRAY);
                     EngineResult result = wrapBuffers(outbufs);
-                    debugw.log(Level.DEBUG, "wrapBuffer returned %s", result.result);
+                    if (debugw.on())
+                        debugw.log("wrapBuffer returned %s", result.result);
 
                     if (result.status() == Status.CLOSED) {
+                        if (!upstreamCompleted) {
+                            upstreamCompleted = true;
+                            upstreamSubscription.cancel();
+                        }
                         if (result.bytesProduced() <= 0)
                             return;
 
@@ -539,8 +581,8 @@ private void processData() {
 
                     boolean handshaking = false;
                     if (result.handshaking()) {
-                        debugw.log(Level.DEBUG, "handshaking");
-                        doHandshake(result, WRITER);
+                        if (debugw.on()) debugw.log("handshaking");
+                        doHandshake(result, WRITER);  // ok to ignore return
                         handshaking = true;
                     } else {
                         if ((handshakeState.getAndSet(NOT_HANDSHAKING) & ~DOING_TASKS) == HANDSHAKING) {
@@ -551,20 +593,14 @@ private void processData() {
                     cleanList(writeList); // tidy up the source list
                     sendResultBytes(result);
                     if (handshaking && !completing) {
-                        if (writeList.isEmpty() && !result.needUnwrap()) {
-                            writer.addData(HS_TRIGGER);
+                        if (needWrap()) {
+                            continue;
+                        } else {
+                            return;
                         }
-                        if (needWrap()) continue;
-                        return;
                     }
                 }
                 if (completing && Utils.remaining(writeList) == 0) {
-                    /*
-                    System.out.println("WRITER DOO 3");
-                    engine.closeOutbound();
-                    EngineResult result = wrapBuffers(Utils.EMPTY_BB_ARRAY);
-                    sendResultBytes(result);
-                    */
                     if (!completed) {
                         completed = true;
                         writeList.clear();
@@ -576,18 +612,64 @@ private void processData() {
                     writer.addData(HS_TRIGGER);
                 }
             } catch (Throwable ex) {
+                errorCommon(ex);
                 handleError(ex);
             }
         }
 
+        @SuppressWarnings("fallthrough")
+        EngineResult wrapBuffers(ByteBuffer[] src) throws SSLException {
+            if (debugw.on())
+                debugw.log("wrapping " + Utils.remaining(src) + " bytes");
+            ByteBuffer dst = getNetBuffer();
+            while (true) {
+                SSLEngineResult sslResult = engine.wrap(src, dst);
+                if (debugw.on()) debugw.log("SSLResult: " + sslResult);
+                switch (sslResult.getStatus()) {
+                    case BUFFER_OVERFLOW:
+                        // Shouldn't happen. We allocated buffer with packet size
+                        // get it again if net buffer size was changed
+                        if (debugw.on()) debugw.log("BUFFER_OVERFLOW");
+                        int appSize = engine.getSession().getApplicationBufferSize();
+                        ByteBuffer b = ByteBuffer.allocate(appSize + dst.position());
+                        dst.flip();
+                        b.put(dst);
+                        dst = b;
+                        break; // try again
+                    case CLOSED:
+                        if (debugw.on()) debugw.log("CLOSED");
+                        // fallthrough. There could be some remaining data in dst.
+                        // CLOSED will be handled by the caller.
+                    case OK:
+                        dst.flip();
+                        final ByteBuffer dest = dst;
+                        if (debugw.on())
+                            debugw.log("OK => produced: %d, not wrapped: %d",
+                                       dest.remaining(),  Utils.remaining(src));
+                        return new EngineResult(sslResult, dest);
+                    case BUFFER_UNDERFLOW:
+                        // Shouldn't happen.  Doesn't returns when wrap()
+                        // underflow handled externally
+                        // assert false : "Buffer Underflow";
+                        if (debug.on()) debug.log("BUFFER_UNDERFLOW");
+                        return new EngineResult(sslResult);
+                    default:
+                        if (debugw.on())
+                            debugw.log("result: %s", sslResult.getStatus());
+                        assert false : "result:" + sslResult.getStatus();
+                }
+            }
+        }
+
         private boolean needWrap() {
             return engine.getHandshakeStatus() == HandshakeStatus.NEED_WRAP;
         }
 
         private void sendResultBytes(EngineResult result) {
             if (result.bytesProduced() > 0) {
-                debugw.log(Level.DEBUG, "Sending %d bytes downstream",
-                           result.bytesProduced());
+                if (debugw.on())
+                    debugw.log("Sending %d bytes downstream",
+                               result.bytesProduced());
                 outgoing(result.destBuffer, false);
             }
         }
@@ -601,19 +683,31 @@ public String toString() {
     }
 
     private void handleError(Throwable t) {
-        debug.log(Level.DEBUG, "handleError", t);
-        cf.completeExceptionally(t);
+        if (debug.on()) debug.log("handleError", t);
+        readerCF.completeExceptionally(t);
+        writerCF.completeExceptionally(t);
         // no-op if already completed
         alpnCF.completeExceptionally(t);
         reader.stop();
         writer.stop();
     }
 
-    private void normalStop() {
+    boolean stopped;
+
+    private synchronized void normalStop() {
+        if (stopped)
+            return;
+        stopped = true;
         reader.stop();
         writer.stop();
     }
 
+    private Void stopOnError(Throwable currentlyUnused) {
+        // maybe log, etc
+        normalStop();
+        return null;
+    }
+
     private void cleanList(List<ByteBuffer> l) {
         synchronized (l) {
             Iterator<ByteBuffer> iter = l.iterator();
@@ -633,7 +727,7 @@ private void cleanList(List<ByteBuffer> l) {
      */
     private static final int NOT_HANDSHAKING = 0;
     private static final int HANDSHAKING = 1;
-    private static final int INIT = 2;
+
     private static final int DOING_TASKS = 4; // bit added to above state
     private static final ByteBuffer HS_TRIGGER = ByteBuffer.allocate(0);
 
@@ -651,9 +745,6 @@ private static String states(AtomicInteger state) {
             case HANDSHAKING:
                 sb.append(" HANDSHAKING ");
                 break;
-            case INIT:
-                sb.append(" INIT ");
-                break;
             default:
                 throw new InternalError();
         }
@@ -670,28 +761,37 @@ private void resumeActivity() {
     final AtomicInteger handshakeState;
     final ConcurrentLinkedQueue<String> stateList = new ConcurrentLinkedQueue<>();
 
-    private void doHandshake(EngineResult r, int caller) {
-        int s = handshakeState.getAndAccumulate(HANDSHAKING, (current, update) -> update | (current & DOING_TASKS));
+    private boolean doHandshake(EngineResult r, int caller) {
+        // unconditionally sets the HANDSHAKING bit, while preserving DOING_TASKS
+        handshakeState.getAndAccumulate(HANDSHAKING, (current, update) -> update | (current & DOING_TASKS));
         stateList.add(r.handshakeStatus().toString());
         stateList.add(Integer.toString(caller));
         switch (r.handshakeStatus()) {
             case NEED_TASK:
+                int s = handshakeState.getAndUpdate((current) -> current | DOING_TASKS);
                 if ((s & DOING_TASKS) > 0) // someone else was doing tasks
-                    return;
+                    return false;
+
+                if (debug.on()) debug.log("obtaining and initiating task execution");
                 List<Runnable> tasks = obtainTasks();
                 executeTasks(tasks);
-                break;
+                return false;  // executeTasks will resume activity
             case NEED_WRAP:
-                writer.addData(HS_TRIGGER);
+                if (caller == READER) {
+                    writer.addData(HS_TRIGGER);
+                    return false;
+                }
                 break;
             case NEED_UNWRAP:
             case NEED_UNWRAP_AGAIN:
                 // do nothing else
+                // receiving-side data will trigger unwrap
                 break;
             default:
                 throw new InternalError("Unexpected handshake status:"
                                         + r.handshakeStatus());
         }
+        return true;
     }
 
     private List<Runnable> obtainTasks() {
@@ -704,66 +804,40 @@ private List<Runnable> obtainTasks() {
     }
 
     private void executeTasks(List<Runnable> tasks) {
+        if (tasks.isEmpty())
+            return;
         exec.execute(() -> {
-            handshakeState.getAndUpdate((current) -> current | DOING_TASKS);
-            List<Runnable> nextTasks = tasks;
-            do {
-                try {
-                    nextTasks.forEach((r) -> {
-                        r.run();
-                    });
+            try {
+                List<Runnable> nextTasks = tasks;
+                do {
+                    nextTasks.forEach(Runnable::run);
                     if (engine.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
                         nextTasks = obtainTasks();
-                    } else break;
-                } catch (Throwable t) {
-                    handleError(t);
-                }
-            } while(true);
-            handshakeState.getAndUpdate((current) -> current & ~DOING_TASKS);
-            writer.addData(HS_TRIGGER);
-            resumeActivity();
-        });
-    }
-
-
-    EngineResult unwrapBuffer(ByteBuffer src) throws IOException {
-        ByteBuffer dst = getAppBuffer();
-        while (true) {
-            SSLEngineResult sslResult = engine.unwrap(src, dst);
-            switch (sslResult.getStatus()) {
-                case BUFFER_OVERFLOW:
-                    // may happen only if app size buffer was changed.
-                    // get it again if app buffer size changed
-                    int appSize = engine.getSession().getApplicationBufferSize();
-                    ByteBuffer b = ByteBuffer.allocate(appSize + dst.position());
-                    dst.flip();
-                    b.put(dst);
-                    dst = b;
-                    break;
-                case CLOSED:
-                    return doClosure(new EngineResult(sslResult));
-                case BUFFER_UNDERFLOW:
-                    // handled implicitly by compaction/reallocation of readBuf
-                    return new EngineResult(sslResult);
-                case OK:
-                     dst.flip();
-                     return new EngineResult(sslResult, dst);
+                    } else {
+                        break;
+                    }
+                } while (true);
+                handshakeState.getAndUpdate((current) -> current & ~DOING_TASKS);
+                //writer.addData(HS_TRIGGER);
+                resumeActivity();
+            } catch (Throwable t) {
+                handleError(t);
             }
-        }
+        });
     }
 
     // FIXME: acknowledge a received CLOSE request from peer
     EngineResult doClosure(EngineResult r) throws IOException {
-        debug.log(Level.DEBUG,
-                "doClosure(%s): %s [isOutboundDone: %s, isInboundDone: %s]",
-                r.result, engine.getHandshakeStatus(),
-                engine.isOutboundDone(), engine.isInboundDone());
+        if (debug.on())
+            debug.log("doClosure(%s): %s [isOutboundDone: %s, isInboundDone: %s]",
+                      r.result, engine.getHandshakeStatus(),
+                      engine.isOutboundDone(), engine.isInboundDone());
         if (engine.getHandshakeStatus() == HandshakeStatus.NEED_WRAP) {
             // we have received TLS close_notify and need to send
             // an acknowledgement back. We're calling doHandshake
             // to finish the close handshake.
             if (engine.isInboundDone() && !engine.isOutboundDone()) {
-                debug.log(Level.DEBUG, "doClosure: close_notify received");
+                if (debug.on()) debug.log("doClosure: close_notify received");
                 close_notify_received = true;
                 doHandshake(r, READER);
             }
@@ -810,11 +884,6 @@ static class EngineResult {
             this.destBuffer = destBuffer;
         }
 
-        // Special result used to trigger handshaking in constructor
-        static EngineResult INIT =
-            new EngineResult(
-                new SSLEngineResult(SSLEngineResult.Status.OK, HandshakeStatus.NEED_WRAP, 0, 0));
-
         boolean handshaking() {
             HandshakeStatus s = result.getHandshakeStatus();
             return s != HandshakeStatus.FINISHED
@@ -856,48 +925,4 @@ private ByteBuffer getAppBuffer() {
     final String dbgString() {
         return "SSLFlowDelegate(" + tubeName + ")";
     }
-
-    @SuppressWarnings("fallthrough")
-    EngineResult wrapBuffers(ByteBuffer[] src) throws SSLException {
-        debug.log(Level.DEBUG, () -> "wrapping "
-                    + Utils.remaining(src) + " bytes");
-        ByteBuffer dst = getNetBuffer();
-        while (true) {
-            SSLEngineResult sslResult = engine.wrap(src, dst);
-            debug.log(Level.DEBUG, () -> "SSLResult: " + sslResult);
-            switch (sslResult.getStatus()) {
-                case BUFFER_OVERFLOW:
-                    // Shouldn't happen. We allocated buffer with packet size
-                    // get it again if net buffer size was changed
-                    debug.log(Level.DEBUG, "BUFFER_OVERFLOW");
-                    int appSize = engine.getSession().getApplicationBufferSize();
-                    ByteBuffer b = ByteBuffer.allocate(appSize + dst.position());
-                    dst.flip();
-                    b.put(dst);
-                    dst = b;
-                    break; // try again
-                case CLOSED:
-                    debug.log(Level.DEBUG, "CLOSED");
-                    // fallthrough. There could be some remaining data in dst.
-                    // CLOSED will be handled by the caller.
-                case OK:
-                    dst.flip();
-                    final ByteBuffer dest = dst;
-                    debug.log(Level.DEBUG, () -> "OK => produced: "
-                                           + dest.remaining()
-                                           + " not wrapped: "
-                                           + Utils.remaining(src));
-                    return new EngineResult(sslResult, dest);
-                case BUFFER_UNDERFLOW:
-                    // Shouldn't happen.  Doesn't returns when wrap()
-                    // underflow handled externally
-                    // assert false : "Buffer Underflow";
-                    debug.log(Level.DEBUG, "BUFFER_UNDERFLOW");
-                    return new EngineResult(sslResult);
-                default:
-                    debug.log(Level.DEBUG, "ASSERT");
-                    assert false;
-            }
-        }
-    }
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLTube.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLTube.java
similarity index 87%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLTube.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/SSLTube.java
index 32a3026dc15..5160e9985d3 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLTube.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/SSLTube.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,9 +23,8 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
-import java.lang.System.Logger.Level;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Objects;
@@ -37,7 +36,7 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
-import jdk.incubator.http.internal.common.SubscriberWrapper.SchedulingAction;
+import jdk.internal.net.http.common.SubscriberWrapper.SchedulingAction;
 import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
 import static javax.net.ssl.SSLEngineResult.HandshakeStatus.FINISHED;
 
@@ -67,9 +66,8 @@
  */
 public class SSLTube implements FlowTube {
 
-    static final boolean DEBUG = Utils.DEBUG; // revisit: temporary developer's flag.
-    final System.Logger debug =
-            Utils.getDebugLogger(this::dbgString, DEBUG);
+    final Logger debug =
+            Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
 
     private final FlowTube tube;
     private final SSLSubscriberWrapper readSubscriber;
@@ -171,13 +169,13 @@ public boolean isFinished() {
     // onComplete/onError are not called before onSubscribed.
     final static class DelegateWrapper implements FlowTube.TubeSubscriber {
         private final FlowTube.TubeSubscriber delegate;
-        private final System.Logger debug;
+        private final Logger debug;
         volatile boolean subscribedCalled;
         volatile boolean subscribedDone;
         volatile boolean completed;
         volatile Throwable error;
         DelegateWrapper(Flow.Subscriber<? super List<ByteBuffer>> delegate,
-                        System.Logger debug) {
+                        Logger debug) {
             this.delegate = FlowTube.asTubeSubscriber(delegate);
             this.debug = debug;
         }
@@ -212,13 +210,13 @@ private void onSubscribe(Consumer<Flow.Subscription> method,
                 finished = completed;
             }
             if (x != null) {
-                debug.log(Level.DEBUG,
-                          "Subscriber completed before subscribe: forwarding %s",
-                          (Object)x);
+                if (debug.on())
+                    debug.log("Subscriber completed before subscribe: forwarding %s",
+                              (Object)x);
                 delegate.onError(x);
             } else if (finished) {
-                debug.log(Level.DEBUG,
-                          "Subscriber completed before subscribe: calling onComplete()");
+                if (debug.on())
+                    debug.log("Subscriber completed before subscribe: calling onComplete()");
                 delegate.onComplete();
             }
         }
@@ -226,9 +224,9 @@ private void onSubscribe(Consumer<Flow.Subscription> method,
         @Override
         public void onError(Throwable t) {
             if (completed) {
-                debug.log(Level.DEBUG,
-                          "Subscriber already completed: ignoring %s",
-                          (Object)t);
+                if (debug.on())
+                    debug.log("Subscriber already completed: ignoring %s",
+                              (Object)t);
                 return;
             }
             boolean subscribed;
@@ -241,9 +239,9 @@ public void onError(Throwable t) {
             if (subscribed) {
                 delegate.onError(t);
             } else {
-                debug.log(Level.DEBUG,
-                          "Subscriber not yet subscribed: stored %s",
-                          (Object)t);
+                if (debug.on())
+                    debug.log("Subscriber not yet subscribed: stored %s",
+                              (Object)t);
             }
         }
 
@@ -257,11 +255,11 @@ public void onComplete() {
                 subscribed = subscribedDone;
             }
             if (subscribed) {
-                debug.log(Level.DEBUG, "DelegateWrapper: completing subscriber");
+                if (debug.on()) debug.log("DelegateWrapper: completing subscriber");
                 delegate.onComplete();
             } else {
-                debug.log(Level.DEBUG,
-                          "Subscriber not yet subscribed: stored completed=true");
+                if (debug.on())
+                    debug.log("Subscriber not yet subscribed: stored completed=true");
             }
         }
 
@@ -291,8 +289,9 @@ final class SSLSubscriberWrapper implements FlowTube.TubeSubscriber {
         //    we're going to wait for onSubscribe to be called.
         //
         void setDelegate(Flow.Subscriber<? super List<ByteBuffer>> delegate) {
-            debug.log(Level.DEBUG, "SSLSubscriberWrapper (reader) got delegate: %s",
-                      delegate);
+            if (debug.on())
+                debug.log("SSLSubscriberWrapper (reader) got delegate: %s",
+                          delegate);
             assert delegate != null;
             DelegateWrapper delegateWrapper = new DelegateWrapper(delegate, debug);
             DelegateWrapper previous;
@@ -307,7 +306,8 @@ void setDelegate(Flow.Subscriber<? super List<ByteBuffer>> delegate) {
                 previous.dropSubscription();
             }
             if (subscription == null) {
-                debug.log(Level.DEBUG, "SSLSubscriberWrapper (reader) no subscription yet");
+                if (debug.on())
+                    debug.log("SSLSubscriberWrapper (reader) no subscription yet");
                 return;
             }
             if (handleNow || !sslDelegate.resumeReader()) {
@@ -331,9 +331,9 @@ void processPendingSubscriber() {
                 previous = subscribed;
             }
             if (subscription == null) {
-                debug.log(Level.DEBUG,
-                         "SSLSubscriberWrapper (reader) %s",
-                         "processPendingSubscriber: no subscription yet");
+                if (debug.on())
+                    debug.log("SSLSubscriberWrapper (reader) " +
+                              "processPendingSubscriber: no subscription yet");
                 return;
             }
             delegateWrapper = pendingDelegate.getAndSet(null);
@@ -354,9 +354,9 @@ public void dropSubscription() {
 
         @Override
         public void onSubscribe(Flow.Subscription subscription) {
-            debug.log(Level.DEBUG,
-                      "SSLSubscriberWrapper (reader) onSubscribe(%s)",
-                      subscription);
+            if (debug.on())
+                debug.log("SSLSubscriberWrapper (reader) onSubscribe(%s)",
+                          subscription);
             onSubscribeImpl(subscription);
         }
 
@@ -371,9 +371,9 @@ private void onSubscribeImpl(Flow.Subscription subscription) {
             }
 
             if (subscriberImpl == null && pending == null) {
-                debug.log(Level.DEBUG,
-                      "SSLSubscriberWrapper (reader) onSubscribeImpl: %s",
-                      "no delegate yet");
+                if (debug.on())
+                    debug.log("SSLSubscriberWrapper (reader) onSubscribeImpl: "
+                              + "no delegate yet");
                 return;
             }
 
@@ -382,17 +382,17 @@ private void onSubscribeImpl(Flow.Subscription subscription) {
                 // subscribed delegate. This is obviously a re-subscribe.
                 // We are in the downstream reader flow, so we should call
                 // onSubscribe directly.
-                debug.log(Level.DEBUG,
-                      "SSLSubscriberWrapper (reader) onSubscribeImpl: %s",
-                      "resubscribing");
+                if (debug.on())
+                    debug.log("SSLSubscriberWrapper (reader) onSubscribeImpl: "
+                              + "resubscribing");
                 onNewSubscription(subscriberImpl, subscription);
             } else {
                 // We have some pending subscriber: subscribe it now that we have
                 // a subscription. If we already had a previous delegate then
                 // it will get a dropSubscription().
-                debug.log(Level.DEBUG,
-                      "SSLSubscriberWrapper (reader) onSubscribeImpl: %s",
-                      "subscribing pending");
+                if (debug.on())
+                    debug.log("SSLSubscriberWrapper (reader) onSubscribeImpl: "
+                              + "subscribing pending");
                 processPendingSubscriber();
             }
         }
@@ -439,7 +439,8 @@ public void onErrorImpl(Throwable throwable) {
             errorRef.compareAndSet(null, throwable);
             Throwable failed = errorRef.get();
             finished = true;
-            debug.log(Level.DEBUG, "%s: onErrorImpl: %s", this, throwable);
+            if (debug.on())
+                debug.log("%s: onErrorImpl: %s", this, throwable);
             DelegateWrapper subscriberImpl;
             synchronized (this) {
                 subscriberImpl = subscribed;
@@ -447,7 +448,8 @@ public void onErrorImpl(Throwable throwable) {
             if (subscriberImpl != null) {
                 subscriberImpl.onError(failed);
             } else {
-                debug.log(Level.DEBUG, "%s: delegate null, stored %s", this, failed);
+                if (debug.on())
+                    debug.log("%s: delegate null, stored %s", this, failed);
             }
             // now if we have any pending subscriber, we should forward
             // the error to them immediately as the read scheduler will
@@ -486,11 +488,11 @@ public void onComplete() {
             }
 
             if (handshakeFailed()) {
-                debug.log(Level.DEBUG,
-                        "handshake: %s, inbound done: %s outbound done: %s",
-                        engine.getHandshakeStatus(),
-                        engine.isInboundDone(),
-                        engine.isOutboundDone());
+                if (debug.on())
+                    debug.log("handshake: %s, inbound done: %s outbound done: %s",
+                              engine.getHandshakeStatus(),
+                              engine.isInboundDone(),
+                              engine.isOutboundDone());
                 onErrorImpl(new SSLHandshakeException(
                         "Remote host terminated the handshake"));
             } else if (subscriberImpl != null) {
@@ -506,7 +508,7 @@ public void onComplete() {
     @Override
     public void connectFlows(TubePublisher writePub,
                              TubeSubscriber readSub) {
-        debug.log(Level.DEBUG, "connecting flows");
+        if (debug.on()) debug.log("connecting flows");
         readSubscriber.setDelegate(readSub);
         writePub.subscribe(this);
     }
@@ -521,7 +523,7 @@ final class SSLSubscriptionWrapper implements Flow.Subscription {
         void setSubscription(Flow.Subscription sub) {
             long demand = writeDemand.get(); // FIXME: isn't it a racy way of passing the demand?
             delegate = sub;
-            debug.log(Level.DEBUG, "setSubscription: demand=%d", demand);
+            if (debug.on()) debug.log("setSubscription: demand=%d", demand);
             if (demand > 0)
                 sub.request(demand);
         }
@@ -529,7 +531,7 @@ void setSubscription(Flow.Subscription sub) {
         @Override
         public void request(long n) {
             writeDemand.increase(n);
-            debug.log(Level.DEBUG, "request: n=%d", n);
+            if (debug.on()) debug.log("request: n=%d", n);
             Flow.Subscription sub = delegate;
             if (sub != null && n > 0) {
                 sub.request(n);
@@ -558,8 +560,8 @@ public void onNext(List<ByteBuffer> item) {
         Objects.requireNonNull(item);
         boolean decremented = writeDemand.tryDecrement();
         assert decremented : "Unexpected writeDemand: ";
-        debug.log(Level.DEBUG,
-                "sending %d  buffers to SSL flow delegate", item.size());
+        if (debug.on())
+            debug.log("sending %d  buffers to SSL flow delegate", item.size());
         sslDelegate.upstreamWriter().onNext(item);
     }
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SequentialScheduler.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/SequentialScheduler.java
similarity index 91%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SequentialScheduler.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/SequentialScheduler.java
index d3c409d26be..1e8bdbbd090 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SequentialScheduler.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/SequentialScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -135,8 +135,8 @@ public interface RestartableTask {
     }
 
     /**
-     * A complete restartable task is one which is simple and self-contained.
-     * It completes once its {@code run} method returns.
+     * A simple and self-contained task that completes once its {@code run}
+     * method returns.
      */
     public static abstract class CompleteRestartableTask
         implements RestartableTask
@@ -155,16 +155,16 @@ public final void run(DeferredCompleter taskCompleter) {
     }
 
     /**
-     * A RestartableTask that runs its main loop within a
-     * synchronized block to place a memory barrier around it.
-     * Because the main loop can't run concurrently in two treads,
-     * then the lock shouldn't be contended and no deadlock should
-     * ever be possible.
+     * A task that runs its main loop within a synchronized block to provide
+     * memory visibility between runs. Since the main loop can't run concurrently,
+     * the lock shouldn't be contended and no deadlock should ever be possible.
      */
     public static final class SynchronizedRestartableTask
             extends CompleteRestartableTask {
+
         private final Runnable mainLoop;
         private final Object lock = new Object();
+
         public SynchronizedRestartableTask(Runnable mainLoop) {
             this.mainLoop = mainLoop;
         }
@@ -189,7 +189,7 @@ protected void run() {
     private final SchedulableTask schedulableTask;
 
     /**
-     * A simple task that can be pushed on an executor to execute
+     * An auxiliary task that starts the restartable task:
      * {@code restartableTask.run(completer)}.
      */
     private final class SchedulableTask implements Runnable {
@@ -225,7 +225,7 @@ public void runOrSchedule() {
     }
 
     /**
-     * Runs or schedules the task to be run in the provided executor.
+     * Executes or schedules the task to be executed in the provided executor.
      *
      * <p> This method can be used when potential executing from a calling
      * thread is not desirable.
@@ -235,10 +235,10 @@ public void runOrSchedule() {
      *         to be executed.
      *
      * @apiNote The given executor can be {@code null} in which case calling
-     * {@code deferOrSchedule(null)} is strictly equivalent to calling
+     * {@code runOrSchedule(null)} is strictly equivalent to calling
      * {@code runOrSchedule()}.
      */
-    public void deferOrSchedule(Executor executor) { // TODO: why this name? why not runOrSchedule?
+    public void runOrSchedule(Executor executor) {
         runOrSchedule(schedulableTask, executor);
     }
 
@@ -348,17 +348,15 @@ public void stop() {
      * Returns a new {@code SequentialScheduler} that executes the provided
      * {@code mainLoop} from within a {@link SynchronizedRestartableTask}.
      *
-     * @apiNote
-     * This is equivalent to calling
-     * {@code new SequentialScheduler(new SynchronizedRestartableTask(mainloop));}
-     * The main loop must not do any blocking operation.
+     * @apiNote This is equivalent to calling
+     * {@code new SequentialScheduler(new SynchronizedRestartableTask(mainLoop))}
+     * The main loop must not perform any blocking operation.
      *
-     * @param mainloop The main loop of the new sequential scheduler.
+     * @param mainLoop The main loop of the new sequential scheduler
      * @return a new {@code SequentialScheduler} that executes the provided
      * {@code mainLoop} from within a {@link SynchronizedRestartableTask}.
      */
-    public static SequentialScheduler synchronizedScheduler(Runnable mainloop) {
-        return new SequentialScheduler(new SynchronizedRestartableTask(mainloop));
+    public static SequentialScheduler synchronizedScheduler(Runnable mainLoop) {
+        return new SequentialScheduler(new SynchronizedRestartableTask(mainLoop));
     }
-
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SubscriberWrapper.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriberWrapper.java
similarity index 83%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SubscriberWrapper.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriberWrapper.java
index e51cb7380e4..64771592d89 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SubscriberWrapper.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriberWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,11 +23,12 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import java.io.Closeable;
 import java.lang.System.Logger.Level;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
@@ -59,9 +60,8 @@ public abstract class SubscriberWrapper
     implements FlowTube.TubeSubscriber, Closeable, Flow.Processor<List<ByteBuffer>,List<ByteBuffer>>
                 // TODO: SSLTube Subscriber will never change? Does this really need to be a TS?
 {
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    final System.Logger logger =
-            Utils.getDebugLogger(this::dbgString, DEBUG);
+    final Logger debug =
+            Utils.getDebugLogger(this::dbgString, Utils.DEBUG);
 
     public enum SchedulingAction { CONTINUE, RETURN, RESCHEDULE }
 
@@ -92,7 +92,11 @@ public enum SchedulingAction { CONTINUE, RETURN, RESCHEDULE }
     public SubscriberWrapper()
     {
         this.outputQ = new ConcurrentLinkedQueue<>();
-        this.cf = new MinimalFuture<>();
+        this.cf = new MinimalFuture<Void>();
+        cf.whenComplete((v,t) -> {
+            if (t != null)
+                errorCommon(t);
+        });
         this.pushScheduler =
                 SequentialScheduler.synchronizedScheduler(new DownstreamPusher());
         this.downstreamSubscription = new SubscriptionBase(pushScheduler,
@@ -200,7 +204,7 @@ public void outgoing(ByteBuffer buffer, boolean complete) {
      * Sometime it might be necessary to complete the downstream subscriber
      * before the upstream completes. For instance, when an SSL server
      * sends a notify_close. In that case we should let the outgoing
-     * complete before upstream us completed.
+     * complete before upstream is completed.
      * @return true, may be overridden by subclasses.
      */
     public boolean closing() {
@@ -212,20 +216,21 @@ public void outgoing(List<ByteBuffer> buffers, boolean complete) {
         if (complete) {
             assert Utils.remaining(buffers) == 0;
             boolean closing = closing();
-            logger.log(Level.DEBUG,
-                    "completionAcknowledged upstreamCompleted:%s, downstreamCompleted:%s, closing:%s",
-                    upstreamCompleted, downstreamCompleted, closing);
-            if (!upstreamCompleted && !closing)
+            if (debug.on())
+                debug.log("completionAcknowledged upstreamCompleted:%s,"
+                          + " downstreamCompleted:%s, closing:%s",
+                          upstreamCompleted, downstreamCompleted, closing);
+            if (!upstreamCompleted && !closing) {
                 throw new IllegalStateException("upstream not completed");
+            }
             completionAcknowledged = true;
         } else {
-            logger.log(Level.DEBUG, () -> "Adding "
-                                   + Utils.remaining(buffers)
-                                   + " to outputQ queue");
+            if (debug.on())
+                debug.log("Adding %d to outputQ queue", Utils.remaining(buffers));
             outputQ.add(buffers);
         }
-        logger.log(Level.DEBUG, () -> "pushScheduler "
-                   + (pushScheduler.isStopped() ? " is stopped!" : " is alive"));
+        if (debug.on())
+            debug.log("pushScheduler" +(pushScheduler.isStopped() ? " is stopped!" : " is alive"));
         pushScheduler.runOrSchedule();
     }
 
@@ -261,7 +266,8 @@ public void run() {
 
         private void run1() {
             if (downstreamCompleted) {
-                logger.log(Level.DEBUG, "DownstreamPusher: downstream is already completed");
+                if (debug.on())
+                    debug.log("DownstreamPusher: downstream is already completed");
                 return;
             }
             switch (enterScheduling()) {
@@ -275,13 +281,14 @@ private void run1() {
             }
             // If there was an error, send it downstream.
             Throwable error = errorRef.get();
-            if (error != null) {
+            if (error != null && outputQ.isEmpty()) {
                 synchronized(this) {
-                    if (downstreamCompleted) return;
+                    if (downstreamCompleted)
+                        return;
                     downstreamCompleted = true;
                 }
-                logger.log(Level.DEBUG,
-                        () -> "DownstreamPusher: forwarding error downstream: " + error);
+                if (debug.on())
+                    debug.log("DownstreamPusher: forwarding error downstream: " + error);
                 pushScheduler.stop();
                 outputQ.clear();
                 downstreamSubscriber.onError(error);
@@ -290,22 +297,20 @@ private void run1() {
 
             // OK - no error, let's proceed
             if (!outputQ.isEmpty()) {
-                logger.log(Level.DEBUG,
-                    "DownstreamPusher: queue not empty, downstreamSubscription: %s",
-                     downstreamSubscription);
+                if (debug.on())
+                    debug.log("DownstreamPusher: queue not empty, downstreamSubscription: %s",
+                              downstreamSubscription);
             } else {
-                logger.log(Level.DEBUG,
-                       "DownstreamPusher: queue empty, downstreamSubscription: %s",
-                       downstreamSubscription);
+                if (debug.on())
+                    debug.log("DownstreamPusher: queue empty, downstreamSubscription: %s",
+                               downstreamSubscription);
             }
 
-            final boolean dbgOn = logger.isLoggable(Level.DEBUG);
             while (!outputQ.isEmpty() && downstreamSubscription.tryDecrement()) {
                 List<ByteBuffer> b = outputQ.poll();
-                if (dbgOn) logger.log(Level.DEBUG,
-                                            "DownstreamPusher: Pushing "
-                                            + Utils.remaining(b)
-                                            + " bytes downstream");
+                if (debug.on())
+                    debug.log("DownstreamPusher: Pushing %d bytes downstream",
+                              Utils.remaining(b));
                 downstreamSubscriber.onNext(b);
             }
             upstreamWindowUpdate();
@@ -315,7 +320,12 @@ private void run1() {
 
     void upstreamWindowUpdate() {
         long downstreamQueueSize = outputQ.size();
-        long n = upstreamWindowUpdate(upstreamWindow.get(), downstreamQueueSize);
+        long upstreamWindowSize = upstreamWindow.get();
+        long n = upstreamWindowUpdate(upstreamWindowSize, downstreamQueueSize);
+        if (debug.on())
+            debug.log("upstreamWindowUpdate, "
+                      + "downstreamQueueSize:%d, upstreamWindow:%d",
+                      downstreamQueueSize, upstreamWindowSize);
         if (n > 0)
             upstreamRequest(n);
     }
@@ -327,16 +337,16 @@ public void onSubscribe(Flow.Subscription subscription) {
         }
         this.upstreamSubscription = subscription;
         upstreamRequest(upstreamWindowUpdate(0, 0));
-        logger.log(Level.DEBUG,
-               "calling downstreamSubscriber::onSubscribe on %s",
-               downstreamSubscriber);
+        if (debug.on())
+            debug.log("calling downstreamSubscriber::onSubscribe on %s",
+                      downstreamSubscriber);
         downstreamSubscriber.onSubscribe(downstreamSubscription);
         onSubscribe();
     }
 
     @Override
     public void onNext(List<ByteBuffer> item) {
-        logger.log(Level.DEBUG, "onNext");
+        if (debug.on()) debug.log("onNext");
         long prev = upstreamWindow.getAndDecrement();
         if (prev <= 0)
             throw new IllegalStateException("invalid onNext call");
@@ -345,7 +355,7 @@ public void onNext(List<ByteBuffer> item) {
     }
 
     private void upstreamRequest(long n) {
-        logger.log(Level.DEBUG, "requesting %d", n);
+        if (debug.on()) debug.log("requesting %d", n);
         upstreamWindow.getAndAdd(n);
         upstreamSubscription.request(n);
     }
@@ -362,14 +372,15 @@ public long upstreamWindow() {
 
     @Override
     public void onError(Throwable throwable) {
-        logger.log(Level.DEBUG, () -> "onError: " + throwable);
+        if (debug.on()) debug.log("onError: " + throwable);
         errorCommon(Objects.requireNonNull(throwable));
     }
 
     protected boolean errorCommon(Throwable throwable) {
-        assert throwable != null;
+        assert throwable != null ||
+                (throwable = new AssertionError("null throwable")) != null;
         if (errorRef.compareAndSet(null, throwable)) {
-            logger.log(Level.DEBUG, "error", throwable);
+            if (debug.on()) debug.log("error", throwable);
             pushScheduler.runOrSchedule();
             upstreamCompleted = true;
             cf.completeExceptionally(throwable);
@@ -383,6 +394,10 @@ public void close() {
         errorCommon(new RuntimeException("wrapper closed"));
     }
 
+    public void close(Throwable t) {
+        errorCommon(t);
+    }
+
     private void incomingCaller(List<ByteBuffer> l, boolean complete) {
         try {
             incoming(l, complete);
@@ -393,7 +408,7 @@ private void incomingCaller(List<ByteBuffer> l, boolean complete) {
 
     @Override
     public void onComplete() {
-        logger.log(Level.DEBUG, () -> "upstream completed: " + toString());
+        if (debug.on()) debug.log("upstream completed: " + toString());
         upstreamCompleted = true;
         incomingCaller(Utils.EMPTY_BB_LIST, true);
         // pushScheduler will call checkCompletion()
@@ -420,7 +435,7 @@ void checkCompletion() {
             return;
         }
         if (completionAcknowledged) {
-            logger.log(Level.DEBUG, "calling downstreamSubscriber.onComplete()");
+            if (debug.on()) debug.log("calling downstreamSubscriber.onComplete()");
             downstreamSubscriber.onComplete();
             // Fix me subscriber.onComplete.run();
             downstreamCompleted = true;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SubscriptionBase.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriptionBase.java
similarity index 76%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SubscriptionBase.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriptionBase.java
index 62b6f6d9bc7..c5b31456bee 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SubscriptionBase.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/SubscriptionBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,18 +23,17 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import java.util.concurrent.Flow;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
 
 /**
- * Maintains subscription counter and provides primitives for
+ * Maintains subscription counter and provides primitives for:
  * - accessing window
  * - reducing window when delivering items externally
  * - resume delivery when window was zero previously
- *
- * @author mimcmah
  */
 public class SubscriptionBase implements Flow.Subscription {
 
@@ -43,21 +42,35 @@ public class SubscriptionBase implements Flow.Subscription {
     final SequentialScheduler scheduler; // when window was zero and is opened, run this
     final Runnable cancelAction; // when subscription cancelled, run this
     final AtomicBoolean cancelled;
+    final Consumer<Throwable> onError;
 
     public SubscriptionBase(SequentialScheduler scheduler, Runnable cancelAction) {
+        this(scheduler, cancelAction, null);
+    }
+
+    public SubscriptionBase(SequentialScheduler scheduler,
+                            Runnable cancelAction,
+                            Consumer<Throwable> onError) {
         this.scheduler = scheduler;
         this.cancelAction = cancelAction;
         this.cancelled = new AtomicBoolean(false);
+        this.onError = onError;
     }
 
     @Override
     public void request(long n) {
-        if (demand.increase(n))
-            scheduler.runOrSchedule();
+        try {
+            if (demand.increase(n))
+                scheduler.runOrSchedule();
+        } catch(Throwable t) {
+            if (onError != null) {
+                if (cancelled.getAndSet(true))
+                    return;
+                onError.accept(t);
+            } else throw t;
+        }
     }
 
-
-
     @Override
     public synchronized String toString() {
         return "SubscriptionBase: window = " + demand.get() +
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
similarity index 60%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
index 1a6ce734b45..a10115026b8 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
@@ -23,24 +23,26 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
-import jdk.incubator.http.HttpHeaders;
 import sun.net.NetProperties;
 import sun.net.util.IPAddressUtil;
+import sun.net.www.HeaderParser;
 
+import javax.net.ssl.ExtendedSSLSession;
 import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLSession;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UncheckedIOException;
 import java.io.UnsupportedEncodingException;
-import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.URLPermission;
+import java.net.http.HttpHeaders;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -48,14 +50,20 @@
 import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
+import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
 
 /**
@@ -64,11 +72,13 @@
 public final class Utils {
 
     public static final boolean ASSERTIONSENABLED;
+
     static {
         boolean enabled = false;
         assert enabled = true;
         ASSERTIONSENABLED = enabled;
     }
+
 //    public static final boolean TESTING;
 //    static {
 //        if (ASSERTIONSENABLED) {
@@ -78,10 +88,22 @@ public final class Utils {
 //    }
     public static final boolean DEBUG = // Revisit: temporary dev flag.
             getBooleanProperty(DebugLogger.HTTP_NAME, false);
+    public static final boolean DEBUG_WS = // Revisit: temporary dev flag.
+            getBooleanProperty(DebugLogger.WS_NAME, false);
     public static final boolean DEBUG_HPACK = // Revisit: temporary dev flag.
             getBooleanProperty(DebugLogger.HPACK_NAME, false);
     public static final boolean TESTING = DEBUG;
 
+    public static final boolean isHostnameVerificationDisabled = // enabled by default
+            hostnameVerificationDisabledValue();
+
+    private static boolean hostnameVerificationDisabledValue() {
+        String prop = getProperty("jdk.internal.httpclient.disableHostnameVerification");
+        if (prop == null)
+            return false;
+        return prop.isEmpty() ? true : Boolean.parseBoolean(prop);
+    }
+
     /**
      * Allocated buffer size. Must never be higher than 16K. But can be lower
      * if smaller allocation units preferred. HTTP/2 mandates that all
@@ -93,14 +115,118 @@ public final class Utils {
             "jdk.httpclient.bufsize", DEFAULT_BUFSIZE
     );
 
-    private static final Set<String> DISALLOWED_HEADERS_SET = Set.of(
-            "authorization", "connection", "cookie", "content-length",
-            "date", "expect", "from", "host", "origin", "proxy-authorization",
-            "referer", "user-agent", "upgrade", "via", "warning");
+    private static final Set<String> DISALLOWED_HEADERS_SET;
+
+    static {
+        // A case insensitive TreeSet of strings.
+        TreeSet<String> treeSet = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        treeSet.addAll(Set.of("connection", "content-length",
+                "date", "expect", "from", "host", "origin",
+                "referer", "upgrade",
+                "via", "warning"));
+        DISALLOWED_HEADERS_SET = Collections.unmodifiableSet(treeSet);
+    }
 
     public static final Predicate<String>
-        ALLOWED_HEADERS = header -> !Utils.DISALLOWED_HEADERS_SET.contains(header);
+            ALLOWED_HEADERS = header -> !DISALLOWED_HEADERS_SET.contains(header);
+
+    public static final BiPredicate<String, List<String>> VALIDATE_USER_HEADER =
+            (name, lv) -> {
+                requireNonNull(name, "header name");
+                requireNonNull(lv, "header values");
+                if (!isValidName(name)) {
+                    throw newIAE("invalid header name: \"%s\"", name);
+                }
+                if (!Utils.ALLOWED_HEADERS.test(name)) {
+                    throw newIAE("restricted header name: \"%s\"", name);
+                }
+                for (String value : lv) {
+                    requireNonNull(value, "header value");
+                    if (!isValidValue(value)) {
+                        throw newIAE("invalid header value for %s: \"%s\"", name, value);
+                    }
+                }
+                return true;
+            };
+
+    private static final Predicate<String> IS_PROXY_HEADER = (k) ->
+            k != null && k.length() > 6 && "proxy-".equalsIgnoreCase(k.substring(0,6));
+    private static final Predicate<String> NO_PROXY_HEADER =
+            IS_PROXY_HEADER.negate();
+    private static final Predicate<String> ALL_HEADERS = (s) -> true;
+
+    private static final Set<String> PROXY_AUTH_DISABLED_SCHEMES;
+    private static final Set<String> PROXY_AUTH_TUNNEL_DISABLED_SCHEMES;
+    static {
+        String proxyAuthDisabled =
+                getNetProperty("jdk.http.auth.proxying.disabledSchemes");
+        String proxyAuthTunnelDisabled =
+                getNetProperty("jdk.http.auth.tunneling.disabledSchemes");
+        PROXY_AUTH_DISABLED_SCHEMES =
+                proxyAuthDisabled == null ? Set.of() :
+                        Stream.of(proxyAuthDisabled.split(","))
+                                .map(String::trim)
+                                .filter((s) -> !s.isEmpty())
+                                .collect(Collectors.toUnmodifiableSet());
+        PROXY_AUTH_TUNNEL_DISABLED_SCHEMES =
+                proxyAuthTunnelDisabled == null ? Set.of() :
+                        Stream.of(proxyAuthTunnelDisabled.split(","))
+                                .map(String::trim)
+                                .filter((s) -> !s.isEmpty())
+                                .collect(Collectors.toUnmodifiableSet());
+    }
+
+    private static final String WSPACES = " \t\r\n";
+    private static final boolean isAllowedForProxy(String name,
+                                                   List<String> value,
+                                                   Set<String> disabledSchemes,
+                                                   Predicate<String> allowedKeys) {
+        if (!allowedKeys.test(name)) return false;
+        if (disabledSchemes.isEmpty()) return true;
+        if (name.equalsIgnoreCase("proxy-authorization")) {
+            if (value.isEmpty()) return false;
+            for (String scheme : disabledSchemes) {
+                int slen = scheme.length();
+                for (String v : value) {
+                    int vlen = v.length();
+                    if (vlen == slen) {
+                        if (v.equalsIgnoreCase(scheme)) {
+                            return false;
+                        }
+                    } else if (vlen > slen) {
+                        if (v.substring(0,slen).equalsIgnoreCase(scheme)) {
+                            int c = v.codePointAt(slen);
+                            if (WSPACES.indexOf(c) > -1
+                                    || Character.isSpaceChar(c)
+                                    || Character.isWhitespace(c)) {
+                                return false;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    public static final BiPredicate<String, List<String>> PROXY_TUNNEL_FILTER =
+            (s,v) -> isAllowedForProxy(s, v, PROXY_AUTH_TUNNEL_DISABLED_SCHEMES,
+                    IS_PROXY_HEADER);
+    public static final BiPredicate<String, List<String>> PROXY_FILTER =
+            (s,v) -> isAllowedForProxy(s, v, PROXY_AUTH_DISABLED_SCHEMES,
+                    ALL_HEADERS);
+    public static final BiPredicate<String, List<String>> NO_PROXY_HEADERS_FILTER =
+            (n,v) -> Utils.NO_PROXY_HEADER.test(n);
+
+
+    public static boolean proxyHasDisabledSchemes(boolean tunnel) {
+        return tunnel ? ! PROXY_AUTH_TUNNEL_DISABLED_SCHEMES.isEmpty()
+                      : ! PROXY_AUTH_DISABLED_SCHEMES.isEmpty();
+    }
 
+    public static IllegalArgumentException newIAE(String message, Object... args) {
+        return new IllegalArgumentException(format(message, args));
+    }
     public static ByteBuffer getBuffer() {
         return ByteBuffer.allocate(BUFSIZE);
     }
@@ -109,7 +235,10 @@ public static Throwable getCompletionCause(Throwable x) {
         if (!(x instanceof CompletionException)
                 && !(x instanceof ExecutionException)) return x;
         final Throwable cause = x.getCause();
-        return cause == null ? x : cause;
+        if (cause == null) {
+            throw new InternalError("Unexpected null cause", x);
+        }
+        return cause;
     }
 
     public static IOException getIOException(Throwable t) {
@@ -192,20 +321,52 @@ public static boolean isValidName(String token) {
         return !token.isEmpty();
     }
 
+    public static class ServerName {
+        ServerName(String name, boolean isLiteral) {
+            this.name = name;
+            this.isLiteral = isLiteral;
+        }
+
+        final String name;
+        final boolean isLiteral;
+
+        public String getName() {
+            return name;
+        }
+
+        public boolean isLiteral() {
+            return isLiteral;
+        }
+    }
+
     /**
-     * If the address was created with a domain name, then return
-     * the domain name string. If created with a literal IP address
-     * then return null. We do this to avoid doing a reverse lookup
-     * Used to populate the TLS SNI parameter. So, SNI is only set
-     * when a domain name was supplied.
+     * Analyse the given address and determine if it is literal or not,
+     * returning the address in String form.
      */
-    public static String getServerName(InetSocketAddress addr) {
+    public static ServerName getServerName(InetSocketAddress addr) {
         String host = addr.getHostString();
-        if (IPAddressUtil.textToNumericFormatV4(host) != null)
-            return null;
-        if (IPAddressUtil.textToNumericFormatV6(host) != null)
-            return null;
-        return host;
+        byte[] literal = IPAddressUtil.textToNumericFormatV4(host);
+        if (literal == null) {
+            // not IPv4 literal. Check IPv6
+            literal = IPAddressUtil.textToNumericFormatV6(host);
+            return new ServerName(host, literal != null);
+        } else {
+            return new ServerName(host, true);
+        }
+    }
+
+    private static boolean isLoopbackLiteral(byte[] bytes) {
+        if (bytes.length == 4) {
+            return bytes[0] == 127;
+        } else if (bytes.length == 16) {
+            for (int i=0; i<14; i++)
+                if (bytes[i] != 0)
+                    return false;
+            if (bytes[15] != 1)
+                return false;
+            return true;
+        } else
+            throw new InternalError();
     }
 
     /*
@@ -218,46 +379,46 @@ public static String getServerName(InetSocketAddress addr) {
      * is not permitted!
      */
     public static boolean isValidValue(String token) {
-        boolean accepted = true;
         for (int i = 0; i < token.length(); i++) {
             char c = token.charAt(i);
             if (c > 255) {
                 return false;
             }
-            if (accepted) {
-                if (c == ' ' || c == '\t') {
-                    accepted = false;
-                } else if (!fieldvchar[c]) {
-                    return false; // forbidden byte
-                }
-            } else {
-                if (c != ' ' && c != '\t') {
-                    if (fieldvchar[c]) {
-                        accepted = true;
-                    } else {
-                        return false; // forbidden byte
-                    }
-                }
+            if (c == ' ' || c == '\t') {
+                continue;
+            } else if (!fieldvchar[c]) {
+                return false; // forbidden byte
             }
         }
-        return accepted;
+        return true;
     }
 
+
     public static int getIntegerNetProperty(String name, int defaultValue) {
         return AccessController.doPrivileged((PrivilegedAction<Integer>) () ->
                 NetProperties.getInteger(name, defaultValue));
     }
 
-    static String getNetProperty(String name) {
+    public static String getNetProperty(String name) {
         return AccessController.doPrivileged((PrivilegedAction<String>) () ->
                 NetProperties.get(name));
     }
 
-    static boolean getBooleanProperty(String name, boolean def) {
+    public static boolean getBooleanProperty(String name, boolean def) {
         return AccessController.doPrivileged((PrivilegedAction<Boolean>) () ->
                 Boolean.parseBoolean(System.getProperty(name, String.valueOf(def))));
     }
 
+    public static String getProperty(String name) {
+        return AccessController.doPrivileged((PrivilegedAction<String>) () ->
+                System.getProperty(name));
+    }
+
+    public static int getIntegerProperty(String name, int defaultValue) {
+        return AccessController.doPrivileged((PrivilegedAction<Integer>) () ->
+                Integer.parseInt(System.getProperty(name, String.valueOf(defaultValue))));
+    }
+
     public static SSLParameters copySSLParameters(SSLParameters p) {
         SSLParameters p1 = new SSLParameters();
         p1.setAlgorithmConstraints(p.getAlgorithmConstraints());
@@ -494,11 +655,17 @@ public static ByteBuffer sliceWithLimitedCapacity(ByteBuffer buffer, int amount)
      * UTF_8
      */
     public static Charset charsetFrom(HttpHeaders headers) {
-        String encoding = headers.firstValue("Content-encoding")
-                .orElse("UTF_8");
+        String type = headers.firstValue("Content-type")
+                .orElse("text/html; charset=utf-8");
+        int i = type.indexOf(";");
+        if (i >= 0) type = type.substring(i+1);
         try {
-            return Charset.forName(encoding);
-        } catch (IllegalArgumentException e) {
+            HeaderParser parser = new HeaderParser(type);
+            String value = parser.findValue("charset");
+            if (value == null) return StandardCharsets.UTF_8;
+            return Charset.forName(value);
+        } catch (Throwable x) {
+            Log.logTrace("Can't find charset in \"{0}\" ({1})", type, x);
             return StandardCharsets.UTF_8;
         }
     }
@@ -599,11 +766,11 @@ public static Logger getDebugLogger(Supplier<String> dbgTag, boolean on) {
      * By default, this logger will forward all messages logged to an internal
      * logger named "jdk.internal.httpclient.hpack.debug".
      * In addition, if the message severity level is >= to
-     * the provided {@code outLevel} it will print the messages on stdout.
+     * the provided {@code errLevel} it will print the messages on stderr.
      * The logger will add some decoration to the printed message, in the form of
      * {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>}
      *
-     * @apiNote To obtain a logger that will always print things on stdout in
+     * @apiNote To obtain a logger that will always print things on stderr in
      *          addition to forwarding to the internal logger, use
      *          {@code getHpackLogger(this::dbgTag, Level.ALL);}.
      *          This is also equivalent to calling
@@ -615,13 +782,13 @@ public static Logger getDebugLogger(Supplier<String> dbgTag, boolean on) {
      *
      * @param dbgTag A lambda that returns a string that identifies the caller
      *               (e.g: "Http2Connection(SocketTube(3))/hpack.Decoder(3)")
-     * @param outLevel The level above which messages will be also printed on
-     *               stdout (in addition to be forwarded to the internal logger).
+     * @param errLevel The level above which messages will be also printed on
+     *               stderr (in addition to be forwarded to the internal logger).
      *
      * @return A logger for HPACK internal debug traces
      */
-    public static Logger getHpackLogger(Supplier<String> dbgTag, Level outLevel) {
-        Level errLevel = Level.OFF;
+    public static Logger getHpackLogger(Supplier<String> dbgTag, Level errLevel) {
+        Level outLevel = Level.OFF;
         return DebugLogger.createHpackLogger(dbgTag, outLevel, errLevel);
     }
 
@@ -632,11 +799,11 @@ public static Logger getHpackLogger(Supplier<String> dbgTag, Level outLevel) {
      * By default, this logger will forward all messages logged to an internal
      * logger named "jdk.internal.httpclient.hpack.debug".
      * In addition, the provided boolean {@code on==true}, it will print the
-     * messages on stdout.
+     * messages on stderr.
      * The logger will add some decoration to the printed message, in the form of
      * {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>}
      *
-     * @apiNote To obtain a logger that will always print things on stdout in
+     * @apiNote To obtain a logger that will always print things on stderr in
      *          addition to forwarding to the internal logger, use
      *          {@code getHpackLogger(this::dbgTag, true);}.
      *          This is also equivalent to calling
@@ -649,12 +816,147 @@ public static Logger getHpackLogger(Supplier<String> dbgTag, Level outLevel) {
      * @param dbgTag A lambda that returns a string that identifies the caller
      *               (e.g: "Http2Connection(SocketTube(3))/hpack.Decoder(3)")
      * @param on  Whether messages should also be printed on
-     *            stdout (in addition to be forwarded to the internal logger).
+     *            stderr (in addition to be forwarded to the internal logger).
      *
      * @return A logger for HPACK internal debug traces
      */
     public static Logger getHpackLogger(Supplier<String> dbgTag, boolean on) {
-        Level outLevel = on ? Level.ALL : Level.OFF;
-        return getHpackLogger(dbgTag, outLevel);
+        Level errLevel = on ? Level.ALL : Level.OFF;
+        return getHpackLogger(dbgTag, errLevel);
+    }
+
+    /**
+     * Get a logger for debug WebSocket traces.The logger should only be used
+     * with levels whose severity is {@code <= DEBUG}.
+     *
+     * By default, this logger will forward all messages logged to an internal
+     * logger named "jdk.internal.httpclient.websocket.debug".
+     * In addition, if the message severity level is >= to
+     * the provided {@code errLevel} it will print the messages on stderr.
+     * The logger will add some decoration to the printed message, in the form of
+     * {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>}
+     *
+     * @apiNote To obtain a logger that will always print things on stderr in
+     *          addition to forwarding to the internal logger, use
+     *          {@code getWebSocketLogger(this::dbgTag, Level.ALL);}.
+     *          This is also equivalent to calling
+     *          {@code getWSLogger(this::dbgTag, true);}.
+     *          To obtain a logger that will only forward to the internal logger,
+     *          use {@code getWebSocketLogger(this::dbgTag, Level.OFF);}.
+     *          This is also equivalent to calling
+     *          {@code getWSLogger(this::dbgTag, false);}.
+     *
+     * @param dbgTag A lambda that returns a string that identifies the caller
+     *               (e.g: "WebSocket(3)")
+     * @param errLevel The level above which messages will be also printed on
+     *               stderr (in addition to be forwarded to the internal logger).
+     *
+     * @return A logger for HPACK internal debug traces
+     */
+    public static Logger getWebSocketLogger(Supplier<String> dbgTag, Level errLevel) {
+        Level outLevel = Level.OFF;
+        return DebugLogger.createWebSocketLogger(dbgTag, outLevel, errLevel);
+    }
+
+    /**
+     * Get a logger for debug WebSocket traces.The logger should only be used
+     * with levels whose severity is {@code <= DEBUG}.
+     *
+     * By default, this logger will forward all messages logged to an internal
+     * logger named "jdk.internal.httpclient.websocket.debug".
+     * In addition, the provided boolean {@code on==true}, it will print the
+     * messages on stderr.
+     * The logger will add some decoration to the printed message, in the form of
+     * {@code <Level>:[<thread-name>] [<elapsed-time>] <dbgTag>: <formatted message>}
+     *
+     * @apiNote To obtain a logger that will always print things on stderr in
+     *          addition to forwarding to the internal logger, use
+     *          {@code getWebSocketLogger(this::dbgTag, true);}.
+     *          This is also equivalent to calling
+     *          {@code getWebSocketLogger(this::dbgTag, Level.ALL);}.
+     *          To obtain a logger that will only forward to the internal logger,
+     *          use {@code getWebSocketLogger(this::dbgTag, false);}.
+     *          This is also equivalent to calling
+     *          {@code getHpackLogger(this::dbgTag, Level.OFF);}.
+     *
+     * @param dbgTag A lambda that returns a string that identifies the caller
+     *               (e.g: "WebSocket(3)")
+     * @param on  Whether messages should also be printed on
+     *            stderr (in addition to be forwarded to the internal logger).
+     *
+     * @return A logger for WebSocket internal debug traces
+     */
+    public static Logger getWebSocketLogger(Supplier<String> dbgTag, boolean on) {
+        Level errLevel = on ? Level.ALL : Level.OFF;
+        return getWebSocketLogger(dbgTag, errLevel);
+    }
+
+    /**
+     * SSLSessions returned to user are wrapped in an immutable object
+     */
+    public static SSLSession immutableSession(SSLSession session) {
+        if (session instanceof ExtendedSSLSession)
+            return new ImmutableExtendedSSLSession((ExtendedSSLSession)session);
+        else
+            return new ImmutableSSLSession(session);
+    }
+
+    /**
+     * Enabled by default. May be disabled for testing. Use with care
+     */
+    public static boolean isHostnameVerificationDisabled() {
+        return isHostnameVerificationDisabled;
+    }
+
+    public static InetSocketAddress resolveAddress(InetSocketAddress address) {
+        if (address != null && address.isUnresolved()) {
+            // The default proxy selector may select a proxy whose  address is
+            // unresolved. We must resolve the address before connecting to it.
+            address = new InetSocketAddress(address.getHostString(), address.getPort());
+        }
+        return address;
+    }
+
+    /**
+     * Returns the smallest (closest to zero) positive number {@code m} (which
+     * is also a power of 2) such that {@code n <= m}.
+     * <pre>{@code
+     *          n  pow2Size(n)
+     * -----------------------
+     *          0           1
+     *          1           1
+     *          2           2
+     *          3           4
+     *          4           4
+     *          5           8
+     *          6           8
+     *          7           8
+     *          8           8
+     *          9          16
+     *         10          16
+     *        ...         ...
+     * 2147483647  1073741824
+     * } </pre>
+     *
+     * The result is capped at {@code 1 << 30} as beyond that int wraps.
+     *
+     * @param n
+     *         capacity
+     *
+     * @return the size of the array
+     * @apiNote Used to size arrays in circular buffers (rings), usually in
+     * order to squeeze extra performance substituting {@code %} operation for
+     * {@code &}, which is up to 2 times faster.
+     */
+    public static int pow2Size(int n) {
+        if (n < 0) {
+            throw new IllegalArgumentException();
+        } else if (n == 0) {
+            return 1;
+        } else if (n >= (1 << 30)) { // 2^31 is a negative int
+            return 1 << 30;
+        } else {
+            return 1 << (32 - Integer.numberOfLeadingZeros(n - 1));
+        }
     }
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ContinuationFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/ContinuationFrame.java
similarity index 94%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ContinuationFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/ContinuationFrame.java
index 3c8c8158596..9c655e3f5b3 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ContinuationFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/ContinuationFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 import java.nio.ByteBuffer;
 import java.util.List;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/DataFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/DataFrame.java
similarity index 95%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/DataFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/DataFrame.java
index e5af442a784..4f17547103e 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/DataFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/DataFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,9 +23,9 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
-import jdk.incubator.http.internal.common.Utils;
+import jdk.internal.net.http.common.Utils;
 
 import java.nio.ByteBuffer;
 import java.util.List;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ErrorFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/ErrorFrame.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ErrorFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/ErrorFrame.java
index 22634fc6145..2d25193c118 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ErrorFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/ErrorFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 public abstract class ErrorFrame extends Http2Frame {
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesDecoder.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/FramesDecoder.java
similarity index 93%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesDecoder.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/FramesDecoder.java
index 9e8ce3485b8..72c7750eb43 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesDecoder.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/FramesDecoder.java
@@ -23,10 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
-
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.Utils;
+package jdk.internal.net.http.frame;
 
 import java.io.IOException;
 import java.lang.System.Logger.Level;
@@ -34,7 +31,10 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Queue;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
  * Frames Decoder
@@ -47,9 +47,8 @@
  */
 public class FramesDecoder {
 
-    static final boolean DEBUG = Utils.DEBUG; // Revisit: temporary dev flag.
-    static final System.Logger DEBUG_LOGGER =
-            Utils.getDebugLogger("FramesDecoder"::toString, DEBUG);
+    static final Logger debug =
+            Utils.getDebugLogger("FramesDecoder"::toString, Utils.DEBUG);
 
     @FunctionalInterface
     public interface FrameProcessor {
@@ -111,13 +110,14 @@ public FramesDecoder(FrameProcessor frameProcessor, int maxFrameSize) {
      */
     public void decode(ByteBuffer inBoundBuffer) throws IOException {
         if (closed) {
-            DEBUG_LOGGER.log(Level.DEBUG, "closed: ignoring buffer (%s bytes)",
-                    inBoundBuffer.remaining());
+            if (debug.on())
+                debug.log("closed: ignoring buffer (%s bytes)",
+                          inBoundBuffer.remaining());
             inBoundBuffer.position(inBoundBuffer.limit());
             return;
         }
         int remaining = inBoundBuffer.remaining();
-        DEBUG_LOGGER.log(Level.DEBUG, "decodes: %d", remaining);
+        if (debug.on()) debug.log("decodes: %d", remaining);
         if (remaining > 0) {
             if (currentBuffer == null) {
                 currentBuffer = inBoundBuffer;
@@ -138,21 +138,20 @@ public void decode(ByteBuffer inBoundBuffer) throws IOException {
                     b.position(position);
                     if (b != currentBuffer)
                         tailSize += remaining;
-                    DEBUG_LOGGER.log(Level.DEBUG, "copied: %d", remaining);
+                    if (debug.on()) debug.log("copied: %d", remaining);
                 } else {
-                    DEBUG_LOGGER.log(Level.DEBUG, "added: %d", remaining);
+                    if (debug.on()) debug.log("added: %d", remaining);
                     tailBuffers.add(inBoundBuffer);
                     tailSize += remaining;
                 }
             }
         }
-        DEBUG_LOGGER.log(Level.DEBUG, "Tail size is now: %d, current=",
-                tailSize,
-                (currentBuffer == null ? 0 :
-                   currentBuffer.remaining()));
+        if (debug.on())
+            debug.log("Tail size is now: %d, current=", tailSize,
+                      (currentBuffer == null ? 0 : currentBuffer.remaining()));
         Http2Frame frame;
         while ((frame = nextFrame()) != null) {
-            DEBUG_LOGGER.log(Level.DEBUG, "Got frame: %s", frame);
+            if (debug.on()) debug.log("Got frame: %s", frame);
             frameProcessor.processFrame(frame);
             frameProcessed();
         }
@@ -177,9 +176,9 @@ private Http2Frame nextFrame() throws IOException {
                     }
                     frameHeaderParsed = true;
                 } else {
-                    DEBUG_LOGGER.log(Level.DEBUG,
-                            "Not enough data to parse header, needs: %d, has: %d",
-                            Http2Frame.FRAME_HEADER_SIZE, available);
+                    if (debug.on())
+                        debug.log("Not enough data to parse header, needs: %d, has: %d",
+                                  Http2Frame.FRAME_HEADER_SIZE, available);
                     return null;
                 }
             }
@@ -193,9 +192,9 @@ private Http2Frame nextFrame() throws IOException {
                     return frame;
                 }
             } else {
-                DEBUG_LOGGER.log(Level.DEBUG,
-                        "Not enough data to parse frame body, needs: %d,  has: %d",
-                        frameLength, available);
+                if (debug.on())
+                    debug.log("Not enough data to parse frame body, needs: %d,  has: %d",
+                              frameLength, available);
                 return null;  // no data for the whole frame header
             }
         }
@@ -281,7 +280,8 @@ private List<ByteBuffer> getBuffers(boolean isDataFrame, int bytecount) {
             int extract = Math.min(remaining, bytecount);
             ByteBuffer extractedBuf;
             if (isDataFrame) {
-                extractedBuf = Utils.sliceWithLimitedCapacity(currentBuffer, extract);
+                extractedBuf = Utils.sliceWithLimitedCapacity(currentBuffer, extract)
+                                    .asReadOnlyBuffer();
                 slicedToDataFrame = true;
             } else {
                 // Header frames here
@@ -308,7 +308,7 @@ public void close(String msg) {
         }
         tailSize = 0;
         currentBuffer = null;
-        DEBUG_LOGGER.log(Level.DEBUG, "closed %s, ignoring %d bytes", msg, bytes);
+        if (debug.on()) debug.log("closed %s, ignoring %d bytes", msg, bytes);
     }
 
     public void skipBytes(int bytecount) {
@@ -519,7 +519,7 @@ private Http2Frame parseGoAwayFrame(int frameLength, int streamid, int flags) {
         int errorCode = getInt();
         byte[] debugData = getBytes(frameLength - 8);
         if (debugData.length > 0) {
-            Log.logError("GoAway debugData " + new String(debugData));
+            Log.logError("GoAway debugData " + new String(debugData, UTF_8));
         }
         return new GoAwayFrame(lastStream, errorCode, debugData);
     }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesEncoder.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/FramesEncoder.java
similarity index 99%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesEncoder.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/FramesEncoder.java
index 85efbfe1cd0..f94cb20c852 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesEncoder.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/FramesEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/GoAwayFrame.java
similarity index 88%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/GoAwayFrame.java
index 0dd10f2a6be..45ec7553f5a 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/GoAwayFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,9 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class GoAwayFrame extends ErrorFrame {
 
@@ -40,7 +42,7 @@ public GoAwayFrame(int lastStream, int errorCode) {
     public GoAwayFrame(int lastStream, int errorCode, byte[] debugData) {
         super(0, 0, errorCode);
         this.lastStream = lastStream;
-        this.debugData = debugData;
+        this.debugData = debugData.clone();
     }
 
     @Override
@@ -55,7 +57,7 @@ int length() {
 
     @Override
     public String toString() {
-        return super.toString() + " Debugdata: " + new String(debugData);
+        return super.toString() + " Debugdata: " + new String(debugData, UTF_8);
     }
 
     public int getLastStream() {
@@ -63,7 +65,7 @@ public int getLastStream() {
     }
 
     public byte[] getDebugData() {
-        return debugData;
+        return debugData.clone();
     }
 
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeaderFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/HeaderFrame.java
similarity index 93%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeaderFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/HeaderFrame.java
index 628e43e6aa7..44bbace5811 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeaderFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/HeaderFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,9 +23,9 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
-import jdk.incubator.http.internal.common.Utils;
+import jdk.internal.net.http.common.Utils;
 
 import java.nio.ByteBuffer;
 import java.util.List;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeadersFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/HeadersFrame.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeadersFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/HeadersFrame.java
index 8c59edcfb18..6fe08bf9697 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeadersFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/HeadersFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 import java.nio.ByteBuffer;
 import java.util.List;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/Http2Frame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/Http2Frame.java
similarity index 97%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/Http2Frame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/Http2Frame.java
index f4930342a0f..3aeb0f4f672 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/Http2Frame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/Http2Frame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 /**
  * When sending a frame, the length field must be set in sub-class
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/MalformedFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/MalformedFrame.java
similarity index 95%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/MalformedFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/MalformedFrame.java
index f365dc7f0e4..74894970fcb 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/MalformedFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/MalformedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 public class MalformedFrame extends Http2Frame {
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/OutgoingHeaders.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/OutgoingHeaders.java
similarity index 94%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/OutgoingHeaders.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/OutgoingHeaders.java
index 984ee492cb6..892b69ef393 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/OutgoingHeaders.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/OutgoingHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,9 +23,9 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
-import jdk.incubator.http.HttpHeaders;
+import java.net.http.HttpHeaders;
 
 /**
  * Contains all parameters for outgoing headers. Is converted to
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/PingFrame.java
similarity index 91%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/PingFrame.java
index 640adb4883c..34001f3da8c 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/PingFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 public class PingFrame extends Http2Frame {
 
@@ -38,7 +38,7 @@ public class PingFrame extends Http2Frame {
     public PingFrame(int flags, byte[] data) {
         super(0, flags);
         assert data.length == 8;
-        this.data = data;
+        this.data = data.clone();
     }
 
     @Override
@@ -61,7 +61,7 @@ public String flagAsString(int flag) {
     }
 
     public byte[] getData() {
-        return data;
+        return data.clone();
     }
 
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PriorityFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/PriorityFrame.java
similarity index 94%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PriorityFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/PriorityFrame.java
index c7f1b7fb7ac..ba20d10abd4 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PriorityFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/PriorityFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 public class PriorityFrame extends Http2Frame {
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PushPromiseFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/PushPromiseFrame.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PushPromiseFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/PushPromiseFrame.java
index b5d53966bee..7c1d22f1b36 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PushPromiseFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/PushPromiseFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 import java.nio.ByteBuffer;
 import java.util.List;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ResetFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/ResetFrame.java
similarity index 93%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ResetFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/ResetFrame.java
index e5d2dfc49ef..471405e02c2 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ResetFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/ResetFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 public class ResetFrame extends ErrorFrame {
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/SettingsFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/SettingsFrame.java
similarity index 92%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/SettingsFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/SettingsFrame.java
index 3ccb125c457..3c3dde3bde6 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/SettingsFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/SettingsFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -114,7 +114,7 @@ public int getParameter(int paramID) {
         if (paramID > MAX_PARAM) {
             throw new IllegalArgumentException("illegal parameter");
         }
-        return parameters[paramID-1];
+        return parameters[paramID - 1];
     }
 
     public SettingsFrame setParameter(int paramID, int value) {
@@ -153,6 +153,14 @@ public byte[] toByteArray() {
 
     private static final int K = 1024;
 
+    public synchronized void update(SettingsFrame updated) {
+        for (int i = 0; i < MAX_PARAM; i++) {
+            if (updated.parameters[i] != -1) {
+                parameters[i] = updated.parameters[i];
+            }
+        }
+    }
+
     public static SettingsFrame getDefaultSettings() {
         SettingsFrame f = new SettingsFrame();
         // TODO: check these values
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/WindowUpdateFrame.java b/src/java.net.http/share/classes/jdk/internal/net/http/frame/WindowUpdateFrame.java
similarity index 94%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/WindowUpdateFrame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/frame/WindowUpdateFrame.java
index b6ab8e142de..886f100bcad 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/WindowUpdateFrame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/frame/WindowUpdateFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 public class WindowUpdateFrame extends Http2Frame {
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BinaryRepresentationWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/BinaryRepresentationWriter.java
similarity index 92%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BinaryRepresentationWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/BinaryRepresentationWriter.java
index 7b42cb7205b..1512578c851 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BinaryRepresentationWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/BinaryRepresentationWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BulkSizeUpdateWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/BulkSizeUpdateWriter.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BulkSizeUpdateWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/BulkSizeUpdateWriter.java
index f8e46fd434d..904c9be8579 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/BulkSizeUpdateWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/BulkSizeUpdateWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 import java.util.Iterator;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Decoder.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/Decoder.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Decoder.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/Decoder.java
index bbf7001ead3..65eb1fbe747 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Decoder.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/Decoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,17 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
-import jdk.incubator.http.internal.hpack.HPACK.Logger;
-import jdk.internal.vm.annotation.Stable;
+import jdk.internal.net.http.hpack.HPACK.Logger;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.EXTRA;
-import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.NORMAL;
+import static jdk.internal.net.http.hpack.HPACK.Logger.Level.EXTRA;
+import static jdk.internal.net.http.hpack.HPACK.Logger.Level.NORMAL;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -67,7 +66,6 @@ public final class Decoder {
     private final Logger logger;
     private static final AtomicLong DECODERS_IDS = new AtomicLong();
 
-    @Stable
     private static final State[] states = new State[256];
 
     static {
@@ -98,7 +96,7 @@ public final class Decoder {
     }
 
     private final long id;
-    private final HeaderTable table;
+    private final SimpleHeaderTable table;
 
     private State state = State.READY;
     private final IntegerReader integerReader;
@@ -144,7 +142,7 @@ public Decoder(int capacity) {
             });
         }
         setMaxCapacity0(capacity);
-        table = new HeaderTable(capacity, logger.subLogger("HeaderTable"));
+        table = new SimpleHeaderTable(capacity, logger.subLogger("HeaderTable"));
         integerReader = new IntegerReader();
         stringReader = new StringReader();
         name = new StringBuilder(512);
@@ -341,17 +339,17 @@ private void resumeIndexed(ByteBuffer input, DecodingCallback action)
             logger.log(NORMAL, () -> format("indexed %s", intValue));
         }
         try {
-            HeaderTable.HeaderField f = getHeaderFieldAt(intValue);
+            SimpleHeaderTable.HeaderField f = getHeaderFieldAt(intValue);
             action.onIndexed(intValue, f.name, f.value);
         } finally {
             state = State.READY;
         }
     }
 
-    private HeaderTable.HeaderField getHeaderFieldAt(int index)
+    private SimpleHeaderTable.HeaderField getHeaderFieldAt(int index)
             throws IOException
     {
-        HeaderTable.HeaderField f;
+        SimpleHeaderTable.HeaderField f;
         try {
             f = table.get(index);
         } catch (IndexOutOfBoundsException e) {
@@ -393,7 +391,7 @@ private void resumeLiteral(ByteBuffer input, DecodingCallback action)
                     logger.log(NORMAL, () -> format("literal without indexing ('%s', '%s')",
                                                     intValue, value));
                 }
-                HeaderTable.HeaderField f = getHeaderFieldAt(intValue);
+                SimpleHeaderTable.HeaderField f = getHeaderFieldAt(intValue);
                 action.onLiteral(intValue, f.name, value, valueHuffmanEncoded);
             } else {
                 if (logger.isLoggable(NORMAL)) {
@@ -450,7 +448,7 @@ private void resumeLiteralWithIndexing(ByteBuffer input,
                     logger.log(NORMAL, () -> format("literal with incremental indexing ('%s', '%s')",
                                                     intValue, value));
                 }
-                HeaderTable.HeaderField f = getHeaderFieldAt(intValue);
+                SimpleHeaderTable.HeaderField f = getHeaderFieldAt(intValue);
                 n = f.name;
                 action.onLiteralWithIndexing(intValue, n, v, valueHuffmanEncoded);
             } else {
@@ -501,7 +499,7 @@ private void resumeLiteralNeverIndexed(ByteBuffer input,
                     logger.log(NORMAL, () -> format("literal never indexed ('%s', '%s')",
                                                     intValue, value));
                 }
-                HeaderTable.HeaderField f = getHeaderFieldAt(intValue);
+                SimpleHeaderTable.HeaderField f = getHeaderFieldAt(intValue);
                 action.onLiteralNeverIndexed(intValue, f.name, value, valueHuffmanEncoded);
             } else {
                 if (logger.isLoggable(NORMAL)) {
@@ -588,7 +586,7 @@ private enum State {
         SIZE_UPDATE
     }
 
-    HeaderTable getTable() {
+    SimpleHeaderTable getTable() {
         return table;
     }
 }
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/DecodingCallback.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/DecodingCallback.java
similarity index 98%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/DecodingCallback.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/DecodingCallback.java
index 3d1395ebe24..5e9df860feb 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/DecodingCallback.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/DecodingCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Encoder.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/Encoder.java
similarity index 97%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Encoder.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/Encoder.java
index cd91af4c4f2..1cf9e153f62 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Encoder.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/Encoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
-import jdk.incubator.http.internal.hpack.HPACK.Logger;
+import jdk.internal.net.http.hpack.HPACK.Logger;
 
 import java.nio.ByteBuffer;
 import java.nio.ReadOnlyBufferException;
@@ -34,8 +34,8 @@
 
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.EXTRA;
-import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.NORMAL;
+import static jdk.internal.net.http.hpack.HPACK.Logger.Level.EXTRA;
+import static jdk.internal.net.http.hpack.HPACK.Logger.Level.NORMAL;
 
 /**
  * Encodes headers to their binary representation.
@@ -121,6 +121,9 @@ public class Encoder {
             = new BulkSizeUpdateWriter();
 
     private BinaryRepresentationWriter writer;
+    // The default implementation of Encoder does not use dynamic region of the
+    // HeaderTable. Thus the performance profile should be similar to that of
+    // SimpleHeaderTable.
     private final HeaderTable headerTable;
 
     private boolean encoding;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HPACK.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/HPACK.java
similarity index 92%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HPACK.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/HPACK.java
index 00e5c654d6a..72994a2a570 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HPACK.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/HPACK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
-import jdk.incubator.http.internal.common.Utils;
-import jdk.incubator.http.internal.hpack.HPACK.Logger.Level;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.hpack.HPACK.Logger.Level;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -35,9 +35,9 @@
 
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
-import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.EXTRA;
-import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.NONE;
-import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.NORMAL;
+import static jdk.internal.net.http.hpack.HPACK.Logger.Level.EXTRA;
+import static jdk.internal.net.http.hpack.HPACK.Logger.Level.NONE;
+import static jdk.internal.net.http.hpack.HPACK.Logger.Level.NORMAL;
 
 /**
  * Internal utilities and stuff.
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/hpack/HeaderTable.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/HeaderTable.java
new file mode 100644
index 00000000000..5b554046043
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/HeaderTable.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2014, 2018, 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.internal.net.http.hpack;
+
+import jdk.internal.net.http.hpack.HPACK.Logger;
+
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+/*
+ * Adds reverse lookup to SimpleHeaderTable. Separated from SimpleHeaderTable
+ * for performance reasons. Decoder does not need this functionality. On the
+ * other hand, Encoder does.
+ */
+final class HeaderTable extends SimpleHeaderTable {
+
+    //
+    // To quickly find an index of an entry in the dynamic table with the given
+    // contents an effective inverse mapping is needed. Here's a simple idea
+    // behind such a mapping.
+    //
+    // # The problem:
+    //
+    // We have a queue with an O(1) lookup by index:
+    //
+    //     get: index -> x
+    //
+    // What we want is an O(1) reverse lookup:
+    //
+    //     indexOf: x -> index
+    //
+    // # Solution:
+    //
+    // Let's store an inverse mapping in a Map<x, Integer>. This have a problem
+    // that when a new element is added to the queue, all indexes in the map
+    // become invalid. Namely, the new element is assigned with an index of 1,
+    // and each index i, i > 1 becomes shifted by 1 to the left:
+    //
+    //     1, 1, 2, 3, ... , n-1, n
+    //
+    // Re-establishing the invariant would seem to require a pass through the
+    // map incrementing all indexes (map values) by 1, which is O(n).
+    //
+    // The good news is we can do much better then this!
+    //
+    // Let's create a single field of type long, called 'counter'. Then each
+    // time a new element 'x' is added to the queue, a value of this field gets
+    // incremented. Then the resulting value of the 'counter_x' is then put as a
+    // value under key 'x' to the map:
+    //
+    //    map.put(x, counter_x)
+    //
+    // It gives us a map that maps an element to a value the counter had at the
+    // time the element had been added.
+    //
+    // In order to retrieve an index of any element 'x' in the queue (at any
+    // given time) we simply need to subtract the value (the snapshot of the
+    // counter at the time when the 'x' was added) from the current value of the
+    // counter. This operation basically answers the question:
+    //
+    //     How many elements ago 'x' was the tail of the queue?
+    //
+    // Which is the same as its index in the queue now. Given, of course, it's
+    // still in the queue.
+    //
+    // I'm pretty sure in a real life long overflow will never happen, so it's
+    // not too practical to add recalibrating code, but a pedantic person might
+    // want to do so:
+    //
+    //     if (counter == Long.MAX_VALUE) {
+    //         recalibrate();
+    //     }
+    //
+    // Where 'recalibrate()' goes through the table doing this:
+    //
+    //     value -= counter
+    //
+    // That's given, of course, the size of the table itself is less than
+    // Long.MAX_VALUE :-)
+    //
+
+    private static final Map<String, LinkedHashMap<String, Integer>> staticIndexes;
+
+    static {
+        staticIndexes = new HashMap<>(STATIC_TABLE_LENGTH); // TODO: Map.of
+        for (int i = 1; i <= STATIC_TABLE_LENGTH; i++) {
+            HeaderField f = staticTable[i];
+            Map<String, Integer> values = staticIndexes
+                    .computeIfAbsent(f.name, k -> new LinkedHashMap<>());
+            values.put(f.value, i);
+        }
+    }
+
+    //                name  ->    (value ->    [index])
+    private final Map<String, Map<String, Deque<Long>>> map;
+    private long counter = 1;
+
+    public HeaderTable(int maxSize, Logger logger) {
+        super(maxSize, logger);
+        map = new HashMap<>();
+    }
+
+    //
+    // This method returns:
+    //
+    // * a positive integer i where i (i = [1..Integer.MAX_VALUE]) is an
+    // index of an entry with a header (n, v), where n.equals(name) &&
+    // v.equals(value)
+    //
+    // * a negative integer j where j (j = [-Integer.MAX_VALUE..-1]) is an
+    // index of an entry with a header (n, v), where n.equals(name)
+    //
+    // * 0 if there's no entry e such that e.getName().equals(name)
+    //
+    // The rationale behind this design is to allow to pack more useful data
+    // into a single invocation, facilitating a single pass where possible
+    // (the idea is the same as in java.util.Arrays.binarySearch(int[], int)).
+    //
+    public int indexOf(CharSequence name, CharSequence value) {
+        // Invoking toString() will possibly allocate Strings for the sake of
+        // the search, which doesn't feel right.
+        String n = name.toString();
+        String v = value.toString();
+
+        // 1. Try exact match in the static region
+        Map<String, Integer> values = staticIndexes.get(n);
+        if (values != null) {
+            Integer idx = values.get(v);
+            if (idx != null) {
+                return idx;
+            }
+        }
+        // 2. Try exact match in the dynamic region
+        int didx = search(n, v);
+        if (didx > 0) {
+            return STATIC_TABLE_LENGTH + didx;
+        } else if (didx < 0) {
+            if (values != null) {
+                // 3. Return name match from the static region
+                return -values.values().iterator().next(); // Iterator allocation
+            } else {
+                // 4. Return name match from the dynamic region
+                return -STATIC_TABLE_LENGTH + didx;
+            }
+        } else {
+            if (values != null) {
+                // 3. Return name match from the static region
+                return -values.values().iterator().next(); // Iterator allocation
+            } else {
+                return 0;
+            }
+        }
+    }
+
+    @Override
+    protected void add(HeaderField f) {
+        super.add(f);
+        Map<String, Deque<Long>> values = map.computeIfAbsent(f.name, k -> new HashMap<>());
+        Deque<Long> indexes = values.computeIfAbsent(f.value, k -> new LinkedList<>());
+        long counterSnapshot = counter++;
+        indexes.add(counterSnapshot);
+        assert indexesUniqueAndOrdered(indexes);
+    }
+
+    private boolean indexesUniqueAndOrdered(Deque<Long> indexes) {
+        long maxIndexSoFar = -1;
+        for (long l : indexes) {
+            if (l <= maxIndexSoFar) {
+                return false;
+            } else {
+                maxIndexSoFar = l;
+            }
+        }
+        return true;
+    }
+
+    int search(String name, String value) {
+        Map<String, Deque<Long>> values = map.get(name);
+        if (values == null) {
+            return 0;
+        }
+        Deque<Long> indexes = values.get(value);
+        if (indexes != null) {
+            return (int) (counter - indexes.peekLast());
+        } else {
+            assert !values.isEmpty();
+            Long any = values.values().iterator().next().peekLast(); // Iterator allocation
+            return -(int) (counter - any);
+        }
+    }
+
+    @Override
+    protected HeaderField remove() {
+        HeaderField f = super.remove();
+        Map<String, Deque<Long>> values = map.get(f.name);
+        Deque<Long> indexes = values.get(f.value);
+        Long index = indexes.pollFirst();
+        if (indexes.isEmpty()) {
+            values.remove(f.value);
+        }
+        assert index != null;
+        if (values.isEmpty()) {
+            map.remove(f.name);
+        }
+        return f;
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Huffman.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/Huffman.java
similarity index 99%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Huffman.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/Huffman.java
index ee43b81bf90..2b7e1b626e9 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/Huffman.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/Huffman.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/ISO_8859_1.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/ISO_8859_1.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/ISO_8859_1.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/ISO_8859_1.java
index dbbd22a5762..3fad6883480 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/ISO_8859_1.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/ISO_8859_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexNameValueWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/IndexNameValueWriter.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexNameValueWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/IndexNameValueWriter.java
index 7369df25f77..486a5954169 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexNameValueWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/IndexNameValueWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexedWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/IndexedWriter.java
similarity index 94%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexedWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/IndexedWriter.java
index e1a8df59376..6dcd69b61e9 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IndexedWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/IndexedWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerReader.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/IntegerReader.java
similarity index 97%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerReader.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/IntegerReader.java
index ff0e9a1a773..9fc9ce72655 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerReader.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/IntegerReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/IntegerWriter.java
similarity index 95%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/IntegerWriter.java
index 33253730a5a..947f9283c4f 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/IntegerWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/IntegerWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -90,7 +90,7 @@ public boolean write(ByteBuffer output) {
         }
         if (state == FIRST_BYTE_WRITTEN) {
             while (value >= 128 && output.hasRemaining()) {
-                output.put((byte) (value % 128 + 128));
+                output.put((byte) ((value & 127) + 128));
                 value /= 128;
             }
             if (!output.hasRemaining()) {
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralNeverIndexedWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/LiteralNeverIndexedWriter.java
similarity index 92%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralNeverIndexedWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/LiteralNeverIndexedWriter.java
index b2a7e15b39d..6551c0ea59c 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralNeverIndexedWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/LiteralNeverIndexedWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 final class LiteralNeverIndexedWriter extends IndexNameValueWriter {
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWithIndexingWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/LiteralWithIndexingWriter.java
similarity index 95%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWithIndexingWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/LiteralWithIndexingWriter.java
index d1145eda792..34a532b0c30 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWithIndexingWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/LiteralWithIndexingWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/LiteralWriter.java
similarity index 92%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/LiteralWriter.java
index f04866b99a2..f344e32df52 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/LiteralWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/LiteralWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 final class LiteralWriter extends IndexNameValueWriter {
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/SimpleHeaderTable.java
similarity index 57%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/SimpleHeaderTable.java
index 30f4304c48e..4a0b4c65d57 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/SimpleHeaderTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,31 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
-import jdk.incubator.http.internal.hpack.HPACK.Logger;
-import jdk.internal.vm.annotation.Stable;
+import jdk.internal.net.http.hpack.HPACK.Logger;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
 import java.util.NoSuchElementException;
 
+import static jdk.internal.net.http.hpack.HPACK.Logger.Level.EXTRA;
+import static jdk.internal.net.http.hpack.HPACK.Logger.Level.NORMAL;
 import static java.lang.String.format;
-import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.EXTRA;
-import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.NORMAL;
-
-//
-// Header Table combined from two tables: static and dynamic.
-//
-// There is a single address space for index values. Index-aware methods
-// correspond to the table as a whole. Size-aware methods only to the dynamic
-// part of it.
-//
-final class HeaderTable {
-
-    @Stable
-    private static final HeaderField[] staticTable = {
+
+/*
+ * A header table consists of two tables, the static table and the dynamic
+ * table. Following the vocabulary of RFC 7541, the length of the header table
+ * is the total number of entries in both the static and the dynamic tables.
+ * The size of the table is the sum of the sizes of its dynamic table's entries.
+ */
+class SimpleHeaderTable {
+
+    protected static final HeaderField[] staticTable = {
             null, // To make index 1-based, instead of 0-based
             new HeaderField(":authority"),
             new HeaderField(":method", "GET"),
@@ -111,82 +105,19 @@ final class HeaderTable {
             new HeaderField("www-authenticate")
     };
 
-    private static final int STATIC_TABLE_LENGTH = staticTable.length - 1;
-    private static final int ENTRY_SIZE = 32;
-    private static final Map<String, LinkedHashMap<String, Integer>> staticIndexes;
-
-    static {
-        staticIndexes = new HashMap<>(STATIC_TABLE_LENGTH); // TODO: Map.of
-        for (int i = 1; i <= STATIC_TABLE_LENGTH; i++) {
-            HeaderField f = staticTable[i];
-            Map<String, Integer> values = staticIndexes
-                    .computeIfAbsent(f.name, k -> new LinkedHashMap<>());
-            values.put(f.value, i);
-        }
-    }
+    protected static final int STATIC_TABLE_LENGTH = staticTable.length - 1;
+    protected static final int ENTRY_SIZE = 32;
 
     private final Logger logger;
-    private final Table dynamicTable = new Table(0);
+
     private int maxSize;
     private int size;
 
-    public HeaderTable(int maxSize, Logger logger) {
+    public SimpleHeaderTable(int maxSize, Logger logger) {
         this.logger = logger;
         setMaxSize(maxSize);
     }
 
-    //
-    // The method returns:
-    //
-    // * a positive integer i where i (i = [1..Integer.MAX_VALUE]) is an
-    // index of an entry with a header (n, v), where n.equals(name) &&
-    // v.equals(value)
-    //
-    // * a negative integer j where j (j = [-Integer.MAX_VALUE..-1]) is an
-    // index of an entry with a header (n, v), where n.equals(name)
-    //
-    // * 0 if there's no entry e such that e.getName().equals(name)
-    //
-    // The rationale behind this design is to allow to pack more useful data
-    // into a single invocation, facilitating a single pass where possible
-    // (the idea is the same as in java.util.Arrays.binarySearch(int[], int)).
-    //
-    public int indexOf(CharSequence name, CharSequence value) {
-        // Invoking toString() will possibly allocate Strings for the sake of
-        // the search, which doesn't feel right.
-        String n = name.toString();
-        String v = value.toString();
-
-        // 1. Try exact match in the static region
-        Map<String, Integer> values = staticIndexes.get(n);
-        if (values != null) {
-            Integer idx = values.get(v);
-            if (idx != null) {
-                return idx;
-            }
-        }
-        // 2. Try exact match in the dynamic region
-        int didx = dynamicTable.indexOf(n, v);
-        if (didx > 0) {
-            return STATIC_TABLE_LENGTH + didx;
-        } else if (didx < 0) {
-            if (values != null) {
-                // 3. Return name match from the static region
-                return -values.values().iterator().next(); // Iterator allocation
-            } else {
-                // 4. Return name match from the dynamic region
-                return -STATIC_TABLE_LENGTH + didx;
-            }
-        } else {
-            if (values != null) {
-                // 3. Return name match from the static region
-                return -values.values().iterator().next(); // Iterator allocation
-            } else {
-                return 0;
-            }
-        }
-    }
-
     public int size() {
         return size;
     }
@@ -196,7 +127,7 @@ public int maxSize() {
     }
 
     public int length() {
-        return STATIC_TABLE_LENGTH + dynamicTable.size();
+        return STATIC_TABLE_LENGTH + buffer.size;
     }
 
     HeaderField get(int index) {
@@ -204,7 +135,7 @@ HeaderField get(int index) {
         if (index <= STATIC_TABLE_LENGTH) {
             return staticTable[index];
         } else {
-            return dynamicTable.get(index - STATIC_TABLE_LENGTH);
+            return buffer.get(index - STATIC_TABLE_LENGTH - 1);
         }
     }
 
@@ -240,7 +171,7 @@ private void put(HeaderField h) {
             return;
         }
         size += entrySize;
-        dynamicTable.add(h);
+        add(h);
         if (logger.isLoggable(EXTRA)) {
             logger.log(EXTRA, () -> format("('%s, '%s') added", h.name, h.value));
             logger.log(EXTRA, this::toString);
@@ -256,12 +187,13 @@ void setMaxSize(int maxSize) {
             evictEntry();
         }
         this.maxSize = maxSize;
-        int upperBound = (maxSize / ENTRY_SIZE) + 1;
-        this.dynamicTable.setCapacity(upperBound);
+        // A header table cannot accommodate more entries than this
+        int upperBound = maxSize / ENTRY_SIZE;
+        buffer.resize(upperBound);
     }
 
     HeaderField evictEntry() {
-        HeaderField f = dynamicTable.remove();
+        HeaderField f = remove();
         int s = sizeOf(f);
         this.size -= s;
         if (logger.isLoggable(EXTRA)) {
@@ -276,7 +208,7 @@ HeaderField evictEntry() {
     public String toString() {
         double used = maxSize == 0 ? 0 : 100 * (((double) size) / maxSize);
         return format("dynamic length: %d, full length: %s, used space: %s/%s (%.1f%%)",
-                      dynamicTable.size(), length(), size, maxSize, used);
+                      buffer.size, length(), size, maxSize, used);
     }
 
     private int checkIndex(int index) {
@@ -302,17 +234,17 @@ String getStateString() {
         }
 
         StringBuilder b = new StringBuilder();
-        for (int i = 1, size = dynamicTable.size(); i <= size; i++) {
-            HeaderField e = dynamicTable.get(i);
+        for (int i = 1, size = buffer.size; i <= size; i++) {
+            HeaderField e = buffer.get(i - 1);
             b.append(format("[%3d] (s = %3d) %s: %s\n", i,
-                    sizeOf(e), e.name, e.value));
+                            sizeOf(e), e.name, e.value));
         }
         b.append(format("      Table size:%4s", this.size));
         return b.toString();
     }
 
     // Convert to a Value Object (JDK-8046159)?
-    static final class HeaderField {
+    protected static final class HeaderField {
 
         final String name;
         final String value;
@@ -331,7 +263,7 @@ public String toString() {
             return value.isEmpty() ? name : name + ": " + value;
         }
 
-        @Override
+        @Override // TODO: remove since used only for testing
         public boolean equals(Object o) {
             if (this == o) {
                 return true;
@@ -343,130 +275,20 @@ public boolean equals(Object o) {
             return name.equals(that.name) && value.equals(that.value);
         }
 
-        @Override
+        @Override // TODO: remove since used only for testing
         public int hashCode() {
             return 31 * name.hashCode() + value.hashCode();
         }
     }
 
-    //
-    // To quickly find an index of an entry in the dynamic table with the given
-    // contents an effective inverse mapping is needed. Here's a simple idea
-    // behind such a mapping.
-    //
-    // # The problem:
-    //
-    // We have a queue with an O(1) lookup by index:
-    //
-    //     get: index -> x
-    //
-    // What we want is an O(1) reverse lookup:
-    //
-    //     indexOf: x -> index
-    //
-    // # Solution:
-    //
-    // Let's store an inverse mapping in a Map<x, Integer>. This have a problem
-    // that when a new element is added to the queue, all indexes in the map
-    // become invalid. Namely, the new element is assigned with an index of 1,
-    // and each index i, i > 1 becomes shifted by 1 to the left:
-    //
-    //     1, 1, 2, 3, ... , n-1, n
-    //
-    // Re-establishing the invariant would seem to require a pass through the
-    // map incrementing all indexes (map values) by 1, which is O(n).
-    //
-    // The good news is we can do much better then this!
-    //
-    // Let's create a single field of type long, called 'counter'. Then each
-    // time a new element 'x' is added to the queue, a value of this field gets
-    // incremented. Then the resulting value of the 'counter_x' is then put as a
-    // value under key 'x' to the map:
-    //
-    //    map.put(x, counter_x)
-    //
-    // It gives us a map that maps an element to a value the counter had at the
-    // time the element had been added.
-    //
-    // In order to retrieve an index of any element 'x' in the queue (at any
-    // given time) we simply need to subtract the value (the snapshot of the
-    // counter at the time when the 'x' was added) from the current value of the
-    // counter. This operation basically answers the question:
-    //
-    //     How many elements ago 'x' was the tail of the queue?
-    //
-    // Which is the same as its index in the queue now. Given, of course, it's
-    // still in the queue.
-    //
-    // I'm pretty sure in a real life long overflow will never happen, so it's
-    // not too practical to add recalibrating code, but a pedantic person might
-    // want to do so:
-    //
-    //     if (counter == Long.MAX_VALUE) {
-    //         recalibrate();
-    //     }
-    //
-    // Where 'recalibrate()' goes through the table doing this:
-    //
-    //     value -= counter
-    //
-    // That's given, of course, the size of the table itself is less than
-    // Long.MAX_VALUE :-)
-    //
-    private static final class Table {
-
-        private final Map<String, Map<String, Long>> map;
-        private final CircularBuffer<HeaderField> buffer;
-        private long counter = 1;
+    private final CircularBuffer<HeaderField> buffer = new CircularBuffer<>(0);
 
-        Table(int capacity) {
-            buffer = new CircularBuffer<>(capacity);
-            map = new HashMap<>(capacity);
-        }
-
-        void add(HeaderField f) {
-            buffer.add(f);
-            Map<String, Long> values = map.computeIfAbsent(f.name, k -> new HashMap<>());
-            values.put(f.value, counter++);
-        }
-
-        HeaderField get(int index) {
-            return buffer.get(index - 1);
-        }
-
-        int indexOf(String name, String value) {
-            Map<String, Long> values = map.get(name);
-            if (values == null) {
-                return 0;
-            }
-            Long index = values.get(value);
-            if (index != null) {
-                return (int) (counter - index);
-            } else {
-                assert !values.isEmpty();
-                Long any = values.values().iterator().next(); // Iterator allocation
-                return -(int) (counter - any);
-            }
-        }
-
-        HeaderField remove() {
-            HeaderField f = buffer.remove();
-            Map<String, Long> values = map.get(f.name);
-            Long index = values.remove(f.value);
-            assert index != null;
-            if (values.isEmpty()) {
-                map.remove(f.name);
-            }
-            return f;
-        }
-
-        int size() {
-            return buffer.size;
-        }
+    protected void add(HeaderField f) {
+        buffer.add(f);
+    }
 
-        public void setCapacity(int capacity) {
-            buffer.resize(capacity);
-        }
+    protected HeaderField remove() {
+        return buffer.remove();
     }
 
     //                    head
@@ -515,7 +337,7 @@ E get(int index) {
             if (index < 0 || index >= size) {
                 throw new IndexOutOfBoundsException(
                         format("0 <= index <= capacity: index=%s, capacity=%s",
-                                index, capacity));
+                               index, capacity));
             }
             int idx = (tail + (size - index - 1)) % capacity;
             return (E) elements[idx];
@@ -525,7 +347,7 @@ public void resize(int newCapacity) {
             if (newCapacity < size) {
                 throw new IllegalStateException(
                         format("newCapacity >= size: newCapacity=%s, size=%s",
-                                newCapacity, size));
+                               newCapacity, size));
             }
 
             Object[] newElements = new Object[newCapacity];
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/SizeUpdateWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/SizeUpdateWriter.java
similarity index 94%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/SizeUpdateWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/SizeUpdateWriter.java
index 0c7895c40e7..6d499ddbad2 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/SizeUpdateWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/SizeUpdateWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringReader.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/StringReader.java
similarity index 97%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringReader.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/StringReader.java
index 68d3bfb3efb..48e5868c416 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringReader.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/StringReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringWriter.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/StringWriter.java
similarity index 97%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringWriter.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/StringWriter.java
index a9c1421fdd9..f7102e52caf 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/StringWriter.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/StringWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/package-info.java b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/package-info.java
similarity index 83%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/package-info.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/hpack/package-info.java
index 094904aa581..f66e8e21e28 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/package-info.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/hpack/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -26,9 +26,9 @@
  * HPACK (Header Compression for HTTP/2) implementation conforming to
  * <a href="https://tools.ietf.org/html/rfc7541">RFC&nbsp;7541</a>.
  *
- * <p> Headers can be decoded and encoded by {@link jdk.incubator.http.internal.hpack.Decoder}
- * and {@link jdk.incubator.http.internal.hpack.Encoder} respectively.
+ * <p> Headers can be decoded and encoded by {@link jdk.internal.net.http.hpack.Decoder}
+ * and {@link jdk.internal.net.http.hpack.Encoder} respectively.
  *
  * <p> Instances of these classes are not safe for use by multiple threads.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/BuilderImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/BuilderImpl.java
similarity index 92%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/BuilderImpl.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/BuilderImpl.java
index 07a9406c15f..0258ae94748 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/BuilderImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/BuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,13 +23,13 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.WebSocket;
-import jdk.incubator.http.WebSocket.Builder;
-import jdk.incubator.http.WebSocket.Listener;
-import jdk.incubator.http.internal.common.Pair;
+import java.net.http.HttpClient;
+import java.net.http.WebSocket;
+import java.net.http.WebSocket.Builder;
+import java.net.http.WebSocket.Listener;
+import jdk.internal.net.http.common.Pair;
 
 import java.net.ProxySelector;
 import java.net.URI;
@@ -41,7 +41,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import static java.util.Objects.requireNonNull;
-import static jdk.incubator.http.internal.common.Pair.pair;
+import static jdk.internal.net.http.common.Pair.pair;
 
 public final class BuilderImpl implements Builder {
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CheckFailedException.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/CheckFailedException.java
similarity index 93%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CheckFailedException.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/CheckFailedException.java
index ff1fa2e23d0..f1d260fc049 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/CheckFailedException.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/CheckFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
 /*
  * Used as a context-neutral exception which can be wrapped into (for example)
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FailWebSocketException.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/FailWebSocketException.java
similarity index 91%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FailWebSocketException.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/FailWebSocketException.java
index a66bab23228..1951868ab0d 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FailWebSocketException.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/FailWebSocketException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,9 +23,9 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
-import static jdk.incubator.http.internal.websocket.StatusCodes.PROTOCOL_ERROR;
+import static jdk.internal.net.http.websocket.StatusCodes.PROTOCOL_ERROR;
 
 /*
  * Used as a marker for protocol issues in the incoming data, so that the
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Frame.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/Frame.java
similarity index 98%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Frame.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/Frame.java
index 47a0ff21bde..0f91f09e96e 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Frame.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/Frame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,14 +23,12 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
-
-import jdk.internal.vm.annotation.Stable;
+package jdk.internal.net.http.websocket;
 
 import java.nio.ByteBuffer;
 
-import static jdk.incubator.http.internal.common.Utils.dump;
-import static jdk.incubator.http.internal.websocket.Frame.Opcode.ofCode;
+import static jdk.internal.net.http.common.Utils.dump;
+import static jdk.internal.net.http.websocket.Frame.Opcode.ofCode;
 
 /*
  * A collection of utilities for reading, writing, and masking frames.
@@ -40,6 +38,7 @@ final class Frame {
     private Frame() { }
 
     static final int MAX_HEADER_SIZE_BYTES = 2 + 8 + 4;
+    static final int MAX_CONTROL_FRAME_PAYLOAD_LENGTH = 125;
 
     enum Opcode {
 
@@ -60,7 +59,6 @@ enum Opcode {
         CONTROL_0xE    (0xE),
         CONTROL_0xF    (0xF);
 
-        @Stable
         private static final Opcode[] opcodes;
 
         static {
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FrameConsumer.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageDecoder.java
similarity index 73%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FrameConsumer.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageDecoder.java
index 33f42622aad..78e49da74a2 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/FrameConsumer.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,11 +23,11 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
-import jdk.incubator.http.WebSocket.MessagePart;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.websocket.Frame.Opcode;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.websocket.Frame.Opcode;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -36,9 +36,9 @@
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
-import static jdk.incubator.http.internal.common.Utils.dump;
-import static jdk.incubator.http.internal.websocket.StatusCodes.NO_STATUS_CODE;
-import static jdk.incubator.http.internal.websocket.StatusCodes.isLegalToReceiveFromServer;
+import static jdk.internal.net.http.common.Utils.dump;
+import static jdk.internal.net.http.websocket.StatusCodes.NO_STATUS_CODE;
+import static jdk.internal.net.http.websocket.StatusCodes.isLegalToReceiveFromServer;
 
 /*
  * Consumes frame parts and notifies a message consumer, when there is
@@ -47,36 +47,42 @@
  * Data consumed but not yet translated is accumulated until it's sufficient to
  * form a message.
  */
-/* Non-final for testing purposes only */
-class FrameConsumer implements Frame.Consumer {
+/* Exposed for testing purposes */
+class MessageDecoder implements Frame.Consumer {
+
+    private static final Logger debug =
+            Utils.getWebSocketLogger("[Input]"::toString, Utils.DEBUG_WS);
 
     private final MessageStreamConsumer output;
     private final UTF8AccumulatingDecoder decoder = new UTF8AccumulatingDecoder();
     private boolean fin;
     private Opcode opcode, originatingOpcode;
-    private MessagePart part = MessagePart.WHOLE;
     private long payloadLen;
     private long unconsumedPayloadLen;
     private ByteBuffer binaryData;
 
-    FrameConsumer(MessageStreamConsumer output) {
+    MessageDecoder(MessageStreamConsumer output) {
         this.output = requireNonNull(output);
     }
 
-    /* Exposed for testing purposes only */
+    /* Exposed for testing purposes */
     MessageStreamConsumer getOutput() {
         return output;
     }
 
     @Override
     public void fin(boolean value) {
-        Log.logTrace("Reading fin: {0}", value);
+        if (debug.on()) {
+            debug.log("fin %s", value);
+        }
         fin = value;
     }
 
     @Override
     public void rsv1(boolean value) {
-        Log.logTrace("Reading rsv1: {0}", value);
+        if (debug.on()) {
+            debug.log("rsv1 %s", value);
+        }
         if (value) {
             throw new FailWebSocketException("Unexpected rsv1 bit");
         }
@@ -84,7 +90,9 @@ public void rsv1(boolean value) {
 
     @Override
     public void rsv2(boolean value) {
-        Log.logTrace("Reading rsv2: {0}", value);
+        if (debug.on()) {
+            debug.log("rsv2 %s", value);
+        }
         if (value) {
             throw new FailWebSocketException("Unexpected rsv2 bit");
         }
@@ -92,7 +100,9 @@ public void rsv2(boolean value) {
 
     @Override
     public void rsv3(boolean value) {
-        Log.logTrace("Reading rsv3: {0}", value);
+        if (debug.on()) {
+            debug.log("rsv3 %s", value);
+        }
         if (value) {
             throw new FailWebSocketException("Unexpected rsv3 bit");
         }
@@ -100,7 +110,9 @@ public void rsv3(boolean value) {
 
     @Override
     public void opcode(Opcode v) {
-        Log.logTrace("Reading opcode: {0}", v);
+        if (debug.on()) {
+            debug.log("opcode %s", v);
+        }
         if (v == Opcode.PING || v == Opcode.PONG || v == Opcode.CLOSE) {
             if (!fin) {
                 throw new FailWebSocketException("Fragmented control frame  " + v);
@@ -122,13 +134,15 @@ public void opcode(Opcode v) {
             }
             opcode = v;
         } else {
-            throw new FailWebSocketException("Unknown opcode " + v);
+            throw new FailWebSocketException("Unexpected opcode " + v);
         }
     }
 
     @Override
     public void mask(boolean value) {
-        Log.logTrace("Reading mask: {0}", value);
+        if (debug.on()) {
+            debug.log("mask %s", value);
+        }
         if (value) {
             throw new FailWebSocketException("Masked frame received");
         }
@@ -136,9 +150,11 @@ public void mask(boolean value) {
 
     @Override
     public void payloadLen(long value) {
-        Log.logTrace("Reading payloadLen: {0}", value);
+        if (debug.on()) {
+            debug.log("payloadLen %s", value);
+        }
         if (opcode.isControl()) {
-            if (value > 125) {
+            if (value > Frame.MAX_CONTROL_FRAME_PAYLOAD_LENGTH) {
                 throw new FailWebSocketException(
                         format("%s's payload length %s", opcode, value));
             }
@@ -153,8 +169,8 @@ public void payloadLen(long value) {
 
     @Override
     public void maskingKey(int value) {
-        // `FrameConsumer.mask(boolean)` is where a masked frame is detected and
-        // reported on; `FrameConsumer.mask(boolean)` MUST be invoked before
+        // `MessageDecoder.mask(boolean)` is where a masked frame is detected and
+        // reported on; `MessageDecoder.mask(boolean)` MUST be invoked before
         // this method;
         // So this method (`maskingKey`) is not supposed to be invoked while
         // reading a frame that has came from the server. If this method is
@@ -164,42 +180,46 @@ public void maskingKey(int value) {
 
     @Override
     public void payloadData(ByteBuffer data) {
-        Log.logTrace("Reading payloadData: data={0}", data);
+        if (debug.on()) {
+            debug.log("payload %s", data);
+        }
         unconsumedPayloadLen -= data.remaining();
-        boolean isLast = unconsumedPayloadLen == 0;
+        boolean lastPayloadChunk = unconsumedPayloadLen == 0;
         if (opcode.isControl()) {
             if (binaryData != null) { // An intermediate or the last chunk
                 binaryData.put(data);
-            } else if (!isLast) { // The first chunk
+            } else if (!lastPayloadChunk) { // The first chunk
                 int remaining = data.remaining();
                 // It shouldn't be 125, otherwise the next chunk will be of size
                 // 0, which is not what Reader promises to deliver (eager
                 // reading)
-                assert remaining < 125 : dump(remaining);
-                binaryData = ByteBuffer.allocate(125).put(data);
+                assert remaining < Frame.MAX_CONTROL_FRAME_PAYLOAD_LENGTH
+                        : dump(remaining);
+                binaryData = ByteBuffer.allocate(
+                        Frame.MAX_CONTROL_FRAME_PAYLOAD_LENGTH).put(data);
             } else { // The only chunk
                 binaryData = ByteBuffer.allocate(data.remaining()).put(data);
             }
         } else {
-            part = determinePart(isLast);
+            boolean last = fin && lastPayloadChunk;
             boolean text = opcode == Opcode.TEXT || originatingOpcode == Opcode.TEXT;
             if (!text) {
-                output.onBinary(data.slice(), part);
+                output.onBinary(data.slice(), last);
                 data.position(data.limit()); // Consume
             } else {
                 boolean binaryNonEmpty = data.hasRemaining();
                 CharBuffer textData;
                 try {
-                    textData = decoder.decode(data, part == MessagePart.WHOLE || part == MessagePart.LAST);
+                    textData = decoder.decode(data, last);
                 } catch (CharacterCodingException e) {
                     throw new FailWebSocketException(
-                            "Invalid UTF-8 in frame " + opcode, StatusCodes.NOT_CONSISTENT)
-                            .initCause(e);
+                            "Invalid UTF-8 in frame " + opcode,
+                            StatusCodes.NOT_CONSISTENT).initCause(e);
                 }
                 if (!(binaryNonEmpty && !textData.hasRemaining())) {
                     // If there's a binary data, that result in no text, then we
-                    // don't deliver anything
-                    output.onText(textData, part);
+                    // don't deliver anything, otherwise:
+                    output.onText(textData, last);
                 }
             }
         }
@@ -207,6 +227,9 @@ public void payloadData(ByteBuffer data) {
 
     @Override
     public void endFrame() {
+        if (debug.on()) {
+            debug.log("end frame");
+        }
         if (opcode.isControl()) {
             binaryData.flip();
         }
@@ -216,7 +239,9 @@ public void endFrame() {
                 String reason = "";
                 if (payloadLen != 0) {
                     int len = binaryData.remaining();
-                    assert 2 <= len && len <= 125 : dump(len, payloadLen);
+                    assert 2 <= len
+                            && len <= Frame.MAX_CONTROL_FRAME_PAYLOAD_LENGTH
+                            : dump(len, payloadLen);
                     statusCode = binaryData.getChar();
                     if (!isLegalToReceiveFromServer(statusCode)) {
                         throw new FailWebSocketException(
@@ -252,18 +277,4 @@ public void endFrame() {
         payloadLen = 0;
         opcode = null;
     }
-
-    private MessagePart determinePart(boolean isLast) {
-        boolean lastChunk = fin && isLast;
-        switch (part) {
-            case LAST:
-            case WHOLE:
-                return lastChunk ? MessagePart.WHOLE : MessagePart.FIRST;
-            case FIRST:
-            case PART:
-                return lastChunk ? MessagePart.LAST : MessagePart.PART;
-            default:
-                throw new InternalError(String.valueOf(part));
-        }
-    }
 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageEncoder.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageEncoder.java
new file mode 100644
index 00000000000..cf321735793
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageEncoder.java
@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http.websocket;
+
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.websocket.Frame.Opcode;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+
+/*
+ * A stateful producer of binary representations of WebSocket messages being
+ * sent from the client to the server.
+ *
+ * An encoding method is given an original message and a byte buffer to put the
+ * resulting bytes to. The method is called until it returns true. Then the
+ * reset method is called. The whole sequence repeats with next message.
+ */
+public class MessageEncoder {
+
+    private static final Logger debug =
+            Utils.getWebSocketLogger("[Output]"::toString, Utils.DEBUG_WS);
+
+    private final SecureRandom maskingKeySource = new SecureRandom();
+    private final Frame.HeaderWriter headerWriter = new Frame.HeaderWriter();
+    private final Frame.Masker payloadMasker = new Frame.Masker();
+    private final CharsetEncoder charsetEncoder
+            = StandardCharsets.UTF_8.newEncoder()
+                                    .onMalformedInput(CodingErrorAction.REPORT)
+                                    .onUnmappableCharacter(CodingErrorAction.REPORT);
+    /*
+     * This buffer is used both to encode characters to UTF-8 and to calculate
+     * the length of the resulting frame's payload. The length of the payload
+     * must be known before the frame's header can be written.
+     * For implementation reasons, this buffer must have a capacity of at least
+     * the maximum size of a Close frame payload, which is 125 bytes
+     * (or Frame.MAX_CONTROL_FRAME_PAYLOAD_LENGTH).
+     */
+    private final ByteBuffer intermediateBuffer = createIntermediateBuffer(
+            Frame.MAX_CONTROL_FRAME_PAYLOAD_LENGTH);
+    private final ByteBuffer headerBuffer = ByteBuffer.allocate(
+            Frame.MAX_HEADER_SIZE_BYTES);
+
+    private boolean started;
+    private boolean flushing;
+    private boolean moreText = true;
+    private long headerCount;
+    /* Has the previous frame got its fin flag set? */
+    private boolean previousFin = true;
+    /* Was the previous frame TEXT or a CONTINUATION thereof? */
+    private boolean previousText;
+    private boolean closed;
+
+    /*
+     * How many bytes of the current message have been already encoded.
+     *
+     * Even though the user hands their buffers over to us, they still can
+     * manipulate these buffers while we are getting data out of them.
+     * The number of produced bytes guards us from such behaviour in the
+     * case of messages that must be restricted in size (Ping, Pong and Close).
+     * For other messages this measure provides a best-effort attempt to detect
+     * concurrent changes to buffer.
+     *
+     * Making a shallow copy (duplicate/slice) and then checking the size
+     * precondition on it would also solve the problem, but at the cost of this
+     * extra copy.
+     */
+    private int actualLen;
+
+    /*
+     * How many bytes were originally there in the message, before the encoding
+     * started.
+     */
+    private int expectedLen;
+
+    /* Exposed for testing purposes */
+    protected ByteBuffer createIntermediateBuffer(int minSize) {
+        int capacity = Utils.getIntegerNetProperty(
+                "jdk.httpclient.websocket.intermediateBufferSize", 16384);
+        return ByteBuffer.allocate(Math.max(minSize, capacity));
+    }
+
+    public void reset() {
+        // Do not reset the message stream state fields, e.g. previousFin,
+        // previousText. Just an individual message state:
+        started = false;
+        flushing = false;
+        moreText = true;
+        headerCount = 0;
+        actualLen = 0;
+    }
+
+    /*
+     * Encodes text messages by cutting them into fragments of maximum size of
+     * intermediateBuffer.capacity()
+     */
+    public boolean encodeText(CharBuffer src, boolean last, ByteBuffer dst)
+            throws IOException
+    {
+        if (debug.on()) {
+            debug.log("encode text src=[pos=%s lim=%s cap=%s] last=%s dst=%s",
+                      src.position(), src.limit(), src.capacity(), last, dst);
+        }
+        if (closed) {
+            throw new IOException("Output closed");
+        }
+        if (!started) {
+            if (!previousText && !previousFin) {
+                // Previous data message was a partial binary message
+                throw new IllegalStateException("Unexpected text message");
+            }
+            started = true;
+            headerBuffer.position(0).limit(0);
+            intermediateBuffer.position(0).limit(0);
+            charsetEncoder.reset();
+        }
+        while (true) {
+            if (debug.on()) {
+                debug.log("put");
+            }
+            if (!putAvailable(headerBuffer, dst)) {
+                return false;
+            }
+            if (debug.on()) {
+                debug.log("mask");
+            }
+            if (maskAvailable(intermediateBuffer, dst) < 0) {
+                return false;
+            }
+            if (debug.on()) {
+                debug.log("moreText");
+            }
+            if (!moreText) {
+                previousFin = last;
+                previousText = true;
+                return true;
+            }
+            intermediateBuffer.clear();
+            CoderResult r = null;
+            if (!flushing) {
+                r = charsetEncoder.encode(src, intermediateBuffer, true);
+                if (r.isUnderflow()) {
+                    flushing = true;
+                }
+            }
+            if (flushing) {
+                r = charsetEncoder.flush(intermediateBuffer);
+                if (r.isUnderflow()) {
+                    moreText = false;
+                }
+            }
+            if (r.isError()) {
+                try {
+                    r.throwException();
+                } catch (CharacterCodingException e) {
+                    throw new IOException("Malformed text message", e);
+                }
+            }
+            if (debug.on()) {
+                debug.log("frame #%s", headerCount);
+            }
+            intermediateBuffer.flip();
+            Opcode opcode = previousFin && headerCount == 0
+                    ? Opcode.TEXT : Opcode.CONTINUATION;
+            boolean fin = last && !moreText;
+            setupHeader(opcode, fin, intermediateBuffer.remaining());
+            headerCount++;
+        }
+    }
+
+    private boolean putAvailable(ByteBuffer src, ByteBuffer dst) {
+        int available = dst.remaining();
+        if (available >= src.remaining()) {
+            dst.put(src);
+            return true;
+        } else {
+            int lim = src.limit();                   // save the limit
+            src.limit(src.position() + available);
+            dst.put(src);
+            src.limit(lim);                          // restore the limit
+            return false;
+        }
+    }
+
+    public boolean encodeBinary(ByteBuffer src, boolean last, ByteBuffer dst)
+            throws IOException
+    {
+        if (debug.on()) {
+            debug.log("encode binary src=%s last=%s dst=%s",
+                      src, last, dst);
+        }
+        if (closed) {
+            throw new IOException("Output closed");
+        }
+        if (!started) {
+            if (previousText && !previousFin) {
+                // Previous data message was a partial text message
+                throw new IllegalStateException("Unexpected binary message");
+            }
+            expectedLen = src.remaining();
+            Opcode opcode = previousFin ? Opcode.BINARY : Opcode.CONTINUATION;
+            setupHeader(opcode, last, expectedLen);
+            previousFin = last;
+            previousText = false;
+            started = true;
+        }
+        if (!putAvailable(headerBuffer, dst)) {
+            return false;
+        }
+        int count = maskAvailable(src, dst);
+        actualLen += Math.abs(count);
+        if (count >= 0 && actualLen != expectedLen) {
+            throw new IOException("Concurrent message modification");
+        }
+        return count >= 0;
+    }
+
+    private int maskAvailable(ByteBuffer src, ByteBuffer dst) {
+        int r0 = dst.remaining();
+        payloadMasker.transferMasking(src, dst);
+        int masked = r0 - dst.remaining();
+        return src.hasRemaining() ? -masked : masked;
+    }
+
+    public boolean encodePing(ByteBuffer src, ByteBuffer dst)
+            throws IOException
+    {
+        if (debug.on()) {
+            debug.log("encode ping src=%s dst=%s", src, dst);
+        }
+        if (closed) {
+            throw new IOException("Output closed");
+        }
+        if (!started) {
+            expectedLen = src.remaining();
+            if (expectedLen > Frame.MAX_CONTROL_FRAME_PAYLOAD_LENGTH) {
+                throw new IllegalArgumentException("Long message: " + expectedLen);
+            }
+            setupHeader(Opcode.PING, true, expectedLen);
+            started = true;
+        }
+        if (!putAvailable(headerBuffer, dst)) {
+            return false;
+        }
+        int count = maskAvailable(src, dst);
+        actualLen += Math.abs(count);
+        if (count >= 0 && actualLen != expectedLen) {
+            throw new IOException("Concurrent message modification");
+        }
+        return count >= 0;
+    }
+
+    public boolean encodePong(ByteBuffer src, ByteBuffer dst)
+            throws IOException
+    {
+        if (debug.on()) {
+            debug.log("encode pong src=%s dst=%s",
+                      src, dst);
+        }
+        if (closed) {
+            throw new IOException("Output closed");
+        }
+        if (!started) {
+            expectedLen = src.remaining();
+            if (expectedLen > Frame.MAX_CONTROL_FRAME_PAYLOAD_LENGTH) {
+                throw new IllegalArgumentException("Long message: " + expectedLen);
+            }
+            setupHeader(Opcode.PONG, true, expectedLen);
+            started = true;
+        }
+        if (!putAvailable(headerBuffer, dst)) {
+            return false;
+        }
+        int count = maskAvailable(src, dst);
+        actualLen += Math.abs(count);
+        if (count >= 0 && actualLen != expectedLen) {
+            throw new IOException("Concurrent message modification");
+        }
+        return count >= 0;
+    }
+
+    public boolean encodeClose(int statusCode, CharBuffer reason, ByteBuffer dst)
+            throws IOException
+    {
+        if (debug.on()) {
+            debug.log("encode close statusCode=%s reason=[pos=%s lim=%s cap=%s] dst=%s",
+                      statusCode, reason.position(), reason.limit(), reason.capacity(), dst);
+        }
+        if (closed) {
+            throw new IOException("Output closed");
+        }
+        if (!started) {
+            if (debug.on()) {
+                debug.log("reason [pos=%s lim=%s cap=%s]",
+                          reason.position(), reason.limit(), reason.capacity());
+            }
+            intermediateBuffer.position(0).limit(Frame.MAX_CONTROL_FRAME_PAYLOAD_LENGTH);
+            intermediateBuffer.putChar((char) statusCode);
+            CoderResult r = charsetEncoder.reset().encode(reason, intermediateBuffer, true);
+            if (r.isUnderflow()) {
+                if (debug.on()) {
+                    debug.log("flushing");
+                }
+                r = charsetEncoder.flush(intermediateBuffer);
+            }
+            if (debug.on()) {
+                debug.log("encoding result: %s", r);
+            }
+            if (r.isError()) {
+                try {
+                    r.throwException();
+                } catch (CharacterCodingException e) {
+                    throw new IOException("Malformed reason", e);
+                }
+            } else if (r.isOverflow()) {
+                // Here the 125 bytes size is ensured by the check for overflow
+                throw new IOException("Long reason");
+            } else if (!r.isUnderflow()) {
+                throw new InternalError(); // assertion
+            }
+            intermediateBuffer.flip();
+            setupHeader(Opcode.CLOSE, true, intermediateBuffer.remaining());
+            started = true;
+            closed = true;
+            if (debug.on()) {
+                debug.log("intermediateBuffer=%s", intermediateBuffer);
+            }
+        }
+        if (!putAvailable(headerBuffer, dst)) {
+            return false;
+        }
+        return maskAvailable(intermediateBuffer, dst) >= 0;
+    }
+
+    private void setupHeader(Opcode opcode, boolean fin, long payloadLen) {
+        if (debug.on()) {
+            debug.log("frame opcode=%s fin=%s len=%s",
+                      opcode, fin, payloadLen);
+        }
+        headerBuffer.clear();
+        int mask = maskingKeySource.nextInt();
+        headerWriter.fin(fin)
+                    .opcode(opcode)
+                    .payloadLen(payloadLen)
+                    .mask(mask)
+                    .write(headerBuffer);
+        headerBuffer.flip();
+        payloadMasker.mask(mask);
+    }
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageQueue.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageQueue.java
new file mode 100644
index 00000000000..602bc9d4b5f
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageQueue.java
@@ -0,0 +1,376 @@
+/*
+ * Copyright (c) 2018, 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.internal.net.http.websocket;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
+import static jdk.internal.net.http.common.Utils.pow2Size;
+
+/*
+ * A FIFO message storage facility.
+ *
+ * The queue supports at most one consumer and an arbitrary number of producers.
+ * Methods `peek`, `remove` and `isEmpty` must not be invoked concurrently.
+ * Methods `addText`, `addBinary`, `addPing`, `addPong` and `addClose` may be
+ * invoked concurrently.
+ *
+ * This queue is of a bounded size. The queue pre-allocates array of the said
+ * size and fills it with `Message` elements. The resulting structure never
+ * changes. This allows to avoid re-allocation and garbage collection of
+ * elements and arrays thereof. For this reason `Message` elements are never
+ * returned from the `peek` method. Instead their components passed to the
+ * provided callback.
+ *
+ * The queue consists of:
+ *
+ *   - a ring array of n + 1 `Message` elements
+ *   - indexes H and T denoting the head and the tail elements of the queue
+ *     respectively
+ *
+ * Each `Message` element contains a boolean flag. This flag is an auxiliary
+ * communication between the producers and the consumer. The flag shows
+ * whether or not the element is ready to be consumed (peeked at, removed). The
+ * flag is required since updating an element involves many fields and thus is
+ * not an atomic action. An addition to the queue happens in two steps:
+ *
+ * # Step 1
+ *
+ * Producers race with each other to secure an index for the element they add.
+ * T is atomically advanced [1] only if the advanced value doesn't equal to H
+ * (a producer doesn't bump into the head of the queue).
+ *
+ * # Step 2
+ *
+ * Once T is advanced in the previous step, the producer updates the message
+ * fields of the element at the previous value of T and then sets the flag of
+ * this element.
+ *
+ * A removal happens in a single step. The consumer gets the element at index H.
+ * If the flag of this element is set, the consumer clears the fields of the
+ * element, clears the flag and finally advances H.
+ *
+ * ----------------------------------------------------------------------------
+ * [1] To advance the index is to change it from i to (i + 1) % (n + 1).
+ */
+public class MessageQueue {
+
+    private final Message[] elements;
+
+    private final AtomicInteger tail = new AtomicInteger();
+    private volatile int head;
+
+    public MessageQueue(int capacity) {
+        if (capacity < 1) {
+            throw new IllegalArgumentException();
+        }
+        int s = pow2Size(capacity + 1);
+        assert s % 2 == 0 : s;
+        Message[] array = new Message[s];
+        for (int i = 0; i < array.length; i++) {
+            array[i] = new Message();
+        }
+        elements = array;
+    }
+
+    /* Exposed for testing purposes */
+    protected static int effectiveCapacityOf(int n) {
+        return pow2Size(n + 1) - 1;
+    }
+
+    public <T> void addText(CharBuffer message,
+                            boolean isLast,
+                            T attachment,
+                            BiConsumer<? super T, ? super Throwable> action,
+                            CompletableFuture<T> future)
+            throws IOException
+    {
+        add(MessageQueue.Type.TEXT, null, null, message, isLast, -1, attachment,
+            action, future);
+    }
+
+    private <T> void add(Type type,
+                         Supplier<? extends ByteBuffer> binarySupplier,
+                         ByteBuffer binary,
+                         CharBuffer text,
+                         boolean isLast,
+                         int statusCode,
+                         T attachment,
+                         BiConsumer<? super T, ? super Throwable> action,
+                         CompletableFuture<? super T> future)
+            throws IOException
+    {
+        // Pong "subtype" is determined by whichever field (data carrier)
+        // is not null. Both fields cannot be null or non-null simultaneously.
+        assert type != Type.PONG || (binary == null ^ binarySupplier == null);
+        int h, currentTail, newTail;
+        do {
+            h = head;
+            currentTail = tail.get();
+            newTail = (currentTail + 1) & (elements.length - 1);
+            if (newTail == h) {
+                throw new IOException("Queue full");
+            }
+        } while (!tail.compareAndSet(currentTail, newTail));
+        Message t = elements[currentTail];
+        if (t.ready) {
+            throw new InternalError();
+        }
+        t.type = type;
+        t.binarySupplier = binarySupplier;
+        t.binary = binary;
+        t.text = text;
+        t.isLast = isLast;
+        t.statusCode = statusCode;
+        t.attachment = attachment;
+        t.action = action;
+        t.future = future;
+        t.ready = true;
+    }
+
+    public <T> void addBinary(ByteBuffer message,
+                              boolean isLast,
+                              T attachment,
+                              BiConsumer<? super T, ? super Throwable> action,
+                              CompletableFuture<? super T> future)
+            throws IOException
+    {
+        add(MessageQueue.Type.BINARY, null, message, null, isLast, -1, attachment,
+            action, future);
+    }
+
+    public <T> void addPing(ByteBuffer message,
+                            T attachment,
+                            BiConsumer<? super T, ? super Throwable> action,
+                            CompletableFuture<? super T> future)
+            throws IOException
+    {
+        add(MessageQueue.Type.PING, null, message, null, false, -1, attachment,
+            action, future);
+    }
+
+    public <T> void addPong(ByteBuffer message,
+                            T attachment,
+                            BiConsumer<? super T, ? super Throwable> action,
+                            CompletableFuture<? super T> future)
+            throws IOException
+    {
+        add(MessageQueue.Type.PONG, null, message, null, false, -1, attachment,
+            action, future);
+    }
+
+    public <T> void addPong(Supplier<? extends ByteBuffer> message,
+                            T attachment,
+                            BiConsumer<? super T, ? super Throwable> action,
+                            CompletableFuture<? super T> future)
+            throws IOException
+    {
+        add(MessageQueue.Type.PONG, message, null, null, false, -1, attachment,
+            action, future);
+    }
+
+    public <T> void addClose(int statusCode,
+                             CharBuffer reason,
+                             T attachment,
+                             BiConsumer<? super T, ? super Throwable> action,
+                             CompletableFuture<? super T> future)
+            throws IOException
+    {
+        add(MessageQueue.Type.CLOSE, null, null, reason, false, statusCode,
+            attachment, action, future);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <R, E extends Throwable> R peek(QueueCallback<R, E> callback)
+            throws E
+    {
+        Message h = elements[head];
+        if (!h.ready) {
+            return callback.onEmpty();
+        }
+        Type type = h.type;
+        switch (type) {
+            case TEXT:
+                try {
+                    return (R) callback.onText(h.text, h.isLast, h.attachment,
+                                               h.action, h.future);
+                } catch (Throwable t) {
+                    // Something unpleasant is going on here with the compiler.
+                    // If this seemingly useless catch is omitted, the compiler
+                    // reports an error:
+                    //
+                    //   java: unreported exception java.lang.Throwable;
+                    //   must be caught or declared to be thrown
+                    //
+                    // My guess is there is a problem with both the type
+                    // inference for the method AND @SuppressWarnings("unchecked")
+                    // being working at the same time.
+                    throw (E) t;
+                }
+            case BINARY:
+                try {
+                    return (R) callback.onBinary(h.binary, h.isLast, h.attachment,
+                                                 h.action, h.future);
+                } catch (Throwable t) {
+                    throw (E) t;
+                }
+            case PING:
+                try {
+                    return (R) callback.onPing(h.binary, h.attachment, h.action,
+                                               h.future);
+                } catch (Throwable t) {
+                    throw (E) t;
+                }
+            case PONG:
+                try {
+                    if (h.binarySupplier != null) {
+                        return (R) callback.onPong(h.binarySupplier, h.attachment,
+                                                   h.action, h.future);
+                    } else {
+                        return (R) callback.onPong(h.binary, h.attachment, h.action,
+                                                   h.future);
+                    }
+                } catch (Throwable t) {
+                    throw (E) t;
+                }
+            case CLOSE:
+                try {
+                    return (R) callback.onClose(h.statusCode, h.text, h.attachment,
+                                                h.action, h.future);
+                } catch (Throwable t) {
+                    throw (E) t;
+                }
+            default:
+                throw new InternalError(String.valueOf(type));
+        }
+    }
+
+    public boolean isEmpty() {
+        return !elements[head].ready;
+    }
+
+    public void remove() {
+        int currentHead = head;
+        Message h = elements[currentHead];
+        if (!h.ready) {
+            throw new InternalError("Queue empty");
+        }
+        h.type = null;
+        h.binarySupplier = null;
+        h.binary = null;
+        h.text = null;
+        h.attachment = null;
+        h.action = null;
+        h.future = null;
+        h.ready = false;
+        head = (currentHead + 1) & (elements.length - 1);
+    }
+
+    private enum Type {
+
+        TEXT,
+        BINARY,
+        PING,
+        PONG,
+        CLOSE
+    }
+
+    /*
+     * A callback for consuming a queue element's fields. Can return a result of
+     * type T or throw an exception of type E. This design allows to avoid
+     * "returning" results or "throwing" errors by updating some objects from
+     * the outside of the methods.
+     */
+    public interface QueueCallback<R, E extends Throwable> {
+
+        <T> R onText(CharBuffer message,
+                     boolean isLast,
+                     T attachment,
+                     BiConsumer<? super T, ? super Throwable> action,
+                     CompletableFuture<? super T> future) throws E;
+
+        <T> R onBinary(ByteBuffer message,
+                       boolean isLast,
+                       T attachment,
+                       BiConsumer<? super T, ? super Throwable> action,
+                       CompletableFuture<? super T> future) throws E;
+
+        <T> R onPing(ByteBuffer message,
+                     T attachment,
+                     BiConsumer<? super T, ? super Throwable> action,
+                     CompletableFuture<? super T> future) throws E;
+
+        <T> R onPong(ByteBuffer message,
+                     T attachment,
+                     BiConsumer<? super T, ? super Throwable> action,
+                     CompletableFuture<? super T> future) throws E;
+
+        <T> R onPong(Supplier<? extends ByteBuffer> message,
+                     T attachment,
+                     BiConsumer<? super T, ? super Throwable> action,
+                     CompletableFuture<? super T> future) throws E;
+
+        <T> R onClose(int statusCode,
+                      CharBuffer reason,
+                      T attachment,
+                      BiConsumer<? super T, ? super Throwable> action,
+                      CompletableFuture<? super T> future) throws E;
+
+        /* The queue is empty*/
+        R onEmpty() throws E;
+    }
+
+    /*
+     * A union of components of all WebSocket message types; also a node in a
+     * queue.
+     *
+     * A `Message` never leaves the context of the queue, thus the reference to
+     * it cannot be retained by anyone other than the queue.
+     */
+    private static class Message {
+
+        private volatile boolean ready;
+
+        // -- The source message fields --
+
+        private Type type;
+        private Supplier<? extends ByteBuffer> binarySupplier;
+        private ByteBuffer binary;
+        private CharBuffer text;
+        private boolean isLast;
+        private int statusCode;
+        private Object attachment;
+        @SuppressWarnings("rawtypes")
+        private BiConsumer action;
+        @SuppressWarnings("rawtypes")
+        private CompletableFuture future;
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/MessageStreamConsumer.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageStreamConsumer.java
similarity index 85%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/MessageStreamConsumer.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageStreamConsumer.java
index 1015dd967a5..1c5d9bea2bd 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/MessageStreamConsumer.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/MessageStreamConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,9 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
-
-import jdk.incubator.http.WebSocket.MessagePart;
+package jdk.internal.net.http.websocket;
 
 import java.nio.ByteBuffer;
 
@@ -34,9 +32,9 @@
  */
 interface MessageStreamConsumer {
 
-    void onText(CharSequence data, MessagePart part);
+    void onText(CharSequence data, boolean last);
 
-    void onBinary(ByteBuffer data, MessagePart part);
+    void onBinary(ByteBuffer data, boolean last);
 
     void onPing(ByteBuffer data);
 
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OpeningHandshake.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java
similarity index 93%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OpeningHandshake.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java
index 183ba5ecb1d..4254f22acd4 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OpeningHandshake.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,18 +23,18 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpClient.Version;
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.WebSocketHandshakeException;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.Pair;
-import jdk.incubator.http.internal.common.Utils;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.WebSocketHandshakeException;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.Pair;
+import jdk.internal.net.http.common.Utils;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -63,9 +63,9 @@
 import java.util.stream.Stream;
 
 import static java.lang.String.format;
-import static jdk.incubator.http.internal.common.Utils.isValidName;
-import static jdk.incubator.http.internal.common.Utils.permissionForProxy;
-import static jdk.incubator.http.internal.common.Utils.stringOf;
+import static jdk.internal.net.http.common.Utils.isValidName;
+import static jdk.internal.net.http.common.Utils.permissionForProxy;
+import static jdk.internal.net.http.common.Utils.stringOf;
 
 public class OpeningHandshake {
 
@@ -186,7 +186,7 @@ static URI createRequestURI(URI uri) {
 
     public CompletableFuture<Result> send() {
         PrivilegedAction<CompletableFuture<Result>> pa = () ->
-                client.sendAsync(this.request, BodyHandler.<Void>discard(null))
+                client.sendAsync(this.request, BodyHandlers.discarding())
                       .thenCompose(this::resultFrom);
         return AccessController.doPrivileged(pa);
     }
@@ -197,9 +197,9 @@ public CompletableFuture<Result> send() {
     static final class Result {
 
         final String subprotocol;
-        final TransportSupplier transport;
+        final TransportFactory transport;
 
-        private Result(String subprotocol, TransportSupplier transport) {
+        private Result(String subprotocol, TransportFactory transport) {
             this.subprotocol = subprotocol;
             this.transport = transport;
         }
@@ -263,7 +263,7 @@ private Result handleResponse(HttpResponse<?> response) throws IOException {
         }
         String subprotocol = checkAndReturnSubprotocol(headers);
         RawChannel channel = ((RawChannel.Provider) response).rawChannel();
-        return new Result(subprotocol, new TransportSupplier(channel));
+        return new Result(subprotocol, new TransportFactoryImpl(channel));
     }
 
     private String checkAndReturnSubprotocol(HttpHeaders responseHeaders)
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/RawChannel.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/RawChannel.java
similarity index 97%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/RawChannel.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/RawChannel.java
index d93106353cf..c22302c709c 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/RawChannel.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/RawChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/StatusCodes.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/StatusCodes.java
similarity index 96%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/StatusCodes.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/StatusCodes.java
index f262005ec69..20110acfa3a 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/StatusCodes.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/StatusCodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
 /*
  * Utilities for WebSocket status codes.
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/Transport.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/Transport.java
new file mode 100644
index 00000000000..fe7a2e05d8a
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/Transport.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2017, 2018, 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.internal.net.http.websocket;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
+/*
+ * A WebSocket view of the underlying communication channel. This view provides
+ * an asynchronous exchange of WebSocket messages rather than asynchronous
+ * exchange of bytes.
+ *
+ * Methods sendText, sendBinary, sendPing, sendPong and sendClose initiate a
+ * corresponding operation and return a CompletableFuture (CF) which will
+ * complete once the operation has completed (succeeded or failed).
+ *
+ * These methods are designed such that their clients may take an advantage on
+ * possible implementation optimizations. Namely, these methods:
+ *
+ * 1. May return null which is considered the same as a CF completed normally
+ * 2. Accept an arbitrary attachment to complete a CF with
+ * 3. Accept an action to take once the operation has completed
+ *
+ * All of the above allows not to create unnecessary instances of CF.
+ * For example, if a message has been sent straight away, there's no need to
+ * create a CF (given the parties agree on the meaning of null and are prepared
+ * to handle it).
+ * If the result of a returned CF is useless to the client, they may specify the
+ * exact instance (attachment) they want the CF to complete with. Thus, no need
+ * to create transforming stages (e.g. thenApply(useless -> myResult)).
+ * If there is the same action that needs to be done each time the CF completes,
+ * the client may pass it directly to the method instead of creating a dependant
+ * stage (e.g. whenComplete(action)).
+ */
+public interface Transport {
+
+    <T> CompletableFuture<T> sendText(CharSequence message,
+                                      boolean isLast,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action);
+
+    <T> CompletableFuture<T> sendBinary(ByteBuffer message,
+                                        boolean isLast,
+                                        T attachment,
+                                        BiConsumer<? super T, ? super Throwable> action);
+
+    <T> CompletableFuture<T> sendPing(ByteBuffer message,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action);
+
+    <T> CompletableFuture<T> sendPong(ByteBuffer message,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action);
+
+    /*
+     * Sends a Pong message with initially unknown data. Used for sending the
+     * most recent automatic Pong reply.
+     */
+    <T> CompletableFuture<T> sendPong(Supplier<? extends ByteBuffer> message,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action);
+
+    <T> CompletableFuture<T> sendClose(int statusCode,
+                                       String reason,
+                                       T attachment,
+                                       BiConsumer<? super T, ? super Throwable> action);
+
+    void request(long n);
+
+    /*
+     * Why is this method needed? Since receiving of messages operates through
+     * callbacks this method allows to abstract out what constitutes as a
+     * message being received (i.e. to decide outside this type when exactly one
+     * should decrement the demand).
+     */
+    void acknowledgeReception(); // TODO: hide
+
+    /*
+     * If this method is invoked, then all pending and subsequent send
+     * operations will fail with IOException.
+     */
+    void closeOutput() throws IOException;
+
+    void closeInput() throws IOException;
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportFactory.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportFactory.java
new file mode 100644
index 00000000000..19abb6c7823
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportFactory.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017, 2018, 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.internal.net.http.websocket;
+
+@FunctionalInterface
+public interface TransportFactory {
+
+    Transport createTransport(MessageQueue queue,
+                              MessageStreamConsumer consumer);
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportFactoryImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportFactoryImpl.java
new file mode 100644
index 00000000000..07728b5877b
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportFactoryImpl.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2017, 2018, 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.internal.net.http.websocket;
+
+public class TransportFactoryImpl implements TransportFactory {
+
+    private final RawChannel channel;
+
+    public TransportFactoryImpl(RawChannel channel) {
+        this.channel = channel;
+    }
+
+    @Override
+    public Transport createTransport(MessageQueue queue,
+                                     MessageStreamConsumer consumer) {
+        return new TransportImpl(queue, consumer, channel);
+    }
+}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java
new file mode 100644
index 00000000000..8b4a43a8661
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java
@@ -0,0 +1,765 @@
+/*
+ * Copyright (c) 2017, 2018, 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.internal.net.http.websocket;
+
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.SequentialScheduler;
+import jdk.internal.net.http.common.SequentialScheduler.CompleteRestartableTask;
+import jdk.internal.net.http.common.Utils;
+
+import java.io.IOException;
+import java.lang.System.Logger.Level;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.channels.SelectionKey;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
+import static jdk.internal.net.http.websocket.TransportImpl.ChannelState.AVAILABLE;
+import static jdk.internal.net.http.websocket.TransportImpl.ChannelState.CLOSED;
+import static jdk.internal.net.http.websocket.TransportImpl.ChannelState.UNREGISTERED;
+import static jdk.internal.net.http.websocket.TransportImpl.ChannelState.WAITING;
+
+public class TransportImpl implements Transport {
+
+    // -- Debugging infrastructure --
+
+    private static final Logger debug =
+            Utils.getWebSocketLogger("[Transport]"::toString, Utils.DEBUG_WS);
+
+    /* Used for correlating enters to and exists from a method */
+    private final AtomicLong counter = new AtomicLong();
+
+    private final SequentialScheduler sendScheduler = new SequentialScheduler(new SendTask());
+
+    private final MessageQueue queue;
+    private final MessageEncoder encoder = new MessageEncoder();
+    /* A reusable buffer for writing, initially with no remaining bytes */
+    private final ByteBuffer dst = createWriteBuffer().position(0).limit(0);
+    /* This array is created once for gathering writes accepted by RawChannel */
+    private final ByteBuffer[] dstArray = new ByteBuffer[]{dst};
+    private final MessageStreamConsumer messageConsumer;
+    private final MessageDecoder decoder;
+    private final Frame.Reader reader = new Frame.Reader();
+
+    private final Demand demand = new Demand();
+    private final SequentialScheduler receiveScheduler;
+    private final RawChannel channel;
+    private final Object closeLock = new Object();
+    private final RawChannel.RawEvent writeEvent = new WriteEvent();
+    private final RawChannel.RawEvent readEvent = new ReadEvent();
+    private final AtomicReference<ChannelState> writeState
+            = new AtomicReference<>(UNREGISTERED);
+    private ByteBuffer data;
+    private volatile ChannelState readState = UNREGISTERED;
+    private boolean inputClosed;
+    private boolean outputClosed;
+
+    public TransportImpl(MessageQueue queue, MessageStreamConsumer consumer,
+                         RawChannel channel) {
+        this.queue = queue;
+        this.messageConsumer = consumer;
+        this.channel = channel;
+        this.decoder = new MessageDecoder(this.messageConsumer);
+        this.data = channel.initialByteBuffer();
+        // To ensure the initial non-final `data` will be visible
+        // (happens-before) when `readEvent.handle()` invokes `receiveScheduler`
+        // the following assignment is done last:
+        receiveScheduler = new SequentialScheduler(new ReceiveTask());
+    }
+
+    private ByteBuffer createWriteBuffer() {
+        String name = "jdk.httpclient.websocket.writeBufferSize";
+        int capacity = Utils.getIntegerNetProperty(name, 16384);
+        if (debug.on()) {
+            debug.log("write buffer capacity %s", capacity);
+        }
+
+        // TODO (optimization?): allocateDirect if SSL?
+        return ByteBuffer.allocate(capacity);
+    }
+
+    private boolean write() throws IOException {
+        if (debug.on()) {
+            debug.log("writing to the channel");
+        }
+        long count = channel.write(dstArray, 0, dstArray.length);
+        if (debug.on()) {
+            debug.log("%s bytes written", count);
+        }
+        for (ByteBuffer b : dstArray) {
+            if (b.hasRemaining()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public <T> CompletableFuture<T> sendText(CharSequence message,
+                                             boolean isLast,
+                                             T attachment,
+                                             BiConsumer<? super T, ? super Throwable> action) {
+        long id = 0;
+        if (debug.on()) {
+            id = counter.incrementAndGet();
+            debug.log("enter send text %s message.length=%s last=%s",
+                              id, message.length(), isLast);
+        }
+        // TODO (optimization?):
+        // These sendXXX methods might be a good place to decide whether or not
+        // we can write straight ahead, possibly returning null instead of
+        // creating a CompletableFuture
+
+        // Even if the text is already CharBuffer, the client will not be happy
+        // if they discover the position is changing. So, no instanceof
+        // cheating, wrap always.
+        CharBuffer text = CharBuffer.wrap(message);
+        MinimalFuture<T> f = new MinimalFuture<>();
+        try {
+            queue.addText(text, isLast, attachment, action, f);
+            sendScheduler.runOrSchedule();
+        } catch (IOException e) {
+            action.accept(null, e);
+            f.completeExceptionally(e);
+        }
+        if (debug.on()) {
+            debug.log("exit send text %s returned %s", id, f);
+        }
+        return f;
+    }
+
+    @Override
+    public <T> CompletableFuture<T> sendBinary(ByteBuffer message,
+                                               boolean isLast,
+                                               T attachment,
+                                               BiConsumer<? super T, ? super Throwable> action) {
+        long id = 0;
+        if (debug.on()) {
+            id = counter.incrementAndGet();
+            debug.log("enter send binary %s message.remaining=%s last=%s",
+                              id, message.remaining(), isLast);
+        }
+        MinimalFuture<T> f = new MinimalFuture<>();
+        try {
+            queue.addBinary(message, isLast, attachment, action, f);
+            sendScheduler.runOrSchedule();
+        } catch (IOException e) {
+            action.accept(null, e);
+            f.completeExceptionally(e);
+        }
+        if (debug.on()) {
+            debug.log("exit send binary %s returned %s", id, f);
+        }
+        return f;
+    }
+
+    @Override
+    public <T> CompletableFuture<T> sendPing(ByteBuffer message,
+                                             T attachment,
+                                             BiConsumer<? super T, ? super Throwable> action) {
+        long id = 0;
+        if (debug.on()) {
+            id = counter.incrementAndGet();
+            debug.log("enter send ping %s message.remaining=%s",
+                              id, message.remaining());
+        }
+        MinimalFuture<T> f = new MinimalFuture<>();
+        try {
+            queue.addPing(message, attachment, action, f);
+            sendScheduler.runOrSchedule();
+        } catch (IOException e) {
+            action.accept(null, e);
+            f.completeExceptionally(e);
+        }
+        if (debug.on()) {
+            debug.log("exit send ping %s returned %s", id, f);
+        }
+        return f;
+    }
+
+    @Override
+    public <T> CompletableFuture<T> sendPong(ByteBuffer message,
+                                             T attachment,
+                                             BiConsumer<? super T, ? super Throwable> action) {
+        long id = 0;
+        if (debug.on()) {
+            id = counter.incrementAndGet();
+            debug.log("enter send pong %s message.remaining=%s",
+                              id, message.remaining());
+        }
+        MinimalFuture<T> f = new MinimalFuture<>();
+        try {
+            queue.addPong(message, attachment, action, f);
+            sendScheduler.runOrSchedule();
+        } catch (IOException e) {
+            action.accept(null, e);
+            f.completeExceptionally(e);
+        }
+        if (debug.on()) {
+            debug.log("exit send pong %s returned %s", id, f);
+        }
+        return f;
+    }
+
+    @Override
+    public <T> CompletableFuture<T> sendPong(Supplier<? extends ByteBuffer> message,
+                                             T attachment,
+                                             BiConsumer<? super T, ? super Throwable> action) {
+        long id = 0;
+        if (debug.on()) {
+            id = counter.incrementAndGet();
+            debug.log("enter send pong %s supplier=%s",
+                      id, message);
+        }
+        MinimalFuture<T> f = new MinimalFuture<>();
+        try {
+            queue.addPong(message, attachment, action, f);
+            sendScheduler.runOrSchedule();
+        } catch (IOException e) {
+            action.accept(null, e);
+            f.completeExceptionally(e);
+        }
+        if (debug.on()) {
+            debug.log("exit send pong %s returned %s", id, f);
+        }
+        return f;
+    }
+
+    @Override
+    public <T> CompletableFuture<T> sendClose(int statusCode,
+                                              String reason,
+                                              T attachment,
+                                              BiConsumer<? super T, ? super Throwable> action) {
+        long id = 0;
+        if (debug.on()) {
+            id = counter.incrementAndGet();
+            debug.log("enter send close %s statusCode=%s reason.length=%s",
+                              id, statusCode, reason.length());
+        }
+        MinimalFuture<T> f = new MinimalFuture<>();
+        try {
+            queue.addClose(statusCode, CharBuffer.wrap(reason), attachment, action, f);
+            sendScheduler.runOrSchedule();
+        } catch (IOException e) {
+            action.accept(null, e);
+            f.completeExceptionally(e);
+        }
+        if (debug.on()) {
+            debug.log("exit send close %s returned %s", id, f);
+        }
+        return f;
+    }
+
+    @Override
+    public void request(long n) {
+        if (debug.on()) {
+            debug.log("request %s", n);
+        }
+        if (demand.increase(n)) {
+            receiveScheduler.runOrSchedule();
+        }
+    }
+
+    @Override
+    public void acknowledgeReception() {
+        boolean decremented = demand.tryDecrement();
+        if (!decremented) {
+            throw new InternalError();
+        }
+    }
+
+    @Override
+    public void closeOutput() throws IOException {
+        if (debug.on()) {
+            debug.log("closeOutput");
+        }
+        synchronized (closeLock) {
+            if (!outputClosed) {
+                outputClosed = true;
+                try {
+                    channel.shutdownOutput();
+                } finally {
+                    if (inputClosed) {
+                        channel.close();
+                    }
+                }
+            }
+        }
+        writeState.set(CLOSED);
+        sendScheduler.runOrSchedule();
+    }
+
+    /*
+     * Permanently stops reading from the channel and delivering messages
+     * regardless of the current demand and data availability.
+     */
+    @Override
+    public void closeInput() throws IOException {
+        if (debug.on()) {
+            debug.log("closeInput");
+        }
+        synchronized (closeLock) {
+            if (!inputClosed) {
+                inputClosed = true;
+                try {
+                    receiveScheduler.stop();
+                    channel.shutdownInput();
+                } finally {
+                    if (outputClosed) {
+                        channel.close();
+                    }
+                }
+            }
+        }
+    }
+
+    /* Common states for send and receive tasks */
+    enum ChannelState {
+        UNREGISTERED,
+        AVAILABLE,
+        WAITING,
+        CLOSED,
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    private class SendTask extends CompleteRestartableTask {
+
+        private final MessageQueue.QueueCallback<Boolean, IOException>
+                encodingCallback = new MessageQueue.QueueCallback<>() {
+
+            @Override
+            public <T> Boolean onText(CharBuffer message,
+                                      boolean isLast,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action,
+                                      CompletableFuture<? super T> future) throws IOException
+            {
+                return encoder.encodeText(message, isLast, dst);
+            }
+
+            @Override
+            public <T> Boolean onBinary(ByteBuffer message,
+                                        boolean isLast,
+                                        T attachment,
+                                        BiConsumer<? super T, ? super Throwable> action,
+                                        CompletableFuture<? super T> future) throws IOException
+            {
+                return encoder.encodeBinary(message, isLast, dst);
+            }
+
+            @Override
+            public <T> Boolean onPing(ByteBuffer message,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action,
+                                      CompletableFuture<? super T> future) throws IOException
+            {
+                return encoder.encodePing(message, dst);
+            }
+
+            @Override
+            public <T> Boolean onPong(ByteBuffer message,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action,
+                                      CompletableFuture<? super T> future) throws IOException
+            {
+                return encoder.encodePong(message, dst);
+            }
+
+            @Override
+            public <T> Boolean onPong(Supplier<? extends ByteBuffer> message,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action,
+                                      CompletableFuture<? super T> future) throws IOException {
+                return encoder.encodePong(message.get(), dst);
+            }
+
+            @Override
+            public <T> Boolean onClose(int statusCode,
+                                       CharBuffer reason,
+                                       T attachment,
+                                       BiConsumer<? super T, ? super Throwable> action,
+                                       CompletableFuture<? super T> future) throws IOException
+            {
+                return encoder.encodeClose(statusCode, reason, dst);
+            }
+
+            @Override
+            public Boolean onEmpty() {
+                return false;
+            }
+        };
+
+        /* Whether the task sees the current head message for first time */
+        private boolean firstPass = true;
+        /* Whether the message has been fully encoded */
+        private boolean encoded;
+
+        // -- Current message completion communication fields --
+
+        private Object attachment;
+        private BiConsumer action;
+        private CompletableFuture future;
+        private final MessageQueue.QueueCallback<Boolean, RuntimeException>
+                /* If there is a message, loads its completion communication fields */
+                loadCallback = new MessageQueue.QueueCallback<Boolean, RuntimeException>() {
+
+            @Override
+            public <T> Boolean onText(CharBuffer message,
+                                      boolean isLast,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action,
+                                      CompletableFuture<? super T> future)
+            {
+                SendTask.this.attachment = attachment;
+                SendTask.this.action = action;
+                SendTask.this.future = future;
+                return true;
+            }
+
+            @Override
+            public <T> Boolean onBinary(ByteBuffer message,
+                                        boolean isLast,
+                                        T attachment,
+                                        BiConsumer<? super T, ? super Throwable> action,
+                                        CompletableFuture<? super T> future)
+            {
+                SendTask.this.attachment = attachment;
+                SendTask.this.action = action;
+                SendTask.this.future = future;
+                return true;
+            }
+
+            @Override
+            public <T> Boolean onPing(ByteBuffer message,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action,
+                                      CompletableFuture<? super T> future)
+            {
+                SendTask.this.attachment = attachment;
+                SendTask.this.action = action;
+                SendTask.this.future = future;
+                return true;
+            }
+
+            @Override
+            public <T> Boolean onPong(ByteBuffer message,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action,
+                                      CompletableFuture<? super T> future)
+            {
+                SendTask.this.attachment = attachment;
+                SendTask.this.action = action;
+                SendTask.this.future = future;
+                return true;
+            }
+
+            @Override
+            public <T> Boolean onPong(Supplier<? extends ByteBuffer> message,
+                                      T attachment,
+                                      BiConsumer<? super T, ? super Throwable> action,
+                                      CompletableFuture<? super T> future)
+            {
+                SendTask.this.attachment = attachment;
+                SendTask.this.action = action;
+                SendTask.this.future = future;
+                return true;
+            }
+
+            @Override
+            public <T> Boolean onClose(int statusCode,
+                                       CharBuffer reason,
+                                       T attachment,
+                                       BiConsumer<? super T, ? super Throwable> action,
+                                       CompletableFuture<? super T> future)
+            {
+                SendTask.this.attachment = attachment;
+                SendTask.this.action = action;
+                SendTask.this.future = future;
+                return true;
+            }
+
+            @Override
+            public Boolean onEmpty() {
+                return false;
+            }
+        };
+
+        @Override
+        public void run() {
+            // Could have been only called in one of the following cases:
+            //   (a) A message has been added to the queue
+            //   (b) The channel is ready for writing
+            if (debug.on()) {
+                debug.log("enter send task");
+            }
+            while (!queue.isEmpty()) {
+                try {
+                    if (dst.hasRemaining()) {
+                        if (debug.on()) {
+                            debug.log("%s bytes remaining in buffer %s",
+                                      dst.remaining(), dst);
+                        }
+                        // The previous part of the binary representation of the
+                        // message hasn't been fully written
+                        if (!tryCompleteWrite()) {
+                            break;
+                        }
+                    } else if (!encoded) {
+                        if (firstPass) {
+                            firstPass = false;
+                            queue.peek(loadCallback);
+                            if (debug.on()) {
+                                debug.log("load message");
+                            }
+                        }
+                        dst.clear();
+                        encoded = queue.peek(encodingCallback);
+                        dst.flip();
+                        if (!tryCompleteWrite()) {
+                            break;
+                        }
+                    } else {
+                        // All done, remove and complete
+                        encoder.reset();
+                        removeAndComplete(null);
+                    }
+                } catch (Throwable t) {
+                    if (debug.on()) {
+                        debug.log("send task exception %s", (Object) t);
+                    }
+                    // buffer cleanup: if there is an exception, the buffer
+                    // should appear empty for the next write as there is
+                    // nothing to write
+                    dst.position(dst.limit());
+                    encoder.reset();
+                    removeAndComplete(t);
+                }
+            }
+            if (debug.on()) {
+                debug.log("exit send task");
+            }
+        }
+
+        private boolean tryCompleteWrite() throws IOException {
+            if (debug.on()) {
+                debug.log("enter writing");
+            }
+            boolean finished = false;
+            loop:
+            while (true) {
+                final ChannelState ws = writeState.get();
+                if (debug.on()) {
+                    debug.log("write state: %s", ws);
+                }
+                switch (ws) {
+                    case WAITING:
+                        break loop;
+                    case UNREGISTERED:
+                        if (debug.on()) {
+                            debug.log("registering write event");
+                        }
+                        channel.registerEvent(writeEvent);
+                        writeState.compareAndSet(UNREGISTERED, WAITING);
+                        if (debug.on()) {
+                            debug.log("registered write event");
+                        }
+                        break loop;
+                    case AVAILABLE:
+                        boolean written = write();
+                        if (written) {
+                            if (debug.on()) {
+                                debug.log("finished writing to the channel");
+                            }
+                            finished = true;
+                            break loop;   // All done
+                        } else {
+                            writeState.compareAndSet(AVAILABLE, UNREGISTERED);
+                            continue loop; //  Effectively "goto UNREGISTERED"
+                        }
+                    case CLOSED:
+                        throw new IOException("Output closed");
+                    default:
+                        throw new InternalError(String.valueOf(ws));
+                }
+            }
+            if (debug.on()) {
+                debug.log("exit writing");
+            }
+            return finished;
+        }
+
+        @SuppressWarnings("unchecked")
+        private void removeAndComplete(Throwable error) {
+            if (debug.on()) {
+                debug.log("removeAndComplete error=%s", (Object) error);
+            }
+            queue.remove();
+            if (error != null) {
+                try {
+                    action.accept(null, error);
+                } finally {
+                    future.completeExceptionally(error);
+                }
+            } else {
+                try {
+                    action.accept(attachment, null);
+                } finally {
+                    future.complete(attachment);
+                }
+            }
+            encoded = false;
+            firstPass = true;
+            attachment = null;
+            action = null;
+            future = null;
+        }
+    }
+
+    private class ReceiveTask extends CompleteRestartableTask {
+
+        @Override
+        public void run() {
+            if (debug.on()) {
+                debug.log("enter receive task");
+            }
+            loop:
+            while (!receiveScheduler.isStopped()) {
+                ChannelState rs = readState;
+                if (data.hasRemaining()) {
+                    if (debug.on()) {
+                        debug.log("remaining bytes received %s",
+                                  data.remaining());
+                    }
+                    if (!demand.isFulfilled()) {
+                        try {
+                            int oldPos = data.position();
+                            reader.readFrame(data, decoder);
+                            int newPos = data.position();
+                            // Reader always consumes bytes:
+                            assert oldPos != newPos : data;
+                        } catch (Throwable e) {
+                            receiveScheduler.stop();
+                            messageConsumer.onError(e);
+                        }
+                        if (!data.hasRemaining()) {
+                            rs = readState = UNREGISTERED;
+                        }
+                        continue;
+                    }
+                    break loop;
+                }
+                if (debug.on()) {
+                    debug.log("receive state: %s", rs);
+                }
+                switch (rs) {
+                    case WAITING:
+                        break loop;
+                    case UNREGISTERED:
+                        try {
+                            rs = readState = WAITING;
+                            channel.registerEvent(readEvent);
+                        } catch (Throwable e) {
+                            receiveScheduler.stop();
+                            messageConsumer.onError(e);
+                        }
+                        break loop;
+                    case AVAILABLE:
+                        try {
+                            data = channel.read();
+                        } catch (Throwable e) {
+                            receiveScheduler.stop();
+                            messageConsumer.onError(e);
+                            break loop;
+                        }
+                        if (data == null) { // EOF
+                            receiveScheduler.stop();
+                            messageConsumer.onComplete();
+                            break loop;
+                        } else if (!data.hasRemaining()) {
+                            // No data at the moment. Pretty much a "goto",
+                            // reusing the existing code path for registration
+                            rs = readState = UNREGISTERED;
+                        }
+                        continue loop;
+                    default:
+                        throw new InternalError(String.valueOf(rs));
+                }
+            }
+            if (debug.on()) {
+                debug.log("exit receive task");
+            }
+        }
+    }
+
+    private class WriteEvent implements RawChannel.RawEvent {
+
+        @Override
+        public int interestOps() {
+            return SelectionKey.OP_WRITE;
+        }
+
+        @Override
+        public void handle() {
+            if (debug.on()) {
+                debug.log("write event");
+            }
+            ChannelState s;
+            do {
+                s = writeState.get();
+                if (s == CLOSED) {
+                    if (debug.on()) {
+                        debug.log("write state %s", s);
+                    }
+                    break;
+                }
+            } while (!writeState.compareAndSet(s, AVAILABLE));
+            sendScheduler.runOrSchedule();
+        }
+    }
+
+    private class ReadEvent implements RawChannel.RawEvent {
+
+        @Override
+        public int interestOps() {
+            return SelectionKey.OP_READ;
+        }
+
+        @Override
+        public void handle() {
+            if (debug.on()) {
+                debug.log("read event");
+            }
+            readState = AVAILABLE;
+            receiveScheduler.runOrSchedule();
+        }
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/UTF8AccumulatingDecoder.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/UTF8AccumulatingDecoder.java
similarity index 94%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/UTF8AccumulatingDecoder.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/UTF8AccumulatingDecoder.java
index 81485783b2f..618d0d356ba 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/UTF8AccumulatingDecoder.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/UTF8AccumulatingDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,9 +23,9 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
-import jdk.incubator.http.internal.common.Log;
+import jdk.internal.net.http.common.Log;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -35,7 +35,7 @@
 import java.nio.charset.CodingErrorAction;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static jdk.incubator.http.internal.common.Utils.EMPTY_BYTEBUFFER;
+import static jdk.internal.net.http.common.Utils.EMPTY_BYTEBUFFER;
 
 final class UTF8AccumulatingDecoder {
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketImpl.java
new file mode 100644
index 00000000000..e39c72c0b7e
--- /dev/null
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketImpl.java
@@ -0,0 +1,872 @@
+/*
+ * Copyright (c) 2015, 2018, 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.internal.net.http.websocket;
+
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.Log;
+import jdk.internal.net.http.common.Logger;
+import jdk.internal.net.http.common.MinimalFuture;
+import jdk.internal.net.http.common.SequentialScheduler;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.websocket.OpeningHandshake.Result;
+
+import java.io.IOException;
+import java.lang.System.Logger.Level;
+import java.lang.ref.Reference;
+import java.net.ProtocolException;
+import java.net.URI;
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+import static java.util.Objects.requireNonNull;
+import static jdk.internal.net.http.common.MinimalFuture.failedFuture;
+import static jdk.internal.net.http.websocket.StatusCodes.CLOSED_ABNORMALLY;
+import static jdk.internal.net.http.websocket.StatusCodes.NO_STATUS_CODE;
+import static jdk.internal.net.http.websocket.StatusCodes.isLegalToSendFromClient;
+import static jdk.internal.net.http.websocket.WebSocketImpl.State.BINARY;
+import static jdk.internal.net.http.websocket.WebSocketImpl.State.CLOSE;
+import static jdk.internal.net.http.websocket.WebSocketImpl.State.ERROR;
+import static jdk.internal.net.http.websocket.WebSocketImpl.State.IDLE;
+import static jdk.internal.net.http.websocket.WebSocketImpl.State.OPEN;
+import static jdk.internal.net.http.websocket.WebSocketImpl.State.PING;
+import static jdk.internal.net.http.websocket.WebSocketImpl.State.PONG;
+import static jdk.internal.net.http.websocket.WebSocketImpl.State.TEXT;
+import static jdk.internal.net.http.websocket.WebSocketImpl.State.WAITING;
+
+/*
+ * A WebSocket client.
+ */
+public final class WebSocketImpl implements WebSocket {
+
+    private static final Logger debug =
+            Utils.getWebSocketLogger("[WebSocket]"::toString, Utils.DEBUG_WS);
+    private final AtomicLong sendCounter = new AtomicLong();
+    private final AtomicLong receiveCounter = new AtomicLong();
+
+    enum State {
+        OPEN,
+        IDLE,
+        WAITING,
+        TEXT,
+        BINARY,
+        PING,
+        PONG,
+        CLOSE,
+        ERROR;
+    }
+
+    private final AtomicReference<ByteBuffer> lastAutomaticPong = new AtomicReference<>();
+    private final MinimalFuture<WebSocket> DONE = MinimalFuture.completedFuture(this);
+    private volatile boolean inputClosed;
+    private final AtomicBoolean outputClosed = new AtomicBoolean();
+
+    private final AtomicReference<State> state = new AtomicReference<>(OPEN);
+
+    /* Components of calls to Listener's methods */
+    private boolean last;
+    private ByteBuffer binaryData;
+    private CharSequence text;
+    private int statusCode;
+    private String reason;
+    private final AtomicReference<Throwable> error = new AtomicReference<>();
+
+    private final URI uri;
+    private final String subprotocol;
+    private final Listener listener;
+
+    private final AtomicBoolean pendingTextOrBinary = new AtomicBoolean();
+    private final AtomicBoolean pendingPingOrPong = new AtomicBoolean();
+    private final Transport transport;
+    private final SequentialScheduler receiveScheduler
+            = new SequentialScheduler(new ReceiveTask());
+    private final Demand demand = new Demand();
+
+    public static CompletableFuture<WebSocket> newInstanceAsync(BuilderImpl b) {
+        Function<Result, WebSocket> newWebSocket = r -> {
+            WebSocket ws = newInstance(b.getUri(),
+                                       r.subprotocol,
+                                       b.getListener(),
+                                       r.transport);
+            // Make sure we don't release the builder until this lambda
+            // has been executed. The builder has a strong reference to
+            // the HttpClientFacade, and we want to keep that live until
+            // after the raw channel is created and passed to WebSocketImpl.
+            Reference.reachabilityFence(b);
+            return ws;
+        };
+        OpeningHandshake h;
+        try {
+            h = new OpeningHandshake(b);
+        } catch (Throwable e) {
+            return failedFuture(e);
+        }
+        return h.send().thenApply(newWebSocket);
+    }
+
+    /* Exposed for testing purposes */
+    static WebSocketImpl newInstance(URI uri,
+                                     String subprotocol,
+                                     Listener listener,
+                                     TransportFactory transport) {
+        WebSocketImpl ws = new WebSocketImpl(uri, subprotocol, listener, transport);
+        // This initialisation is outside of the constructor for the sake of
+        // safe publication of WebSocketImpl.this
+        ws.signalOpen();
+        return ws;
+    }
+
+    private WebSocketImpl(URI uri,
+                          String subprotocol,
+                          Listener listener,
+                          TransportFactory transportFactory) {
+        this.uri = requireNonNull(uri);
+        this.subprotocol = requireNonNull(subprotocol);
+        this.listener = requireNonNull(listener);
+        // Why 6? 1 sendPing/sendPong + 1 sendText/sendBinary + 1 Close +
+        // 2 automatic Ping replies + 1 automatic Close = 6 messages
+        // Why 2 automatic Pong replies? One is being sent, but the byte buffer
+        // has been set to null, another just has been added.
+        this.transport = transportFactory.createTransport(new MessageQueue(6),
+                new SignallingMessageConsumer());
+    }
+
+    // FIXME: add to action handling of errors -> signalError()
+
+    @Override
+    public CompletableFuture<WebSocket> sendText(CharSequence message,
+                                                 boolean last) {
+        Objects.requireNonNull(message);
+        long id = 0;
+        if (debug.on()) {
+            id = sendCounter.incrementAndGet();
+            debug.log("enter send text %s payload length=%s last=%s",
+                      id, message.length(), last);
+        }
+        CompletableFuture<WebSocket> result;
+        if (!setPendingTextOrBinary()) {
+            result = failedFuture(new IllegalStateException("Send pending"));
+        } else {
+            result = transport.sendText(message, last, this,
+                                        (r, e) -> clearPendingTextOrBinary());
+        }
+        if (debug.on()) {
+            debug.log("exit send text %s returned %s", id, result);
+        }
+
+        return replaceNull(result);
+    }
+
+    @Override
+    public CompletableFuture<WebSocket> sendBinary(ByteBuffer message,
+                                                   boolean last) {
+        Objects.requireNonNull(message);
+        long id = 0;
+        if (debug.on()) {
+            id = sendCounter.incrementAndGet();
+            debug.log("enter send binary %s payload=%s last=%s",
+                      id, message, last);
+        }
+        CompletableFuture<WebSocket> result;
+        if (!setPendingTextOrBinary()) {
+            result = failedFuture(new IllegalStateException("Send pending"));
+        } else {
+            result = transport.sendBinary(message, last, this,
+                                          (r, e) -> clearPendingTextOrBinary());
+        }
+        if (debug.on()) {
+            debug.log("exit send binary %s returned %s", id, result);
+        }
+        return replaceNull(result);
+    }
+
+    private void clearPendingTextOrBinary() {
+        pendingTextOrBinary.set(false);
+    }
+
+    private boolean setPendingTextOrBinary() {
+        return pendingTextOrBinary.compareAndSet(false, true);
+    }
+
+    private CompletableFuture<WebSocket> replaceNull(
+            CompletableFuture<WebSocket> cf)
+    {
+        if (cf == null) {
+            return DONE;
+        } else {
+            return cf;
+        }
+    }
+
+    @Override
+    public CompletableFuture<WebSocket> sendPing(ByteBuffer message) {
+        Objects.requireNonNull(message);
+        long id = 0;
+        if (debug.on()) {
+            id = sendCounter.incrementAndGet();
+            debug.log("enter send ping %s payload=%s", id, message);
+        }
+        CompletableFuture<WebSocket> result;
+        if (!setPendingPingOrPong()) {
+            result = failedFuture(new IllegalStateException("Send pending"));
+        } else {
+            result = transport.sendPing(message, this,
+                                        (r, e) -> clearPendingPingOrPong());
+        }
+        if (debug.on()) {
+            debug.log("exit send ping %s returned %s", id, result);
+        }
+        return replaceNull(result);
+    }
+
+    @Override
+    public CompletableFuture<WebSocket> sendPong(ByteBuffer message) {
+        Objects.requireNonNull(message);
+        long id = 0;
+        if (debug.on()) {
+            id = sendCounter.incrementAndGet();
+            debug.log("enter send pong %s payload=%s", id, message);
+        }
+        CompletableFuture<WebSocket> result;
+        if (!setPendingPingOrPong()) {
+            result = failedFuture(new IllegalStateException("Send pending"));
+        } else {
+            result =  transport.sendPong(message, this,
+                                         (r, e) -> clearPendingPingOrPong());
+        }
+        if (debug.on()) {
+            debug.log("exit send pong %s returned %s", id, result);
+        }
+        return replaceNull(result);
+    }
+
+    private boolean setPendingPingOrPong() {
+        return pendingPingOrPong.compareAndSet(false, true);
+    }
+
+    private void clearPendingPingOrPong() {
+        pendingPingOrPong.set(false);
+    }
+
+    @Override
+    public CompletableFuture<WebSocket> sendClose(int statusCode,
+                                                  String reason) {
+        Objects.requireNonNull(reason);
+        long id = 0;
+        if (debug.on()) {
+            id = sendCounter.incrementAndGet();
+            debug.log("enter send close %s statusCode=%s reason.length=%s",
+                      id, statusCode, reason.length());
+        }
+        CompletableFuture<WebSocket> result;
+        // Close message is the only type of message whose validity is checked
+        // in the corresponding send method. This is made in order to close the
+        // output in place. Otherwise the number of Close messages in queue
+        // would not be bounded.
+        if (!isLegalToSendFromClient(statusCode)) {
+            result = failedFuture(new IllegalArgumentException("statusCode"));
+        } else if (!isLegalReason(reason)) {
+            result = failedFuture(new IllegalArgumentException("reason"));
+        } else if (!outputClosed.compareAndSet(false, true)){
+            result = failedFuture(new IOException("Output closed"));
+        } else {
+            result = sendClose0(statusCode, reason);
+        }
+        if (debug.on()) {
+            debug.log("exit send close %s returned %s", id, result);
+        }
+        return replaceNull(result);
+    }
+
+    private static boolean isLegalReason(String reason) {
+        if (reason.length() > 123) { // quick check
+            return false;
+        }
+        CharsetEncoder encoder = StandardCharsets.UTF_8.newEncoder()
+                        .onMalformedInput(CodingErrorAction.REPORT)
+                        .onUnmappableCharacter(CodingErrorAction.REPORT);
+        ByteBuffer bytes;
+        try {
+            bytes = encoder.encode(CharBuffer.wrap(reason));
+        } catch (CharacterCodingException ignored) {
+            return false;
+        }
+        return bytes.remaining() <= 123;
+    }
+
+    /*
+     * The implementation uses this method internally to send Close messages
+     * with codes that are not allowed to be sent through the API.
+     */
+    private CompletableFuture<WebSocket> sendClose0(int statusCode,
+                                                    String reason) {
+        return transport.sendClose(statusCode, reason, this,
+                                   (r, e) -> processCloseError(e));
+    }
+
+    private void processCloseError(Throwable e) {
+        if (e == null) {
+            debug.log("send close completed successfully");
+        } else {
+            debug.log("send close completed with error", e);
+        }
+        outputClosed.set(true);
+        try {
+            transport.closeOutput();
+        } catch (IOException ignored) { }
+    }
+
+    @Override
+    public void request(long n) {
+        if (debug.on()) {
+            debug.log("request %s", n);
+        }
+        if (demand.increase(n)) {
+            receiveScheduler.runOrSchedule();
+        }
+    }
+
+    @Override
+    public String getSubprotocol() {
+        return subprotocol;
+    }
+
+    @Override
+    public boolean isOutputClosed() {
+        return outputClosed.get();
+    }
+
+    @Override
+    public boolean isInputClosed() {
+        return inputClosed;
+    }
+
+    @Override
+    public void abort() {
+        if (debug.on()) {
+            debug.log("abort");
+        }
+        inputClosed = true;
+        outputClosed.set(true);
+        receiveScheduler.stop();
+        close();
+    }
+
+    @Override
+    public String toString() {
+        return super.toString()
+                + "[uri=" + uri
+                + (!subprotocol.isEmpty() ? ", subprotocol=" + subprotocol : "")
+                + "]";
+    }
+
+    /*
+     * The assumptions about order is as follows:
+     *
+     *     - state is never changed more than twice inside the `run` method:
+     *       x --(1)--> IDLE --(2)--> y (otherwise we're loosing events, or
+     *       overwriting parts of messages creating a mess since there's no
+     *       queueing)
+     *     - OPEN is always the first state
+     *     - no messages are requested/delivered before onOpen is called (this
+     *       is implemented by making WebSocket instance accessible first in
+     *       onOpen)
+     *     - after the state has been observed as CLOSE/ERROR, the scheduler
+     *       is stopped
+     */
+    private class ReceiveTask extends SequentialScheduler.CompleteRestartableTask {
+
+        // Transport only asked here and nowhere else because we must make sure
+        // onOpen is invoked first and no messages become pending before onOpen
+        // finishes
+
+        @Override
+        public void run() {
+            if (debug.on()) {
+                debug.log("enter receive task");
+            }
+            loop:
+            while (!receiveScheduler.isStopped()) {
+                State s = state.get();
+                if (debug.on()) {
+                    debug.log("receive state: %s", s);
+                }
+                try {
+                    switch (s) {
+                        case OPEN:
+                            processOpen();
+                            tryChangeState(OPEN, IDLE);
+                            break;
+                        case TEXT:
+                            processText();
+                            tryChangeState(TEXT, IDLE);
+                            break;
+                        case BINARY:
+                            processBinary();
+                            tryChangeState(BINARY, IDLE);
+                            break;
+                        case PING:
+                            processPing();
+                            tryChangeState(PING, IDLE);
+                            break;
+                        case PONG:
+                            processPong();
+                            tryChangeState(PONG, IDLE);
+                            break;
+                        case CLOSE:
+                            processClose();
+                            break loop;
+                        case ERROR:
+                            processError();
+                            break loop;
+                        case IDLE:
+                            if (demand.tryDecrement()
+                                    && tryChangeState(IDLE, WAITING)) {
+                                transport.request(1);
+                            }
+                            break loop;
+                        case WAITING:
+                            // For debugging spurious signalling: when there was
+                            // a signal, but apparently nothing has changed
+                            break loop;
+                        default:
+                            throw new InternalError(String.valueOf(s));
+                    }
+                } catch (Throwable t) {
+                    signalError(t);
+                }
+            }
+            if (debug.on()) {
+                debug.log("exit receive task");
+            }
+        }
+
+        private void processError() throws IOException {
+            if (debug.on()) {
+                debug.log("processError");
+            }
+            transport.closeInput();
+            receiveScheduler.stop();
+            Throwable err = error.get();
+            if (err instanceof FailWebSocketException) {
+                int code1 = ((FailWebSocketException) err).getStatusCode();
+                err = new ProtocolException().initCause(err);
+                if (debug.on()) {
+                    debug.log("failing %s with error=%s statusCode=%s",
+                              WebSocketImpl.this, err, code1);
+                }
+                sendCloseSilently(code1);
+            }
+            long id = 0;
+            if (debug.on()) {
+                id = receiveCounter.incrementAndGet();
+                debug.log("enter onError %s error=%s", id, err);
+            }
+            try {
+                listener.onError(WebSocketImpl.this, err);
+            } finally {
+                if (debug.on()) {
+                    debug.log("exit onError %s", id);
+                }
+            }
+        }
+
+        private void processClose() throws IOException {
+            debug.log("processClose");
+            transport.closeInput();
+            receiveScheduler.stop();
+            CompletionStage<?> cs = null; // when the listener is ready to close
+            long id = 0;
+            if (debug.on()) {
+                id = receiveCounter.incrementAndGet();
+                debug.log("enter onClose %s statusCode=%s reason.length=%s",
+                          id, statusCode, reason.length());
+            }
+            try {
+                cs = listener.onClose(WebSocketImpl.this, statusCode, reason);
+            } finally {
+                debug.log("exit onClose %s returned %s", id, cs);
+            }
+            if (cs == null) {
+                cs = DONE;
+            }
+            int code;
+            if (statusCode == NO_STATUS_CODE || statusCode == CLOSED_ABNORMALLY) {
+                code = NORMAL_CLOSURE;
+                debug.log("using statusCode %s instead of %s",
+                          statusCode, code);
+
+            } else {
+                code = statusCode;
+            }
+            cs.whenComplete((r, e) -> {
+                if (debug.on()) {
+                    debug.log("CompletionStage returned by onClose completed result=%s error=%s",
+                              r, e);
+                }
+                sendCloseSilently(code);
+            });
+        }
+
+        private void processPong() {
+            long id = 0;
+            if (debug.on()) {
+                id = receiveCounter.incrementAndGet();
+                debug.log("enter onPong %s payload=%s",
+                          id, binaryData);
+            }
+            CompletionStage<?> cs = null;
+            try {
+                cs = listener.onPong(WebSocketImpl.this, binaryData);
+            } finally {
+                if (debug.on()) {
+                    debug.log("exit onPong %s returned %s", id, cs);
+                }
+            }
+        }
+
+        private void processPing() {
+            if (debug.on()) {
+                debug.log("processPing");
+            }
+            // A full copy of this (small) data is made. This way sending a
+            // replying Pong could be done in parallel with the listener
+            // handling this Ping.
+            ByteBuffer slice = binaryData.slice();
+            if (!outputClosed.get()) {
+                ByteBuffer copy = ByteBuffer.allocate(binaryData.remaining())
+                        .put(binaryData)
+                        .flip();
+                if (!trySwapAutomaticPong(copy)) {
+                    // Non-exclusive send;
+                    BiConsumer<WebSocketImpl, Throwable> reporter = (r, e) -> {
+                        if (e != null) { // TODO: better error handing. What if already closed?
+                            signalError(Utils.getCompletionCause(e));
+                        }
+                    };
+                    transport.sendPong(WebSocketImpl.this::clearAutomaticPong,
+                                       WebSocketImpl.this,
+                                       reporter);
+                }
+            }
+            long id = 0;
+            if (debug.on()) {
+                id = receiveCounter.incrementAndGet();
+                debug.log("enter onPing %s payload=%s", id, slice);
+            }
+            CompletionStage<?> cs = null;
+            try {
+                cs = listener.onPing(WebSocketImpl.this, slice);
+            } finally {
+                if (debug.on()) {
+                    debug.log("exit onPing %s returned %s", id, cs);
+                }
+            }
+        }
+
+        private void processBinary() {
+            long id = 0;
+            if (debug.on()) {
+                id = receiveCounter.incrementAndGet();
+                debug.log("enter onBinary %s payload=%s last=%s",
+                          id, binaryData, last);
+            }
+            CompletionStage<?> cs = null;
+            try {
+                cs = listener.onBinary(WebSocketImpl.this, binaryData, last);
+            } finally {
+                if (debug.on()) {
+                    debug.log("exit onBinary %s returned %s", id, cs);
+                }
+            }
+        }
+
+        private void processText() {
+            long id = 0;
+            if (debug.on()) {
+                id = receiveCounter.incrementAndGet();
+                debug.log("enter onText %s payload.length=%s last=%s",
+                          id, text.length(), last);
+            }
+            CompletionStage<?> cs = null;
+            try {
+                cs = listener.onText(WebSocketImpl.this, text, last);
+            } finally {
+                if (debug.on()) {
+                    debug.log("exit onText %s returned %s", id, cs);
+                }
+            }
+        }
+
+        private void processOpen() {
+            long id = 0;
+            if (debug.on()) {
+                id = receiveCounter.incrementAndGet();
+                debug.log("enter onOpen %s", id);
+            }
+            try {
+                listener.onOpen(WebSocketImpl.this);
+            } finally {
+                if (debug.on()) {
+                    debug.log("exit onOpen %s", id);
+                }
+            }
+        }
+    }
+
+    private void sendCloseSilently(int statusCode) {
+        sendClose0(statusCode, "").whenComplete((r, e) -> {
+            if (e != null) {
+                if (debug.on()) {
+                    debug.log("automatic closure completed with error",
+                              (Object) e);
+                }
+            }
+        });
+    }
+
+    private ByteBuffer clearAutomaticPong() {
+        ByteBuffer data;
+        do {
+            data = lastAutomaticPong.get();
+            if (data == null) {
+                // This method must never be called unless a message that is
+                // using it has been added previously
+                throw new InternalError();
+            }
+        } while (!lastAutomaticPong.compareAndSet(data, null));
+        return data;
+    }
+
+    // bound pings
+    private boolean trySwapAutomaticPong(ByteBuffer copy) {
+        ByteBuffer message;
+        boolean swapped;
+        while (true) {
+            message = lastAutomaticPong.get();
+            if (message == null) {
+                if (!lastAutomaticPong.compareAndSet(null, copy)) {
+                    // It's only this method that can change null to ByteBuffer,
+                    // and this method is invoked at most by one thread at a
+                    // time. Thus no failure in the atomic operation above is
+                    // expected.
+                    throw new InternalError();
+                }
+                swapped = false;
+                break;
+            } else if (lastAutomaticPong.compareAndSet(message, copy)) {
+                swapped = true;
+                break;
+            }
+        }
+        if (debug.on()) {
+            debug.log("swapped automatic pong from %s to %s",
+                      message, copy);
+        }
+        return swapped;
+    }
+
+    private void signalOpen() {
+        debug.log("signalOpen");
+        receiveScheduler.runOrSchedule();
+    }
+
+    private void signalError(Throwable error) {
+        if (debug.on()) {
+            debug.log("signalError %s", (Object) error);
+        }
+        inputClosed = true;
+        outputClosed.set(true);
+        if (!this.error.compareAndSet(null, error) || !trySetState(ERROR)) {
+            if (debug.on()) {
+                debug.log("signalError", error);
+            }
+            Log.logError(error);
+        } else {
+            close();
+        }
+    }
+
+    private void close() {
+        if (debug.on()) {
+            debug.log("close");
+        }
+        Throwable first = null;
+        try {
+            transport.closeInput();
+        } catch (Throwable t1) {
+            first = t1;
+        } finally {
+            Throwable second = null;
+            try {
+                transport.closeOutput();
+            } catch (Throwable t2) {
+                second = t2;
+            } finally {
+                Throwable e = null;
+                if (first != null && second != null) {
+                    first.addSuppressed(second);
+                    e = first;
+                } else if (first != null) {
+                    e = first;
+                } else if (second != null) {
+                    e = second;
+                }
+                if (e != null) {
+                    if (debug.on()) {
+                        debug.log("exception in close", e);
+                    }
+                }
+            }
+        }
+    }
+
+    private void signalClose(int statusCode, String reason) {
+        // FIXME: make sure no race reason & close are not intermixed
+        inputClosed = true;
+        this.statusCode = statusCode;
+        this.reason = reason;
+        boolean managed = trySetState(CLOSE);
+        if (debug.on()) {
+            debug.log("signalClose statusCode=%s reason.length=%s: %s",
+                      statusCode, reason.length(), managed);
+        }
+        if (managed) {
+            try {
+                transport.closeInput();
+            } catch (Throwable t) {
+                if (debug.on()) {
+                    debug.log("exception closing input", (Object) t);
+                }
+            }
+        }
+    }
+
+    private class SignallingMessageConsumer implements MessageStreamConsumer {
+
+        @Override
+        public void onText(CharSequence data, boolean last) {
+            transport.acknowledgeReception();
+            text = data;
+            WebSocketImpl.this.last = last;
+            tryChangeState(WAITING, TEXT);
+        }
+
+        @Override
+        public void onBinary(ByteBuffer data, boolean last) {
+            transport.acknowledgeReception();
+            binaryData = data;
+            WebSocketImpl.this.last = last;
+            tryChangeState(WAITING, BINARY);
+        }
+
+        @Override
+        public void onPing(ByteBuffer data) {
+            transport.acknowledgeReception();
+            binaryData = data;
+            tryChangeState(WAITING, PING);
+        }
+
+        @Override
+        public void onPong(ByteBuffer data) {
+            transport.acknowledgeReception();
+            binaryData = data;
+            tryChangeState(WAITING, PONG);
+        }
+
+        @Override
+        public void onClose(int statusCode, CharSequence reason) {
+            transport.acknowledgeReception();
+            signalClose(statusCode, reason.toString());
+        }
+
+        @Override
+        public void onComplete() {
+            transport.acknowledgeReception();
+            signalClose(CLOSED_ABNORMALLY, "");
+        }
+
+        @Override
+        public void onError(Throwable error) {
+            signalError(error);
+        }
+    }
+
+    private boolean trySetState(State newState) {
+        State currentState;
+        boolean success = false;
+        while (true) {
+            currentState = state.get();
+            if (currentState == ERROR || currentState == CLOSE) {
+                break;
+            } else if (state.compareAndSet(currentState, newState)) {
+                receiveScheduler.runOrSchedule();
+                success = true;
+                break;
+            }
+        }
+        if (debug.on()) {
+            debug.log("set state %s (previous %s) %s",
+                      newState, currentState, success);
+        }
+        return success;
+    }
+
+    private boolean tryChangeState(State expectedState, State newState) {
+        State witness = state.compareAndExchange(expectedState, newState);
+        boolean success = false;
+        if (witness == expectedState) {
+            receiveScheduler.runOrSchedule();
+            success = true;
+        } else if (witness != ERROR && witness != CLOSE) {
+            // This should be the only reason for inability to change the state
+            // from IDLE to WAITING: the state has changed to terminal
+            throw new InternalError();
+        }
+        if (debug.on()) {
+            debug.log("change state from %s to %s %s",
+                      expectedState, newState, success);
+        }
+        return success;
+    }
+
+    /* Exposed for testing purposes */
+    protected Transport transport() {
+        return transport;
+    }
+}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketRequest.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketRequest.java
similarity index 93%
rename from src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketRequest.java
rename to src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketRequest.java
index 799f00250ce..9a3a9eddce5 100644
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketRequest.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/WebSocketRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
 import java.net.Proxy;
 
diff --git a/src/jdk.incubator.httpclient/share/classes/module-info.java b/src/java.net.http/share/classes/module-info.java
similarity index 84%
rename from src/jdk.incubator.httpclient/share/classes/module-info.java
rename to src/java.net.http/share/classes/module-info.java
index 471bc39f067..d0129af7d02 100644
--- a/src/jdk.incubator.httpclient/share/classes/module-info.java
+++ b/src/java.net.http/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,12 +24,11 @@
  */
 
 /**
- * Defines the high-level HTTP and WebSocket API.
- * {@Incubating}
+ * Defines the HTTP Client and WebSocket APIs.
  *
  * @moduleGraph
- * @since 9
+ * @since 11
  */
-module jdk.incubator.httpclient {
-    exports jdk.incubator.http;
+module java.net.http {
+    exports java.net.http;
 }
diff --git a/src/java.se/share/classes/module-info.java b/src/java.se/share/classes/module-info.java
index fc7627b6ff5..96c1f21f0f1 100644
--- a/src/java.se/share/classes/module-info.java
+++ b/src/java.se/share/classes/module-info.java
@@ -48,6 +48,7 @@
     requires transitive java.management;
     requires transitive java.management.rmi;
     requires transitive java.naming;
+    requires transitive java.net.http;
     requires transitive java.prefs;
     requires transitive java.rmi;
     requires transitive java.scripting;
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
index d32cf55231f..24d60d05031 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
@@ -528,7 +528,7 @@ public void run () {
                     if (https) {
                         if (sslContext == null) {
                             logger.log (Level.WARNING,
-                                "SSL connection received. No https contxt created");
+                                "SSL connection received. No https context created");
                             throw new HttpError ("No SSL context established");
                         }
                         sslStreams = new SSLStreams (ServerImpl.this, sslContext, chan);
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java
deleted file mode 100644
index 1ff5daa372f..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java
+++ /dev/null
@@ -1,793 +0,0 @@
-/*
- * Copyright (c) 2015, 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;
-
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URLPermission;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.time.Duration;
-import java.util.Iterator;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Flow;
-import java.util.function.Supplier;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-/**
- * Represents one HTTP request which can be sent to a server.
- * {@Incubating }
- *
- * <p> {@code HttpRequest} instances are built from {@code HttpRequest}
- * {@linkplain HttpRequest.Builder builders}. {@code HttpRequest} builders
- * are obtained by calling {@link HttpRequest#newBuilder(URI) HttpRequest.newBuilder}.
- * A request's {@linkplain URI}, headers and body can be set. Request bodies are
- * provided through a {@link BodyPublisher} object supplied to the
- * {@link Builder#DELETE(BodyPublisher) DELETE},
- * {@link Builder#POST(BodyPublisher) POST} or
- * {@link Builder#PUT(BodyPublisher) PUT} methods.
- * {@link Builder#GET() GET} does not take a body. Once all required
- * parameters have been set in the builder, {@link Builder#build() } is called
- * to return the {@code HttpRequest}. Builders can also be copied and modified
- * multiple times in order to build multiple related requests that differ in
- * some parameters.
- *
- * <p> Two simple, example HTTP interactions are shown below:
- * <pre>
- * {@code
- *      HttpClient client = HttpClient.newHttpClient();
- *
- *      // GET
- *      HttpResponse<String> response = client.send(
- *          HttpRequest
- *              .newBuilder(new URI("http://www.foo.com/"))
- *              .headers("Foo", "foovalue", "Bar", "barvalue")
- *              .GET()
- *              .build(),
- *          BodyHandler.asString()
- *      );
- *      int statusCode = response.statusCode();
- *      String body = response.body();
- *
- *      // POST
- *      HttpResponse<Path> response = client.send(
- *          HttpRequest
- *              .newBuilder(new URI("http://www.foo.com/"))
- *              .headers("Foo", "foovalue", "Bar", "barvalue")
- *              .POST(BodyPublisher.fromString("Hello world"))
- *              .build(),
- *          BodyHandler.asFile(Paths.get("/path"))
- *      );
- *      int statusCode = response.statusCode();
- *      Path body = response.body(); // should be "/path"
- * }
- * </pre>
- *
- * <p> The request is sent and the response obtained by calling one of the
- * following methods in {@link HttpClient}.
- * <ul><li>{@link HttpClient#send(HttpRequest, HttpResponse.BodyHandler)} blocks
- * until the entire request has been sent and the response has been received.</li>
- * <li>{@link HttpClient#sendAsync(HttpRequest,HttpResponse.BodyHandler)} sends the
- * request and receives the response asynchronously. Returns immediately with a
- * {@link java.util.concurrent.CompletableFuture CompletableFuture}&lt;{@link
- * HttpResponse}&gt;.</li>
- * <li>{@link HttpClient#sendAsync(HttpRequest, HttpResponse.MultiSubscriber) }
- * sends the request asynchronously, expecting multiple responses. This
- * capability is of most relevance to HTTP/2 server push, but can be used for
- * single responses (HTTP/1.1 or HTTP/2) also.</li>
- * </ul>
- *
- * <p> Once a {@link HttpResponse} is received, the headers, response code
- * and body (typically) are available. Whether the body has been read or not
- * depends on the type {@code <T>} of the response body. See below.
- *
- * <p> See below for discussion of synchronous versus asynchronous usage.
- *
- * <p> <b>Request bodies</b>
- *
- * <p> Request bodies can be sent using one of the convenience request publisher
- * implementations below, provided in {@link BodyPublisher}. Alternatively, a
- * custom Publisher implementation can be used.
- * <ul>
- * <li>{@link BodyPublisher#fromByteArray(byte[]) fromByteArray(byte[])} from byte array</li>
- * <li>{@link BodyPublisher#fromByteArrays(Iterable) fromByteArrays(Iterable)}
- *      from an Iterable of byte arrays</li>
- * <li>{@link BodyPublisher#fromFile(java.nio.file.Path) fromFile(Path)} from the file located
- *     at the given Path</li>
- * <li>{@link BodyPublisher#fromString(java.lang.String) fromString(String)} from a String </li>
- * <li>{@link BodyPublisher#fromInputStream(Supplier) fromInputStream}({@link Supplier}&lt;
- *      {@link InputStream}&gt;) from an InputStream obtained from a Supplier</li>
- * <li>{@link BodyPublisher#noBody() } no request body is sent</li>
- * </ul>
- *
- * <p> <b>Response bodies</b>
- *
- * <p> Responses bodies are handled at two levels. When sending the request,
- * a response body handler is specified. This is a function ({@linkplain
- * HttpResponse.BodyHandler}) which will be called with the response status code
- * and headers, once they are received. This function is then expected to return
- * a {@link HttpResponse.BodySubscriber}{@code <T>} which is then used to read
- * the response body, converting it into an instance of T. After this occurs,
- * the response becomes available in a {@link HttpResponse}, and {@link
- * HttpResponse#body()} can then be called to obtain the actual body. Some
- * implementations and examples of usage of both {@link
- * HttpResponse.BodySubscriber} and {@link HttpResponse.BodyHandler} are
- * provided in {@link HttpResponse}:
- *
- * <p> <b>Some of the pre-defined body handlers</b><br>
- * <ul>
- * <li>{@link HttpResponse.BodyHandler#asByteArray() BodyHandler.asByteArray()}
- * stores the body in a byte array</li>
- * <li>{@link HttpResponse.BodyHandler#asString() BodyHandler.asString()}
- * stores the body as a String </li>
- * <li>{@link HttpResponse.BodyHandler#asFile(java.nio.file.Path)
- * BodyHandler.asFile(Path)} stores the body in a named file</li>
- * <li>{@link HttpResponse.BodyHandler#discard(Object) BodyHandler.discard()}
- * discards the response body and returns the given value instead.</li>
- * </ul>
- *
- * <p> <b>Multi responses</b>
- *
- * <p> With HTTP/2 it is possible for a server to return a main response and zero
- * or more additional responses (known as server pushes) to a client-initiated
- * request. These are handled using a special response subscriber called {@link
- * HttpResponse.MultiSubscriber}.
- *
- * <p> <b>Blocking/asynchronous behavior and thread usage</b>
- *
- * <p> There are two styles of request sending: <i>synchronous</i> and
- * <i>asynchronous</i>. {@link HttpClient#send(HttpRequest, HttpResponse.BodyHandler) }
- * blocks the calling thread until the request has been sent and the response received.
- *
- * <p> {@link HttpClient#sendAsync(HttpRequest, HttpResponse.BodyHandler)} is
- * asynchronous and returns immediately with a {@link CompletableFuture}&lt;{@link
- * HttpResponse}&gt; and when this object completes (possibly in a different
- * thread) the response has been received.
- *
- * <p> {@link HttpClient#sendAsync(HttpRequest, HttpResponse.MultiSubscriber)}
- * is the variant for multi responses and is also asynchronous.
- *
- * <p> Instances of {@code CompletableFuture} can be combined in different ways
- * to declare the dependencies among several asynchronous tasks, while allowing
- * for the maximum level of parallelism to be utilized.
- *
- * <p> <a id="securitychecks"></a><b>Security checks</b></a>
- *
- * <p> If a security manager is present then security checks are performed by
- * the HTTP Client's sending methods. An appropriate {@link URLPermission} is
- * required to access the destination server, and proxy server if one has
- * been configured. The {@code URLPermission} form used to access proxies uses a
- * method parameter of {@code "CONNECT"} (for all kinds of proxying) and a URL
- * string  of the form {@code "socket://host:port"} where host and port specify
- * the proxy's address.
- *
- * <p> In this implementation, if an explicit {@linkplain
- * HttpClient.Builder#executor(Executor) executor} has not been set for an
- * {@code HttpClient}, and a security manager has been installed, then the
- * default executor will execute asynchronous and dependent tasks in a context
- * that is granted no permissions. Custom {@linkplain HttpRequest.BodyPublisher
- * request body publishers}, {@linkplain HttpResponse.BodyHandler response body
- * handlers}, {@linkplain HttpResponse.BodySubscriber response body subscribers},
- * and {@linkplain WebSocket.Listener WebSocket Listeners}, if executing
- * operations that require privileges, should do so  within an appropriate
- * {@linkplain AccessController#doPrivileged(PrivilegedAction) privileged context}.
- *
- * <p> <b>Examples</b>
- * <pre>{@code
- *      HttpClient client = HttpClient
- *              .newBuilder()
- *              .build();
- *
- *      HttpRequest request = HttpRequest
- *              .newBuilder(new URI("http://www.foo.com/"))
- *              .POST(BodyPublisher.fromString("Hello world"))
- *              .build();
- *
- *      HttpResponse<Path> response =
- *          client.send(request, BodyHandler.asFile(Paths.get("/path")));
- *
- *      Path body = response.body();
- * }</pre>
- *
- * <p><b>Asynchronous Example</b>
- *
- * <p> The above example will work asynchronously, if {@link HttpClient#sendAsync
- * (HttpRequest, HttpResponse.BodyHandler) sendAsync} is used instead of
- * {@link HttpClient#send(HttpRequest,HttpResponse.BodyHandler) send}
- * in which case the returned object is a {@link CompletableFuture}{@code <HttpResponse>}
- * instead of {@link HttpResponse}. The following example shows how multiple requests
- * can be sent asynchronously. It also shows how dependent asynchronous operations
- * (receiving response, and receiving response body) can be chained easily using
- * one of the many methods in {@code CompletableFuture}.
- * <pre>
- * {@code
- *  // fetch a list of target URIs asynchronously and store them in Files.
- *
- *      List<URI> targets = ...
- *
- *      List<CompletableFuture<File>> futures = targets
- *          .stream()
- *          .map(target -> client
- *                  .sendAsync(
- *                      HttpRequest.newBuilder(target)
- *                                 .GET()
- *                                 .build(),
- *                      BodyHandler.asFile(Paths.get("base", target.getPath())))
- *                  .thenApply(response -> response.body())
- *                  .thenApply(path -> path.toFile()))
- *          .collect(Collectors.toList());
- *
- *      // all async operations waited for here
- *
- *      CompletableFuture.allOf(futures.toArray(new CompletableFuture<?>[0]))
- *          .join();
- *
- *      // all elements of futures have completed and can be examined.
- *      // Use File.exists() to check whether file was successfully downloaded
- * }
- * </pre>
- *
- * <p> Unless otherwise stated, {@code null} parameter values will cause methods
- * of this class to throw {@code NullPointerException}.
- *
- * @since 9
- */
-public abstract class HttpRequest {
-
-    /**
-     * Creates an HttpRequest.
-     */
-    protected HttpRequest() {}
-
-    /**
-     * A builder of {@linkplain HttpRequest HTTP Requests}.
-     * {@Incubating}
-     *
-     * <p> Instances of {@code HttpRequest.Builder} are created by calling {@link
-     * HttpRequest#newBuilder(URI)} or {@link HttpRequest#newBuilder()}.
-     *
-     * <p> Each of the setter methods in this class modifies the state of the
-     * builder and returns <i>this</i> (ie. the same instance). The methods are
-     * not synchronized and should not be called from multiple threads without
-     * external synchronization.
-     *
-     * <p> Note, that not all request headers may be set by user code. Some are
-     * restricted for security reasons and others such as the headers relating
-     * to authentication, redirection and cookie management are managed by
-     * specific APIs rather than through directly user set headers.
-     *
-     * <p> The {@linkplain #build() build} method returns a new {@code
-     * HttpRequest} each time it is invoked.
-     *
-     * @since 9
-     */
-    public abstract static class Builder {
-
-        /**
-         * Creates a Builder.
-         */
-        protected Builder() {}
-
-        /**
-         * Sets this {@code HttpRequest}'s request {@code URI}.
-         *
-         * @param uri the request URI
-         * @return this request builder
-         * @throws IllegalArgumentException if the {@code URI} scheme is not
-         *         supported
-         */
-        public abstract Builder uri(URI uri);
-
-        /**
-         * Requests the server to acknowledge the request before sending the
-         * body. This is disabled by default. If enabled, the server is
-         * requested to send an error response or a {@code 100 Continue}
-         * response before the client sends the request body. This means the
-         * request publisher for the request will not be invoked until this
-         * interim response is received.
-         *
-         * @param enable {@code true} if Expect continue to be sent
-         * @return this request builder
-         */
-        public abstract Builder expectContinue(boolean enable);
-
-        /**
-         * Sets the preferred {@link HttpClient.Version} for this request.
-         *
-         * <p> The corresponding {@link HttpResponse} should be checked for the
-         * version that was actually used. If the version is not set in a
-         * request, then the version requested will be that of the sending
-         * {@link HttpClient}.
-         *
-         * @param version the HTTP protocol version requested
-         * @return this request builder
-         */
-        public abstract Builder version(HttpClient.Version version);
-
-        /**
-         * Adds the given name value pair to the set of headers for this request.
-         * The given value is added to the list of values for that name.
-         *
-         * @param name the header name
-         * @param value the header value
-         * @return this request builder
-         * @throws IllegalArgumentException if the header name or value is not
-         *         valid, see <a href="https://tools.ietf.org/html/rfc7230#section-3.2">
-         *         RFC 7230 section-3.2</a>
-         */
-        public abstract Builder header(String name, String value);
-
-        /**
-         * Adds the given name value pairs to the set of headers for this
-         * request. The supplied {@code String} instances must alternate as
-         * header names and header values.
-         * To add several values to the same name then the same name must
-         * be supplied with each new value.
-         *
-         * @param headers the list of name value pairs
-         * @return this request builder
-         * @throws IllegalArgumentException if there are an odd number of
-         *         parameters, or if a header name or value is not valid, see
-         *         <a href="https://tools.ietf.org/html/rfc7230#section-3.2">
-         *         RFC 7230 section-3.2</a>
-         */
-        public abstract Builder headers(String... headers);
-
-        /**
-         * Sets a timeout for this request. If the response is not received
-         * within the specified timeout then a {@link HttpTimeoutException} is
-         * thrown from {@link HttpClient#send(jdk.incubator.http.HttpRequest,
-         * jdk.incubator.http.HttpResponse.BodyHandler) HttpClient::send} or
-         * {@link HttpClient#sendAsync(jdk.incubator.http.HttpRequest,
-         * jdk.incubator.http.HttpResponse.BodyHandler) HttpClient::sendAsync}
-         * completes exceptionally with a {@code HttpTimeoutException}. The effect
-         * of not setting a timeout is the same as setting an infinite Duration, ie.
-         * block forever.
-         *
-         * @param duration the timeout duration
-         * @return this request builder
-         * @throws IllegalArgumentException if the duration is non-positive
-         */
-        public abstract Builder timeout(Duration duration);
-
-        /**
-         * Sets the given name value pair to the set of headers for this
-         * request. This overwrites any previously set values for name.
-         *
-         * @param name the header name
-         * @param value the header value
-         * @return this request builder
-         * @throws IllegalArgumentException if the header name or value is not valid,
-         *         see <a href="https://tools.ietf.org/html/rfc7230#section-3.2">
-         *         RFC 7230 section-3.2</a>
-         */
-        public abstract Builder setHeader(String name, String value);
-
-        /**
-         * Sets the request method of this builder to GET.
-         * This is the default.
-         *
-         * @return a {@code HttpRequest}
-         */
-        public abstract Builder GET();
-
-        /**
-         * Sets the request method of this builder to POST and sets its
-         * request body publisher to the given value.
-         *
-         * @param bodyPublisher the body publisher
-         *
-         * @return a {@code HttpRequest}
-         */
-        public abstract Builder POST(BodyPublisher bodyPublisher);
-
-        /**
-         * Sets the request method of this builder to PUT and sets its
-         * request body publisher to the given value.
-         *
-         * @param bodyPublisher the body publisher
-         *
-         * @return a {@code HttpRequest}
-         */
-        public abstract Builder PUT(BodyPublisher bodyPublisher);
-
-        /**
-         * Sets the request method of this builder to DELETE and sets its
-         * request body publisher to the given value.
-         *
-         * @param bodyPublisher the body publisher
-         *
-         * @return a {@code HttpRequest}
-         */
-
-        public abstract Builder DELETE(BodyPublisher bodyPublisher);
-
-        /**
-         * Sets the request method and request body of this builder to the
-         * given values.
-         *
-         * @apiNote The {@linkplain BodyPublisher#noBody() noBody} request
-         * body publisher can be used where no request body is required or
-         * appropriate.
-         *
-         * @param method the method to use
-         * @param bodyPublisher the body publisher
-         * @return a {@code HttpRequest}
-         * @throws IllegalArgumentException if the method is unrecognised
-         */
-        public abstract Builder method(String method, BodyPublisher bodyPublisher);
-
-        /**
-         * Builds and returns a {@link HttpRequest}.
-         *
-         * @return the request
-         * @throws IllegalStateException if a URI has not been set
-         */
-        public abstract HttpRequest build();
-
-        /**
-         * Returns an exact duplicate copy of this {@code Builder} based on
-         * current state. The new builder can then be modified independently of
-         * this builder.
-         *
-         * @return an exact copy of this Builder
-         */
-        public abstract Builder copy();
-    }
-
-    /**
-     * Creates a {@code HttpRequest} builder.
-     *
-     * @param uri the request URI
-     * @return a new request builder
-     * @throws IllegalArgumentException if the URI scheme is not supported.
-     */
-    public static HttpRequest.Builder newBuilder(URI uri) {
-        return new HttpRequestBuilderImpl(uri);
-    }
-
-    /**
-     * Creates a {@code HttpRequest} builder.
-     *
-     * @return a new request builder
-     */
-    public static HttpRequest.Builder newBuilder() {
-        return new HttpRequestBuilderImpl();
-    }
-
-    /**
-     * Returns an {@code Optional} containing the {@link BodyPublisher} set on
-     * this request. If no {@code BodyPublisher} was set in the requests's
-     * builder, then the {@code Optional} is empty.
-     *
-     * @return an {@code Optional} containing this request's {@code BodyPublisher}
-     */
-    public abstract Optional<BodyPublisher> bodyPublisher();
-
-    /**
-     * Returns the request method for this request. If not set explicitly,
-     * the default method for any request is "GET".
-     *
-     * @return this request's method
-     */
-    public abstract String method();
-
-    /**
-     * Returns an {@code Optional} containing this request's timeout duration.
-     * If the timeout duration was not set in the request's builder, then the
-     * {@code Optional} is empty.
-     *
-     * @return an {@code Optional} containing this request's timeout duration
-     */
-    public abstract Optional<Duration> timeout();
-
-    /**
-     * Returns this request's {@link HttpRequest.Builder#expectContinue(boolean)
-     * expect continue } setting.
-     *
-     * @return this request's expect continue setting
-     */
-    public abstract boolean expectContinue();
-
-    /**
-     * Returns this request's request {@code URI}.
-     *
-     * @return this request's URI
-     */
-    public abstract URI uri();
-
-    /**
-     * Returns an {@code Optional} containing the HTTP protocol version that
-     * will be requested for this {@code HttpRequest}. If the version was not
-     * set in the request's builder, then the {@code Optional} is empty.
-     * In that case, the version requested will be that of the sending
-     * {@link HttpClient}. The corresponding {@link HttpResponse} should be
-     * queried to determine the version that was actually used.
-     *
-     * @return HTTP protocol version
-     */
-    public abstract Optional<HttpClient.Version> version();
-
-    /**
-     * The (user-accessible) request headers that this request was (or will be)
-     * sent with.
-     *
-     * @return this request's HttpHeaders
-     */
-    public abstract HttpHeaders headers();
-
-    /**
-     * Tests this HTTP request instance for equality with the given object.
-     *
-     * <p> If the given object is not an {@code HttpRequest} then this
-     * method returns {@code false}. Two HTTP requests are equal if their URI,
-     * method, and headers fields are all equal.
-     *
-     * <p> This method satisfies the general contract of the {@link
-     * Object#equals(Object) Object.equals} method.
-     *
-     * @param obj the object to which this object is to be compared
-     * @return {@code true} if, and only if, the given object is an {@code
-     *         HttpRequest} that is equal to this HTTP request
-     */
-    @Override
-    public final boolean equals(Object obj) {
-       if (! (obj instanceof HttpRequest))
-           return false;
-       HttpRequest that = (HttpRequest)obj;
-       if (!that.method().equals(this.method()))
-           return false;
-       if (!that.uri().equals(this.uri()))
-           return false;
-       if (!that.headers().equals(this.headers()))
-           return false;
-       return true;
-    }
-
-    /**
-     * Computes a hash code for this HTTP request instance.
-     *
-     * <p> The hash code is based upon the HTTP request's URI, method, and
-     * header components, and satisfies the general contract of the
-     * {@link Object#hashCode Object.hashCode} method.
-     *
-     * @return the hash-code value for this HTTP request
-     */
-    public final int hashCode() {
-        return method().hashCode()
-                + uri().hashCode()
-                + headers().hashCode();
-    }
-
-    /**
-     * A Publisher which converts high level Java objects into flows of
-     * byte buffers suitable for sending as request bodies.
-     * {@Incubating}
-     *
-     * <p> The {@code BodyPublisher} class implements {@link Flow.Publisher
-     * Flow.Publisher&lt;ByteBuffer&gt;} which means that a {@code BodyPublisher}
-     * acts as a publisher of {@linkplain ByteBuffer byte buffers}.
-     *
-     * <p> The HTTP client implementation subscribes to the publisher in order
-     * to receive the flow of outgoing data buffers. The normal semantics of
-     * {@link Flow.Subscriber} and {@link Flow.Publisher} are implemented by the
-     * library and are expected from publisher implementations. Each outgoing
-     * request results in one {@code Subscriber} subscribing to the {@code
-     * BodyPublisher} in order to provide the sequence of byte buffers
-     * containing the request body.
-     * Instances of {@code ByteBuffer} published  by the publisher must be
-     * allocated by the publisher, and must not be accessed after being handed
-     * over to the library.
-     * These subscriptions complete normally when the request is fully sent,
-     * and can be canceled or terminated early through error. If a request
-     * needs to be resent for any reason, then a new subscription is created
-     * which is expected to generate the same data as before.
-     *
-     * <p> A publisher that reports a {@linkplain #contentLength() content
-     * length} of {@code 0} may not be subscribed to by the HTTP client
-     * implementation, as it has effectively no data to publish.
-     */
-    public interface BodyPublisher extends Flow.Publisher<ByteBuffer> {
-
-        /**
-         * Returns a request body publisher whose body is retrieved from the
-         * given {@code Flow.Publisher}. The returned request body publisher
-         * has an unknown content length.
-         *
-         * @apiNote This method can be used as an adapter between {@code
-         * BodyPublisher} and {@code Flow.Publisher}, where the amount of
-         * request body that the publisher will publish is unknown.
-         *
-         * @param publisher the publisher responsible for publishing the body
-         * @return a BodyPublisher
-         */
-        static BodyPublisher fromPublisher(Flow.Publisher<? extends ByteBuffer> publisher) {
-            return new RequestPublishers.PublisherAdapter(publisher, -1L);
-        }
-
-        /**
-         * Returns a request body publisher whose body is retrieved from the
-         * given {@code Flow.Publisher}. The returned request body publisher
-         * has the given content length.
-         *
-         * <p> The given {@code contentLength} is a positive number, that
-         * represents the exact amount of bytes the {@code publisher} must
-         * publish.
-         *
-         * @apiNote This method can be used as an adapter between {@code
-         * BodyPublisher} and {@code Flow.Publisher}, where the amount of
-         * request body that the publisher will publish is known.
-         *
-         * @param publisher the publisher responsible for publishing the body
-         * @param contentLength a positive number representing the exact
-         *                      amount of bytes the publisher will publish
-         * @throws IllegalArgumentException if the content length is
-         *                                  non-positive
-         * @return a BodyPublisher
-         */
-        static BodyPublisher fromPublisher(Flow.Publisher<? extends ByteBuffer> publisher,
-                                           long contentLength) {
-            if (contentLength < 1)
-                throw new IllegalArgumentException("non-positive contentLength: " + contentLength);
-            return new RequestPublishers.PublisherAdapter(publisher, contentLength);
-        }
-
-        /**
-         * Returns a request body publisher whose body is the given {@code
-         * String}, converted using the {@link StandardCharsets#UTF_8 UTF_8}
-         * character set.
-         *
-         * @param body the String containing the body
-         * @return a BodyPublisher
-         */
-        static BodyPublisher fromString(String body) {
-            return fromString(body, UTF_8);
-        }
-
-        /**
-         * Returns a request body publisher whose body is the given {@code
-         * String}, converted using the given character set.
-         *
-         * @param s the String containing the body
-         * @param charset the character set to convert the string to bytes
-         * @return a BodyPublisher
-         */
-        static BodyPublisher fromString(String s, Charset charset) {
-            return new RequestPublishers.StringPublisher(s, charset);
-        }
-
-        /**
-         * A request body publisher that reads its data from an {@link
-         * InputStream}. A {@link Supplier} of {@code InputStream} is used in
-         * case the request needs to be repeated, as the content is not buffered.
-         * The {@code Supplier} may return {@code null} on subsequent attempts,
-         * in which case the request fails.
-         *
-         * @param streamSupplier a Supplier of open InputStreams
-         * @return a BodyPublisher
-         */
-        // TODO (spec): specify that the stream will be closed
-        static BodyPublisher fromInputStream(Supplier<? extends InputStream> streamSupplier) {
-            return new RequestPublishers.InputStreamPublisher(streamSupplier);
-        }
-
-        /**
-         * Returns a request body publisher whose body is the given byte array.
-         *
-         * @param buf the byte array containing the body
-         * @return a BodyPublisher
-         */
-        static BodyPublisher fromByteArray(byte[] buf) {
-            return new RequestPublishers.ByteArrayPublisher(buf);
-        }
-
-        /**
-         * Returns a request body publisher whose body is the content of the
-         * given byte array of {@code length} bytes starting from the specified
-         * {@code offset}.
-         *
-         * @param buf the byte array containing the body
-         * @param offset the offset of the first byte
-         * @param length the number of bytes to use
-         * @return a BodyPublisher
-         * @throws IndexOutOfBoundsException if the sub-range is defined to be
-         *                                   out-of-bounds
-         */
-        static BodyPublisher fromByteArray(byte[] buf, int offset, int length) {
-            Objects.checkFromIndexSize(offset, length, buf.length);
-            return new RequestPublishers.ByteArrayPublisher(buf, offset, length);
-        }
-
-        private static String pathForSecurityCheck(Path path) {
-            return path.toFile().getPath();
-        }
-
-        /**
-         * A request body publisher that takes data from the contents of a File.
-         *
-         * @param path the path to the file containing the body
-         * @return a BodyPublisher
-         * @throws java.io.FileNotFoundException if the path is not found
-         * @throws SecurityException if a security manager has been installed
-         *          and it denies {@link SecurityManager#checkRead(String)
-         *          read access} to the given file
-         */
-        static BodyPublisher fromFile(Path path) throws FileNotFoundException {
-            Objects.requireNonNull(path);
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null)
-                sm.checkRead(pathForSecurityCheck(path));
-            if (Files.notExists(path))
-                throw new FileNotFoundException(path + " not found");
-            return new RequestPublishers.FilePublisher(path);
-        }
-
-        /**
-         * A request body publisher that takes data from an {@code Iterable}
-         * of byte arrays. An {@link Iterable} is provided which supplies
-         * {@link Iterator} instances. Each attempt to send the request results
-         * in one invocation of the {@code Iterable}.
-         *
-         * @param iter an Iterable of byte arrays
-         * @return a BodyPublisher
-         */
-        static BodyPublisher fromByteArrays(Iterable<byte[]> iter) {
-            return new RequestPublishers.IterablePublisher(iter);
-        }
-
-        /**
-         * A request body publisher which sends no request body.
-         *
-         * @return a BodyPublisher which completes immediately and sends
-         *         no request body.
-         */
-        static BodyPublisher noBody() {
-            return new RequestPublishers.EmptyPublisher();
-        }
-
-        /**
-         * Returns the content length for this request body. May be zero
-         * if no request body being sent, greater than zero for a fixed
-         * length content, or less than zero for an unknown content length.
-         *
-         * This method may be invoked before the publisher is subscribed to.
-         * This method may be invoked more than once by the HTTP client
-         * implementation, and MUST return the same constant value each time.
-         *
-         * @return the content length for this request body, if known
-         */
-        long contentLength();
-    }
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java
deleted file mode 100644
index 1945cc6b1be..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java
+++ /dev/null
@@ -1,1102 +0,0 @@
-/*
- * Copyright (c) 2015, 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;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import jdk.incubator.http.ResponseSubscribers.MultiSubscriberImpl;
-import static jdk.incubator.http.internal.common.Utils.unchecked;
-import static jdk.incubator.http.internal.common.Utils.charsetFrom;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.channels.FileChannel;
-import java.nio.file.OpenOption;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.security.AccessControlContext;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Flow;
-import java.util.concurrent.Flow.Subscriber;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import javax.net.ssl.SSLParameters;
-
-/**
- * Represents a response to a {@link HttpRequest}.
- * {@Incubating}
- *
- * <p> A {@code HttpResponse} is available when the response status code and
- * headers have been received, and typically after the response body has also
- * been received. This depends on the response body handler provided when
- * sending the request. In all cases, the response body handler is invoked
- * before the body is read. This gives applications an opportunity to decide
- * how to handle the body.
- *
- * <p> Methods are provided in this class for accessing the response headers,
- * and response body.
- *
- * <p><b>Response handlers and subscribers</b>
- *
- * <p> Response bodies are handled at two levels. Application code supplies a
- * response handler ({@link BodyHandler}) which may examine the response status
- * code and headers, and which then returns a {@link BodySubscriber} to actually
- * read (or discard) the body and convert it into some useful Java object type.
- * The handler can return one of the pre-defined subscriber types, or a custom
- * subscriber, or if the body is to be discarded it can call {@link
- * BodySubscriber#discard(Object) discard} and return a subscriber which
- * discards the response body. Static implementations of both handlers and
- * subscribers are provided in {@linkplain BodyHandler BodyHandler} and
- * {@linkplain BodySubscriber BodySubscriber} respectively. In all cases, the
- * handler functions provided are convenience implementations which ignore the
- * supplied status code and headers and return the relevant pre-defined {@code
- * BodySubscriber}.
- *
- * <p> See {@link BodyHandler} for example usage.
- *
- * @param <T> the response body type
- * @since 9
- */
-public abstract class HttpResponse<T> {
-
-    /**
-     * Creates an HttpResponse.
-     */
-    protected HttpResponse() { }
-
-    /**
-     * Returns the status code for this response.
-     *
-     * @return the response code
-     */
-    public abstract int statusCode();
-
-    /**
-     * Returns the {@link HttpRequest} corresponding to this response.
-     *
-     * <p> This may not be the original request provided by the caller,
-     * for example, if that request was redirected.
-     *
-     * @see #previousResponse()
-     *
-     * @return the request
-     */
-    public abstract HttpRequest request();
-
-    /**
-     * Returns an {@code Optional} containing the previous intermediate response
-     * if one was received. An intermediate response is one that is received
-     * as a result of redirection or authentication. If no previous response
-     * was received then an empty {@code Optional} is returned.
-     *
-     * @return an Optional containing the HttpResponse, if any.
-     */
-    public abstract Optional<HttpResponse<T>> previousResponse();
-
-    /**
-     * Returns the received response headers.
-     *
-     * @return the response headers
-     */
-    public abstract HttpHeaders headers();
-
-    /**
-     * Returns the body. Depending on the type of {@code T}, the returned body
-     * may represent the body after it was read (such as {@code byte[]}, or
-     * {@code String}, or {@code Path}) or it may represent an object with
-     * which the body is read, such as an {@link java.io.InputStream}.
-     *
-     * <p> If this {@code HttpResponse} was returned from an invocation of
-     * {@link #previousResponse()} then this method returns {@code null}
-     *
-     * @return the body
-     */
-    public abstract T body();
-
-    /**
-     * Returns the {@link javax.net.ssl.SSLParameters} in effect for this
-     * response. Returns {@code null} if this is not a HTTPS response.
-     *
-     * @return the SSLParameters associated with the response
-     */
-    public abstract SSLParameters sslParameters();
-
-    /**
-     * Returns the {@code URI} that the response was received from. This may be
-     * different from the request {@code URI} if redirection occurred.
-     *
-     * @return the URI of the response
-     */
-    public abstract URI uri();
-
-    /**
-     * Returns the HTTP protocol version that was used for this response.
-     *
-     * @return HTTP protocol version
-     */
-    public abstract HttpClient.Version version();
-
-
-    private static String pathForSecurityCheck(Path path) {
-        return path.toFile().getPath();
-    }
-
-    /** A body handler that is further restricted by a given ACC. */
-    interface UntrustedBodyHandler<T> extends BodyHandler<T> {
-        void setAccessControlContext(AccessControlContext acc);
-    }
-
-    /**
-     * A Path body handler.
-     *
-     * Note: Exists mainly too allow setting of the senders ACC post creation of
-     * the handler.
-     */
-    static class PathBodyHandler implements UntrustedBodyHandler<Path> {
-        private final Path file;
-        private final OpenOption[]openOptions;
-        private volatile AccessControlContext acc;
-
-        PathBodyHandler(Path file, OpenOption... openOptions) {
-            this.file = file;
-            this.openOptions = openOptions;
-        }
-
-        @Override
-        public void setAccessControlContext(AccessControlContext acc) {
-            this.acc = acc;
-        }
-
-        @Override
-        public BodySubscriber<Path> apply(int statusCode, HttpHeaders headers) {
-            ResponseSubscribers.PathSubscriber bs = (ResponseSubscribers.PathSubscriber)
-                    BodySubscriber.asFileImpl(file, openOptions);
-            bs.setAccessControlContext(acc);
-            return bs;
-        }
-    }
-
-    // Similar to Path body handler, but for file download. Supports setting ACC.
-    static class FileDownloadBodyHandler implements UntrustedBodyHandler<Path> {
-        private final Path directory;
-        private final OpenOption[]openOptions;
-        private volatile AccessControlContext acc;
-
-        FileDownloadBodyHandler(Path directory, OpenOption... openOptions) {
-            this.directory = directory;
-            this.openOptions = openOptions;
-        }
-
-        @Override
-        public void setAccessControlContext(AccessControlContext acc) {
-            this.acc = acc;
-        }
-
-        @Override
-        public BodySubscriber<Path> apply(int statusCode, HttpHeaders headers) {
-            String dispoHeader = headers.firstValue("Content-Disposition")
-                    .orElseThrow(() -> unchecked(new IOException("No Content-Disposition")));
-            if (!dispoHeader.startsWith("attachment;")) {
-                throw unchecked(new IOException("Unknown Content-Disposition type"));
-            }
-            int n = dispoHeader.indexOf("filename=");
-            if (n == -1) {
-                throw unchecked(new IOException("Bad Content-Disposition type"));
-            }
-            int lastsemi = dispoHeader.lastIndexOf(';');
-            String disposition;
-            if (lastsemi < n) {
-                disposition = dispoHeader.substring(n + 9);
-            } else {
-                disposition = dispoHeader.substring(n + 9, lastsemi);
-            }
-            Path file = Paths.get(directory.toString(), disposition);
-
-            ResponseSubscribers.PathSubscriber bs = (ResponseSubscribers.PathSubscriber)
-                    BodySubscriber.asFileImpl(file, openOptions);
-            bs.setAccessControlContext(acc);
-            return bs;
-        }
-    }
-
-    /**
-     * A handler for response bodies.
-     * {@Incubating}
-     *
-     * <p> This is a function that takes two parameters: the response status code,
-     * and the response headers, and which returns a {@linkplain BodySubscriber}.
-     * The function is always called just before the response body is read. Its
-     * implementation may examine the status code or headers and must decide,
-     * whether to accept the response body or discard it, and if accepting it,
-     * exactly how to handle it.
-     *
-     * <p> Some pre-defined implementations which do not utilize the status code
-     * or headers (meaning the body is always accepted) are defined:
-     * <ul><li>{@link #asByteArray() }</li>
-     * <li>{@link #asByteArrayConsumer(java.util.function.Consumer)
-     * asByteArrayConsumer(Consumer)}</li>
-     * <li>{@link #asString(java.nio.charset.Charset) asString(Charset)}</li>
-     * <li>{@link #asFile(Path, OpenOption...)
-     * asFile(Path,OpenOption...)}</li>
-     * <li>{@link #asFileDownload(java.nio.file.Path,OpenOption...)
-     * asFileDownload(Path,OpenOption...)}</li>
-     * <li>{@link #asInputStream() asInputStream()}</li>
-     * <li>{@link #discard(Object) }</li>
-     * <li>{@link #buffering(BodyHandler, int)
-     * buffering(BodyHandler,int)}</li>
-     * </ul>
-     *
-     * <p> These implementations return the equivalent {@link BodySubscriber}.
-     * Alternatively, the handler can be used to examine the status code
-     * or headers and return different body subscribers as appropriate.
-     *
-     * <p><b>Examples of handler usage</b>
-     *
-     * <p> The first example uses one of the predefined handler functions which
-     * ignores the response headers and status, and always process the response
-     * body in the same way.
-     * <pre>
-     * {@code
-     *      HttpResponse<Path> resp = HttpRequest
-     *              .create(URI.create("http://www.foo.com"))
-     *              .GET()
-     *              .response(BodyHandler.asFile(Paths.get("/tmp/f")));
-     * }
-     * </pre>
-     * Note, that even though these pre-defined handlers ignore the status code
-     * and headers, this information is still accessible from the
-     * {@code HttpResponse} when it is returned.
-     *
-     * <p> In the second example, the function returns a different subscriber
-     * depending on the status code.
-     * <pre>
-     * {@code
-     *      HttpResponse<Path> resp1 = HttpRequest
-     *              .create(URI.create("http://www.foo.com"))
-     *              .GET()
-     *              .response(
-     *                  (status, headers) -> status == 200
-     *                      ? BodySubscriber.asFile(Paths.get("/tmp/f"))
-     *                      : BodySubscriber.discard(Paths.get("/NULL")));
-     * }
-     * </pre>
-     *
-     * @param <T> the response body type
-     */
-    @FunctionalInterface
-    public interface BodyHandler<T> {
-
-        /**
-         * Returns a {@link BodySubscriber BodySubscriber} considering the given
-         * response status code and headers. This method is always called before
-         * the body is read and its implementation can decide to keep the body
-         * and store it somewhere, or else discard it by returning the {@code
-         * BodySubscriber} returned from {@link BodySubscriber#discard(Object)
-         * discard}.
-         *
-         * @param statusCode the HTTP status code received
-         * @param responseHeaders the response headers received
-         * @return a body subscriber
-         */
-        public BodySubscriber<T> apply(int statusCode, HttpHeaders responseHeaders);
-
-        /**
-         * Returns a response body handler that returns a {@link BodySubscriber
-         * BodySubscriber}{@code <Void>} obtained from {@linkplain
-         * BodySubscriber#fromSubscriber(Subscriber)}, with the given
-         * {@code subscriber}.
-         *
-         * <p> The response body is not available through this, or the {@code
-         * HttpResponse} API, but instead all response body is forwarded to the
-         * given {@code subscriber}, which should make it available, if
-         * appropriate, through some other mechanism, e.g. an entry in a
-         * database, etc.
-         *
-         * @apiNote This method can be used as an adapter between {@code
-         * BodySubscriber} and {@code Flow.Subscriber}.
-         *
-         * <p> For example:
-         * <pre> {@code
-         *  TextSubscriber subscriber = new TextSubscriber();
-         *  HttpResponse<Void> response = client.sendAsync(request,
-         *      BodyHandler.fromSubscriber(subscriber)).join();
-         *  System.out.println(response.statusCode());
-         * }</pre>
-         *
-         * @param subscriber the subscriber
-         * @return a response body handler
-         */
-        public static BodyHandler<Void>
-        fromSubscriber(Subscriber<? super List<ByteBuffer>> subscriber) {
-            Objects.requireNonNull(subscriber);
-            return (status, headers) -> BodySubscriber.fromSubscriber(subscriber,
-                                                                      s -> null);
-        }
-
-        /**
-         * Returns a response body handler that returns a {@link BodySubscriber
-         * BodySubscriber}{@code <T>} obtained from {@link
-         * BodySubscriber#fromSubscriber(Subscriber, Function)}, with the
-         * given {@code subscriber} and {@code finisher} function.
-         *
-         * <p> The given {@code finisher} function is applied after the given
-         * subscriber's {@code onComplete} has been invoked. The {@code finisher}
-         * function is invoked with the given subscriber, and returns a value
-         * that is set as the response's body.
-         *
-         * @apiNote This method can be used as an adapter between {@code
-         * BodySubscriber} and {@code Flow.Subscriber}.
-         *
-         * <p> For example:
-         * <pre> {@code
-         * TextSubscriber subscriber = ...;  // accumulates bytes and transforms them into a String
-         * HttpResponse<String> response = client.sendAsync(request,
-         *     BodyHandler.fromSubscriber(subscriber, TextSubscriber::getTextResult)).join();
-         * String text = response.body();
-         * }</pre>
-         *
-         * @param <S> the type of the Subscriber
-         * @param <T> the type of the response body
-         * @param subscriber the subscriber
-         * @param finisher a function to be applied after the subscriber has completed
-         * @return a response body handler
-         */
-        public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodyHandler<T>
-        fromSubscriber(S subscriber, Function<S,T> finisher) {
-            Objects.requireNonNull(subscriber);
-            Objects.requireNonNull(finisher);
-            return (status, headers) -> BodySubscriber.fromSubscriber(subscriber,
-                                                                      finisher);
-        }
-
-        /**
-         * Returns a response body handler which discards the response body and
-         * uses the given value as a replacement for it.
-         *
-         * @param <U> the response body type
-         * @param value the value of U to return as the body, may be {@code null}
-         * @return a response body handler
-         */
-        public static <U> BodyHandler<U> discard(U value) {
-            return (status, headers) -> BodySubscriber.discard(value);
-        }
-
-        /**
-         * Returns a {@code BodyHandler<String>} that returns a
-         * {@link BodySubscriber BodySubscriber}{@code <String>} obtained from
-         * {@link BodySubscriber#asString(Charset) BodySubscriber.asString(Charset)}.
-         * The body is decoded using the given character set.
-         *
-         * @param charset the character set to convert the body with
-         * @return a response body handler
-         */
-        public static BodyHandler<String> asString(Charset charset) {
-            Objects.requireNonNull(charset);
-            return (status, headers) -> BodySubscriber.asString(charset);
-        }
-
-        /**
-         * Returns a {@code BodyHandler<Path>} that returns a
-         * {@link BodySubscriber BodySubscriber}{@code <Path>} obtained from
-         * {@link BodySubscriber#asFile(Path, OpenOption...)
-         * BodySubscriber.asFile(Path,OpenOption...)}.
-         *
-         * <p> When the {@code HttpResponse} object is returned, the body has
-         * been completely written to the file, and {@link #body()} returns a
-         * reference to its {@link Path}.
-         *
-         * @param file the filename to store the body in
-         * @param openOptions any options to use when opening/creating the file
-         * @return a response body handler
-         * @throws SecurityException If a security manager has been installed
-         *          and it denies {@link SecurityManager#checkWrite(String)
-         *          write access} to the file. The {@link
-         *          SecurityManager#checkDelete(String) checkDelete} method is
-         *          invoked to check delete access if the file is opened with
-         *          the {@code DELETE_ON_CLOSE} option.
-         */
-        public static BodyHandler<Path> asFile(Path file, OpenOption... openOptions) {
-            Objects.requireNonNull(file);
-            List<OpenOption> opts = List.of(openOptions);
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                String fn = pathForSecurityCheck(file);
-                sm.checkWrite(fn);
-                if (opts.contains(StandardOpenOption.DELETE_ON_CLOSE))
-                    sm.checkDelete(fn);
-                if (opts.contains(StandardOpenOption.READ))
-                    sm.checkRead(fn);
-            }
-            return new PathBodyHandler(file, openOptions);
-        }
-
-        /**
-         * Returns a {@code BodyHandler<Path>} that returns a
-         * {@link BodySubscriber BodySubscriber}{@code <Path>} obtained from
-         * {@link BodySubscriber#asFile(Path) BodySubscriber.asFile(Path)}.
-         *
-         * <p> When the {@code HttpResponse} object is returned, the body has
-         * been completely written to the file, and {@link #body()} returns a
-         * reference to its {@link Path}.
-         *
-         * @param file the file to store the body in
-         * @return a response body handler
-         * @throws SecurityException if a security manager has been installed
-         *          and it denies {@link SecurityManager#checkWrite(String)
-         *          write access} to the file
-         */
-        public static BodyHandler<Path> asFile(Path file) {
-            return BodyHandler.asFile(file, StandardOpenOption.CREATE,
-                                            StandardOpenOption.WRITE);
-        }
-
-        /**
-         * Returns a {@code BodyHandler<Path>} that returns a
-         * {@link BodySubscriber BodySubscriber}&lt;{@link Path}&gt;
-         * where the download directory is specified, but the filename is
-         * obtained from the {@code Content-Disposition} response header. The
-         * {@code Content-Disposition} header must specify the <i>attachment</i>
-         * type and must also contain a <i>filename</i> parameter. If the
-         * filename specifies multiple path components only the final component
-         * is used as the filename (with the given directory name).
-         *
-         * <p> When the {@code HttpResponse} object is returned, the body has
-         * been completely written to the file and {@link #body()} returns a
-         * {@code Path} object for the file. The returned {@code Path} is the
-         * combination of the supplied directory name and the file name supplied
-         * by the server. If the destination directory does not exist or cannot
-         * be written to, then the response will fail with an {@link IOException}.
-         *
-         * @param directory the directory to store the file in
-         * @param openOptions open options
-         * @return a response body handler
-         * @throws SecurityException If a security manager has been installed
-         *          and it denies {@link SecurityManager#checkWrite(String)
-         *          write access} to the file. The {@link
-         *          SecurityManager#checkDelete(String) checkDelete} method is
-         *          invoked to check delete access if the file is opened with
-         *          the {@code DELETE_ON_CLOSE} option.
-         */
-         //####: check if the dir exists and is writable??
-        public static BodyHandler<Path> asFileDownload(Path directory,
-                                                       OpenOption... openOptions) {
-            Objects.requireNonNull(directory);
-            List<OpenOption> opts = List.of(openOptions);
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                String fn = pathForSecurityCheck(directory);
-                sm.checkWrite(fn);
-                if (opts.contains(StandardOpenOption.DELETE_ON_CLOSE))
-                    sm.checkDelete(fn);
-                if (opts.contains(StandardOpenOption.READ))
-                    sm.checkRead(fn);
-            }
-            return new FileDownloadBodyHandler(directory, openOptions);
-        }
-
-        /**
-         * Returns a {@code BodyHandler<InputStream>} that returns a
-         * {@link BodySubscriber BodySubscriber}{@code <InputStream>} obtained
-         * from {@link BodySubscriber#asInputStream() BodySubscriber.asInputStream}.
-         *
-         * <p> When the {@code HttpResponse} object is returned, the response
-         * headers will have been completely read, but the body may not have
-         * been fully received yet. The {@link #body()} method returns an
-         * {@link InputStream} from which the body can be read as it is received.
-         *
-         * @apiNote See {@link BodySubscriber#asInputStream()} for more information.
-         *
-         * @return a response body handler
-         */
-        public static BodyHandler<InputStream> asInputStream() {
-            return (status, headers) -> BodySubscriber.asInputStream();
-        }
-
-        /**
-         * Returns a {@code BodyHandler<Void>} that returns a
-         * {@link BodySubscriber BodySubscriber}{@code <Void>} obtained from
-         * {@link BodySubscriber#asByteArrayConsumer(Consumer)
-         * BodySubscriber.asByteArrayConsumer(Consumer)}.
-         *
-         * <p> When the {@code HttpResponse} object is returned, the body has
-         * been completely written to the consumer.
-         *
-         * @param consumer a Consumer to accept the response body
-         * @return a response body handler
-         */
-        public static BodyHandler<Void> asByteArrayConsumer(Consumer<Optional<byte[]>> consumer) {
-            Objects.requireNonNull(consumer);
-            return (status, headers) -> BodySubscriber.asByteArrayConsumer(consumer);
-        }
-
-        /**
-         * Returns a {@code BodyHandler<byte[]>} that returns a
-         * {@link BodySubscriber BodySubscriber}&lt;{@code byte[]}&gt; obtained
-         * from {@link BodySubscriber#asByteArray() BodySubscriber.asByteArray()}.
-         *
-         * <p> When the {@code HttpResponse} object is returned, the body has
-         * been completely written to the byte array.
-         *
-         * @return a response body handler
-         */
-        public static BodyHandler<byte[]> asByteArray() {
-            return (status, headers) -> BodySubscriber.asByteArray();
-        }
-
-        /**
-         * Returns a {@code BodyHandler<String>} that returns a
-         * {@link BodySubscriber BodySubscriber}{@code <String>} obtained from
-         * {@link BodySubscriber#asString(java.nio.charset.Charset)
-         * BodySubscriber.asString(Charset)}. The body is
-         * decoded using the character set specified in
-         * the {@code Content-encoding} response header. If there is no such
-         * header, or the character set is not supported, then
-         * {@link java.nio.charset.StandardCharsets#UTF_8 UTF_8} is used.
-         *
-         * <p> When the {@code HttpResponse} object is returned, the body has
-         * been completely written to the string.
-         *
-         * @return a response body handler
-         */
-        public static BodyHandler<String> asString() {
-            return (status, headers) -> BodySubscriber.asString(charsetFrom(headers));
-        }
-
-        /**
-         * Returns a {@code BodyHandler} which, when invoked, returns a {@linkplain
-         * BodySubscriber#buffering(BodySubscriber,int) buffering BodySubscriber}
-         * that buffers data before delivering it to the downstream subscriber.
-         * These {@code BodySubscriber} instances are created by calling
-         * {@linkplain BodySubscriber#buffering(BodySubscriber,int)
-         * BodySubscriber.buffering} with a subscriber obtained from the given
-         * downstream handler and the {@code bufferSize} parameter.
-         *
-         * @param downstreamHandler the downstream handler
-         * @param bufferSize the buffer size parameter passed to {@linkplain
-         *        BodySubscriber#buffering(BodySubscriber,int) BodySubscriber.buffering}
-         * @return a body handler
-         * @throws IllegalArgumentException if {@code bufferSize <= 0}
-         */
-         public static <T> BodyHandler<T> buffering(BodyHandler<T> downstreamHandler,
-                                                    int bufferSize) {
-             Objects.requireNonNull(downstreamHandler);
-             if (bufferSize <= 0)
-                 throw new IllegalArgumentException("must be greater than 0");
-             return (status, headers) -> BodySubscriber
-                     .buffering(downstreamHandler.apply(status, headers),
-                                bufferSize);
-         }
-    }
-
-    /**
-     * A subscriber for response bodies.
-     * {@Incubating}
-     *
-     * <p> The object acts as a {@link Flow.Subscriber}&lt;{@link List}&lt;{@link
-     * ByteBuffer}&gt;&gt; to the HTTP client implementation, which publishes
-     * unmodifiable lists of ByteBuffers containing the response body. The Flow
-     * of data, as well as the order of ByteBuffers in the Flow lists, is a
-     * strictly ordered representation of the response body. Both the Lists and
-     * the ByteBuffers, once passed to the subscriber, are no longer used by the
-     * HTTP client. The subscriber converts the incoming buffers of data to some
-     * user-defined object type {@code T}.
-     *
-     * <p> The {@link #getBody()} method returns a {@link CompletionStage}{@code
-     * <T>} that provides the response body object. The {@code CompletionStage}
-     * must be obtainable at any time. When it completes depends on the nature
-     * of type {@code T}. In many cases, when {@code T} represents the entire
-     * body after being read then it completes after the body has been read. If
-     * {@code T} is a streaming type such as {@link java.io.InputStream} then it
-     * completes before the body has been read, because the calling code uses it
-     * to consume the data.
-     *
-     * @apiNote To ensure that all resources associated with the
-     * corresponding exchange are properly released, an implementation
-     * of {@code BodySubscriber} must ensure to {@linkplain
-     * Flow.Subscription#request request} more data until {@link
-     * #onComplete() onComplete} or {@link #onError(Throwable) onError}
-     * are signalled, or {@linkplain Flow.Subscription#request cancel} its
-     * {@linkplain #onSubscribe(Flow.Subscription) subscription}
-     * if unable or unwilling to do so.
-     * Calling {@code cancel} before exhausting the data may cause
-     * the underlying HTTP connection to be closed and prevent it
-     * from being reused for subsequent operations.
-     *
-     * @param <T> the response body type
-     */
-    public interface BodySubscriber<T>
-            extends Flow.Subscriber<List<ByteBuffer>> {
-
-        /**
-         * Returns a {@code CompletionStage} which when completed will return
-         * the response body object.
-         *
-         * @return a CompletionStage for the response body
-         */
-        public CompletionStage<T> getBody();
-
-        /**
-         * Returns a body subscriber that forwards all response body to the
-         * given {@code Flow.Subscriber}. The {@linkplain #getBody()} completion
-         * stage} of the returned body subscriber completes after one of the
-         * given subscribers {@code onComplete} or {@code onError} has been
-         * invoked.
-         *
-         * @apiNote This method can be used as an adapter between {@code
-         * BodySubscriber} and {@code Flow.Subscriber}.
-         *
-         * @param <S> the type of the Subscriber
-         * @param subscriber the subscriber
-         * @return a body subscriber
-         */
-        public static <S extends Subscriber<? super List<ByteBuffer>>> BodySubscriber<Void>
-        fromSubscriber(S subscriber) {
-            return new ResponseSubscribers.SubscriberAdapter<S,Void>(subscriber, s -> null);
-        }
-
-        /**
-         * Returns a body subscriber that forwards all response body to the
-         * given {@code Flow.Subscriber}. The {@linkplain #getBody()} completion
-         * stage} of the returned body subscriber completes after one of the
-         * given subscribers {@code onComplete} or {@code onError} has been
-         * invoked.
-         *
-         * <p> The given {@code finisher} function is applied after the given
-         * subscriber's {@code onComplete} has been invoked. The {@code finisher}
-         * function is invoked with the given subscriber, and returns a value
-         * that is set as the response's body.
-         *
-         * @apiNote This method can be used as an adapter between {@code
-         * BodySubscriber} and {@code Flow.Subscriber}.
-         *
-         * @param <S> the type of the Subscriber
-         * @param <T> the type of the response body
-         * @param subscriber the subscriber
-         * @param finisher a function to be applied after the subscriber has
-         *                 completed
-         * @return a body subscriber
-         */
-        public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodySubscriber<T>
-        fromSubscriber(S subscriber,
-                       Function<S,T> finisher) {
-            return new ResponseSubscribers.SubscriberAdapter<S,T>(subscriber, finisher);
-        }
-
-        /**
-         * Returns a body subscriber which stores the response body as a {@code
-         * String} converted using the given {@code Charset}.
-         *
-         * <p> The {@link HttpResponse} using this subscriber is available after
-         * the entire response has been read.
-         *
-         * @param charset the character set to convert the String with
-         * @return a body subscriber
-         */
-        public static BodySubscriber<String> asString(Charset charset) {
-            Objects.requireNonNull(charset);
-            return new ResponseSubscribers.ByteArraySubscriber<>(
-                    bytes -> new String(bytes, charset)
-            );
-        }
-
-        /**
-         * Returns a {@code BodySubscriber} which stores the response body as a
-         * byte array.
-         *
-         * <p> The {@link HttpResponse} using this subscriber is available after
-         * the entire response has been read.
-         *
-         * @return a body subscriber
-         */
-        public static BodySubscriber<byte[]> asByteArray() {
-            return new ResponseSubscribers.ByteArraySubscriber<>(
-                    Function.identity() // no conversion
-            );
-        }
-
-        // no security check
-        private static BodySubscriber<Path> asFileImpl(Path file, OpenOption... openOptions) {
-            return new ResponseSubscribers.PathSubscriber(file, openOptions);
-        }
-
-        /**
-         * Returns a {@code BodySubscriber} which stores the response body in a
-         * file opened with the given options and name. The file will be opened
-         * with the given options using {@link FileChannel#open(Path,OpenOption...)
-         * FileChannel.open} just before the body is read. Any exception thrown
-         * will be returned or thrown from {@link HttpClient#send(HttpRequest,
-         * BodyHandler) HttpClient::send} or {@link HttpClient#sendAsync(HttpRequest,
-         * BodyHandler) HttpClient::sendAsync} as appropriate.
-         *
-         * <p> The {@link HttpResponse} using this subscriber is available after
-         * the entire response has been read.
-         *
-         * @param file the file to store the body in
-         * @param openOptions the list of options to open the file with
-         * @return a body subscriber
-         * @throws SecurityException If a security manager has been installed
-         *          and it denies {@link SecurityManager#checkWrite(String)
-         *          write access} to the file. The {@link
-         *          SecurityManager#checkDelete(String) checkDelete} method is
-         *          invoked to check delete access if the file is opened with the
-         *          {@code DELETE_ON_CLOSE} option.
-         */
-        public static BodySubscriber<Path> asFile(Path file, OpenOption... openOptions) {
-            Objects.requireNonNull(file);
-            List<OpenOption> opts = List.of(openOptions);
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                String fn = pathForSecurityCheck(file);
-                sm.checkWrite(fn);
-                if (opts.contains(StandardOpenOption.DELETE_ON_CLOSE))
-                    sm.checkDelete(fn);
-                if (opts.contains(StandardOpenOption.READ))
-                    sm.checkRead(fn);
-            }
-            return asFileImpl(file, openOptions);
-        }
-
-        /**
-         * Returns a {@code BodySubscriber} which stores the response body in a
-         * file opened with the given name. Has the same effect as calling
-         * {@link #asFile(Path, OpenOption...) asFile} with the standard open
-         * options {@code CREATE} and {@code WRITE}
-         *
-         * <p> The {@link HttpResponse} using this subscriber is available after
-         * the entire response has been read.
-         *
-         * @param file the file to store the body in
-         * @return a body subscriber
-         * @throws SecurityException if a security manager has been installed
-         *          and it denies {@link SecurityManager#checkWrite(String)
-         *          write access} to the file
-         */
-        public static BodySubscriber<Path> asFile(Path file) {
-            return asFile(file, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
-        }
-
-        /**
-         * Returns a {@code BodySubscriber} which provides the incoming body
-         * data to the provided Consumer of {@code Optional<byte[]>}. Each
-         * call to {@link Consumer#accept(java.lang.Object) Consumer.accept()}
-         * will contain a non empty {@code Optional}, except for the final
-         * invocation after all body data has been read, when the {@code
-         * Optional} will be empty.
-         *
-         * <p> The {@link HttpResponse} using this subscriber is available after
-         * the entire response has been read.
-         *
-         * @param consumer a Consumer of byte arrays
-         * @return a BodySubscriber
-         */
-        public static BodySubscriber<Void> asByteArrayConsumer(Consumer<Optional<byte[]>> consumer) {
-            return new ResponseSubscribers.ConsumerSubscriber(consumer);
-        }
-
-        /**
-         * Returns a {@code BodySubscriber} which streams the response body as
-         * an {@link InputStream}.
-         *
-         * <p> The {@link HttpResponse} using this subscriber is available
-         * immediately after the response headers have been read, without
-         * requiring to wait for the entire body to be processed. The response
-         * body can then be read directly from the {@link InputStream}.
-         *
-         * @apiNote To ensure that all resources associated with the
-         * corresponding exchange are properly released the caller must
-         * ensure to either read all bytes until EOF is reached, or call
-         * {@link InputStream#close} if it is unable or unwilling to do so.
-         * Calling {@code close} before exhausting the stream may cause
-         * the underlying HTTP connection to be closed and prevent it
-         * from being reused for subsequent operations.
-         *
-         * @return a body subscriber that streams the response body as an
-         *         {@link InputStream}.
-         */
-        public static BodySubscriber<InputStream> asInputStream() {
-            return new ResponseSubscribers.HttpResponseInputStream();
-        }
-
-        /**
-         * Returns a response subscriber which discards the response body. The
-         * supplied value is the value that will be returned from
-         * {@link HttpResponse#body()}.
-         *
-         * @param <U> The type of the response body
-         * @param value the value to return from HttpResponse.body(), may be {@code null}
-         * @return a {@code BodySubscriber}
-         */
-        public static <U> BodySubscriber<U> discard(U value) {
-            return new ResponseSubscribers.NullSubscriber<>(Optional.ofNullable(value));
-        }
-
-        /**
-         * Returns a {@code BodySubscriber} which buffers data before delivering
-         * it to the given downstream subscriber. The subscriber guarantees to
-         * deliver {@code buffersize} bytes of data to each invocation of the
-         * downstream's {@linkplain #onNext(Object) onNext} method, except for
-         * the final invocation, just before {@linkplain #onComplete() onComplete}
-         * is invoked. The final invocation of {@code onNext} may contain fewer
-         * than {@code buffersize} bytes.
-         *
-         * <p> The returned subscriber delegates its {@link #getBody()} method
-         * to the downstream subscriber.
-         *
-         * @param downstream the downstream subscriber
-         * @param bufferSize the buffer size
-         * @return a buffering body subscriber
-         * @throws IllegalArgumentException if {@code bufferSize <= 0}
-         */
-         public static <T> BodySubscriber<T> buffering(BodySubscriber<T> downstream,
-                                                       int bufferSize) {
-             if (bufferSize <= 0)
-                 throw new IllegalArgumentException("must be greater than 0");
-             return new BufferingSubscriber<T>(downstream, bufferSize);
-         }
-    }
-
-    /**
-     * A response subscriber for a HTTP/2 multi response.
-     * {@Incubating}
-     *
-     * <p> A multi response comprises a main response, and zero or more additional
-     * responses. Each additional response is sent by the server in response to
-     * requests (PUSH_PROMISEs) that the server also generates. Additional responses are
-     * typically resources that the server expects the client will need which
-     * are related to the initial request.
-     * <p>
-     * Note. Instead of implementing this interface, applications should consider
-     * first using the mechanism (built on this interface) provided by
-     * {@link MultiSubscriber#asMap(java.util.function.Function, boolean)
-     * MultiSubscriber.asMap()} which is a slightly simplified, but also
-     * general purpose interface.
-     * <p>
-     * The server generated requests are also known as <i>push promises</i>.
-     * The server is permitted to send any number of these requests up to the
-     * point where the main response is fully received. Therefore, after
-     * completion of the main response, the final number of additional
-     * responses is known. Additional responses may be canceled, but given that
-     * the server does not wait for any acknowledgment before sending the
-     * response, this must be done quickly to avoid unnecessary data transmission.
-     *
-     * <p> {@code MultiSubscriber}s are parameterized with a type {@code U} which
-     * represents some meaningful aggregate of the responses received. This
-     * would typically be a collection of response or response body objects.
-     *
-     * @param <U> a type representing the aggregated results
-     * @param <T> a type representing all of the response bodies
-     *
-     * @since 9
-     */
-    public interface MultiSubscriber<U,T> {
-        /**
-         * Called for the main request from the user. This {@link HttpRequest}
-         * parameter is the request that was supplied to {@link
-         * HttpClient#sendAsync(HttpRequest, MultiSubscriber)}. The
-         * implementation must return an {@link BodyHandler} for the response
-         * body.
-         *
-         * @param request the request
-         *
-         * @return an optional body handler
-         */
-        BodyHandler<T> onRequest(HttpRequest request);
-
-        /**
-         * Called for each push promise that is received. The {@link HttpRequest}
-         * parameter represents the PUSH_PROMISE. The implementation must return
-         * an {@code Optional} of {@link BodyHandler} for the response body.
-         * Different handlers (of the same type) can be returned for different
-         * pushes within the same multi send. If no handler (an empty {@code
-         * Optional}) is returned, then the push will be canceled. If required,
-         * the {@code CompletableFuture<Void>} supplied to the {@code
-         * onFinalPushPromise} parameter of {@link
-         * #completion(CompletableFuture, CompletableFuture)} can be used to
-         * determine when the final PUSH_PROMISE is received.
-         *
-         * @param pushPromise the push promise
-         *
-         * @return an optional body handler
-         */
-        Optional<BodyHandler<T>> onPushPromise(HttpRequest pushPromise);
-
-        /**
-         * Called for each response received. For each request either one of
-         * onResponse() or onError() is guaranteed to be called, but not both.
-         *
-         * <p> Note: The reason for switching to this callback interface rather
-         * than using CompletableFutures supplied to onRequest() is that there
-         * is a subtle interaction between those CFs and the CF returned from
-         * completion() (or when onComplete() was called formerly). The completion()
-         * CF will not complete until after all of the work done by the onResponse()
-         * calls is done. Whereas if you just create CF's dependent on a supplied
-         * CF (to onRequest()) then the implementation has no visibility of the
-         * dependent CFs and can't guarantee to call onComplete() (or complete
-         * the completion() CF) after the dependent CFs complete.
-         *
-         * @param response the response received
-         */
-        void onResponse(HttpResponse<T> response);
-
-        /**
-         * Called if an error occurs receiving a response. For each request
-         * either one of onResponse() or onError() is guaranteed to be called,
-         * but not both.
-         *
-         * @param request the main request or subsequent push promise
-         * @param t the Throwable that caused the error
-         */
-        void onError(HttpRequest request, Throwable t);
-
-        /**
-         * Returns a {@link java.util.concurrent.CompletableFuture}{@code <U>}
-         * which completes when the aggregate result object itself is available.
-         * It is expected that the returned {@code CompletableFuture} will depend
-         * on one of the given {@code CompletableFuture<Void}s which themselves
-         * complete after all individual responses associated with the multi
-         * response have completed, or after all push promises have been received.
-         * This method is called after {@link #onRequest(HttpRequest)} but
-         * before any other methods.
-         *
-         * @implNote Implementations might follow the pattern shown below
-         * <pre>
-         * {@code
-         *      CompletableFuture<U> completion(
-         *              CompletableFuture<Void> onComplete,
-         *              CompletableFuture<Void> onFinalPushPromise)
-         *      {
-         *          return onComplete.thenApply((v) -> {
-         *              U u = ... instantiate and populate a U instance
-         *              return u;
-         *          });
-         *      }
-         * }
-         * </pre>
-         *
-         * @param onComplete a CompletableFuture which completes after all
-         * responses have been received relating to this multi request.
-         *
-         * @param onFinalPushPromise CompletableFuture which completes after all
-         * push promises have been received.
-         *
-         * @return the aggregate CF response object
-         */
-        CompletableFuture<U> completion(CompletableFuture<Void> onComplete,
-                CompletableFuture<Void> onFinalPushPromise);
-
-        /**
-         * Returns a general purpose handler for multi responses. The aggregated
-         * result object produced by this handler is a
-         * {@code Map<HttpRequest,CompletableFuture<HttpResponse<V>>>}. Each
-         * request (both the original user generated request and each server
-         * generated push promise) is returned as a key of the map. The value
-         * corresponding to each key is a
-         * {@code CompletableFuture<HttpResponse<V>>}.
-         *
-         * <p> There are two ways to use these handlers, depending on the value
-         * of the <i>completion</I> parameter. If completion is true, then the
-         * aggregated result will be available after all responses have
-         * themselves completed. If <i>completion</i> is false, then the
-         * aggregated result will be available immediately after the last push
-         * promise was received. In the former case, this implies that all the
-         * CompletableFutures in the map values will have completed. In the
-         * latter case, they may or may not have completed yet.
-         *
-         * <p> The simplest way to use these handlers is to set completion to
-         * {@code true}, and then all (results) values in the Map will be
-         * accessible without blocking.
-         * <p>
-         * See {@link #asMap(java.util.function.Function, boolean)}
-         * for a code sample of using this interface.
-         *
-         * <p> See {@link #asMap(Function, boolean)} for a code sample of using
-         * this interface.
-         *
-         * @param <V> the body type used for all responses
-         * @param reqHandler a function invoked for the user's request and each
-         *                   push promise
-         * @param completion {@code true} if the aggregate CompletableFuture
-         *                   completes after all responses have been received,
-         *                   or {@code false} after all push promises received
-         *
-         * @return a MultiSubscriber
-         */
-        public static <V> MultiSubscriber<MultiMapResult<V>,V> asMap(
-                Function<HttpRequest, Optional<HttpResponse.BodyHandler<V>>> reqHandler,
-                boolean completion) {
-            return new MultiSubscriberImpl<V>(reqHandler.andThen(optv -> optv.get()),
-                                              reqHandler,
-                                              completion);
-        }
-
-        /**
-         * Returns a general purpose handler for multi responses. This is a
-         * convenience method which invokes {@link #asMap(Function,boolean)
-         * asMap(Function, true)} meaning that the aggregate result
-         * object completes after all responses have been received.
-         *
-         * <p><b>Example usage:</b>
-         * <br>
-         * <pre>
-         * {@code
-         *          HttpRequest request = HttpRequest.newBuilder()
-         *                  .uri(URI.create("https://www.foo.com/"))
-         *                  .GET()
-         *                  .build();
-         *
-         *          HttpClient client = HttpClient.newHttpClient();
-         *
-         *          Map<HttpRequest,CompletableFuture<HttpResponse<String>>> results = client
-         *              .sendAsync(request, MultiSubscriber.asMap(
-         *                  (req) -> Optional.of(HttpResponse.BodyHandler.asString())))
-         *              .join();
-         * }</pre>
-         *
-         * <p> The lambda in this example is the simplest possible implementation,
-         * where neither the incoming requests are examined, nor the response
-         * headers, and every push that the server sends is accepted. When the
-         * join() call returns, all {@code HttpResponse}s and their associated
-         * body objects are available.
-         *
-         * @param <V> the body type used for all responses
-         * @param reqHandler a function invoked for each push promise and the
-         *                   main request
-         * @return a MultiSubscriber
-         */
-        public static <V> MultiSubscriber<MultiMapResult<V>,V> asMap(
-                Function<HttpRequest, Optional<HttpResponse.BodyHandler<V>>> reqHandler) {
-
-            return asMap(reqHandler, true);
-        }
-
-    }
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java
deleted file mode 100644
index 7396709e8b0..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java
+++ /dev/null
@@ -1,119 +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;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * A {@link java.util.Map} containing the result of a HTTP/2 request and multi-response.
- * {@Incubating}
- * <p>
- * This is one possible implementation of the aggregate result type {@code <U>} returned
- * from {@link HttpClient#sendAsync(HttpRequest,HttpResponse.MultiSubscriber) }.
- * The map is indexed by {@link HttpRequest} and each value is a
- * {@link java.util.concurrent.CompletableFuture}&lt;
- * {@link HttpResponse}{@code <V>}&gt;
- * <p>
- * A {@code MultiMapResult} is obtained from an invocation such as the one shown below:
- * <p>
- * {@link CompletableFuture}&lt;{@code MultiMapResult<V>}&gt;
- * {@link HttpClient#sendAsync(HttpRequest,
- * HttpResponse.MultiSubscriber) HttpClient.sendAsync(}{@link
- * HttpResponse.MultiSubscriber#asMap(java.util.function.Function)
- * MultiSubscriber.asMap(Function)})
- *
- * @param <V> the response body type for all responses
- */
-public class MultiMapResult<V> implements Map<HttpRequest,CompletableFuture<HttpResponse<V>>> {
-    private final Map<HttpRequest,CompletableFuture<HttpResponse<V>>> map;
-
-    MultiMapResult(Map<HttpRequest,CompletableFuture<HttpResponse<V>>> map) {
-        this.map = map;
-    }
-
-    @Override
-    public int size() {
-        return map.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return map.isEmpty();
-    }
-
-    @Override
-    public boolean containsKey(Object key) {
-        return map.containsKey(key);
-    }
-
-    @Override
-    public boolean containsValue(Object value) {
-        return map.containsValue(value);
-    }
-
-    @Override
-    public CompletableFuture<HttpResponse<V>> get(Object key) {
-        return map.get(key);
-    }
-
-    @Override
-    public CompletableFuture<HttpResponse<V>> put(HttpRequest key, CompletableFuture<HttpResponse<V>> value) {
-        return map.put(key, value);
-    }
-
-    @Override
-    public CompletableFuture<HttpResponse<V>> remove(Object key) {
-        return map.remove(key);
-    }
-
-    @Override
-    public void putAll(Map<? extends HttpRequest, ? extends CompletableFuture<HttpResponse<V>>> m) {
-        map.putAll(m);
-    }
-
-    @Override
-    public void clear() {
-        map.clear();
-    }
-
-    @Override
-    public Set<HttpRequest> keySet() {
-        return map.keySet();
-    }
-
-    @Override
-    public Collection<CompletableFuture<HttpResponse<V>>> values() {
-        return map.values();
-    }
-
-    @Override
-    public Set<Entry<HttpRequest, CompletableFuture<HttpResponse<V>>>> entrySet() {
-        return map.entrySet();
-    }
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java
deleted file mode 100644
index 0f38092a487..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java
+++ /dev/null
@@ -1,185 +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;
-
-import java.security.AccessControlContext;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.HttpResponse.UntrustedBodyHandler;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.Log;
-
-/**
- * One PushGroup object is associated with the parent Stream of the pushed
- * Streams. This keeps track of all common state associated with the pushes.
- */
-class PushGroup<U,T> {
-    // the overall completion object, completed when all pushes are done.
-    final CompletableFuture<Void> resultCF;
-    final CompletableFuture<Void> noMorePushesCF;
-
-    volatile Throwable error; // any exception that occurred during pushes
-
-    // CF for main response
-    final CompletableFuture<HttpResponse<T>> mainResponse;
-
-    // user's subscriber object
-    final HttpResponse.MultiSubscriber<U, T> multiSubscriber;
-
-    final HttpResponse.BodyHandler<T> mainBodyHandler;
-
-    private final AccessControlContext acc;
-
-    int numberOfPushes;
-    int remainingPushes;
-    boolean noMorePushes = false;
-
-    PushGroup(HttpResponse.MultiSubscriber<U, T> multiSubscriber,
-              HttpRequestImpl req,
-              AccessControlContext acc) {
-        this(multiSubscriber, req, new MinimalFuture<>(), acc);
-    }
-
-    // Check mainBodyHandler before calling nested constructor.
-    private PushGroup(HttpResponse.MultiSubscriber<U, T> multiSubscriber,
-                      HttpRequestImpl req,
-                      CompletableFuture<HttpResponse<T>> mainResponse,
-                      AccessControlContext acc) {
-        this(multiSubscriber,
-             mainResponse,
-             multiSubscriber.onRequest(req),
-             acc);
-    }
-
-    // This private constructor is called after all parameters have been checked.
-    private PushGroup(HttpResponse.MultiSubscriber<U, T> multiSubscriber,
-                      CompletableFuture<HttpResponse<T>> mainResponse,
-                      HttpResponse.BodyHandler<T> mainBodyHandler,
-                      AccessControlContext acc) {
-
-        assert mainResponse != null; // A new instance is created above
-        assert mainBodyHandler != null; // should have been checked above
-
-        this.resultCF = new MinimalFuture<>();
-        this.noMorePushesCF = new MinimalFuture<>();
-        this.multiSubscriber = multiSubscriber;
-        this.mainResponse = mainResponse.thenApply(r -> {
-            multiSubscriber.onResponse(r);
-            return r;
-        });
-        this.mainBodyHandler = mainBodyHandler;
-        if (acc != null) {
-            // Restricts the file publisher with the senders ACC, if any
-            if (mainBodyHandler instanceof UntrustedBodyHandler)
-                ((UntrustedBodyHandler)this.mainBodyHandler).setAccessControlContext(acc);
-        }
-        this.acc = acc;
-    }
-
-    CompletableFuture<Void> groupResult() {
-        return resultCF;
-    }
-
-    HttpResponse.MultiSubscriber<U, T> subscriber() {
-        return multiSubscriber;
-    }
-
-    Optional<BodyHandler<T>> handlerForPushRequest(HttpRequest ppRequest) {
-        Optional<BodyHandler<T>> bh = multiSubscriber.onPushPromise(ppRequest);
-        if (acc != null && bh.isPresent()) {
-            // Restricts the file publisher with the senders ACC, if any
-            BodyHandler<T> x = bh.get();
-            if (x instanceof UntrustedBodyHandler)
-                ((UntrustedBodyHandler)x).setAccessControlContext(acc);
-            bh = Optional.of(x);
-        }
-        return bh;
-    }
-
-    HttpResponse.BodyHandler<T> mainResponseHandler() {
-        return mainBodyHandler;
-    }
-
-    synchronized void setMainResponse(CompletableFuture<HttpResponse<T>> r) {
-        r.whenComplete((HttpResponse<T> response, Throwable t) -> {
-            if (t != null)
-                mainResponse.completeExceptionally(t);
-            else
-                mainResponse.complete(response);
-        });
-    }
-
-    synchronized void addPush() {
-        numberOfPushes++;
-        remainingPushes++;
-    }
-
-    // This is called when the main body response completes because it means
-    // no more PUSH_PROMISEs are possible
-
-    synchronized void noMorePushes(boolean noMore) {
-        noMorePushes = noMore;
-        checkIfCompleted();
-        noMorePushesCF.complete(null);
-    }
-
-    CompletableFuture<Void> pushesCF() {
-        return noMorePushesCF;
-    }
-
-    synchronized boolean noMorePushes() {
-        return noMorePushes;
-    }
-
-    synchronized void pushCompleted() {
-        remainingPushes--;
-        checkIfCompleted();
-    }
-
-    synchronized void checkIfCompleted() {
-        if (Log.trace()) {
-            Log.logTrace("PushGroup remainingPushes={0} error={1} noMorePushes={2}",
-                         remainingPushes,
-                         (error==null)?error:error.getClass().getSimpleName(),
-                         noMorePushes);
-        }
-        if (remainingPushes == 0 && error == null && noMorePushes) {
-            if (Log.trace()) {
-                Log.logTrace("push completed");
-            }
-            resultCF.complete(null);
-        }
-    }
-
-    synchronized void pushError(Throwable t) {
-        if (t == null) {
-            return;
-        }
-        this.error = t;
-        resultCF.completeExceptionally(t);
-    }
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java
deleted file mode 100644
index 32c8f73c7e7..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2015, 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;
-
-import jdk.incubator.http.internal.common.Utils;
-import jdk.incubator.http.internal.websocket.RawChannel;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectableChannel;
-import java.nio.channels.SocketChannel;
-import java.util.function.Supplier;
-
-/*
- * Each RawChannel corresponds to a TCP connection (SocketChannel) but is
- * connected to a Selector and an ExecutorService for invoking the send and
- * receive callbacks. Also includes SSL processing.
- */
-final class RawChannelImpl implements RawChannel {
-
-    private final HttpClientImpl client;
-    private final HttpConnection.DetachedConnectionChannel detachedChannel;
-    private final Object         initialLock = new Object();
-    private Supplier<ByteBuffer> initial;
-
-    RawChannelImpl(HttpClientImpl client,
-                   HttpConnection connection,
-                   Supplier<ByteBuffer> initial)
-            throws IOException
-    {
-        this.client = client;
-        this.detachedChannel = connection.detachChannel();
-        this.initial = initial;
-
-        SocketChannel chan = connection.channel();
-        client.cancelRegistration(chan);
-        // Constructing a RawChannel is supposed to have a "hand over"
-        // semantics, in other words if construction fails, the channel won't be
-        // needed by anyone, in which case someone still needs to close it
-        try {
-            chan.configureBlocking(false);
-        } catch (IOException e) {
-            try {
-                chan.close();
-            } catch (IOException e1) {
-                e.addSuppressed(e1);
-            } finally {
-                detachedChannel.close();
-            }
-            throw e;
-        }
-    }
-
-    private class NonBlockingRawAsyncEvent extends AsyncEvent {
-
-        private final RawEvent re;
-
-        NonBlockingRawAsyncEvent(RawEvent re) {
-            // !BLOCKING & !REPEATING
-            this.re = re;
-        }
-
-        @Override
-        public SelectableChannel channel() {
-            return detachedChannel.channel();
-        }
-
-        @Override
-        public int interestOps() {
-            return re.interestOps();
-        }
-
-        @Override
-        public void handle() {
-            re.handle();
-        }
-
-        @Override
-        public void abort(IOException ioe) { }
-    }
-
-    @Override
-    public void registerEvent(RawEvent event) throws IOException {
-        client.registerEvent(new NonBlockingRawAsyncEvent(event));
-    }
-
-    @Override
-    public ByteBuffer read() throws IOException {
-        assert !detachedChannel.channel().isBlocking();
-        // connection.read() will no longer be available.
-        return detachedChannel.read();
-    }
-
-    @Override
-    public ByteBuffer initialByteBuffer() {
-        synchronized (initialLock) {
-            if (initial == null) {
-                throw new IllegalStateException();
-            }
-            ByteBuffer ref = initial.get();
-            ref = ref.hasRemaining() ? Utils.copy(ref)
-                    : Utils.EMPTY_BYTEBUFFER;
-            initial = null;
-            return ref;
-        }
-    }
-
-    @Override
-    public long write(ByteBuffer[] src, int offset, int len) throws IOException {
-        // this makes the whitebox driver test fail.
-        return detachedChannel.write(src, offset, len);
-    }
-
-    @Override
-    public void shutdownInput() throws IOException {
-        detachedChannel.shutdownInput();
-    }
-
-    @Override
-    public void shutdownOutput() throws IOException {
-        detachedChannel.shutdownOutput();
-    }
-
-    @Override
-    public void close() throws IOException {
-        detachedChannel.close();
-    }
-
-    @Override
-    public String toString() {
-        return super.toString()+"("+ detachedChannel.toString() + ")";
-    }
-
-
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java
deleted file mode 100644
index 0af6fd6d6f4..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Copyright (c) 2015, 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;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import javax.net.ssl.SSLEngineResult.HandshakeStatus;
-import javax.net.ssl.SSLEngineResult.Status;
-import javax.net.ssl.*;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.Utils;
-import static javax.net.ssl.SSLEngineResult.HandshakeStatus.*;
-
-/**
- * Implements the mechanics of SSL by managing an SSLEngine object.
- * <p>
- * This class is only used to implement the {@link
- * AbstractAsyncSSLConnection.SSLConnectionChannel} which is handed of
- * to RawChannelImpl when creating a WebSocket.
- */
-class SSLDelegate {
-
-    final SSLEngine engine;
-    final EngineWrapper wrapper;
-    final Lock handshaking = new ReentrantLock();
-    final SocketChannel chan;
-
-    SSLDelegate(SSLEngine eng, SocketChannel chan)
-    {
-        this.engine = eng;
-        this.chan = chan;
-        this.wrapper = new EngineWrapper(chan, engine);
-    }
-
-    // alpn[] may be null
-//    SSLDelegate(SocketChannel chan, HttpClientImpl client, String[] alpn, String sn)
-//        throws IOException
-//    {
-//        serverName = sn;
-//        SSLContext context = client.sslContext();
-//        engine = context.createSSLEngine();
-//        engine.setUseClientMode(true);
-//        SSLParameters sslp = client.sslParameters();
-//        sslParameters = Utils.copySSLParameters(sslp);
-//        if (sn != null) {
-//            SNIHostName sni = new SNIHostName(sn);
-//            sslParameters.setServerNames(List.of(sni));
-//        }
-//        if (alpn != null) {
-//            sslParameters.setApplicationProtocols(alpn);
-//            Log.logSSL("SSLDelegate: Setting application protocols: {0}" + Arrays.toString(alpn));
-//        } else {
-//            Log.logSSL("SSLDelegate: No application protocols proposed");
-//        }
-//        engine.setSSLParameters(sslParameters);
-//        wrapper = new EngineWrapper(chan, engine);
-//        this.chan = chan;
-//        this.client = client;
-//    }
-
-//    SSLParameters getSSLParameters() {
-//        return sslParameters;
-//    }
-
-    static long countBytes(ByteBuffer[] buffers, int start, int number) {
-        long c = 0;
-        for (int i=0; i<number; i++) {
-            c+= buffers[start+i].remaining();
-        }
-        return c;
-    }
-
-
-    static class WrapperResult {
-        static WrapperResult createOK() {
-            WrapperResult r = new WrapperResult();
-            r.buf = null;
-            r.result = new SSLEngineResult(Status.OK, NOT_HANDSHAKING, 0, 0);
-            return r;
-        }
-        SSLEngineResult result;
-
-        ByteBuffer buf; // buffer containing result data
-    }
-
-    int app_buf_size;
-    int packet_buf_size;
-
-    enum BufType {
-        PACKET,
-        APPLICATION
-    }
-
-    ByteBuffer allocate (BufType type) {
-        return allocate (type, -1);
-    }
-
-    // TODO: Use buffer pool for this
-    ByteBuffer allocate (BufType type, int len) {
-        assert engine != null;
-        synchronized (this) {
-            int size;
-            if (type == BufType.PACKET) {
-                if (packet_buf_size == 0) {
-                    SSLSession sess = engine.getSession();
-                    packet_buf_size = sess.getPacketBufferSize();
-                }
-                if (len > packet_buf_size) {
-                    packet_buf_size = len;
-                }
-                size = packet_buf_size;
-            } else {
-                if (app_buf_size == 0) {
-                    SSLSession sess = engine.getSession();
-                    app_buf_size = sess.getApplicationBufferSize();
-                }
-                if (len > app_buf_size) {
-                    app_buf_size = len;
-                }
-                size = app_buf_size;
-            }
-            return ByteBuffer.allocate (size);
-        }
-    }
-
-    /* reallocates the buffer by :-
-     * 1. creating a new buffer double the size of the old one
-     * 2. putting the contents of the old buffer into the new one
-     * 3. set xx_buf_size to the new size if it was smaller than new size
-     *
-     * flip is set to true if the old buffer needs to be flipped
-     * before it is copied.
-     */
-    private ByteBuffer realloc (ByteBuffer b, boolean flip, BufType type) {
-        // TODO: there should be the linear growth, rather than exponential as
-        // we definitely know the maximum amount of space required to unwrap
-        synchronized (this) {
-            int nsize = 2 * b.capacity();
-            ByteBuffer n = allocate (type, nsize);
-            if (flip) {
-                b.flip();
-            }
-            n.put(b);
-            b = n;
-        }
-        return b;
-    }
-
-    /**
-     * This is a thin wrapper over SSLEngine and the SocketChannel, which
-     * guarantees the ordering of wraps/unwraps with respect to the underlying
-     * channel read/writes. It handles the UNDER/OVERFLOW status codes
-     * It does not handle the handshaking status codes, or the CLOSED status code
-     * though once the engine is closed, any attempt to read/write to it
-     * will get an exception.  The overall result is returned.
-     * It functions synchronously/blocking
-     */
-    class EngineWrapper {
-
-        SocketChannel chan;
-        SSLEngine engine;
-        final Object wrapLock;
-        final Object unwrapLock;
-        ByteBuffer unwrap_src, wrap_dst;
-        boolean closed = false;
-        int u_remaining; // the number of bytes left in unwrap_src after an unwrap()
-
-        EngineWrapper (SocketChannel chan, SSLEngine engine) {
-            this.chan = chan;
-            this.engine = engine;
-            wrapLock = new Object();
-            unwrapLock = new Object();
-            unwrap_src = allocate(BufType.PACKET);
-            wrap_dst = allocate(BufType.PACKET);
-        }
-
-//        void close () throws IOException {
-//        }
-
-        WrapperResult wrapAndSend(ByteBuffer src, boolean ignoreClose)
-            throws IOException
-        {
-            ByteBuffer[] buffers = new ByteBuffer[1];
-            buffers[0] = src;
-            return wrapAndSend(buffers, 0, 1, ignoreClose);
-        }
-
-        /* try to wrap and send the data in src. Handles OVERFLOW.
-         * Might block if there is an outbound blockage or if another
-         * thread is calling wrap(). Also, might not send any data
-         * if an unwrap is needed.
-         */
-        WrapperResult wrapAndSend(ByteBuffer[] src,
-                                  int offset,
-                                  int len,
-                                  boolean ignoreClose)
-            throws IOException
-        {
-            if (closed && !ignoreClose) {
-                throw new IOException ("Engine is closed");
-            }
-            Status status;
-            WrapperResult r = new WrapperResult();
-            synchronized (wrapLock) {
-                wrap_dst.clear();
-                do {
-                    r.result = engine.wrap (src, offset, len, wrap_dst);
-                    status = r.result.getStatus();
-                    if (status == Status.BUFFER_OVERFLOW) {
-                        wrap_dst = realloc (wrap_dst, true, BufType.PACKET);
-                    }
-                } while (status == Status.BUFFER_OVERFLOW);
-                if (status == Status.CLOSED && !ignoreClose) {
-                    closed = true;
-                    return r;
-                }
-                if (r.result.bytesProduced() > 0) {
-                    wrap_dst.flip();
-                    int l = wrap_dst.remaining();
-                    assert l == r.result.bytesProduced();
-                    while (l>0) {
-                        l -= chan.write (wrap_dst);
-                    }
-                }
-            }
-            return r;
-        }
-
-        /* block until a complete message is available and return it
-         * in dst, together with the Result. dst may have been re-allocated
-         * so caller should check the returned value in Result
-         * If handshaking is in progress then, possibly no data is returned
-         */
-        WrapperResult recvAndUnwrap(ByteBuffer dst) throws IOException {
-            Status status;
-            WrapperResult r = new WrapperResult();
-            r.buf = dst;
-            if (closed) {
-                throw new IOException ("Engine is closed");
-            }
-            boolean needData;
-            if (u_remaining > 0) {
-                unwrap_src.compact();
-                unwrap_src.flip();
-                needData = false;
-            } else {
-                unwrap_src.clear();
-                needData = true;
-            }
-            synchronized (unwrapLock) {
-                int x;
-                do {
-                    if (needData) {
-                        x = chan.read (unwrap_src);
-                        if (x == -1) {
-                            throw new IOException ("connection closed for reading");
-                        }
-                        unwrap_src.flip();
-                    }
-                    r.result = engine.unwrap (unwrap_src, r.buf);
-                    status = r.result.getStatus();
-                    if (status == Status.BUFFER_UNDERFLOW) {
-                        if (unwrap_src.limit() == unwrap_src.capacity()) {
-                            /* buffer not big enough */
-                            unwrap_src = realloc (
-                                unwrap_src, false, BufType.PACKET
-                            );
-                        } else {
-                            /* Buffer not full, just need to read more
-                             * data off the channel. Reset pointers
-                             * for reading off SocketChannel
-                             */
-                            unwrap_src.position (unwrap_src.limit());
-                            unwrap_src.limit (unwrap_src.capacity());
-                        }
-                        needData = true;
-                    } else if (status == Status.BUFFER_OVERFLOW) {
-                        r.buf = realloc (r.buf, true, BufType.APPLICATION);
-                        needData = false;
-                    } else if (status == Status.CLOSED) {
-                        closed = true;
-                        r.buf.flip();
-                        return r;
-                    }
-                } while (status != Status.OK);
-            }
-            u_remaining = unwrap_src.remaining();
-            return r;
-        }
-    }
-
-//    WrapperResult sendData (ByteBuffer src) throws IOException {
-//        ByteBuffer[] buffers = new ByteBuffer[1];
-//        buffers[0] = src;
-//        return sendData(buffers, 0, 1);
-//    }
-
-    /**
-     * send the data in the given ByteBuffer. If a handshake is needed
-     * then this is handled within this method. When this call returns,
-     * all of the given user data has been sent and any handshake has been
-     * completed. Caller should check if engine has been closed.
-     */
-    WrapperResult sendData (ByteBuffer[] src, int offset, int len) throws IOException {
-        WrapperResult r = WrapperResult.createOK();
-        while (countBytes(src, offset, len) > 0) {
-            r = wrapper.wrapAndSend(src, offset, len, false);
-            Status status = r.result.getStatus();
-            if (status == Status.CLOSED) {
-                doClosure ();
-                return r;
-            }
-            HandshakeStatus hs_status = r.result.getHandshakeStatus();
-            if (hs_status != HandshakeStatus.FINISHED &&
-                hs_status != HandshakeStatus.NOT_HANDSHAKING)
-            {
-                doHandshake(hs_status);
-            }
-        }
-        return r;
-    }
-
-    /**
-     * read data thru the engine into the given ByteBuffer. If the
-     * given buffer was not large enough, a new one is allocated
-     * and returned. This call handles handshaking automatically.
-     * Caller should check if engine has been closed.
-     */
-    WrapperResult recvData (ByteBuffer dst) throws IOException {
-        /* we wait until some user data arrives */
-        int mark = dst.position();
-        WrapperResult r = null;
-        int pos = dst.position();
-        while (dst.position() == pos) {
-            r = wrapper.recvAndUnwrap (dst);
-            dst = (r.buf != dst) ? r.buf: dst;
-            Status status = r.result.getStatus();
-            if (status == Status.CLOSED) {
-                doClosure ();
-                return r;
-            }
-
-            HandshakeStatus hs_status = r.result.getHandshakeStatus();
-            if (hs_status != HandshakeStatus.FINISHED &&
-                hs_status != HandshakeStatus.NOT_HANDSHAKING)
-            {
-                doHandshake (hs_status);
-            }
-        }
-        Utils.flipToMark(dst, mark);
-        return r;
-    }
-
-    /* we've received a close notify. Need to call wrap to send
-     * the response
-     */
-    void doClosure () throws IOException {
-        try {
-            handshaking.lock();
-            ByteBuffer tmp = allocate(BufType.APPLICATION);
-            WrapperResult r;
-            do {
-                tmp.clear();
-                tmp.flip ();
-                r = wrapper.wrapAndSend(tmp, true);
-            } while (r.result.getStatus() != Status.CLOSED);
-        } finally {
-            handshaking.unlock();
-        }
-    }
-
-    /* do the (complete) handshake after acquiring the handshake lock.
-     * If two threads call this at the same time, then we depend
-     * on the wrapper methods being idempotent. eg. if wrapAndSend()
-     * is called with no data to send then there must be no problem
-     */
-    @SuppressWarnings("fallthrough")
-    void doHandshake (HandshakeStatus hs_status) throws IOException {
-        boolean wasBlocking;
-        try {
-            wasBlocking = chan.isBlocking();
-            handshaking.lock();
-            chan.configureBlocking(true);
-            ByteBuffer tmp = allocate(BufType.APPLICATION);
-            while (hs_status != HandshakeStatus.FINISHED &&
-                   hs_status != HandshakeStatus.NOT_HANDSHAKING)
-            {
-                WrapperResult r = null;
-                switch (hs_status) {
-                    case NEED_TASK:
-                        Runnable task;
-                        while ((task = engine.getDelegatedTask()) != null) {
-                            /* run in current thread, because we are already
-                             * running an external Executor
-                             */
-                            task.run();
-                        }
-                        /* fall thru - call wrap again */
-                    case NEED_WRAP:
-                        tmp.clear();
-                        tmp.flip();
-                        r = wrapper.wrapAndSend(tmp, false);
-                        break;
-
-                    case NEED_UNWRAP:
-                        tmp.clear();
-                        r = wrapper.recvAndUnwrap (tmp);
-                        if (r.buf != tmp) {
-                            tmp = r.buf;
-                        }
-                        assert tmp.position() == 0;
-                        break;
-                }
-                hs_status = r.result.getHandshakeStatus();
-            }
-            Log.logSSL(getSessionInfo());
-            if (!wasBlocking) {
-                chan.configureBlocking(false);
-            }
-        } finally {
-            handshaking.unlock();
-        }
-    }
-
-//    static void printParams(SSLParameters p) {
-//        System.out.println("SSLParameters:");
-//        if (p == null) {
-//            System.out.println("Null params");
-//            return;
-//        }
-//        for (String cipher : p.getCipherSuites()) {
-//                System.out.printf("cipher: %s\n", cipher);
-//        }
-//        // JDK 8 EXCL START
-//        for (String approto : p.getApplicationProtocols()) {
-//                System.out.printf("application protocol: %s\n", approto);
-//        }
-//        // JDK 8 EXCL END
-//        for (String protocol : p.getProtocols()) {
-//                System.out.printf("protocol: %s\n", protocol);
-//        }
-//        if (p.getServerNames() != null) {
-//            for (SNIServerName sname : p.getServerNames()) {
-//                System.out.printf("server name: %s\n", sname.toString());
-//            }
-//        }
-//    }
-
-    String getSessionInfo() {
-        StringBuilder sb = new StringBuilder();
-        String application = engine.getApplicationProtocol();
-        SSLSession sess = engine.getSession();
-        String cipher = sess.getCipherSuite();
-        String protocol = sess.getProtocol();
-        sb.append("Handshake complete alpn: ")
-                .append(application)
-                .append(", Cipher: ")
-                .append(cipher)
-                .append(", Protocol: ")
-                .append(protocol);
-        return sb.toString();
-    }
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java
deleted file mode 100644
index e992f9efccc..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java
+++ /dev/null
@@ -1,718 +0,0 @@
-/*
- * Copyright (c) 2015, 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;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
-/**
- * A WebSocket client.
- * {@Incubating}
- *
- * <p> To create a {@code WebSocket} use the {@link HttpClient#newWebSocketBuilder}
- * method. To close a {@code WebSocket} use one of the {@code sendClose} or
- * {@code abort} methods.
- *
- * <p> WebSocket messages are sent through a {@code WebSocket} and received
- * through the {@code WebSocket}'s {@code Listener}. Messages can be sent until
- * the output is closed, and received until the input is closed.
- * A {@code WebSocket} whose output and input are both closed may be considered
- * itself closed. To check these states use {@link #isOutputClosed()} and
- * {@link #isInputClosed()}.
- *
- * <p> Methods that send messages return {@code CompletableFuture} which
- * completes normally if the message is sent or completes exceptionally if an
- * error occurs.
- *
- * <p> To receive a message, first request it. If {@code n} messages are
- * requested, the listener will receive up to {@code n} more invocations of the
- * designated methods from the {@code WebSocket}. To request messages use
- * {@link #request(long)}. Request is an additive operation, that is
- * {@code request(n)} followed by {@code request(m)} is equivalent to
- * {@code request(n + m)}.
- *
- * <p> When sending or receiving a message in parts, a whole message is
- * transferred as a sequence of one or more invocations where the last
- * invocation is identified via an additional method argument.
- *
- * <p> Unless otherwise stated, {@code null} arguments will cause methods
- * of {@code WebSocket} to throw {@code NullPointerException}, similarly,
- * {@code WebSocket} will not pass {@code null} arguments to methods of
- * {@code Listener}.
- *
- * @implSpec Methods of {@code WebSocket} are failure-atomic in respect to
- * {@code NullPointerException}, {@code IllegalArgumentException} and
- * {@code IllegalStateException}. That is, if a method throws said exception, or
- * a returned {@code CompletableFuture} completes exceptionally with said
- * exception, the {@code WebSocket} will behave as if the method has not been
- * invoked at all.
- *
- * <p> A {@code WebSocket} invokes methods of its listener in a thread-safe
- * manner.
- *
- * <p> {@code WebSocket} handles Ping and Close messages automatically (as per
- * RFC 6455) by replying with Pong and Close messages respectively. If the
- * listener receives Ping or Close messages, no mandatory actions from the
- * listener are required.
- *
- * @since 9
- */
-public interface WebSocket {
-
-    /**
-     * The WebSocket Close message status code (<code>{@value}</code>),
-     * indicating normal closure, meaning that the purpose for which the
-     * connection was established has been fulfilled.
-     *
-     * @see #sendClose(int, String)
-     * @see Listener#onClose(WebSocket, int, String)
-     */
-    int NORMAL_CLOSURE = 1000;
-
-    /**
-     * A builder for creating {@code WebSocket} instances.
-     * {@Incubating}
-     *
-     * <p> To obtain a {@code WebSocket} configure a builder as required by
-     * calling intermediate methods (the ones that return the builder itself),
-     * then call {@code buildAsync()}. If an intermediate method is not called,
-     * an appropriate default value (or behavior) will be assumed.
-     *
-     * <p> Unless otherwise stated, {@code null} arguments will cause methods of
-     * {@code Builder} to throw {@code NullPointerException}.
-     *
-     * @since 9
-     */
-    interface Builder {
-
-        /**
-         * Adds the given name-value pair to the list of additional HTTP headers
-         * sent during the opening handshake.
-         *
-         * <p> Headers defined in WebSocket Protocol are illegal. If this method
-         * is not invoked, no additional HTTP headers will be sent.
-         *
-         * @param name
-         *         the header name
-         * @param value
-         *         the header value
-         *
-         * @return this builder
-         */
-        Builder header(String name, String value);
-
-        /**
-         * Sets a timeout for establishing a WebSocket connection.
-         *
-         * <p> If the connection is not established within the specified
-         * duration then building of the {@code WebSocket} will fail with
-         * {@link HttpTimeoutException}. If this method is not invoked then the
-         * infinite timeout is assumed.
-         *
-         * @param timeout
-         *         the timeout, non-{@linkplain Duration#isNegative() negative},
-         *         non-{@linkplain Duration#ZERO ZERO}
-         *
-         * @return this builder
-         */
-        Builder connectTimeout(Duration timeout);
-
-        /**
-         * Sets a request for the given subprotocols.
-         *
-         * <p> After the {@code WebSocket} has been built, the actual
-         * subprotocol can be queried via
-         * {@link WebSocket#getSubprotocol WebSocket.getSubprotocol()}.
-         *
-         * <p> Subprotocols are specified in the order of preference. The most
-         * preferred subprotocol is specified first. If there are any additional
-         * subprotocols they are enumerated from the most preferred to the least
-         * preferred.
-         *
-         * <p> Subprotocols not conforming to the syntax of subprotocol
-         * identifiers are illegal. If this method is not invoked then no
-         * subprotocols will be requested.
-         *
-         * @param mostPreferred
-         *         the most preferred subprotocol
-         * @param lesserPreferred
-         *         the lesser preferred subprotocols
-         *
-         * @return this builder
-         */
-        Builder subprotocols(String mostPreferred, String... lesserPreferred);
-
-        /**
-         * Builds a {@link WebSocket} connected to the given {@code URI} and
-         * associated with the given {@code Listener}.
-         *
-         * <p> Returns a {@code CompletableFuture} which will either complete
-         * normally with the resulting {@code WebSocket} or complete
-         * exceptionally with one of the following errors:
-         * <ul>
-         * <li> {@link IOException} -
-         *          if an I/O error occurs
-         * <li> {@link WebSocketHandshakeException} -
-         *          if the opening handshake fails
-         * <li> {@link HttpTimeoutException} -
-         *          if the opening handshake does not complete within
-         *          the timeout
-         * <li> {@link InterruptedException} -
-         *          if the operation is interrupted
-         * <li> {@link SecurityException} -
-         *          if a security manager has been installed and it denies
-         *          {@link java.net.URLPermission access} to {@code uri}.
-         *          <a href="HttpRequest.html#securitychecks">Security checks</a>
-         *          contains more information relating to the security context
-         *          in which the the listener is invoked.
-         * <li> {@link IllegalArgumentException} -
-         *          if any of the arguments of this builder's methods are
-         *          illegal
-         * </ul>
-         *
-         * @param uri
-         *         the WebSocket URI
-         * @param listener
-         *         the listener
-         *
-         * @return a {@code CompletableFuture} with the {@code WebSocket}
-         */
-        CompletableFuture<WebSocket> buildAsync(URI uri, Listener listener);
-    }
-
-    /**
-     * The receiving interface of {@code WebSocket}.
-     * {@Incubating}
-     *
-     * <p> A {@code WebSocket} invokes methods on its listener when it receives
-     * messages or encounters events. The invoking {@code WebSocket} is passed
-     * as an argument to {@code Listener}'s methods. A {@code WebSocket} invokes
-     * methods on its listener in a thread-safe manner.
-     *
-     * <p> Unless otherwise stated if a listener's method throws an exception or
-     * a {@code CompletionStage} returned from a method completes exceptionally,
-     * the {@code WebSocket} will invoke {@code onError} with this exception.
-     *
-     * <p> If a listener's method returns {@code null} rather than a
-     * {@code CompletionStage}, {@code WebSocket} will behave as if the listener
-     * returned a {@code CompletionStage} that is already completed normally.
-     *
-     * @since 9
-     */
-    interface Listener {
-
-        /**
-         * A {@code WebSocket} has been connected.
-         *
-         * <p> This is the first invocation and it is made at most once. This
-         * method is typically used to make an initial request for messages.
-         *
-         * @implSpec The default implementation of this method behaves as if:
-         *
-         * <pre>{@code
-         *     webSocket.request(1);
-         * }</pre>
-         *
-         * @param webSocket
-         *         the WebSocket that has been connected
-         */
-        default void onOpen(WebSocket webSocket) { webSocket.request(1); }
-
-        /**
-         * A Text message has been received.
-         *
-         * <p> If a whole message has been received, this method will be invoked
-         * with {@code MessagePart.WHOLE} marker. Otherwise, it will be invoked
-         * with {@code FIRST}, possibly a number of times with {@code PART} and,
-         * finally, with {@code LAST} markers. If this message is partial, it
-         * may be an incomplete UTF-16 sequence. However, the concatenation of
-         * all messages through the last will be a complete UTF-16 sequence.
-         *
-         * <p> Return a {@code CompletionStage} which will be used by the
-         * {@code WebSocket} as a signal it may reclaim the
-         * {@code CharSequence}. Do not access the {@code CharSequence} after
-         * this {@ode CompletionStage} has completed.
-         *
-         * @implSpec The default implementation of this method behaves as if:
-         *
-         * <pre>{@code
-         *     webSocket.request(1);
-         *     return null;
-         * }</pre>
-         *
-         * @implNote This method is always invoked with character sequences
-         * which are complete UTF-16 sequences.
-         *
-         * @param webSocket
-         *         the WebSocket on which the message has been received
-         * @param message
-         *         the message
-         * @param part
-         *         the part
-         *
-         * @return a {@code CompletionStage} which completes when the
-         * {@code CharSequence} may be reclaimed; or {@code null} if it may be
-         * reclaimed immediately
-         */
-        default CompletionStage<?> onText(WebSocket webSocket,
-                                          CharSequence message,
-                                          MessagePart part) {
-            webSocket.request(1);
-            return null;
-        }
-
-        /**
-         * A Binary message has been received.
-         *
-         * <p> If a whole message has been received, this method will be invoked
-         * with {@code MessagePart.WHOLE} marker. Otherwise, it will be invoked
-         * with {@code FIRST}, possibly a number of times with {@code PART} and,
-         * finally, with {@code LAST} markers.
-         *
-         * <p> This message consists of bytes from the buffer's position to
-         * its limit.
-         *
-         * <p> Return a {@code CompletionStage} which will be used by the
-         * {@code WebSocket} as a signal it may reclaim the
-         * {@code ByteBuffer}. Do not access the {@code ByteBuffer} after
-         * this {@ode CompletionStage} has completed.
-         *
-         * @implSpec The default implementation of this method behaves as if:
-         *
-         * <pre>{@code
-         *     webSocket.request(1);
-         *     return null;
-         * }</pre>
-         *
-         * @param webSocket
-         *         the WebSocket on which the message has been received
-         * @param message
-         *         the message
-         * @param part
-         *         the part
-         *
-         * @return a {@code CompletionStage} which completes when the
-         * {@code ByteBuffer} may be reclaimed; or {@code null} if it may be
-         * reclaimed immediately
-         */
-        default CompletionStage<?> onBinary(WebSocket webSocket,
-                                            ByteBuffer message,
-                                            MessagePart part) {
-            webSocket.request(1);
-            return null;
-        }
-
-        /**
-         * A Ping message has been received.
-         *
-         * <p> The message consists of not more than {@code 125} bytes from
-         * the buffer's position to its limit.
-         *
-         * <p> Return a {@code CompletionStage} which will be used by the
-         * {@code WebSocket} as a signal it may reclaim the
-         * {@code ByteBuffer}. Do not access the {@code ByteBuffer} after
-         * this {@ode CompletionStage} has completed.
-         *
-         * @implSpec The default implementation of this method behaves as if:
-         *
-         * <pre>{@code
-         *     webSocket.request(1);
-         *     return null;
-         * }</pre>
-         *
-         * @param webSocket
-         *         the WebSocket on which the message has been received
-         * @param message
-         *         the message
-         *
-         * @return a {@code CompletionStage} which completes when the
-         * {@code ByteBuffer} may be reclaimed; or {@code null} if it may be
-         * reclaimed immediately
-         */
-        default CompletionStage<?> onPing(WebSocket webSocket,
-                                          ByteBuffer message) {
-            webSocket.request(1);
-            return null;
-        }
-
-        /**
-         * A Pong message has been received.
-         *
-         * <p> The message consists of not more than {@code 125} bytes from
-         * the buffer's position to its limit.
-         *
-         * <p> Return a {@code CompletionStage} which will be used by the
-         * {@code WebSocket} as a signal it may reclaim the
-         * {@code ByteBuffer}. Do not access the {@code ByteBuffer} after
-         * this {@ode CompletionStage} has completed.
-         *
-         * @implSpec The default implementation of this method behaves as if:
-         *
-         * <pre>{@code
-         *     webSocket.request(1);
-         *     return null;
-         * }</pre>
-         *
-         * @param webSocket
-         *         the WebSocket on which the message has been received
-         * @param message
-         *         the message
-         *
-         * @return a {@code CompletionStage} which completes when the
-         * {@code ByteBuffer} may be reclaimed; or {@code null} if it may be
-         * reclaimed immediately
-         */
-        default CompletionStage<?> onPong(WebSocket webSocket,
-                                          ByteBuffer message) {
-            webSocket.request(1);
-            return null;
-        }
-
-        /**
-         * A Close message has been received.
-         *
-         * <p> This is the last invocation from the {@code WebSocket}. By the
-         * time this invocation begins the {@code WebSocket}'s input will have
-         * been closed. Be prepared to receive this invocation at any time after
-         * {@code onOpen} regardless of whether or not any messages have been
-         * requested from the {@code WebSocket}.
-         *
-         * <p> A Close message consists of a status code and a reason for
-         * closing. The status code is an integer from the range
-         * {@code 1000 <= code <= 65535}. The {@code reason} is a string which
-         * has an UTF-8 representation not longer than {@code 123} bytes.
-         *
-         * <p> Return a {@code CompletionStage} that will be used by the
-         * {@code WebSocket} as a signal that it may close the output. The
-         * {@code WebSocket} will close the output at the earliest of completion
-         * of the returned {@code CompletionStage} or invoking a
-         * {@link WebSocket#sendClose(int, String) sendClose} method.
-         *
-         * <p> If an exception is thrown from this method or a
-         * {@code CompletionStage} returned from it completes exceptionally,
-         * the resulting behaviour is undefined.
-         *
-         * @param webSocket
-         *         the WebSocket on which the message has been received
-         * @param statusCode
-         *         the status code
-         * @param reason
-         *         the reason
-         *
-         * @return a {@code CompletionStage} which completes when the
-         * {@code WebSocket} may be closed; or {@code null} if it may be
-         * closed immediately
-         */
-        default CompletionStage<?> onClose(WebSocket webSocket,
-                                           int statusCode,
-                                           String reason) {
-            return null;
-        }
-
-        /**
-         * An unrecoverable error has occurred.
-         *
-         * <p> This is the last invocation from the {@code WebSocket}. By the
-         * time this invocation begins both {@code WebSocket}'s input and output
-         * will have been closed. Be prepared to receive this invocation at any
-         * time after {@code onOpen} regardless of whether or not any messages
-         * have been requested from the {@code WebSocket}.
-         *
-         * <p> If an exception is thrown from this method, resulting behavior is
-         * undefined.
-         *
-         * @param webSocket
-         *         the WebSocket on which the error has occurred
-         * @param error
-         *         the error
-         */
-        default void onError(WebSocket webSocket, Throwable error) { }
-    }
-
-    /**
-     * A marker used by {@link WebSocket.Listener} for identifying partial
-     * messages.
-     * {@Incubating}
-     *
-     * @since 9
-     */
-    enum MessagePart {
-
-        /**
-         * The first part of a message.
-         */
-        FIRST,
-
-        /**
-         * A middle part of a message.
-         */
-        PART,
-
-        /**
-         * The last part of a message.
-         */
-        LAST,
-
-        /**
-         * A whole message consisting of a single part.
-         */
-        WHOLE
-    }
-
-    /**
-     * Sends a Text message with characters from the given {@code CharSequence}.
-     *
-     * <p> To send a Text message invoke this method only after the previous
-     * Text or Binary message has been sent. The character sequence must not be
-     * modified until the {@code CompletableFuture} returned from this method
-     * has completed.
-     *
-     * <p> A {@code CompletableFuture} returned from this method can
-     * complete exceptionally with:
-     * <ul>
-     * <li> {@link IllegalArgumentException} -
-     *          if {@code message} is a malformed UTF-16 sequence
-     * <li> {@link IllegalStateException} -
-     *          if {@code sendClose} has been invoked
-     *          or if the previous message has not been sent yet
-     *          or if a previous Binary message was sent with
-     *          {@code isLast == false}
-     * <li> {@link IOException} -
-     *          if an I/O error occurs
-     * </ul>
-     *
-     * @implNote If a partial UTF-16 sequence is passed to this method, a
-     * {@code CompletableFuture} returned will complete exceptionally with
-     * {@code IOException}.
-     *
-     * @param message
-     *         the message
-     * @param isLast
-     *         {@code true} if this is the last part of the message,
-     *         {@code false} otherwise
-     *
-     * @return a {@code CompletableFuture} that completes, with this
-     * {@code WebSocket}, when the message has been sent
-     */
-    CompletableFuture<WebSocket> sendText(CharSequence message, boolean isLast);
-
-    /**
-     * Sends a Binary message with bytes from the given {@code ByteBuffer}.
-     *
-     * <p> To send a Binary message invoke this method only after the previous
-     * Text or Binary message has been sent. The message consists of bytes from
-     * the buffer's position to its limit. Upon normal completion of a
-     * {@code CompletableFuture} returned from this method the buffer will have
-     * no remaining bytes. The buffer must not be accessed until after that.
-     *
-     * <p> The {@code CompletableFuture} returned from this method can
-     * complete exceptionally with:
-     * <ul>
-     * <li> {@link IllegalStateException} -
-     *          if {@code sendClose} has been invoked
-     *          or if the previous message has not been sent yet
-     *          or if a previous Text message was sent with
-     *              {@code isLast == false}
-     * <li> {@link IOException} -
-     *          if an I/O error occurs
-     * </ul>
-     *
-     * @param message
-     *         the message
-     * @param isLast
-     *         {@code true} if this is the last part of the message,
-     *         {@code false} otherwise
-     *
-     * @return a {@code CompletableFuture} that completes, with this
-     * {@code WebSocket}, when the message has been sent
-     */
-    CompletableFuture<WebSocket> sendBinary(ByteBuffer message, boolean isLast);
-
-    /**
-     * Sends a Ping message with bytes from the given {@code ByteBuffer}.
-     *
-     * <p> The message consists of not more than {@code 125} bytes from the
-     * buffer's position to its limit. Upon normal completion of a
-     * {@code CompletableFuture} returned from this method the buffer will
-     * have no remaining bytes. The buffer must not be accessed until after that.
-     *
-     * <p> The {@code CompletableFuture} returned from this method can
-     * complete exceptionally with:
-     * <ul>
-     * <li> {@link IllegalArgumentException} -
-     *          if the message is too long
-     * <li> {@link IllegalStateException} -
-     *          if {@code sendClose} has been invoked
-     * <li> {@link IOException} -
-     *          if an I/O error occurs
-     * </ul>
-     *
-     * @param message
-     *         the message
-     *
-     * @return a {@code CompletableFuture} that completes, with this
-     * {@code WebSocket}, when the Ping message has been sent
-     */
-    CompletableFuture<WebSocket> sendPing(ByteBuffer message);
-
-    /**
-     * Sends a Pong message with bytes from the given {@code ByteBuffer}.
-     *
-     * <p> The message consists of not more than {@code 125} bytes from the
-     * buffer's position to its limit. Upon normal completion of a
-     * {@code CompletableFuture} returned from this method the buffer will have
-     * no remaining bytes. The buffer must not be accessed until after that.
-     *
-     * <p> The {@code CompletableFuture} returned from this method can
-     * complete exceptionally with:
-     * <ul>
-     * <li> {@link IllegalArgumentException} -
-     *          if the message is too long
-     * <li> {@link IllegalStateException} -
-     *          if {@code sendClose} has been invoked
-     * <li> {@link IOException} -
-     *          if an I/O error occurs
-     * </ul>
-     *
-     * @param message
-     *         the message
-     *
-     * @return a {@code CompletableFuture} that completes, with this
-     * {@code WebSocket}, when the Pong message has been sent
-     */
-    CompletableFuture<WebSocket> sendPong(ByteBuffer message);
-
-    /**
-     * Sends a Close message with the given status code and the reason,
-     * initiating an orderly closure.
-     *
-     * <p> When this method returns the output will have been closed.
-     *
-     * <p> The {@code statusCode} is an integer from the range
-     * {@code 1000 <= code <= 4999}. Status codes {@code 1002}, {@code 1003},
-     * {@code 1006}, {@code 1007}, {@code 1009}, {@code 1010}, {@code 1012},
-     * {@code 1013} and {@code 1015} are illegal. Behaviour in respect to other
-     * status codes is implementation-specific. The {@code reason} is a string
-     * that has an UTF-8 representation not longer than {@code 123} bytes.
-     *
-     * <p> Use the provided integer constant {@link #NORMAL_CLOSURE} as a status
-     * code and an empty string as a reason in a typical case.
-     *
-     * <p> A {@code CompletableFuture} returned from this method can
-     * complete exceptionally with:
-     * <ul>
-     * <li> {@link IllegalArgumentException} -
-     *          if {@code statusCode} or {@code reason} are illegal
-     * <li> {@link IOException} -
-     *          if an I/O error occurs
-     * </ul>
-     *
-     * @implSpec An endpoint sending a Close message might not receive a
-     * complementing Close message in a timely manner for a variety of reasons.
-     * The {@code WebSocket} implementation is responsible for providing a
-     * closure mechanism that guarantees that once {@code sendClose} method has
-     * been invoked the {@code WebSocket} will close regardless of whether or
-     * not a Close frame has been received and without further intervention from
-     * the user of this API. Method {@code sendClose} is designed to be,
-     * possibly, the last call from the user of this API.
-     *
-     * @param statusCode
-     *         the status code
-     * @param reason
-     *         the reason
-     *
-     * @return a {@code CompletableFuture} that completes, with this
-     * {@code WebSocket}, when the Close message has been sent
-     */
-    CompletableFuture<WebSocket> sendClose(int statusCode, String reason);
-
-    /**
-     * Requests {@code n} more messages from this {@code WebSocket}.
-     *
-     * <p> This {@code WebSocket} will invoke its listener's {@code onText},
-     * {@code onBinary}, {@code onPing}, {@code onPong} or {@code onClose}
-     * methods up to {@code n} more times.
-     *
-     * <p> This method may be invoked at any time.
-     *
-     * @param n
-     *         the number of messages requested
-     *
-     * @throws IllegalArgumentException
-     *         if {@code n <= 0}
-     */
-    void request(long n);
-
-    /**
-     * Returns the subprotocol for this {@code WebSocket}.
-     *
-     * <p> This method may be invoked at any time.
-     *
-     * @return the subprotocol for this {@code WebSocket}, or an empty
-     * {@code String} if there's no subprotocol
-     */
-    String getSubprotocol();
-
-    /**
-     * Tells whether or not this {@code WebSocket} is permanently closed
-     * for sending messages.
-     *
-     * <p> If this method returns {@code true}, subsequent invocations will also
-     * return {@code true}. This method may be invoked at any time.
-     *
-     * @return {@code true} if closed, {@code false} otherwise
-     */
-    boolean isOutputClosed();
-
-    /**
-     * Tells whether or not this {@code WebSocket} is permanently closed
-     * for receiving messages.
-     *
-     * <p> If this method returns {@code true}, subsequent invocations will also
-     * return {@code true}. This method may be invoked at any time.
-     *
-     * @return {@code true} if closed, {@code false} otherwise
-     */
-    boolean isInputClosed();
-
-    /**
-     * Closes this {@code WebSocket} abruptly.
-     *
-     * <p> When this method returns both the input and output will have been
-     * closed. This method may be invoked at any time. Subsequent invocations
-     * have no effect.
-     *
-     * @apiNote Depending on its implementation, the state (for example, whether
-     * or not a message is being transferred at the moment) and possible errors
-     * while releasing associated resources, this {@code WebSocket} may invoke
-     * its listener's {@code onError}.
-     */
-    void abort();
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OutgoingMessage.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OutgoingMessage.java
deleted file mode 100644
index ba717bca398..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OutgoingMessage.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 2015, 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.websocket;
-
-import jdk.incubator.http.internal.websocket.Frame.Opcode;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
-import java.security.SecureRandom;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Objects.requireNonNull;
-import static jdk.incubator.http.internal.common.Utils.EMPTY_BYTEBUFFER;
-import static jdk.incubator.http.internal.websocket.Frame.MAX_HEADER_SIZE_BYTES;
-import static jdk.incubator.http.internal.websocket.Frame.Opcode.BINARY;
-import static jdk.incubator.http.internal.websocket.Frame.Opcode.CLOSE;
-import static jdk.incubator.http.internal.websocket.Frame.Opcode.CONTINUATION;
-import static jdk.incubator.http.internal.websocket.Frame.Opcode.PING;
-import static jdk.incubator.http.internal.websocket.Frame.Opcode.PONG;
-import static jdk.incubator.http.internal.websocket.Frame.Opcode.TEXT;
-
-/*
- * A stateful object that represents a WebSocket message being sent to the
- * channel.
- *
- * Data provided to the constructors is copied. Otherwise we would have to deal
- * with mutability, security, masking/unmasking, readonly status, etc. So
- * copying greatly simplifies the implementation.
- *
- * In the case of memory-sensitive environments an alternative implementation
- * could use an internal pool of buffers though at the cost of extra complexity
- * and possible performance degradation.
- */
-abstract class OutgoingMessage {
-
-    // Share per WebSocket?
-    private static final SecureRandom maskingKeys = new SecureRandom();
-
-    protected ByteBuffer[] frame;
-    protected int offset;
-
-    /*
-     * Performs contextualization. This method is not a part of the constructor
-     * so it would be possible to defer the work it does until the most
-     * convenient moment (up to the point where sentTo is invoked).
-     */
-    protected boolean contextualize(Context context) {
-        // masking and charset decoding should be performed here rather than in
-        // the constructor (as of today)
-        if (context.isCloseSent()) {
-            throw new IllegalStateException("Close sent");
-        }
-        return true;
-    }
-
-    protected boolean sendTo(RawChannel channel) throws IOException {
-        while ((offset = nextUnwrittenIndex()) != -1) {
-            long n = channel.write(frame, offset, frame.length - offset);
-            if (n == 0) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private int nextUnwrittenIndex() {
-        for (int i = offset; i < frame.length; i++) {
-            if (frame[i].hasRemaining()) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    static final class Text extends OutgoingMessage {
-
-        private final ByteBuffer payload;
-        private final boolean isLast;
-
-        Text(CharSequence characters, boolean isLast) {
-            CharsetEncoder encoder = UTF_8.newEncoder(); // Share per WebSocket?
-            try {
-                payload = encoder.encode(CharBuffer.wrap(characters));
-            } catch (CharacterCodingException e) {
-                throw new IllegalArgumentException(
-                        "Malformed UTF-8 text message");
-            }
-            this.isLast = isLast;
-        }
-
-        @Override
-        protected boolean contextualize(Context context) {
-            super.contextualize(context);
-            if (context.isPreviousBinary() && !context.isPreviousLast()) {
-                throw new IllegalStateException("Unexpected text message");
-            }
-            frame = getDataMessageBuffers(
-                    TEXT, context.isPreviousLast(), isLast, payload, payload);
-            context.setPreviousBinary(false);
-            context.setPreviousText(true);
-            context.setPreviousLast(isLast);
-            return true;
-        }
-    }
-
-    static final class Binary extends OutgoingMessage {
-
-        private final ByteBuffer payload;
-        private final boolean isLast;
-
-        Binary(ByteBuffer payload, boolean isLast) {
-            this.payload = requireNonNull(payload);
-            this.isLast = isLast;
-        }
-
-        @Override
-        protected boolean contextualize(Context context) {
-            super.contextualize(context);
-            if (context.isPreviousText() && !context.isPreviousLast()) {
-                throw new IllegalStateException("Unexpected binary message");
-            }
-            ByteBuffer newBuffer = ByteBuffer.allocate(payload.remaining());
-            frame = getDataMessageBuffers(
-                    BINARY, context.isPreviousLast(), isLast, payload, newBuffer);
-            context.setPreviousText(false);
-            context.setPreviousBinary(true);
-            context.setPreviousLast(isLast);
-            return true;
-        }
-    }
-
-    static final class Ping extends OutgoingMessage {
-
-        Ping(ByteBuffer payload) {
-            frame = getControlMessageBuffers(PING, payload);
-        }
-    }
-
-    static final class Pong extends OutgoingMessage {
-
-        Pong(ByteBuffer payload) {
-            frame = getControlMessageBuffers(PONG, payload);
-        }
-    }
-
-    static final class Close extends OutgoingMessage {
-
-        Close() {
-            frame = getControlMessageBuffers(CLOSE, EMPTY_BYTEBUFFER);
-        }
-
-        Close(int statusCode, CharSequence reason) {
-            ByteBuffer payload = ByteBuffer.allocate(125)
-                    .putChar((char) statusCode);
-            CoderResult result = UTF_8.newEncoder()
-                    .encode(CharBuffer.wrap(reason),
-                            payload,
-                            true);
-            if (result.isOverflow()) {
-                throw new IllegalArgumentException("Long reason");
-            } else if (result.isError()) {
-                try {
-                    result.throwException();
-                } catch (CharacterCodingException e) {
-                    throw new IllegalArgumentException(
-                            "Malformed UTF-8 reason", e);
-                }
-            }
-            payload.flip();
-            frame = getControlMessageBuffers(CLOSE, payload);
-        }
-
-        @Override
-        protected boolean contextualize(Context context) {
-            if (context.isCloseSent()) {
-                return false;
-            } else {
-                context.setCloseSent();
-                return true;
-            }
-        }
-    }
-
-    private static ByteBuffer[] getControlMessageBuffers(Opcode opcode,
-                                                         ByteBuffer payload) {
-        assert opcode.isControl() : opcode;
-        int remaining = payload.remaining();
-        if (remaining > 125) {
-            throw new IllegalArgumentException
-                    ("Long message: " + remaining);
-        }
-        ByteBuffer frame = ByteBuffer.allocate(MAX_HEADER_SIZE_BYTES + remaining);
-        int mask = maskingKeys.nextInt();
-        new Frame.HeaderWriter()
-                .fin(true)
-                .opcode(opcode)
-                .payloadLen(remaining)
-                .mask(mask)
-                .write(frame);
-        Frame.Masker.transferMasking(payload, frame, mask);
-        frame.flip();
-        return new ByteBuffer[]{frame};
-    }
-
-    private static ByteBuffer[] getDataMessageBuffers(Opcode type,
-                                                      boolean isPreviousLast,
-                                                      boolean isLast,
-                                                      ByteBuffer payloadSrc,
-                                                      ByteBuffer payloadDst) {
-        assert !type.isControl() && type != CONTINUATION : type;
-        ByteBuffer header = ByteBuffer.allocate(MAX_HEADER_SIZE_BYTES);
-        int mask = maskingKeys.nextInt();
-        new Frame.HeaderWriter()
-                .fin(isLast)
-                .opcode(isPreviousLast ? type : CONTINUATION)
-                .payloadLen(payloadDst.remaining())
-                .mask(mask)
-                .write(header);
-        header.flip();
-        Frame.Masker.transferMasking(payloadSrc, payloadDst, mask);
-        payloadDst.flip();
-        return new ByteBuffer[]{header, payloadDst};
-    }
-
-    /*
-     * An instance of this class is passed sequentially between messages, so
-     * every message in a sequence can check the context it is in and update it
-     * if necessary.
-     */
-    public static class Context {
-
-        boolean previousLast = true;
-        boolean previousBinary;
-        boolean previousText;
-        boolean closeSent;
-
-        private boolean isPreviousText() {
-            return this.previousText;
-        }
-
-        private void setPreviousText(boolean value) {
-            this.previousText = value;
-        }
-
-        private boolean isPreviousBinary() {
-            return this.previousBinary;
-        }
-
-        private void setPreviousBinary(boolean value) {
-            this.previousBinary = value;
-        }
-
-        private boolean isPreviousLast() {
-            return this.previousLast;
-        }
-
-        private void setPreviousLast(boolean value) {
-            this.previousLast = value;
-        }
-
-        private boolean isCloseSent() {
-            return closeSent;
-        }
-
-        private void setCloseSent() {
-            closeSent = true;
-        }
-    }
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java
deleted file mode 100644
index d9371c58ac2..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2015, 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.websocket;
-
-import jdk.incubator.http.internal.common.Demand;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-
-/*
- * Receives incoming data from the channel on demand and converts it into a
- * stream of WebSocket messages which are then delivered to the supplied message
- * consumer in a strict sequential order and non-recursively. In other words,
- *
- *     onText()
- *     onText()
- *     onBinary()
- *     ...
- *
- * instead of
- *
- *     onText()
- *       onText()
- *         onBinary()
- *     ...
- *
- * even if `request(long n)` is called from inside these invocations.
- */
-public class Receiver {
-
-    private final MessageStreamConsumer messageConsumer;
-    private final RawChannel channel;
-    private final FrameConsumer frameConsumer;
-    private final Frame.Reader reader = new Frame.Reader();
-    private final RawChannel.RawEvent event = createHandler();
-    protected final Demand demand = new Demand(); /* Exposed for testing purposes */
-    private final SequentialScheduler pushScheduler;
-
-    private ByteBuffer data;
-    private volatile int state;
-
-    private static final int UNREGISTERED = 0;
-    private static final int AVAILABLE    = 1;
-    private static final int WAITING      = 2;
-
-    public Receiver(MessageStreamConsumer messageConsumer, RawChannel channel) {
-        this.messageConsumer = messageConsumer;
-        this.channel = channel;
-        this.frameConsumer = new FrameConsumer(this.messageConsumer);
-        this.data = channel.initialByteBuffer();
-        // To ensure the initial non-final `data` will be visible
-        // (happens-before) when `handler` invokes `pushContinuously`
-        // the following assignment is done last:
-        pushScheduler = createScheduler();
-    }
-
-    /* Exposed for testing purposes */
-    protected SequentialScheduler createScheduler() {
-        return new SequentialScheduler(new PushContinuouslyTask());
-    }
-
-    private RawChannel.RawEvent createHandler() {
-        return new RawChannel.RawEvent() {
-
-            @Override
-            public int interestOps() {
-                return SelectionKey.OP_READ;
-            }
-
-            @Override
-            public void handle() {
-                state = AVAILABLE;
-                pushScheduler.runOrSchedule();
-            }
-        };
-    }
-
-    public void request(long n) {
-        if (demand.increase(n)) {
-            pushScheduler.runOrSchedule();
-        }
-    }
-
-    /*
-     * Why is this method needed? Since Receiver operates through callbacks
-     * this method allows to abstract out what constitutes as a message being
-     * received (i.e. to decide outside this type when exactly one should
-     * decrement the demand).
-     */
-    void acknowledge() {
-        long x = demand.decreaseAndGet(1);
-        if (x < 0) {
-            throw new InternalError(String.valueOf(x));
-        }
-    }
-
-    /*
-     * Stops the machinery from reading and delivering messages permanently,
-     * regardless of the current demand and data availability.
-     */
-    public void close() throws IOException {
-        pushScheduler.stop();
-        channel.shutdownInput();
-    }
-
-    private class PushContinuouslyTask
-        extends SequentialScheduler.CompleteRestartableTask
-    {
-        @Override
-        public void run() {
-            while (!pushScheduler.isStopped()) {
-                if (data.hasRemaining()) {
-                    if (!demand.isFulfilled()) {
-                        try {
-                            int oldPos = data.position();
-                            reader.readFrame(data, frameConsumer);
-                            int newPos = data.position();
-                            assert oldPos != newPos : data; // reader always consumes bytes
-                        } catch (Throwable e) {
-                            pushScheduler.stop();
-                            messageConsumer.onError(e);
-                        }
-                        continue;
-                    }
-                    break;
-                }
-                switch (state) {
-                    case WAITING:
-                        return;
-                    case UNREGISTERED:
-                        try {
-                            state = WAITING;
-                            channel.registerEvent(event);
-                        } catch (Throwable e) {
-                            pushScheduler.stop();
-                            messageConsumer.onError(e);
-                        }
-                        return;
-                    case AVAILABLE:
-                        try {
-                            data = channel.read();
-                        } catch (Throwable e) {
-                            pushScheduler.stop();
-                            messageConsumer.onError(e);
-                            return;
-                        }
-                        if (data == null) { // EOF
-                            pushScheduler.stop();
-                            messageConsumer.onComplete();
-                            return;
-                        } else if (!data.hasRemaining()) { // No data at the moment
-                            // Pretty much a "goto", reusing the existing code path
-                            // for registration
-                            state = UNREGISTERED;
-                        }
-                        continue;
-                    default:
-                        throw new InternalError(String.valueOf(state));
-                }
-            }
-        }
-    }
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java
deleted file mode 100644
index e15374eb1f9..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2015, 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.websocket;
-
-import java.io.IOException;
-import java.nio.channels.SelectionKey;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
-
-import static java.util.Objects.requireNonNull;
-
-/*
- * Sends messages one at a time, in an asynchronous and non-blocking fashion.
- *
- * No matter whether the message has been fully sent or an error has occurred,
- * the transmitter reports the outcome to the supplied handler and becomes ready
- * to accept a new message. Until then, the transmitter is considered "busy" and
- * an IllegalStateException will be thrown on each attempt to invoke send.
- */
-public class Transmitter {
-
-    /* This flag is used solely for assertions */
-    private final AtomicBoolean busy = new AtomicBoolean();
-    private OutgoingMessage message;
-    private Consumer<Exception> completionHandler;
-    private final RawChannel channel;
-    private final RawChannel.RawEvent event;
-
-    public Transmitter(RawChannel channel) {
-        this.channel = channel;
-        this.event = createHandler();
-    }
-
-    /**
-     * The supplied handler may be invoked in the calling thread.
-     * A {@code StackOverflowError} may thus occur if there's a possibility
-     * that this method is called again by the supplied handler.
-     */
-    public void send(OutgoingMessage message,
-                     Consumer<Exception> completionHandler)
-    {
-        requireNonNull(message);
-        requireNonNull(completionHandler);
-        if (!busy.compareAndSet(false, true)) {
-            throw new IllegalStateException();
-        }
-        send0(message, completionHandler);
-    }
-
-    public void close() throws IOException {
-        channel.shutdownOutput();
-    }
-
-    private RawChannel.RawEvent createHandler() {
-        return new RawChannel.RawEvent() {
-
-            @Override
-            public int interestOps() {
-                return SelectionKey.OP_WRITE;
-            }
-
-            @Override
-            public void handle() {
-                // registerEvent(e) happens-before subsequent e.handle(), so
-                // we're fine reading the stored message and the completionHandler
-                send0(message, completionHandler);
-            }
-        };
-    }
-
-    private void send0(OutgoingMessage message, Consumer<Exception> handler) {
-        boolean b = busy.get();
-        assert b; // Please don't inline this, as busy.get() has memory
-                  // visibility effects and we don't want the program behaviour
-                  // to depend on whether the assertions are turned on
-                  // or turned off
-        try {
-            boolean sent = message.sendTo(channel);
-            if (sent) {
-                busy.set(false);
-                handler.accept(null);
-            } else {
-                // The message has not been fully sent, the transmitter needs to
-                // remember the message until it can continue with sending it
-                this.message = message;
-                this.completionHandler = handler;
-                try {
-                    channel.registerEvent(event);
-                } catch (IOException e) {
-                    this.message = null;
-                    this.completionHandler = null;
-                    busy.set(false);
-                    handler.accept(e);
-                }
-            }
-        } catch (IOException e) {
-            busy.set(false);
-            handler.accept(e);
-        }
-    }
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/TransportSupplier.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/TransportSupplier.java
deleted file mode 100644
index d433a208d9a..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/TransportSupplier.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 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.websocket;
-
-import java.io.IOException;
-
-/*
- * Abstracts out I/O channel for the WebSocket implementation. The latter then
- * deals with input and output streams of messages and does not have to
- * understand the state machine of channels (e.g. how exactly they are closed).
- * Mocking this type will allow testing WebSocket message exchange in isolation.
- */
-public class TransportSupplier {
-
-    protected final RawChannel channel; /* Exposed for testing purposes */
-    private final Object lock = new Object();
-    private Transmitter transmitter;
-    private Receiver receiver;
-    private boolean receiverShutdown;
-    private boolean transmitterShutdown;
-    private boolean closed;
-
-    public TransportSupplier(RawChannel channel) {
-        this.channel = channel;
-    }
-
-    public Receiver receiver(MessageStreamConsumer consumer) {
-        synchronized (lock) {
-            if (receiver == null) {
-                receiver = newReceiver(consumer);
-            }
-            return receiver;
-        }
-    }
-
-    public Transmitter transmitter() {
-        synchronized (lock) {
-            if (transmitter == null) {
-                transmitter = newTransmitter();
-            }
-            return transmitter;
-        }
-    }
-
-    protected Receiver newReceiver(MessageStreamConsumer consumer) {
-        return new Receiver(consumer, channel) {
-            @Override
-            public void close() throws IOException {
-                synchronized (lock) {
-                    if (!closed) {
-                        try {
-                            super.close();
-                        } finally {
-                            receiverShutdown = true;
-                            if (transmitterShutdown) {
-                                closed = true;
-                                channel.close();
-                            }
-                        }
-                    }
-                }
-            }
-        };
-    }
-
-    protected Transmitter newTransmitter() {
-        return new Transmitter(channel) {
-            @Override
-            public void close() throws IOException {
-                synchronized (lock) {
-                    if (!closed) {
-                        try {
-                            super.close();
-                        } finally {
-                            transmitterShutdown = true;
-                            if (receiverShutdown) {
-                                closed = true;
-                                channel.close();
-                            }
-                        }
-                    }
-                }
-            }
-        };
-    }
-}
diff --git a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java
deleted file mode 100644
index 043b97eff66..00000000000
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * Copyright (c) 2015, 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.websocket;
-
-import jdk.incubator.http.WebSocket;
-import jdk.incubator.http.internal.common.Demand;
-import jdk.incubator.http.internal.common.Log;
-import jdk.incubator.http.internal.common.MinimalFuture;
-import jdk.incubator.http.internal.common.Pair;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-import jdk.incubator.http.internal.common.SequentialScheduler.DeferredCompleter;
-import jdk.incubator.http.internal.common.Utils;
-import jdk.incubator.http.internal.websocket.OpeningHandshake.Result;
-import jdk.incubator.http.internal.websocket.OutgoingMessage.Binary;
-import jdk.incubator.http.internal.websocket.OutgoingMessage.Close;
-import jdk.incubator.http.internal.websocket.OutgoingMessage.Context;
-import jdk.incubator.http.internal.websocket.OutgoingMessage.Ping;
-import jdk.incubator.http.internal.websocket.OutgoingMessage.Pong;
-import jdk.incubator.http.internal.websocket.OutgoingMessage.Text;
-
-import java.io.IOException;
-import java.lang.ref.Reference;
-import java.net.ProtocolException;
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.util.Queue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import static java.util.Objects.requireNonNull;
-import static jdk.incubator.http.internal.common.MinimalFuture.failedFuture;
-import static jdk.incubator.http.internal.common.Pair.pair;
-import static jdk.incubator.http.internal.websocket.StatusCodes.CLOSED_ABNORMALLY;
-import static jdk.incubator.http.internal.websocket.StatusCodes.NO_STATUS_CODE;
-import static jdk.incubator.http.internal.websocket.StatusCodes.isLegalToSendFromClient;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.State.BINARY;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.State.CLOSE;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.State.ERROR;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.State.IDLE;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.State.OPEN;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.State.PING;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.State.PONG;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.State.TEXT;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.State.WAITING;
-
-/*
- * A WebSocket client.
- */
-public final class WebSocketImpl implements WebSocket {
-
-    enum State {
-        OPEN,
-        IDLE,
-        WAITING,
-        TEXT,
-        BINARY,
-        PING,
-        PONG,
-        CLOSE,
-        ERROR;
-    }
-
-    private volatile boolean inputClosed;
-    private volatile boolean outputClosed;
-
-    private final AtomicReference<State> state = new AtomicReference<>(OPEN);
-
-    /* Components of calls to Listener's methods */
-    private MessagePart part;
-    private ByteBuffer binaryData;
-    private CharSequence text;
-    private int statusCode;
-    private String reason;
-    private final AtomicReference<Throwable> error = new AtomicReference<>();
-
-    private final URI uri;
-    private final String subprotocol;
-    private final Listener listener;
-
-    private final AtomicBoolean outstandingSend = new AtomicBoolean();
-    private final SequentialScheduler sendScheduler = new SequentialScheduler(new SendTask());
-    private final Queue<Pair<OutgoingMessage, CompletableFuture<WebSocket>>>
-            queue = new ConcurrentLinkedQueue<>();
-    private final Context context = new OutgoingMessage.Context();
-    private final Transmitter transmitter;
-    private final Receiver receiver;
-    private final SequentialScheduler receiveScheduler = new SequentialScheduler(new ReceiveTask());
-    private final Demand demand = new Demand();
-
-    public static CompletableFuture<WebSocket> newInstanceAsync(BuilderImpl b) {
-        Function<Result, WebSocket> newWebSocket = r -> {
-            WebSocket ws = newInstance(b.getUri(),
-                                       r.subprotocol,
-                                       b.getListener(),
-                                       r.transport);
-            // Make sure we don't release the builder until this lambda
-            // has been executed. The builder has a strong reference to
-            // the HttpClientFacade, and we want to keep that live until
-            // after the raw channel is created and passed to WebSocketImpl.
-            Reference.reachabilityFence(b);
-            return ws;
-        };
-        OpeningHandshake h;
-        try {
-            h = new OpeningHandshake(b);
-        } catch (Throwable e) {
-            return failedFuture(e);
-        }
-        return h.send().thenApply(newWebSocket);
-    }
-
-    /* Exposed for testing purposes */
-    static WebSocket newInstance(URI uri,
-                                 String subprotocol,
-                                 Listener listener,
-                                 TransportSupplier transport) {
-        WebSocketImpl ws = new WebSocketImpl(uri, subprotocol, listener, transport);
-        // This initialisation is outside of the constructor for the sake of
-        // safe publication of WebSocketImpl.this
-        ws.signalOpen();
-        return ws;
-    }
-
-    private WebSocketImpl(URI uri,
-                          String subprotocol,
-                          Listener listener,
-                          TransportSupplier transport) {
-        this.uri = requireNonNull(uri);
-        this.subprotocol = requireNonNull(subprotocol);
-        this.listener = requireNonNull(listener);
-        this.transmitter = transport.transmitter();
-        this.receiver = transport.receiver(new SignallingMessageConsumer());
-    }
-
-    @Override
-    public CompletableFuture<WebSocket> sendText(CharSequence message, boolean isLast) {
-        return enqueueExclusively(new Text(message, isLast));
-    }
-
-    @Override
-    public CompletableFuture<WebSocket> sendBinary(ByteBuffer message, boolean isLast) {
-        return enqueueExclusively(new Binary(message, isLast));
-    }
-
-    @Override
-    public CompletableFuture<WebSocket> sendPing(ByteBuffer message) {
-        return enqueue(new Ping(message));
-    }
-
-    @Override
-    public CompletableFuture<WebSocket> sendPong(ByteBuffer message) {
-        return enqueue(new Pong(message));
-    }
-
-    @Override
-    public CompletableFuture<WebSocket> sendClose(int statusCode, String reason) {
-        if (!isLegalToSendFromClient(statusCode)) {
-            return failedFuture(
-                    new IllegalArgumentException("statusCode: " + statusCode));
-        }
-        Close msg;
-        try {
-            msg = new Close(statusCode, reason);
-        } catch (IllegalArgumentException e) {
-            return failedFuture(e);
-        }
-        outputClosed = true;
-        return enqueueClose(msg);
-    }
-
-    /*
-     * Sends a Close message, then shuts down the transmitter since no more
-     * messages are expected to be sent after this.
-     */
-    private CompletableFuture<WebSocket> enqueueClose(Close m) {
-        // TODO: MUST be a CF created once and shared across sendClose, otherwise
-        // a second sendClose may prematurely close the channel
-        return enqueue(m)
-                .orTimeout(60, TimeUnit.SECONDS)
-                .whenComplete((r, error) -> {
-                    try {
-                        transmitter.close();
-                    } catch (IOException e) {
-                        Log.logError(e);
-                    }
-                    if (error instanceof TimeoutException) {
-                        try {
-                            receiver.close();
-                        } catch (IOException e) {
-                            Log.logError(e);
-                        }
-                    }
-                });
-    }
-
-    /*
-     * Accepts the given message into the outgoing queue in a mutually-exclusive
-     * fashion in respect to other messages accepted through this method. No
-     * further messages will be accepted until the returned CompletableFuture
-     * completes. This method is used to enforce "one outstanding send
-     * operation" policy.
-     */
-    private CompletableFuture<WebSocket> enqueueExclusively(OutgoingMessage m) {
-        if (!outstandingSend.compareAndSet(false, true)) {
-            return failedFuture(new IllegalStateException("Send pending"));
-        }
-        return enqueue(m).whenComplete((r, e) -> outstandingSend.set(false));
-    }
-
-    private CompletableFuture<WebSocket> enqueue(OutgoingMessage m) {
-        CompletableFuture<WebSocket> cf = new MinimalFuture<>();
-        boolean added = queue.add(pair(m, cf));
-        if (!added) {
-            // The queue is supposed to be unbounded
-            throw new InternalError();
-        }
-        sendScheduler.runOrSchedule();
-        return cf;
-    }
-
-    /*
-     * This is a message sending task. It pulls messages from the queue one by
-     * one and sends them. It may be run in different threads, but never
-     * concurrently.
-     */
-    private class SendTask implements SequentialScheduler.RestartableTask {
-
-        @Override
-        public void run(DeferredCompleter taskCompleter) {
-            Pair<OutgoingMessage, CompletableFuture<WebSocket>> p = queue.poll();
-            if (p == null) {
-                taskCompleter.complete();
-                return;
-            }
-            OutgoingMessage message = p.first;
-            CompletableFuture<WebSocket> cf = p.second;
-            try {
-                if (!message.contextualize(context)) { // Do not send the message
-                    cf.complete(null);
-                    repeat(taskCompleter);
-                    return;
-                }
-                Consumer<Exception> h = e -> {
-                    if (e == null) {
-                        cf.complete(WebSocketImpl.this);
-                    } else {
-                        cf.completeExceptionally(e);
-                    }
-                    repeat(taskCompleter);
-                };
-                transmitter.send(message, h);
-            } catch (Throwable t) {
-                cf.completeExceptionally(t);
-                repeat(taskCompleter);
-            }
-        }
-
-        private void repeat(DeferredCompleter taskCompleter) {
-            taskCompleter.complete();
-            // More than a single message may have been enqueued while
-            // the task has been busy with the current message, but
-            // there is only a single signal recorded
-            sendScheduler.runOrSchedule();
-        }
-    }
-
-    @Override
-    public void request(long n) {
-        if (demand.increase(n)) {
-            receiveScheduler.runOrSchedule();
-        }
-    }
-
-    @Override
-    public String getSubprotocol() {
-        return subprotocol;
-    }
-
-    @Override
-    public boolean isOutputClosed() {
-        return outputClosed;
-    }
-
-    @Override
-    public boolean isInputClosed() {
-        return inputClosed;
-    }
-
-    @Override
-    public void abort() {
-        inputClosed = true;
-        outputClosed = true;
-        receiveScheduler.stop();
-        close();
-    }
-
-    @Override
-    public String toString() {
-        return super.toString()
-                + "[uri=" + uri
-                + (!subprotocol.isEmpty() ? ", subprotocol=" + subprotocol : "")
-                + "]";
-    }
-
-    /*
-     * The assumptions about order is as follows:
-     *
-     *     - state is never changed more than twice inside the `run` method:
-     *       x --(1)--> IDLE --(2)--> y (otherwise we're loosing events, or
-     *       overwriting parts of messages creating a mess since there's no
-     *       queueing)
-     *     - OPEN is always the first state
-     *     - no messages are requested/delivered before onOpen is called (this
-     *       is implemented by making WebSocket instance accessible first in
-     *       onOpen)
-     *     - after the state has been observed as CLOSE/ERROR, the scheduler
-     *       is stopped
-     */
-    private class ReceiveTask extends SequentialScheduler.CompleteRestartableTask {
-
-        // Receiver only asked here and nowhere else because we must make sure
-        // onOpen is invoked first and no messages become pending before onOpen
-        // finishes
-
-        @Override
-        public void run() {
-            while (true) {
-                State s = state.get();
-                try {
-                    switch (s) {
-                        case OPEN:
-                            processOpen();
-                            tryChangeState(OPEN, IDLE);
-                            break;
-                        case TEXT:
-                            processText();
-                            tryChangeState(TEXT, IDLE);
-                            break;
-                        case BINARY:
-                            processBinary();
-                            tryChangeState(BINARY, IDLE);
-                            break;
-                        case PING:
-                            processPing();
-                            tryChangeState(PING, IDLE);
-                            break;
-                        case PONG:
-                            processPong();
-                            tryChangeState(PONG, IDLE);
-                            break;
-                        case CLOSE:
-                            processClose();
-                            return;
-                        case ERROR:
-                            processError();
-                            return;
-                        case IDLE:
-                            if (demand.tryDecrement()
-                                    && tryChangeState(IDLE, WAITING)) {
-                                receiver.request(1);
-                            }
-                            return;
-                        case WAITING:
-                            // For debugging spurious signalling: when there was a
-                            // signal, but apparently nothing has changed
-                            return;
-                        default:
-                            throw new InternalError(String.valueOf(s));
-                    }
-                } catch (Throwable t) {
-                    signalError(t);
-                }
-            }
-        }
-
-        private void processError() throws IOException {
-            receiver.close();
-            receiveScheduler.stop();
-            Throwable err = error.get();
-            if (err instanceof FailWebSocketException) {
-                int code1 = ((FailWebSocketException) err).getStatusCode();
-                err = new ProtocolException().initCause(err);
-                enqueueClose(new Close(code1, ""))
-                        .whenComplete(
-                                (r, e) -> {
-                                    if (e != null) {
-                                        Log.logError(e);
-                                    }
-                                });
-            }
-            listener.onError(WebSocketImpl.this, err);
-        }
-
-        private void processClose() throws IOException {
-            receiver.close();
-            receiveScheduler.stop();
-            CompletionStage<?> readyToClose;
-            readyToClose = listener.onClose(WebSocketImpl.this, statusCode, reason);
-            if (readyToClose == null) {
-                readyToClose = MinimalFuture.completedFuture(null);
-            }
-            int code;
-            if (statusCode == NO_STATUS_CODE || statusCode == CLOSED_ABNORMALLY) {
-                code = NORMAL_CLOSURE;
-            } else {
-                code = statusCode;
-            }
-            readyToClose.whenComplete((r, e) -> {
-                enqueueClose(new Close(code, ""))
-                        .whenComplete((r1, e1) -> {
-                            if (e1 != null) {
-                                Log.logError(e1);
-                            }
-                        });
-            });
-        }
-
-        private void processPong() {
-            listener.onPong(WebSocketImpl.this, binaryData);
-        }
-
-        private void processPing() {
-            // Let's make a full copy of this tiny data. What we want here
-            // is to rule out a possibility the shared data we send might be
-            // corrupted by processing in the listener.
-            ByteBuffer slice = binaryData.slice();
-            ByteBuffer copy = ByteBuffer.allocate(binaryData.remaining())
-                    .put(binaryData)
-                    .flip();
-            // Non-exclusive send;
-            CompletableFuture<WebSocket> pongSent = enqueue(new Pong(copy));
-            pongSent.whenComplete(
-                    (r, e) -> {
-                        if (e != null) {
-                            signalError(Utils.getCompletionCause(e));
-                        }
-                    }
-            );
-            listener.onPing(WebSocketImpl.this, slice);
-        }
-
-        private void processBinary() {
-            listener.onBinary(WebSocketImpl.this, binaryData, part);
-        }
-
-        private void processText() {
-            listener.onText(WebSocketImpl.this, text, part);
-        }
-
-        private void processOpen() {
-            listener.onOpen(WebSocketImpl.this);
-        }
-    }
-
-    private void signalOpen() {
-        receiveScheduler.runOrSchedule();
-    }
-
-    private void signalError(Throwable error) {
-        inputClosed = true;
-        outputClosed = true;
-        if (!this.error.compareAndSet(null, error) || !trySetState(ERROR)) {
-            Log.logError(error);
-        } else {
-            close();
-        }
-    }
-
-    private void close() {
-        try {
-            try {
-                receiver.close();
-            } finally {
-                transmitter.close();
-            }
-        } catch (Throwable t) {
-            Log.logError(t);
-        }
-    }
-
-    /*
-     * Signals a Close event (might not correspond to anything happened on the
-     * channel, i.e. might be synthetic).
-     */
-    private void signalClose(int statusCode, String reason) {
-        inputClosed = true;
-        this.statusCode = statusCode;
-        this.reason = reason;
-        if (!trySetState(CLOSE)) {
-            Log.logTrace("Close: {0}, ''{1}''", statusCode, reason);
-        } else {
-            try {
-                receiver.close();
-            } catch (Throwable t) {
-                Log.logError(t);
-            }
-        }
-    }
-
-    private class SignallingMessageConsumer implements MessageStreamConsumer {
-
-        @Override
-        public void onText(CharSequence data, MessagePart part) {
-            receiver.acknowledge();
-            text = data;
-            WebSocketImpl.this.part = part;
-            tryChangeState(WAITING, TEXT);
-        }
-
-        @Override
-        public void onBinary(ByteBuffer data, MessagePart part) {
-            receiver.acknowledge();
-            binaryData = data;
-            WebSocketImpl.this.part = part;
-            tryChangeState(WAITING, BINARY);
-        }
-
-        @Override
-        public void onPing(ByteBuffer data) {
-            receiver.acknowledge();
-            binaryData = data;
-            tryChangeState(WAITING, PING);
-        }
-
-        @Override
-        public void onPong(ByteBuffer data) {
-            receiver.acknowledge();
-            binaryData = data;
-            tryChangeState(WAITING, PONG);
-        }
-
-        @Override
-        public void onClose(int statusCode, CharSequence reason) {
-            receiver.acknowledge();
-            signalClose(statusCode, reason.toString());
-        }
-
-        @Override
-        public void onComplete() {
-            receiver.acknowledge();
-            signalClose(CLOSED_ABNORMALLY, "");
-        }
-
-        @Override
-        public void onError(Throwable error) {
-            signalError(error);
-        }
-    }
-
-    private boolean trySetState(State newState) {
-        while (true) {
-            State currentState = state.get();
-            if (currentState == ERROR || currentState == CLOSE) {
-                return false;
-            } else if (state.compareAndSet(currentState, newState)) {
-                receiveScheduler.runOrSchedule();
-                return true;
-            }
-        }
-    }
-
-    private boolean tryChangeState(State expectedState, State newState) {
-        State witness = state.compareAndExchange(expectedState, newState);
-        if (witness == expectedState) {
-            receiveScheduler.runOrSchedule();
-            return true;
-        }
-        // This should be the only reason for inability to change the state from
-        // IDLE to WAITING: the state has changed to terminal
-        if (witness != ERROR && witness != CLOSE) {
-            throw new InternalError();
-        }
-        return false;
-    }
-}
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 4c4fccb7e63..395337ccfcf 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -537,8 +537,6 @@ java/net/MulticastSocket/Test.java                              7145658 macosx-a
 
 java/net/DatagramSocket/SendDatagramToBadAddress.java           7143960 macosx-all
 
-java/net/httpclient/SplitResponseSSL.java                       8194151 windows-all
-
 ############################################################################
 
 # jdk_nio
diff --git a/test/jdk/java/net/httpclient/AbstractNoBody.java b/test/jdk/java/net/httpclient/AbstractNoBody.java
index 1ddb79ab2b1..72ecc5a970e 100644
--- a/test/jdk/java/net/httpclient/AbstractNoBody.java
+++ b/test/jdk/java/net/httpclient/AbstractNoBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,6 +23,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
@@ -32,7 +33,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.incubator.http.HttpClient;
+import java.net.http.HttpClient;
 import javax.net.ssl.SSLContext;
 import jdk.testlibrary.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
@@ -91,6 +92,11 @@ HttpClient newHttpClient() {
                 .build();
     }
 
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
     @BeforeTest
     public void setup() throws Exception {
         printStamp(START, "setup");
@@ -101,39 +107,37 @@ public void setup() throws Exception {
         // HTTP/1.1
         HttpHandler h1_fixedLengthNoBodyHandler = new HTTP1_FixedLengthNoBodyHandler();
         HttpHandler h1_chunkNoBodyHandler = new HTTP1_ChunkedNoBodyHandler();
-        InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.setExecutor(serverExecutor);
         httpTestServer.createContext("/http1/noBodyFixed", h1_fixedLengthNoBodyHandler);
         httpTestServer.createContext("/http1/noBodyChunk", h1_chunkNoBodyHandler);
-        httpURI_fixed = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/noBodyFixed";
-        httpURI_chunk = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/noBodyChunk";
+        httpURI_fixed = "http://" + serverAuthority(httpTestServer) + "/http1/noBodyFixed";
+        httpURI_chunk = "http://" + serverAuthority(httpTestServer) + "/http1/noBodyChunk";
 
         httpsTestServer = HttpsServer.create(sa, 0);
         httpsTestServer.setExecutor(serverExecutor);
         httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
         httpsTestServer.createContext("/https1/noBodyFixed", h1_fixedLengthNoBodyHandler);
         httpsTestServer.createContext("/https1/noBodyChunk", h1_chunkNoBodyHandler);
-        httpsURI_fixed = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/noBodyFixed";
-        httpsURI_chunk = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/noBodyChunk";
+        httpsURI_fixed = "https://" + serverAuthority(httpsTestServer) + "/https1/noBodyFixed";
+        httpsURI_chunk = "https://" + serverAuthority(httpsTestServer) + "/https1/noBodyChunk";
 
         // HTTP/2
         Http2Handler h2_fixedLengthNoBodyHandler = new HTTP2_FixedLengthNoBodyHandler();
         Http2Handler h2_chunkedNoBodyHandler = new HTTP2_ChunkedNoBodyHandler();
 
-        http2TestServer = new Http2TestServer("127.0.0.1", false, 0, serverExecutor, null);
+        http2TestServer = new Http2TestServer("localhost", false, 0, serverExecutor, null);
         http2TestServer.addHandler(h2_fixedLengthNoBodyHandler, "/http2/noBodyFixed");
         http2TestServer.addHandler(h2_chunkedNoBodyHandler, "/http2/noBodyChunk");
-        int port = http2TestServer.getAddress().getPort();
-        http2URI_fixed = "http://127.0.0.1:" + port + "/http2/noBodyFixed";
-        http2URI_chunk = "http://127.0.0.1:" + port + "/http2/noBodyChunk";
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/noBodyFixed";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/noBodyChunk";
 
-        https2TestServer = new Http2TestServer("127.0.0.1", true, 0, serverExecutor, sslContext);
+        https2TestServer = new Http2TestServer("localhost", true, 0, serverExecutor, sslContext);
         https2TestServer.addHandler(h2_fixedLengthNoBodyHandler, "/https2/noBodyFixed");
         https2TestServer.addHandler(h2_chunkedNoBodyHandler, "/https2/noBodyChunk");
-        port = https2TestServer.getAddress().getPort();
-        https2URI_fixed = "https://127.0.0.1:" + port + "/https2/noBodyFixed";
-        https2URI_chunk = "https://127.0.0.1:" + port + "/https2/noBodyChunk";
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/noBodyFixed";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/noBodyChunk";
 
         httpTestServer.start();
         httpsTestServer.start();
diff --git a/test/jdk/java/net/httpclient/AsFileDownloadTest.java b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
new file mode 100644
index 00000000000..15feaa47a5a
--- /dev/null
+++ b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
@@ -0,0 +1,375 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Basic test for ofFileDownload
+ * @bug 8196965
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          jdk.httpserver
+ * @library /lib/testlibrary /test/lib http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.Platform
+ * @build jdk.test.lib.util.FileUtils
+ * @run testng/othervm AsFileDownloadTest
+ * @run testng/othervm/java.security.policy=AsFileDownloadTest.policy AsFileDownloadTest
+ */
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.net.ssl.SSLContext;
+import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.util.FileUtils;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static java.net.http.HttpResponse.BodyHandlers.ofFileDownload;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.StandardOpenOption.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+public class AsFileDownloadTest {
+
+    SSLContext sslContext;
+    HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    HttpsServer httpsTestServer;       // HTTPS/1.1
+    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI;
+    String httpsURI;
+    String http2URI;
+    String https2URI;
+
+    Path tempDir;
+
+    static final String[][] contentDispositionValues = new String[][] {
+          // URI query     Content-Type header value         Expected filename
+            { "001", "Attachment; filename=example001.html", "example001.html" },
+            { "002", "attachment; filename=example002.html", "example002.html" },
+            { "003", "ATTACHMENT; filename=example003.html", "example003.html" },
+            { "004", "attAChment; filename=example004.html", "example004.html" },
+            { "005", "attachmeNt; filename=example005.html", "example005.html" },
+
+            { "006", "attachment; Filename=example006.html", "example006.html" },
+            { "007", "attachment; FILENAME=example007.html", "example007.html" },
+            { "008", "attachment; fileName=example008.html", "example008.html" },
+            { "009", "attachment; fIlEnAMe=example009.html", "example009.html" },
+
+            { "010", "attachment; filename=Example010.html", "Example010.html" },
+            { "011", "attachment; filename=EXAMPLE011.html", "EXAMPLE011.html" },
+            { "012", "attachment; filename=eXample012.html", "eXample012.html" },
+            { "013", "attachment; filename=example013.HTML", "example013.HTML" },
+            { "014", "attachment; filename  =eXaMpLe014.HtMl", "eXaMpLe014.HtMl"},
+
+            { "015", "attachment; filename=a",               "a"               },
+            { "016", "attachment; filename= b",              "b"               },
+            { "017", "attachment; filename=  c",             "c"               },
+            { "018", "attachment; filename=    d",           "d"               },
+            { "019", "attachment; filename=e  ; filename*=utf-8''eee.txt",  "e"},
+            { "020", "attachment; filename*=utf-8''fff.txt; filename=f",    "f"},
+            { "021", "attachment;  filename=g",              "g"               },
+            { "022", "attachment;   filename= h",            "h"               },
+
+            { "023", "attachment; filename=\"space name\"",                       "space name" },
+            { "024", "attachment; filename=me.txt; filename*=utf-8''you.txt",     "me.txt"     },
+            { "025", "attachment; filename=\"m y.txt\"; filename*=utf-8''you.txt", "m y.txt"   },
+
+            { "030", "attachment; filename=foo/file1.txt",        "file1.txt" },
+            { "031", "attachment; filename=foo/bar/file2.txt",    "file2.txt" },
+            { "032", "attachment; filename=baz\\file3.txt",       "file3.txt" },
+            { "033", "attachment; filename=baz\\bar\\file4.txt",  "file4.txt" },
+            { "034", "attachment; filename=x/y\\file5.txt",       "file5.txt" },
+            { "035", "attachment; filename=x/y\\file6.txt",       "file6.txt" },
+            { "036", "attachment; filename=x/y\\z/file7.txt",     "file7.txt" },
+            { "037", "attachment; filename=x/y\\z/\\x/file8.txt", "file8.txt" },
+            { "038", "attachment; filename=/root/file9.txt",      "file9.txt" },
+            { "039", "attachment; filename=../file10.txt",        "file10.txt" },
+            { "040", "attachment; filename=..\\file11.txt",       "file11.txt" },
+            { "041", "attachment; filename=foo/../../file12.txt", "file12.txt" },
+    };
+
+    @DataProvider(name = "positive")
+    public Object[][] positive() {
+        List<Object[]> list = new ArrayList<>();
+
+        Arrays.asList(contentDispositionValues).stream()
+                .map(e -> new Object[] {httpURI +  "?" + e[0], e[1], e[2]})
+                .forEach(list::add);
+        Arrays.asList(contentDispositionValues).stream()
+                .map(e -> new Object[] {httpsURI +  "?" + e[0], e[1], e[2]})
+                .forEach(list::add);
+        Arrays.asList(contentDispositionValues).stream()
+                .map(e -> new Object[] {http2URI +  "?" + e[0], e[1], e[2]})
+                .forEach(list::add);
+        Arrays.asList(contentDispositionValues).stream()
+                .map(e -> new Object[] {https2URI +  "?" + e[0], e[1], e[2]})
+                .forEach(list::add);
+
+        return list.stream().toArray(Object[][]::new);
+    }
+
+    @Test(dataProvider = "positive")
+    void test(String uriString, String contentDispositionValue, String expectedFilename)
+        throws Exception
+    {
+        out.printf("test(%s, %s, %s): starting", uriString, contentDispositionValue, expectedFilename);
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+
+        URI uri = URI.create(uriString);
+        HttpRequest request = HttpRequest.newBuilder(uri)
+                .POST(BodyPublishers.ofString("May the luck of the Irish be with you!"))
+                .build();
+
+        BodyHandler bh = ofFileDownload(tempDir.resolve(uri.getPath().substring(1)),
+                                        CREATE, TRUNCATE_EXISTING, WRITE);
+        HttpResponse<Path> response = client.send(request, bh);
+
+        out.println("Got response: " + response);
+        out.println("Got body Path: " + response.body());
+        String fileContents = new String(Files.readAllBytes(response.body()), UTF_8);
+        out.println("Got body: " + fileContents);
+
+        assertEquals(response.statusCode(),200);
+        assertEquals(response.body().getFileName().toString(), expectedFilename);
+        assertTrue(response.headers().firstValue("Content-Disposition").isPresent());
+        assertEquals(response.headers().firstValue("Content-Disposition").get(),
+                     contentDispositionValue);
+        assertEquals(fileContents, "May the luck of the Irish be with you!");
+    }
+
+    // --- Negative
+
+    static final String[][] contentDispositionBADValues = new String[][] {
+            // URI query     Content-Type header value
+            { "100", ""                                    },  // empty
+            { "101", "filename=example.html"               },  // no attachment
+            { "102", "attachment; filename=space name"     },  // unquoted with space
+            { "103", "attachment; filename="               },  // empty filename param
+            { "104", "attachment; filename=\""             },  // single quote
+            { "105", "attachment; filename=\"\""           },  // empty quoted
+            { "106", "attachment; filename=."              },  // dot
+            { "107", "attachment; filename=.."             },  // dot dot
+            { "108", "attachment; filename=\".."           },  // badly quoted dot dot
+            { "109", "attachment; filename=\"..\""         },  // quoted dot dot
+            { "110", "attachment; filename=\"bad"          },  // badly quoted
+            { "111", "attachment; filename=\"bad;"         },  // badly quoted with ';'
+            { "112", "attachment; filename=\"bad ;"        },  // badly quoted with ' ;'
+            { "113", "attachment; filename*=utf-8''xx.txt "},  // no "filename" param
+
+            { "120", "<<NOT_PRESENT>>"                     },  // header not present
+
+    };
+
+    @DataProvider(name = "negative")
+    public Object[][] negative() {
+        List<Object[]> list = new ArrayList<>();
+
+        Arrays.asList(contentDispositionBADValues).stream()
+                .map(e -> new Object[] {httpURI +  "?" + e[0], e[1]})
+                .forEach(list::add);
+        Arrays.asList(contentDispositionBADValues).stream()
+                .map(e -> new Object[] {httpsURI +  "?" + e[0], e[1]})
+                .forEach(list::add);
+        Arrays.asList(contentDispositionBADValues).stream()
+                .map(e -> new Object[] {http2URI +  "?" + e[0], e[1]})
+                .forEach(list::add);
+        Arrays.asList(contentDispositionBADValues).stream()
+                .map(e -> new Object[] {https2URI +  "?" + e[0], e[1]})
+                .forEach(list::add);
+
+        return list.stream().toArray(Object[][]::new);
+    }
+
+    @Test(dataProvider = "negative")
+    void negativeTest(String uriString, String contentDispositionValue)
+            throws Exception
+    {
+        out.printf("negativeTest(%s, %s): starting", uriString, contentDispositionValue);
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+
+        URI uri = URI.create(uriString);
+        HttpRequest request = HttpRequest.newBuilder(uri)
+                .POST(BodyPublishers.ofString("Does not matter"))
+                .build();
+
+        BodyHandler bh = ofFileDownload(tempDir, CREATE, TRUNCATE_EXISTING, WRITE);
+        try {
+            HttpResponse<Path> response = client.send(request, bh);
+            fail("UNEXPECTED response: " + response + ", path:" + response.body());
+        } catch (UncheckedIOException | IOException ioe) {
+            System.out.println("Caught expected: " + ioe);
+        }
+    }
+
+    // -- Infrastructure
+
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        tempDir = Paths.get("asFileDownloadTest.tmp.dir");
+        if (Files.exists(tempDir))
+            throw new AssertionError("Unexpected test work dir existence: " + tempDir.toString());
+
+        Files.createDirectory(tempDir);
+        // Unique dirs per test run, based on the URI path
+        Files.createDirectories(tempDir.resolve("http1/afdt/"));
+        Files.createDirectories(tempDir.resolve("https1/afdt/"));
+        Files.createDirectories(tempDir.resolve("http2/afdt/"));
+        Files.createDirectories(tempDir.resolve("https2/afdt/"));
+
+        // HTTP/1.1 server logging in case of security exceptions ( uncomment if needed )
+        //Logger logger = Logger.getLogger("com.sun.net.httpserver");
+        //ConsoleHandler ch = new ConsoleHandler();
+        //logger.setLevel(Level.ALL);
+        //ch.setLevel(Level.ALL);
+        //logger.addHandler(ch);
+
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpServer.create(sa, 0);
+        httpTestServer.createContext("/http1/afdt", new Http1FileDispoHandler());
+        httpURI = "http://" + serverAuthority(httpTestServer) + "/http1/afdt";
+
+        httpsTestServer = HttpsServer.create(sa, 0);
+        httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer.createContext("/https1/afdt", new Http1FileDispoHandler());
+        httpsURI = "https://" + serverAuthority(httpsTestServer) + "/https1/afdt";
+
+        http2TestServer = new Http2TestServer("localhost", false, 0);
+        http2TestServer.addHandler(new Http2FileDispoHandler(), "/http2/afdt");
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/afdt";
+
+        https2TestServer = new Http2TestServer("localhost", true, 0);
+        https2TestServer.addHandler(new Http2FileDispoHandler(), "/https2/afdt");
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/afdt";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop(0);
+        httpsTestServer.stop(0);
+        http2TestServer.stop();
+        https2TestServer.stop();
+
+        if (System.getSecurityManager() == null && Files.exists(tempDir)) {
+            // clean up before next run with security manager
+            FileUtils.deleteFileTreeWithRetry(tempDir);
+        }
+    }
+
+    static String contentDispositionValueFromURI(URI uri) {
+        String queryIndex = uri.getQuery();
+        String[][] values;
+        if (queryIndex.startsWith("0"))  // positive tests start with '0'
+            values = contentDispositionValues;
+        else if (queryIndex.startsWith("1"))  // negative tests start with '1'
+            values = contentDispositionBADValues;
+        else
+            throw new AssertionError("SERVER: UNEXPECTED query:" + queryIndex);
+
+        return Arrays.asList(values).stream()
+                .filter(e -> e[0].equals(queryIndex))
+                .map(e -> e[1])
+                .findFirst()
+                .orElseThrow();
+    }
+
+    static class Http1FileDispoHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                byte[] bytes = is.readAllBytes();
+
+                String value = contentDispositionValueFromURI(t.getRequestURI());
+                if (!value.equals("<<NOT_PRESENT>>"))
+                    t.getResponseHeaders().set("Content-Disposition", value);
+
+                t.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+    }
+
+    static class Http2FileDispoHandler implements Http2Handler {
+        @Override
+        public void handle(Http2TestExchange t) throws IOException {
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                byte[] bytes = is.readAllBytes();
+
+                String value = contentDispositionValueFromURI(t.getRequestURI());
+                if (!value.equals("<<NOT_PRESENT>>"))
+                    t.getResponseHeaders().addHeader("Content-Disposition", value);
+
+                t.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/AsFileDownloadTest.policy b/test/jdk/java/net/httpclient/AsFileDownloadTest.policy
new file mode 100644
index 00000000000..a8454c470e2
--- /dev/null
+++ b/test/jdk/java/net/httpclient/AsFileDownloadTest.policy
@@ -0,0 +1,65 @@
+//
+// Copyright (c) 2018, 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.
+//
+
+// for JTwork/classes/0/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.class
+grant codeBase "file:${test.classes}/../../../../lib/testlibrary/-" {
+    permission java.util.PropertyPermission "test.src.path", "read";
+    permission java.io.FilePermission "${test.src}/../../../lib/testlibrary/jdk/testlibrary/testkeys", "read";
+};
+
+// for JTwork//classes/0/java/net/httpclient/http2/server/*
+grant codeBase "file:${test.classes}/../../../../java/net/httpclient/http2/server/*" {
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
+
+    permission java.net.SocketPermission "localhost:*", "accept,resolve";
+    permission java.lang.RuntimePermission "modifyThread";
+};
+
+grant codeBase "file:${test.classes}/*" {
+    permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir", "read,write";
+    permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir/-", "read,write";
+
+    permission java.net.URLPermission "http://localhost:*/http1/afdt",   "POST";
+    permission java.net.URLPermission "https://localhost:*/https1/afdt", "POST";
+    permission java.net.URLPermission "http://localhost:*/http2/afdt",   "POST";
+    permission java.net.URLPermission "https://localhost:*/https2/afdt", "POST";
+
+
+    // needed to grant permission to the HTTP/2 server
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
+
+    // for HTTP/1.1 server logging
+    permission java.util.logging.LoggingPermission "control";
+
+    // needed to grant the HTTP servers
+    permission java.net.SocketPermission "localhost:*", "accept,resolve";
+
+    permission java.util.PropertyPermission "*", "read";
+    permission java.lang.RuntimePermission "modifyThread";
+};
diff --git a/test/jdk/java/net/httpclient/BasicAuthTest.java b/test/jdk/java/net/httpclient/BasicAuthTest.java
index 04ae3e8f39a..f87235fe673 100644
--- a/test/jdk/java/net/httpclient/BasicAuthTest.java
+++ b/test/jdk/java/net/httpclient/BasicAuthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 8087112
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          jdk.httpserver
  * @run main/othervm BasicAuthTest
  * @summary Basic Authentication Test
@@ -38,15 +38,18 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.URI;
-import jdk.incubator.http.*;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
 
 public class BasicAuthTest {
 
@@ -55,7 +58,8 @@ public class BasicAuthTest {
     static final String POST_BODY = "This is the POST body 123909090909090";
 
     public static void main(String[] args) throws Exception {
-        HttpServer server = HttpServer.create(new InetSocketAddress(0), 10);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(),0);
+        HttpServer server = HttpServer.create(addr, 10);
         ExecutorService e = Executors.newCachedThreadPool();
         Handler h = new Handler();
         HttpContext serverContext = server.createContext("/test", h);
@@ -72,10 +76,10 @@ public static void main(String[] args) throws Exception {
                                       .build();
 
         try {
-            URI uri = new URI("http://127.0.0.1:" + Integer.toString(port) + "/test/foo");
+            URI uri = new URI("http://localhost:" + Integer.toString(port) + "/test/foo");
             HttpRequest req = HttpRequest.newBuilder(uri).GET().build();
 
-            HttpResponse resp = client.send(req, asString());
+            HttpResponse resp = client.send(req, BodyHandlers.ofString());
             ok = resp.statusCode() == 200 && resp.body().equals(RESPONSE);
 
             if (!ok || ca.count != 1)
@@ -83,7 +87,7 @@ public static void main(String[] args) throws Exception {
 
             // repeat same request, should succeed but no additional authenticator calls
 
-            resp = client.send(req, asString());
+            resp = client.send(req, BodyHandlers.ofString());
             ok = resp.statusCode() == 200 && resp.body().equals(RESPONSE);
 
             if (!ok || ca.count != 1)
@@ -92,9 +96,9 @@ public static void main(String[] args) throws Exception {
             // try a POST
 
             req = HttpRequest.newBuilder(uri)
-                             .POST(fromString(POST_BODY))
+                             .POST(BodyPublishers.ofString(POST_BODY))
                              .build();
-            resp = client.send(req, asString());
+            resp = client.send(req, BodyHandlers.ofString());
             ok = resp.statusCode() == 200;
 
             if (!ok || ca.count != 1)
@@ -156,6 +160,5 @@ public void handle(HttpExchange he) throws IOException {
                 ok = true;
             }
         }
-
    }
 }
diff --git a/test/jdk/java/net/httpclient/BasicRedirectTest.java b/test/jdk/java/net/httpclient/BasicRedirectTest.java
new file mode 100644
index 00000000000..25c4a4de9a8
--- /dev/null
+++ b/test/jdk/java/net/httpclient/BasicRedirectTest.java
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Basic test for redirect and redirect policies
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          jdk.httpserver
+ * @library /lib/testlibrary /test/lib http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm
+ *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
+ *       BasicRedirectTest
+ */
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import javax.net.ssl.SSLContext;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class BasicRedirectTest implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;       // HTTPS/1.1
+    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    String httpURI;
+    String httpURIToMoreSecure; // redirects HTTP to HTTPS
+    String httpsURI;
+    String httpsURIToLessSecure; // redirects HTTPS to HTTP
+    String http2URI;
+    String http2URIToMoreSecure; // redirects HTTP to HTTPS
+    String https2URI;
+    String https2URIToLessSecure; // redirects HTTPS to HTTP
+
+    static final String MESSAGE = "Is fearr Gaeilge briste, na Bearla cliste";
+    static final int ITERATIONS = 3;
+
+    @DataProvider(name = "positive")
+    public Object[][] positive() {
+        return new Object[][] {
+                { httpURI,               Redirect.ALWAYS        },
+                { httpsURI,              Redirect.ALWAYS        },
+                { http2URI,              Redirect.ALWAYS        },
+                { https2URI,             Redirect.ALWAYS        },
+                { httpURIToMoreSecure,   Redirect.ALWAYS        },
+                { http2URIToMoreSecure,  Redirect.ALWAYS        },
+                { httpsURIToLessSecure,  Redirect.ALWAYS        },
+                { https2URIToLessSecure, Redirect.ALWAYS        },
+
+                { httpURI,               Redirect.NORMAL        },
+                { httpsURI,              Redirect.NORMAL        },
+                { http2URI,              Redirect.NORMAL        },
+                { https2URI,             Redirect.NORMAL        },
+                { httpURIToMoreSecure,   Redirect.NORMAL        },
+                { http2URIToMoreSecure,  Redirect.NORMAL        },
+        };
+    }
+
+    @Test(dataProvider = "positive")
+    void test(String uriString, Redirect redirectPolicy) throws Exception {
+        out.printf("%n---- starting positive (%s, %s) ----%n", uriString, redirectPolicy);
+        HttpClient client = HttpClient.newBuilder()
+                .followRedirects(redirectPolicy)
+                .sslContext(sslContext)
+                .build();
+
+        URI uri = URI.create(uriString);
+        HttpRequest request = HttpRequest.newBuilder(uri).build();
+        out.println("Initial request: " + request.uri());
+
+        for (int i=0; i< ITERATIONS; i++) {
+            out.println("iteration: " + i);
+            HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+
+            out.println("  Got response: " + response);
+            out.println("  Got body Path: " + response.body());
+            out.println("  Got response.request: " + response.request());
+
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.body(), MESSAGE);
+            // asserts redirected URI in response.request().uri()
+            assertTrue(response.uri().getPath().endsWith("message"));
+            assertPreviousRedirectResponses(request, response);
+        }
+    }
+
+    static void assertPreviousRedirectResponses(HttpRequest initialRequest,
+                                                HttpResponse<?> finalResponse) {
+        // there must be at least one previous response
+        finalResponse.previousResponse()
+                .orElseThrow(() -> new RuntimeException("no previous response"));
+
+        HttpResponse<?> response = finalResponse;
+        do {
+            URI uri = response.uri();
+            response = response.previousResponse().get();
+            assertTrue(300 <= response.statusCode() && response.statusCode() <= 309,
+                       "Expected 300 <= code <= 309, got:" + response.statusCode());
+            assertEquals(response.body(), null, "Unexpected body: " + response.body());
+            String locationHeader = response.headers().firstValue("Location")
+                      .orElseThrow(() -> new RuntimeException("no previous Location"));
+            assertTrue(uri.toString().endsWith(locationHeader),
+                      "URI: " + uri + ", Location: " + locationHeader);
+
+        } while (response.previousResponse().isPresent());
+
+        // initial
+        assertEquals(initialRequest, response.request(),
+                String.format("Expected initial request [%s] to equal last prev req [%s]",
+                              initialRequest, response.request()));
+    }
+
+    // --  negatives
+
+    @DataProvider(name = "negative")
+    public Object[][] negative() {
+        return new Object[][] {
+                { httpURI,               Redirect.NEVER         },
+                { httpsURI,              Redirect.NEVER         },
+                { http2URI,              Redirect.NEVER         },
+                { https2URI,             Redirect.NEVER         },
+                { httpURIToMoreSecure,   Redirect.NEVER         },
+                { http2URIToMoreSecure,  Redirect.NEVER         },
+                { httpsURIToLessSecure,  Redirect.NEVER         },
+                { https2URIToLessSecure, Redirect.NEVER         },
+
+                { httpsURIToLessSecure,  Redirect.NORMAL        },
+                { https2URIToLessSecure, Redirect.NORMAL        },
+        };
+    }
+
+    @Test(dataProvider = "negative")
+    void testNegatives(String uriString,Redirect redirectPolicy) throws Exception {
+        out.printf("%n---- starting negative (%s, %s) ----%n", uriString, redirectPolicy);
+        HttpClient client = HttpClient.newBuilder()
+                .followRedirects(redirectPolicy)
+                .sslContext(sslContext)
+                .build();
+
+        URI uri = URI.create(uriString);
+        HttpRequest request = HttpRequest.newBuilder(uri).build();
+        out.println("Initial request: " + request.uri());
+
+        for (int i=0; i< ITERATIONS; i++) {
+            out.println("iteration: " + i);
+            HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+
+            out.println("  Got response: " + response);
+            out.println("  Got body Path: " + response.body());
+            out.println("  Got response.request: " + response.request());
+
+            assertEquals(response.statusCode(), 302);
+            assertEquals(response.body(), "XY");
+            // asserts original URI in response.request().uri()
+            assertTrue(response.uri().equals(uri));
+            assertFalse(response.previousResponse().isPresent());
+        }
+    }
+
+
+    // -- Infrastructure
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(new BasicHttpRedirectHandler(), "/http1/same/");
+        httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/same/redirect";
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(new BasicHttpRedirectHandler(),"/https1/same/");
+        httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/same/redirect";
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(new BasicHttpRedirectHandler(), "/http2/same/");
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/same/redirect";
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(new BasicHttpRedirectHandler(), "/https2/same/");
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/same/redirect";
+
+
+        // HTTP to HTTPS redirect handler
+        httpTestServer.addHandler(new ToSecureHttpRedirectHandler(httpsURI), "/http1/toSecure/");
+        httpURIToMoreSecure = "http://" + httpTestServer.serverAuthority()+ "/http1/toSecure/redirect";
+        // HTTP2 to HTTP2S redirect handler
+        http2TestServer.addHandler(new ToSecureHttpRedirectHandler(https2URI), "/http2/toSecure/");
+        http2URIToMoreSecure = "http://" + http2TestServer.serverAuthority() + "/http2/toSecure/redirect";
+
+        // HTTPS to HTTP redirect handler
+        httpsTestServer.addHandler(new ToLessSecureRedirectHandler(httpURI), "/https1/toLessSecure/");
+        httpsURIToLessSecure = "https://" + httpsTestServer.serverAuthority() + "/https1/toLessSecure/redirect";
+        // HTTPS2 to HTTP2 redirect handler
+        https2TestServer.addHandler(new ToLessSecureRedirectHandler(http2URI), "/https2/toLessSecure/");
+        https2URIToLessSecure = "https://" + https2TestServer.serverAuthority() + "/https2/toLessSecure/redirect";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop();
+        httpsTestServer.stop();
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    // Redirects to same protocol
+    static class BasicHttpRedirectHandler implements HttpTestHandler {
+        // flip-flop between chunked/variable and fixed length redirect responses
+        volatile int count;
+
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            System.out.println("BasicHttpRedirectHandler for: " + t.getRequestURI());
+            readAllRequestData(t);
+
+            if (t.getRequestURI().getPath().endsWith("redirect")) {
+                String url = t.getRequestURI().resolve("message").toString();
+                t.getResponseHeaders().addHeader("Location", url);
+                int len = count % 2 == 0 ? 2 : -1;
+                t.sendResponseHeaders(302, len);
+                try (OutputStream os = t.getResponseBody()) {
+                    os.write(new byte[]{'X', 'Y'});  // stuffing some response body
+                }
+            } else {
+                try (OutputStream os = t.getResponseBody()) {
+                    byte[] bytes = MESSAGE.getBytes(UTF_8);
+                    t.sendResponseHeaders(200, bytes.length);
+                    os.write(bytes);
+                }
+            }
+        }
+    }
+
+    // Redirects to a, possibly, more secure protocol, (HTTP to HTTPS)
+    static class ToSecureHttpRedirectHandler implements HttpTestHandler {
+        final String targetURL;
+        ToSecureHttpRedirectHandler(String targetURL) {
+            this.targetURL = targetURL;
+        }
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            System.out.println("ToSecureHttpRedirectHandler for: " + t.getRequestURI());
+            readAllRequestData(t);
+
+            if (t.getRequestURI().getPath().endsWith("redirect")) {
+                t.getResponseHeaders().addHeader("Location", targetURL);
+                System.out.println("ToSecureHttpRedirectHandler redirecting to: " + targetURL);
+                t.sendResponseHeaders(302, 2); // fixed-length
+                try (OutputStream os = t.getResponseBody()) {
+                    os.write(new byte[]{'X', 'Y'});
+                }
+            } else {
+                Throwable ex = new RuntimeException("Unexpected request");
+                ex.printStackTrace();
+                t.sendResponseHeaders(500, 0);
+            }
+        }
+    }
+
+    // Redirects to a, possibly, less secure protocol (HTTPS to HTTP)
+    static class ToLessSecureRedirectHandler implements HttpTestHandler {
+        final String targetURL;
+        ToLessSecureRedirectHandler(String targetURL) {
+            this.targetURL = targetURL;
+        }
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            System.out.println("ToLessSecureRedirectHandler for: " + t.getRequestURI());
+            readAllRequestData(t);
+
+            if (t.getRequestURI().getPath().endsWith("redirect")) {
+                t.getResponseHeaders().addHeader("Location", targetURL);
+                System.out.println("ToLessSecureRedirectHandler redirecting to: " + targetURL);
+                t.sendResponseHeaders(302, -1);  // chunked/variable
+                try (OutputStream os = t.getResponseBody()) {
+                    os.write(new byte[]{'X', 'Y'});
+                }
+            } else {
+                Throwable ex = new RuntimeException("Unexpected request");
+                ex.printStackTrace();
+                t.sendResponseHeaders(500, 0);
+            }
+        }
+    }
+
+    static void readAllRequestData(HttpTestExchange t) throws IOException {
+        try (InputStream is = t.getRequestBody()) {
+            is.readAllBytes();
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/BodyProcessorInputStreamTest.java b/test/jdk/java/net/httpclient/BodyProcessorInputStreamTest.java
index d548c365f6a..06baf683915 100644
--- a/test/jdk/java/net/httpclient/BodyProcessorInputStreamTest.java
+++ b/test/jdk/java/net/httpclient/BodyProcessorInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -21,27 +21,19 @@
  * questions.
  */
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import java.nio.ByteBuffer;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Flow;
 import java.util.stream.Stream;
 import static java.lang.System.err;
 
@@ -95,14 +87,14 @@ public static void main(String[] args) throws Exception {
         // This example shows how to return an InputStream that can be used to
         // start reading the response body before the response is fully received.
         // In comparison, the snipet below (which uses
-        // HttpResponse.BodyHandler.asString()) obviously will not return before the
+        // HttpResponse.BodyHandlers.ofString()) obviously will not return before the
         // response body is fully read:
         //
         // System.out.println(
-        //    client.sendAsync(request, HttpResponse.BodyHandler.asString()).get().body());
+        //    client.sendAsync(request, HttpResponse.BodyHandlers.ofString()).get().body());
 
         CompletableFuture<HttpResponse<InputStream>> handle =
-            client.sendAsync(request, HttpResponse.BodyHandler.asInputStream());
+            client.sendAsync(request, BodyHandlers.ofInputStream());
         if (DEBUG) err.println("Request sent");
 
         HttpResponse<InputStream> pending = handle.get();
diff --git a/test/jdk/java/net/httpclient/BufferingSubscriberCancelTest.java b/test/jdk/java/net/httpclient/BufferingSubscriberCancelTest.java
index 684e1f6ee2d..a4c5bab55dc 100644
--- a/test/jdk/java/net/httpclient/BufferingSubscriberCancelTest.java
+++ b/test/jdk/java/net/httpclient/BufferingSubscriberCancelTest.java
@@ -31,7 +31,7 @@
 import java.util.concurrent.SubmissionPublisher;
 import java.util.function.IntSupplier;
 import java.util.stream.IntStream;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscriber;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import static java.lang.Long.MAX_VALUE;
@@ -39,7 +39,7 @@
 import static java.lang.System.out;
 import static java.nio.ByteBuffer.wrap;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static jdk.incubator.http.HttpResponse.BodySubscriber.buffering;
+import static java.net.http.HttpResponse.BodySubscribers.buffering;
 import static org.testng.Assert.*;
 
 /*
diff --git a/test/jdk/java/net/httpclient/BufferingSubscriberErrorCompleteTest.java b/test/jdk/java/net/httpclient/BufferingSubscriberErrorCompleteTest.java
index ed875bc3dc6..5292f4b9860 100644
--- a/test/jdk/java/net/httpclient/BufferingSubscriberErrorCompleteTest.java
+++ b/test/jdk/java/net/httpclient/BufferingSubscriberErrorCompleteTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -25,24 +25,19 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Flow.Subscription;
 import java.util.concurrent.Phaser;
 import java.util.concurrent.SubmissionPublisher;
-import java.util.function.IntSupplier;
 import java.util.stream.IntStream;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscriber;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import static java.lang.Long.MAX_VALUE;
 import static java.lang.Long.MIN_VALUE;
-import static java.lang.System.out;
 import static java.nio.ByteBuffer.wrap;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static jdk.incubator.http.HttpResponse.BodySubscriber.buffering;
+import static java.net.http.HttpResponse.BodySubscribers.buffering;
 import static org.testng.Assert.*;
 
 /*
diff --git a/test/jdk/java/net/httpclient/BufferingSubscriberTest.java b/test/jdk/java/net/httpclient/BufferingSubscriberTest.java
index 1a246f83caa..c35c62c062a 100644
--- a/test/jdk/java/net/httpclient/BufferingSubscriberTest.java
+++ b/test/jdk/java/net/httpclient/BufferingSubscriberTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -33,8 +33,10 @@
 import java.util.concurrent.Flow.Subscription;
 import java.util.concurrent.SubmissionPublisher;
 import java.util.function.BiConsumer;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
 import jdk.test.lib.RandomFactory;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -87,8 +89,8 @@ public Object[][] negatives() {
     public void subscriberThrowsIAE(int bufferSize) {
         printStamp(START, "subscriberThrowsIAE(%d)", bufferSize);
         try {
-            BodySubscriber<?> bp = BodySubscriber.asByteArray();
-            BodySubscriber.buffering(bp, bufferSize);
+            BodySubscriber<?> bp = BodySubscribers.ofByteArray();
+            BodySubscribers.buffering(bp, bufferSize);
         } finally {
             printStamp(END, "subscriberThrowsIAE(%d)", bufferSize);
         }
@@ -98,8 +100,8 @@ public void subscriberThrowsIAE(int bufferSize) {
     public void handlerThrowsIAE(int bufferSize) {
         printStamp(START, "handlerThrowsIAE(%d)", bufferSize);
         try {
-            BodyHandler<?> bp = BodyHandler.asByteArray();
-            BodyHandler.buffering(bp, bufferSize);
+            BodyHandler<?> bp = BodyHandlers.ofByteArray();
+            BodyHandlers.buffering(bp, bufferSize);
         } finally {
             printStamp(END, "handlerThrowsIAE(%d)", bufferSize);
         }
@@ -242,7 +244,7 @@ static BodySubscriber<Integer> createSubscriber(int bufferSize,
                                                 delay,
                                                 expectedTotalSize,
                                                 requestAmount);
-            return BodySubscriber.buffering(s, bufferSize);
+            return BodySubscribers.buffering(s, bufferSize);
         }
 
         private void requestMore() {
diff --git a/test/jdk/java/net/httpclient/CancelledResponse.java b/test/jdk/java/net/httpclient/CancelledResponse.java
index 04c28f6e979..24a9c9de016 100644
--- a/test/jdk/java/net/httpclient/CancelledResponse.java
+++ b/test/jdk/java/net/httpclient/CancelledResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -21,12 +21,11 @@
  * questions.
  */
 
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpClient.Version;
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.jshell.spi.ExecutionControl;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import jdk.testlibrary.SimpleSSLContext;
 
 import javax.net.ServerSocketFactory;
@@ -46,18 +45,20 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodySubscriber;
 
 import static java.lang.String.format;
 import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
 /**
  * @test
  * @bug 8087112
  * @library /lib/testlibrary
+ * @modules java.net.http/jdk.internal.net.http.common
  * @build jdk.testlibrary.SimpleSSLContext
- * @build MockServer
+ * @build MockServer ReferenceTracker
  * @run main/othervm  CancelledResponse
  * @run main/othervm  CancelledResponse SSL
  */
@@ -74,7 +75,9 @@ static String response(String body, boolean serverKeepalive) {
         if (!serverKeepalive)
             sb.append("Connection: Close\r\n");
 
-        sb.append("Content-length: ").append(body.length()).append("\r\n");
+        sb.append("Content-length: ")
+                .append(body.getBytes(ISO_8859_1).length)
+                .append("\r\n");
         sb.append("\r\n");
         sb.append(body);
         return sb.toString();
@@ -86,6 +89,7 @@ static String response(String body, boolean serverKeepalive) {
         "aliquip ex ea commodo consequat."
     };
 
+    static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
     final ServerSocketFactory factory;
     final SSLContext context;
     final boolean useSSL;
@@ -106,7 +110,7 @@ public HttpClient newHttpClient() {
         } else {
             client = HttpClient.newHttpClient();
         }
-        return client;
+        return TRACKER.track(client);
     }
 
     public static void main(String[] args) throws Exception {
@@ -116,14 +120,31 @@ public static void main(String[] args) throws Exception {
         }
         CancelledResponse sp = new CancelledResponse(useSSL);
 
-        for (Version version : Version.values()) {
-            for (boolean serverKeepalive : new boolean[]{ true, false }) {
-                // Note: the mock server doesn't support Keep-Alive, but
-                // pretending that it might exercises code paths in and out of
-                // the connection pool, and retry logic
-                for (boolean async : new boolean[]{ true, false }) {
-                    sp.test(version, serverKeepalive, async);
+        Throwable failed = null;
+        try {
+            for (Version version : Version.values()) {
+                for (boolean serverKeepalive : new boolean[]{true, false}) {
+                    // Note: the mock server doesn't support Keep-Alive, but
+                    // pretending that it might exercises code paths in and out of
+                    // the connection pool, and retry logic
+                    for (boolean async : new boolean[]{true, false}) {
+                        sp.test(version, serverKeepalive, async);
+                    }
+                }
+            }
+        } catch (Exception | Error t) {
+            failed = t;
+            throw t;
+        } finally {
+            Thread.sleep(100);
+            AssertionError trackFailed = TRACKER.check(500);
+            if (trackFailed != null) {
+                if (failed != null) {
+                    failed.addSuppressed(trackFailed);
+                    if (failed instanceof Error) throw (Error) failed;
+                    if (failed instanceof Exception) throw (Exception) failed;
                 }
+                throw trackFailed;
             }
         }
     }
@@ -158,11 +179,11 @@ void test(Version version, boolean serverKeepalive, boolean async)
                 try {
                     if (async) {
                         out.println("send async: " + request);
-                        cf1 = client.sendAsync(request, asString(body, cancelled));
+                        cf1 = client.sendAsync(request, ofString(body, cancelled));
                         r = cf1.get();
                     } else { // sync
                         out.println("send sync: " + request);
-                        r = client.send(request, asString(body, cancelled));
+                        r = client.send(request, ofString(body, cancelled));
                     }
                 } catch (CancelException c1) {
                     System.out.println("Got expected exception: " + c1);
@@ -286,13 +307,13 @@ static class CancellingHandler implements BodyHandler<String> {
             this.cancelled = cancelled;
         }
         @Override
-        public BodySubscriber<String> apply(int statusCode, HttpHeaders responseHeaders) {
+        public BodySubscriber<String> apply(HttpResponse.ResponseInfo rinfo) {
             assert !cancelled.get();
             return new CancellingSubscriber(expected, cancelled);
         }
     }
 
-    BodyHandler<String> asString(String expected, AtomicBoolean cancelled) {
+    BodyHandler<String> ofString(String expected, AtomicBoolean cancelled) {
         return new CancellingHandler(expected, cancelled);
     }
 
diff --git a/test/jdk/java/net/httpclient/ConcurrentResponses.java b/test/jdk/java/net/httpclient/ConcurrentResponses.java
index 0d3cba9a82a..ded6fb8244b 100644
--- a/test/jdk/java/net/httpclient/ConcurrentResponses.java
+++ b/test/jdk/java/net/httpclient/ConcurrentResponses.java
@@ -27,9 +27,9 @@
  * @summary Buffers given to response body subscribers should not contain
  *          unprocessed HTTP data
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary http2/server
@@ -41,6 +41,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -57,19 +58,20 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
 import jdk.testlibrary.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
+import static java.net.http.HttpResponse.BodyHandlers.discarding;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.fail;
@@ -144,7 +146,7 @@ public Object[][] variants() {
     }
 
 
-    // The asString implementation accumulates data, below a certain threshold
+    // The ofString implementation accumulates data, below a certain threshold
     // into the byte buffers it is given.
     @Test(dataProvider = "uris")
     void testAsString(String uri) throws Exception {
@@ -158,11 +160,11 @@ void testAsString(String uri) throws Exception {
         }
 
         // initial connection to seed the cache so next parallel connections reuse it
-        client.sendAsync(HttpRequest.newBuilder(URI.create(uri)).build(), discard(null)).join();
+        client.sendAsync(HttpRequest.newBuilder(URI.create(uri)).build(), discarding()).join();
 
         // will reuse connection cached from the previous request ( when HTTP/2 )
         CompletableFuture.allOf(requests.keySet().parallelStream()
-                .map(request -> client.sendAsync(request, asString()))
+                .map(request -> client.sendAsync(request, BodyHandlers.ofString()))
                 .map(cf -> cf.thenCompose(ConcurrentResponses::assert200ResponseCode))
                 .map(cf -> cf.thenCompose(response -> assertbody(response, requests.get(response.request()))))
                 .toArray(CompletableFuture<?>[]::new))
@@ -183,7 +185,7 @@ void testWithCustomSubscriber(String uri) throws Exception {
         }
 
         // initial connection to seed the cache so next parallel connections reuse it
-        client.sendAsync(HttpRequest.newBuilder(URI.create(uri)).build(), discard(null)).join();
+        client.sendAsync(HttpRequest.newBuilder(URI.create(uri)).build(), discarding()).join();
 
         // will reuse connection cached from the previous request ( when HTTP/2 )
         CompletableFuture.allOf(requests.keySet().parallelStream()
@@ -195,21 +197,21 @@ void testWithCustomSubscriber(String uri) throws Exception {
     }
 
     /**
-     * A subscriber that wraps asString, but mucks with any data between limit
+     * A subscriber that wraps ofString, but mucks with any data between limit
      * and capacity, if the client mistakenly passes it any that is should not.
      */
     static class CustomSubscriber implements BodySubscriber<String> {
-        static final BodyHandler<String> handler = (r,h) -> new CustomSubscriber();
-        private final BodySubscriber<String> asString = BodySubscriber.asString(UTF_8);
+        static final BodyHandler<String> handler = (r) -> new CustomSubscriber();
+        private final BodySubscriber<String> ofString = BodySubscribers.ofString(UTF_8);
 
         @Override
         public CompletionStage<String> getBody() {
-            return asString.getBody();
+            return ofString.getBody();
         }
 
         @Override
         public void onSubscribe(Flow.Subscription subscription) {
-            asString.onSubscribe(subscription);
+            ofString.onSubscribe(subscription);
         }
 
         @Override
@@ -217,6 +219,9 @@ public void onNext(List<ByteBuffer> buffers) {
             // Muck any data beyond the give limit, since there shouldn't
             // be any of interest to the HTTP Client.
             for (ByteBuffer buffer : buffers) {
+                if (buffer.isReadOnly())
+                    continue;
+
                 if (buffer.limit() != buffer.capacity()) {
                     final int limit = buffer.limit();
                     final int position = buffer.position();
@@ -228,22 +233,26 @@ public void onNext(List<ByteBuffer> buffers) {
                     buffer.limit(limit);       // restore original limit
                 }
             }
-            asString.onNext(buffers);
+            ofString.onNext(buffers);
         }
 
         @Override
         public void onError(Throwable throwable) {
-            asString.onError(throwable);
+            ofString.onError(throwable);
             throwable.printStackTrace();
             fail("UNEXPECTED:" + throwable);
         }
 
         @Override
         public void onComplete() {
-            asString.onComplete();
+            ofString.onComplete();
         }
     }
 
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
 
     @BeforeTest
     public void setup() throws Exception {
@@ -251,31 +260,31 @@ public void setup() throws Exception {
         if (sslContext == null)
             throw new AssertionError("Unexpected null sslContext");
 
-        InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/fixed", new Http1FixedHandler());
-        httpFixedURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/fixed";
+        httpFixedURI = "http://" + serverAuthority(httpTestServer) + "/http1/fixed";
         httpTestServer.createContext("/http1/chunked", new Http1ChunkedHandler());
-        httpChunkedURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/chunked";
+        httpChunkedURI = "http://" + serverAuthority(httpTestServer) + "/http1/chunked";
 
         httpsTestServer = HttpsServer.create(sa, 0);
         httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
         httpsTestServer.createContext("/https1/fixed", new Http1FixedHandler());
-        httpsFixedURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/fixed";
+        httpsFixedURI = "https://" + serverAuthority(httpsTestServer) + "/https1/fixed";
         httpsTestServer.createContext("/https1/chunked", new Http1ChunkedHandler());
-        httpsChunkedURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/chunked";
+        httpsChunkedURI = "https://" + serverAuthority(httpsTestServer) + "/https1/chunked";
 
-        http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+        http2TestServer = new Http2TestServer("localhost", false, 0);
         http2TestServer.addHandler(new Http2FixedHandler(), "/http2/fixed");
-        http2FixedURI = "http://127.0.0.1:" + http2TestServer.getAddress().getPort() + "/http2/fixed";
+        http2FixedURI = "http://" + http2TestServer.serverAuthority()+ "/http2/fixed";
         http2TestServer.addHandler(new Http2VariableHandler(), "/http2/variable");
-        http2VariableURI = "http://127.0.0.1:" + http2TestServer.getAddress().getPort() + "/http2/variable";
+        http2VariableURI = "http://" + http2TestServer.serverAuthority() + "/http2/variable";
 
-        https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+        https2TestServer = new Http2TestServer("localhost", true, 0);
         https2TestServer.addHandler(new Http2FixedHandler(), "/https2/fixed");
-        https2FixedURI = "https://127.0.0.1:" + https2TestServer.getAddress().getPort() + "/https2/fixed";
+        https2FixedURI = "https://" + https2TestServer.serverAuthority() + "/https2/fixed";
         https2TestServer.addHandler(new Http2VariableHandler(), "/https2/variable");
-        https2VariableURI = "https://127.0.0.1:" + https2TestServer.getAddress().getPort() + "/https2/variable";
+        https2VariableURI = "https://" + https2TestServer.serverAuthority() + "/https2/variable";
 
         httpTestServer.start();
         httpsTestServer.start();
diff --git a/test/jdk/java/net/httpclient/CookieHeaderTest.java b/test/jdk/java/net/httpclient/CookieHeaderTest.java
new file mode 100644
index 00000000000..a39edf95c0d
--- /dev/null
+++ b/test/jdk/java/net/httpclient/CookieHeaderTest.java
@@ -0,0 +1,559 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8199851
+ * @summary Test for multiple vs single cookie header for HTTP/2 vs HTTP/1.1
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          jdk.httpserver
+ * @library /lib/testlibrary /test/lib http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm
+ *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
+ *       CookieHeaderTest
+ */
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class CookieHeaderTest implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
+    HttpTestServer httpsTestServer;       // HTTPS/1.1
+    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    DummyServer httpDummyServer;
+    DummyServer httpsDummyServer;
+    String httpURI;
+    String httpsURI;
+    String http2URI;
+    String https2URI;
+    String httpDummy;
+    String httpsDummy;
+
+    static final String MESSAGE = "Basic CookieHeaderTest message body";
+    static final int ITERATIONS = 3;
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    @DataProvider(name = "positive")
+    public Object[][] positive() {
+        return new Object[][] {
+                { httpURI, HttpClient.Version.HTTP_1_1  },
+                { httpsURI, HttpClient.Version.HTTP_1_1  },
+                { httpDummy, HttpClient.Version.HTTP_1_1 },
+                { httpsDummy, HttpClient.Version.HTTP_1_1 },
+                { httpURI, HttpClient.Version.HTTP_2  },
+                { httpsURI, HttpClient.Version.HTTP_2  },
+                { httpDummy, HttpClient.Version.HTTP_2 },
+                { httpsDummy, HttpClient.Version.HTTP_2 },
+                { http2URI, null  },
+                { https2URI, null },
+        };
+    }
+
+    static final AtomicLong requestCounter = new AtomicLong();
+
+    @Test(dataProvider = "positive")
+    void test(String uriString, HttpClient.Version version) throws Exception {
+        out.printf("%n---- starting (%s) ----%n", uriString);
+        ConcurrentHashMap<String, List<String>> cookieHeaders
+                = new ConcurrentHashMap<>();
+        CookieHandler cookieManager = new TestCookieHandler(cookieHeaders);
+        HttpClient client = HttpClient.newBuilder()
+                .followRedirects(Redirect.ALWAYS)
+                .cookieHandler(cookieManager)
+                .sslContext(sslContext)
+                .build();
+        assert client.cookieHandler().isPresent();
+
+        URI uri = URI.create(uriString);
+        List<String> cookies = new ArrayList<>();
+        cookies.add("CUSTOMER=ARTHUR_DENT");
+        cookies.add("LOCATION=TR\u0100IN_STATION");
+        cookies.add("LOC\u0100TION=TRAIN_STATION");
+        cookies.add("ORDER=BISCUITS");
+        cookieHeaders.put("Cookie", cookies);
+
+        HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri)
+                .header("X-uuid", "uuid-" + requestCounter.incrementAndGet());
+        if (version != null) {
+            requestBuilder.version(version);
+        }
+        HttpRequest request = requestBuilder.build();
+        out.println("Initial request: " + request.uri());
+
+        for (int i=0; i< ITERATIONS; i++) {
+            out.println("iteration: " + i);
+            HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+
+            out.println("  Got response: " + response);
+            out.println("  Got body Path: " + response.body());
+
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.body(), MESSAGE);
+            assertEquals(response.headers().allValues("X-Request-Cookie"),
+                    cookies.stream()
+                            .filter(s -> !s.startsWith("LOC"))
+                            .collect(Collectors.toList()));
+            requestBuilder = HttpRequest.newBuilder(uri)
+                    .header("X-uuid", "uuid-" + requestCounter.incrementAndGet());
+            if (version != null) {
+                requestBuilder.version(version);
+            }
+            request = requestBuilder.build();
+        }
+    }
+
+    // -- Infrastructure
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(new CookieValidationHandler(), "/http1/cookie/");
+        httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/retry";
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(new CookieValidationHandler(),"/https1/cookie/");
+        httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/cookie/retry";
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(new CookieValidationHandler(), "/http2/cookie/");
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/cookie/retry";
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(new CookieValidationHandler(), "/https2/cookie/");
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/cookie/retry";
+
+
+        // DummyServer
+        httpDummyServer = DummyServer.create(sa);
+        httpsDummyServer = DummyServer.create(sa, sslContext);
+        httpDummy = "http://" + httpDummyServer.serverAuthority() + "/http1/dummy/x";
+        httpsDummy = "https://" + httpsDummyServer.serverAuthority() + "/https1/dummy/x";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+        httpDummyServer.start();
+        httpsDummyServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop();
+        httpsTestServer.stop();
+        http2TestServer.stop();
+        https2TestServer.stop();
+        httpsDummyServer.stopServer();
+        httpsDummyServer.stopServer();
+    }
+
+    static class TestCookieHandler extends CookieHandler {
+
+        final ConcurrentHashMap<String, List<String>> cookies;
+        TestCookieHandler(ConcurrentHashMap<String, List<String>> map) {
+            this.cookies = map;
+        }
+
+        @Override
+        public Map<String, List<String>> get(URI uri, Map<String, List<String>> requestHeaders)
+                throws IOException
+        {
+            return cookies;
+        }
+
+        @Override
+        public void put(URI uri, Map<String, List<String>> responseHeaders)
+                throws IOException
+        {
+            // do nothing
+        }
+    }
+
+    static class CookieValidationHandler implements HttpTestHandler {
+        ConcurrentHashMap<String,String> closedRequests = new ConcurrentHashMap<>();
+
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            System.out.println("CookieValidationHandler for: " + t.getRequestURI());
+
+            List<String> uuids = t.getRequestHeaders().get("X-uuid");
+            if (uuids == null || uuids.size() != 1) {
+                readAllRequestData(t);
+                try (OutputStream os = t.getResponseBody()) {
+                    String msg = "Incorrect uuid header values:[" + uuids + "]";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                }
+                return;
+            }
+
+            String uuid = uuids.get(0);
+            // retrying
+            if (closedRequests.putIfAbsent(uuid, t.getRequestURI().toString()) == null) {
+                if (t.getExchangeVersion() == HttpClient.Version.HTTP_1_1) {
+                    // Throwing an exception here only causes a retry
+                    // with HTTP_1_1 - where it forces the server to close
+                    // the connection.
+                    // For HTTP/2 then throwing an IOE would cause the server
+                    // to close the stream, and throwing anything else would
+                    // cause it to close the connection, but neither would
+                    // cause the client to retry.
+                    // So we simply do not try to retry with HTTP/2 and just verify
+                    // we have received the expected cookie
+                    throw new IOException("Closing on first request");
+                }
+            }
+
+            // Check whether this request was upgraded.
+            // An upgraded request will have a version of HTTP_2 and
+            // an Upgrade: h2c header
+            HttpClient.Version version = t.getExchangeVersion();
+            List<String> upgrade = t.getRequestHeaders().get("Upgrade");
+            if (upgrade == null) upgrade = List.of();
+            boolean upgraded = version == HttpClient.Version.HTTP_2
+                    && upgrade.stream().anyMatch("h2c"::equalsIgnoreCase);
+
+            // not retrying
+            readAllRequestData(t);
+            try (OutputStream os = t.getResponseBody()) {
+                List<String> cookie = t.getRequestHeaders().get("Cookie");
+                if (cookie != null) {
+                    if (version == HttpClient.Version.HTTP_1_1 || upgraded) {
+                        if (cookie.size() == 1) {
+                            cookie = List.of(cookie.get(0).split("; "));
+                        } else if (cookie.size() > 1) {
+                            String msg = "Found multiple 'Cookie:' lines for version=%s (upgraded=%s): %s";
+                            msg = String.format(msg, version, upgraded, cookie);
+                            (new RuntimeException(msg)).printStackTrace();
+                            t.sendResponseHeaders(500, -1);
+                            os.write(msg.getBytes(UTF_8));
+                            return;
+                        }
+                    }
+                    Collections.sort(cookie = new ArrayList<String>(cookie));
+                }
+                if (cookie == null || cookie.size() == 0) {
+                    String msg = "No cookie header present";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                } else if (!cookie.get(0).equals("CUSTOMER=ARTHUR_DENT")) {
+                    String msg = "Incorrect cookie header value:[" + cookie.get(0) + "]";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                } else if (cookie.size() == 2 && !cookie.get(1).equals("ORDER=BISCUITS")) {
+                    String msg = "Incorrect cookie header value:[" + cookie.get(0) + "]";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                } else if (cookie.size() != 2) {
+                    String msg = "Incorrect cookie header values:[" + cookie + "]";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                } else {
+                    assert cookie.get(0).equals("CUSTOMER=ARTHUR_DENT");
+                    byte[] bytes = MESSAGE.getBytes(UTF_8);
+                    for (String value : cookie) {
+                        t.getResponseHeaders().addHeader("X-Request-Cookie", value);
+                    }
+                    t.sendResponseHeaders(200, bytes.length);
+                    os.write(bytes);
+                }
+            } finally {
+                closedRequests.remove(uuid);
+            }
+
+        }
+    }
+
+    static void readAllRequestData(HttpTestExchange t) throws IOException {
+        try (InputStream is = t.getRequestBody()) {
+            is.readAllBytes();
+        }
+    }
+
+    static class DummyServer extends Thread {
+        final ServerSocket ss;
+        final boolean secure;
+        ConcurrentLinkedQueue<Socket> connections = new ConcurrentLinkedQueue<>();
+        volatile boolean stopped;
+        DummyServer(ServerSocket ss, boolean secure) {
+            super("DummyServer[" + ss.getLocalPort()+"]");
+            this.secure = secure;
+            this.ss = ss;
+        }
+
+        // This is a bit shaky. It doesn't handle continuation
+        // lines, but our client shouldn't send any.
+        // Read a line from the input stream, swallowing the final
+        // \r\n sequence. Stops at the first \n, doesn't complain
+        // if it wasn't preceded by '\r'.
+        //
+        String readLine(InputStream r) throws IOException {
+            StringBuilder b = new StringBuilder();
+            int c;
+            while ((c = r.read()) != -1) {
+                if (c == '\n') break;
+                b.appendCodePoint(c);
+            }
+            if (b.codePointAt(b.length() -1) == '\r') {
+                b.delete(b.length() -1, b.length());
+            }
+            return b.toString();
+        }
+
+        @Override
+        public void run() {
+            try {
+                while(!stopped) {
+                    Socket clientConnection = ss.accept();
+                    connections.add(clientConnection);
+                    System.out.println(now() + getName() + ": Client accepted");
+                    StringBuilder headers = new StringBuilder();
+                    Socket targetConnection = null;
+                    InputStream  ccis = clientConnection.getInputStream();
+                    OutputStream ccos = clientConnection.getOutputStream();
+                    Writer w = new OutputStreamWriter(
+                            clientConnection.getOutputStream(), "UTF-8");
+                    PrintWriter pw = new PrintWriter(w);
+                    System.out.println(now() + getName() + ": Reading request line");
+                    String requestLine = readLine(ccis);
+                    System.out.println(now() + getName() + ": Request line: " + requestLine);
+
+                    StringTokenizer tokenizer = new StringTokenizer(requestLine);
+                    String method = tokenizer.nextToken();
+                    assert method.equalsIgnoreCase("POST") || method.equalsIgnoreCase("GET");
+                    String path = tokenizer.nextToken();
+                    URI uri;
+                    try {
+                        String hostport = serverAuthority();
+                        uri = new URI((secure ? "https" : "http") +"://" + hostport + path);
+                    } catch (Throwable x) {
+                        System.err.printf("Bad target address: \"%s\" in \"%s\"%n",
+                                path, requestLine);
+                        clientConnection.close();
+                        continue;
+                    }
+
+                    // Read all headers until we find the empty line that
+                    // signals the end of all headers.
+                    String line = requestLine;
+                    String cookies = null;
+                    while (!line.equals("")) {
+                        System.out.println(now() + getName() + ": Reading header: "
+                                + (line = readLine(ccis)));
+                        if (line.startsWith("Cookie:")) {
+                            if (cookies == null) cookies = line;
+                            else cookies = cookies + "\n" + line;
+                        }
+                        headers.append(line).append("\r\n");
+                    }
+
+                    StringBuilder response = new StringBuilder();
+                    StringBuilder xheaders = new StringBuilder();
+
+                    int index = headers.toString()
+                            .toLowerCase(Locale.US)
+                            .indexOf("content-length: ");
+                    if (index >= 0) {
+                        index = index + "content-length: ".length();
+                        String cl = headers.toString().substring(index);
+                        StringTokenizer tk = new StringTokenizer(cl);
+                        int len = Integer.parseInt(tk.nextToken());
+                        System.out.println(now() + getName()
+                                + ": received body: "
+                                + new String(ccis.readNBytes(len), UTF_8));
+                    }
+                    String resp = MESSAGE;
+                    String status = "200 OK";
+                    if (cookies == null) {
+                        resp = "No cookies found in headers";
+                        status = "500 Internal Server Error";
+                    } else if (cookies.contains("\n")) {
+                        resp = "More than one 'Cookie:' line found: "
+                                + Arrays.asList(cookies.split("\n"));
+                        status = "500 Internal Server Error";
+                    } else {
+                        List<String> values =
+                                Stream.of(cookies.substring("Cookie:".length()).trim().split("; "))
+                                        .map(String::trim)
+                                        .collect(Collectors.toList());
+                        Collections.sort(values);
+                        if (values.size() != 2) {
+                            resp = "Bad cookie list: " + values;
+                            status = "500 Internal Server Error";
+                        } else if (!values.get(0).equals("CUSTOMER=ARTHUR_DENT")) {
+                            resp = "Unexpected cookie: " + values.get(0) + " in " + values;
+                            status = "500 Internal Server Error";
+                        } else if (!values.get(1).equals("ORDER=BISCUITS")) {
+                            resp = "Unexpected cookie: " + values.get(1) + " in " + values;
+                            status = "500 Internal Server Error";
+                        } else {
+                            for (String cookie : values) {
+                                xheaders.append("X-Request-Cookie: ")
+                                        .append(cookie)
+                                        .append("\r\n");
+                            }
+                        }
+                    }
+                    byte[] b = resp.getBytes(UTF_8);
+                    System.out.println(now()
+                            + getName() + ": sending back " + uri);
+
+                    response.append("HTTP/1.1 ")
+                            .append(status)
+                            .append("\r\nContent-Length: ")
+                            .append(b.length)
+                            .append("\r\n")
+                            .append(xheaders)
+                            .append("\r\n");
+
+                    // Then send the 200 OK response to the client
+                    System.out.println(now() + getName() + ": Sending "
+                            + response);
+                    pw.print(response);
+                    pw.flush();
+                    ccos.write(b);
+                    ccos.flush();
+                    ccos.close();
+                    connections.remove(clientConnection);
+                    clientConnection.close();
+                }
+            } catch (Throwable t) {
+                if (!stopped) {
+                    System.out.println(now() + getName() + ": failed: " + t);
+                    t.printStackTrace();
+                    try {
+                        stopServer();
+                    } catch (Throwable e) {
+
+                    }
+                }
+            } finally {
+                System.out.println(now() + getName() + ": exiting");
+            }
+        }
+
+        void close(Socket s) {
+            try {
+                s.close();
+            } catch(Throwable t) {
+
+            }
+        }
+        public void stopServer() throws IOException {
+            stopped = true;
+            ss.close();
+            connections.forEach(this::close);
+        }
+
+        public String serverAuthority() {
+            return InetAddress.getLoopbackAddress().getHostName() + ":"
+                    + ss.getLocalPort();
+        }
+
+        static DummyServer create(InetSocketAddress sa) throws IOException {
+            ServerSocket ss = ServerSocketFactory.getDefault()
+                    .createServerSocket(sa.getPort(), -1, sa.getAddress());
+            return  new DummyServer(ss, false);
+        }
+
+        static DummyServer create(InetSocketAddress sa, SSLContext sslContext) throws IOException {
+            ServerSocket ss = sslContext.getServerSocketFactory()
+                    .createServerSocket(sa.getPort(), -1, sa.getAddress());
+            return new DummyServer(ss, true);
+        }
+
+
+    }
+}
diff --git a/test/jdk/java/net/httpclient/CustomRequestPublisher.java b/test/jdk/java/net/httpclient/CustomRequestPublisher.java
index 399921fc8e9..c42966c9fd0 100644
--- a/test/jdk/java/net/httpclient/CustomRequestPublisher.java
+++ b/test/jdk/java/net/httpclient/CustomRequestPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -25,9 +25,9 @@
  * @test
  * @summary Checks correct handling of Publishers that call onComplete without demand
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary http2/server
@@ -44,10 +44,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Flow;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -56,19 +58,23 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import javax.net.ssl.SSLContext;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import javax.net.ssl.SSLSession;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import jdk.testlibrary.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import static java.lang.System.out;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static java.net.http.HttpResponse.BodyHandlers.ofString;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 public class CustomRequestPublisher {
 
@@ -110,6 +116,28 @@ public Object[][] variants() {
 
     static final int ITERATION_COUNT = 10;
 
+    /** Asserts HTTP Version, and SSLSession presence when applicable. */
+    static void assertVersionAndSession(HttpResponse response, String uri) {
+        if (uri.contains("http2") || uri.contains("https2"))
+            assertEquals(response.version(), HTTP_2);
+        else if (uri.contains("http1") || uri.contains("https1"))
+            assertEquals(response.version(), HTTP_1_1);
+        else
+            fail("Unknown HTTP version in test for: " + uri);
+
+        Optional<SSLSession> ssl = response.sslSession();
+        if (uri.contains("https")) {
+            assertTrue(ssl.isPresent(),
+                    "Expected optional containing SSLSession but got:" + ssl);
+            try {
+                ssl.get().invalidate();
+                fail("SSLSession is not immutable: " + ssl.get());
+            } catch (UnsupportedOperationException expected) { }
+        } else {
+            assertTrue(!ssl.isPresent(), "UNEXPECTED non-empty optional:" + ssl);
+        }
+    }
+
     @Test(dataProvider = "variants")
     void test(String uri, Supplier<BodyPublisher> bpSupplier, boolean sameClient)
             throws Exception
@@ -124,13 +152,15 @@ void test(String uri, Supplier<BodyPublisher> bpSupplier, boolean sameClient)
                     .POST(bodyPublisher)
                     .build();
 
-            HttpResponse<String> resp = client.send(request, asString());
+            HttpResponse<String> resp = client.send(request, ofString());
 
             out.println("Got response: " + resp);
             out.println("Got body: " + resp.body());
             assertTrue(resp.statusCode() == 200,
                     "Expected 200, got:" + resp.statusCode());
             assertEquals(resp.body(), bodyPublisher.bodyAsString());
+
+            assertVersionAndSession(resp, uri);
         }
     }
 
@@ -148,7 +178,7 @@ void testAsync(String uri, Supplier<BodyPublisher> bpSupplier, boolean sameClien
                     .POST(bodyPublisher)
                     .build();
 
-            CompletableFuture<HttpResponse<String>> cf = client.sendAsync(request, asString());
+            CompletableFuture<HttpResponse<String>> cf = client.sendAsync(request, ofString());
             HttpResponse<String> resp = cf.get();
 
             out.println("Got response: " + resp);
@@ -156,6 +186,8 @@ void testAsync(String uri, Supplier<BodyPublisher> bpSupplier, boolean sameClien
             assertTrue(resp.statusCode() == 200,
                     "Expected 200, got:" + resp.statusCode());
             assertEquals(resp.body(), bodyPublisher.bodyAsString());
+
+            assertVersionAndSession(resp, uri);
         }
     }
 
@@ -283,31 +315,34 @@ public void cancel() {
         }
     }
 
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
     @BeforeTest
     public void setup() throws Exception {
         sslContext = new SimpleSSLContext().get();
         if (sslContext == null)
             throw new AssertionError("Unexpected null sslContext");
 
-        InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/echo", new Http1EchoHandler());
-        httpURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/echo";
+        httpURI = "http://" + serverAuthority(httpTestServer) + "/http1/echo";
 
         httpsTestServer = HttpsServer.create(sa, 0);
         httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
         httpsTestServer.createContext("/https1/echo", new Http1EchoHandler());
-        httpsURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/echo";
+        httpsURI = "https://" + serverAuthority(httpsTestServer) + "/https1/echo";
 
-        http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+        http2TestServer = new Http2TestServer("localhost", false, 0);
         http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
-        int port = http2TestServer.getAddress().getPort();
-        http2URI = "http://127.0.0.1:" + port + "/http2/echo";
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/echo";
 
-        https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+        https2TestServer = new Http2TestServer("localhost", true, 0);
         https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
-        port = https2TestServer.getAddress().getPort();
-        https2URI = "https://127.0.0.1:" + port + "/https2/echo";
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/echo";
 
         httpTestServer.start();
         httpsTestServer.start();
diff --git a/test/jdk/java/net/httpclient/CustomResponseSubscriber.java b/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
index 290b4de9262..51a6cff6dc2 100644
--- a/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
+++ b/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -27,14 +27,15 @@
  * @library /lib/testlibrary http2/server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  * @run testng/othervm CustomResponseSubscriber
  */
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -48,12 +49,13 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import  jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
 import javax.net.ssl.SSLContext;
 import jdk.testlibrary.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
@@ -62,7 +64,6 @@
 import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static jdk.incubator.http.HttpResponse.BodySubscriber.asString;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
@@ -134,50 +135,54 @@ public void testAsString(String uri, boolean sameClient) throws Exception {
 
     static class CRSBodyHandler implements BodyHandler<String> {
         @Override
-        public BodySubscriber<String> apply(int statusCode, HttpHeaders responseHeaders) {
-            assertEquals(statusCode, 200);
+        public BodySubscriber<String> apply(HttpResponse.ResponseInfo rinfo) {
+            assertEquals(rinfo.statusCode(), 200);
             return new CRSBodySubscriber();
         }
     }
 
     static class CRSBodySubscriber implements BodySubscriber<String> {
-        private final BodySubscriber<String> asString = asString(UTF_8);
+        private final BodySubscriber<String> ofString = BodySubscribers.ofString(UTF_8);
         volatile boolean onSubscribeCalled;
 
         @Override
         public void onSubscribe(Flow.Subscription subscription) {
             //out.println("onSubscribe ");
             onSubscribeCalled = true;
-            asString.onSubscribe(subscription);
+            ofString.onSubscribe(subscription);
         }
 
         @Override
         public void onNext(List<ByteBuffer> item) {
            // out.println("onNext " + item);
             assertTrue(onSubscribeCalled);
-            asString.onNext(item);
+            ofString.onNext(item);
         }
 
         @Override
         public void onError(Throwable throwable) {
             //out.println("onError");
             assertTrue(onSubscribeCalled);
-            asString.onError(throwable);
+            ofString.onError(throwable);
         }
 
         @Override
         public void onComplete() {
             //out.println("onComplete");
             assertTrue(onSubscribeCalled, "onComplete called before onSubscribe");
-            asString.onComplete();
+            ofString.onComplete();
         }
 
         @Override
         public CompletionStage<String> getBody() {
-            return asString.getBody();
+            return ofString.getBody();
         }
     }
 
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
 
     @BeforeTest
     public void setup() throws Exception {
@@ -188,37 +193,35 @@ public void setup() throws Exception {
         // HTTP/1.1
         HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler();
         HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler();
-        InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/fixed", h1_fixedLengthHandler);
         httpTestServer.createContext("/http1/chunk", h1_chunkHandler);
-        httpURI_fixed = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/fixed";
-        httpURI_chunk = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/chunk";
+        httpURI_fixed = "http://" + serverAuthority(httpTestServer) + "/http1/fixed";
+        httpURI_chunk = "http://" + serverAuthority(httpTestServer) + "/http1/chunk";
 
         httpsTestServer = HttpsServer.create(sa, 0);
         httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
         httpsTestServer.createContext("/https1/fixed", h1_fixedLengthHandler);
         httpsTestServer.createContext("/https1/chunk", h1_chunkHandler);
-        httpsURI_fixed = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/fixed";
-        httpsURI_chunk = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/chunk";
+        httpsURI_fixed = "https://" + serverAuthority(httpsTestServer) + "/https1/fixed";
+        httpsURI_chunk = "https://" + serverAuthority(httpsTestServer) + "/https1/chunk";
 
         // HTTP/2
         Http2Handler h2_fixedLengthHandler = new HTTP2_FixedLengthHandler();
         Http2Handler h2_chunkedHandler = new HTTP2_VariableHandler();
 
-        http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+        http2TestServer = new Http2TestServer("localhost", false, 0);
         http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
         http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
-        int port = http2TestServer.getAddress().getPort();
-        http2URI_fixed = "http://127.0.0.1:" + port + "/http2/fixed";
-        http2URI_chunk = "http://127.0.0.1:" + port + "/http2/chunk";
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk";
 
-        https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+        https2TestServer = new Http2TestServer("localhost", true, 0);
         https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
         https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
-        port = https2TestServer.getAddress().getPort();
-        https2URI_fixed = "https://127.0.0.1:" + port + "/https2/fixed";
-        https2URI_chunk = "https://127.0.0.1:" + port + "/https2/chunk";
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk";
 
         httpTestServer.start();
         httpsTestServer.start();
diff --git a/test/jdk/java/net/httpclient/DependentActionsTest.java b/test/jdk/java/net/httpclient/DependentActionsTest.java
new file mode 100644
index 00000000000..5dcd670ed90
--- /dev/null
+++ b/test/jdk/java/net/httpclient/DependentActionsTest.java
@@ -0,0 +1,674 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Verify that dependent synchronous actions added before the CF
+ *          completes are executed either asynchronously in an executor when the
+ *          CF later completes, or in the user thread that joins.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters ThrowingPublishers
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm -Djdk.internal.httpclient.debug=true DependentActionsTest
+ * @run testng/othervm/java.security.policy=dependent.policy
+  *        -Djdk.internal.httpclient.debug=true DependentActionsTest
+ */
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.StackWalker.StackFrame;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.System.out;
+import static java.lang.String.format;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class DependentActionsTest implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;   // HTTPS/1.1
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI_fixed;
+    String httpURI_chunk;
+    String httpsURI_fixed;
+    String httpsURI_chunk;
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    static final StackWalker WALKER =
+            StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
+
+    static final int ITERATION_COUNT = 1;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+    static volatile boolean tasksFailed;
+    static final AtomicLong serverCount = new AtomicLong();
+    static final AtomicLong clientCount = new AtomicLong();
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    private volatile HttpClient sharedClient;
+
+    static class TestExecutor implements Executor {
+        final AtomicLong tasks = new AtomicLong();
+        Executor executor;
+        TestExecutor(Executor executor) {
+            this.executor = executor;
+        }
+
+        @Override
+        public void execute(Runnable command) {
+            long id = tasks.incrementAndGet();
+            executor.execute(() -> {
+                try {
+                    command.run();
+                } catch (Throwable t) {
+                    tasksFailed = true;
+                    System.out.printf(now() + "Task %s failed: %s%n", id, t);
+                    System.err.printf(now() + "Task %s failed: %s%n", id, t);
+                    FAILURES.putIfAbsent("Task " + id, t);
+                    throw t;
+                }
+            });
+        }
+    }
+
+    @AfterClass
+    static final void printFailedTests() {
+        out.println("\n=========================");
+        try {
+            out.printf("%n%sCreated %d servers and %d clients%n",
+                    now(), serverCount.get(), clientCount.get());
+            if (FAILURES.isEmpty()) return;
+            out.println("Failed tests: ");
+            FAILURES.entrySet().forEach((e) -> {
+                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+                e.getValue().printStackTrace(out);
+                e.getValue().printStackTrace();
+            });
+            if (tasksFailed) {
+                System.out.println("WARNING: Some tasks failed");
+            }
+        } finally {
+            out.println("\n=========================\n");
+        }
+    }
+
+    private String[] uris() {
+        return new String[] {
+                httpURI_fixed,
+                httpURI_chunk,
+                httpsURI_fixed,
+                httpsURI_chunk,
+                http2URI_fixed,
+                http2URI_chunk,
+                https2URI_fixed,
+                https2URI_chunk,
+        };
+    }
+
+    static final class SemaphoreStallerSupplier
+            implements Supplier<SemaphoreStaller> {
+        @Override
+        public SemaphoreStaller get() {
+            return new SemaphoreStaller();
+        }
+        @Override
+        public String toString() {
+            return "SemaphoreStaller";
+        }
+    }
+
+    @DataProvider(name = "noStalls")
+    public Object[][] noThrows() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2][];
+        int i = 0;
+        for (boolean sameClient : List.of(false, true)) {
+            for (String uri: uris()) {
+                result[i++] = new Object[] {uri, sameClient};
+            }
+        }
+        assert i == uris.length * 2;
+        return result;
+    }
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2][];
+        int i = 0;
+        Supplier<? extends Staller> s = new SemaphoreStallerSupplier();
+        for (Supplier<? extends Staller> staller : List.of(s)) {
+            for (boolean sameClient : List.of(false, true)) {
+                for (String uri : uris()) {
+                    result[i++] = new Object[]{uri, sameClient, staller};
+                }
+            }
+        }
+        assert i == uris.length * 2;
+        return result;
+    }
+
+    private HttpClient makeNewClient() {
+        clientCount.incrementAndGet();
+        return HttpClient.newBuilder()
+                .executor(executor)
+                .sslContext(sslContext)
+                .build();
+    }
+
+    HttpClient newHttpClient(boolean share) {
+        if (!share) return makeNewClient();
+        HttpClient shared = sharedClient;
+        if (shared != null) return shared;
+        synchronized (this) {
+            shared = sharedClient;
+            if (shared == null) {
+                shared = sharedClient = makeNewClient();
+            }
+            return shared;
+        }
+    }
+
+    @Test(dataProvider = "noStalls")
+    public void testNoStalls(String uri, boolean sameClient)
+            throws Exception {
+        HttpClient client = null;
+        out.printf("%ntestNoStalls(%s, %b)%n", uri, sameClient);
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<String> handler =
+                    new StallingBodyHandler((w) -> {},
+                            BodyHandlers.ofString());
+            HttpResponse<String> response = client.send(req, handler);
+            String body = response.body();
+            assertEquals(URI.create(body).getPath(), URI.create(uri).getPath());
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsStringAsync(String uri,
+                                  boolean sameClient,
+                                  Supplier<Staller> s)
+            throws Exception
+    {
+        Staller staller = s.get();
+        String test = format("testAsStringAsync(%s, %b, %s)",
+                uri, sameClient, staller);
+        testDependent(test, uri, sameClient, BodyHandlers::ofString,
+                this::finish, this::extractString, staller);
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsLinesAsync(String uri,
+                                 boolean sameClient,
+                                 Supplier<Staller> s)
+            throws Exception
+    {
+        Staller staller = s.get();
+        String test = format("testAsLinesAsync(%s, %b, %s)",
+                uri, sameClient, staller);
+        testDependent(test, uri, sameClient, BodyHandlers::ofLines,
+                this::finish, this::extractStream, staller);
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsInputStreamAsync(String uri,
+                                       boolean sameClient,
+                                       Supplier<Staller> s)
+            throws Exception
+    {
+        Staller staller = s.get();
+        String test = format("testAsInputStreamAsync(%s, %b, %s)",
+                uri, sameClient, staller);
+        testDependent(test, uri, sameClient, BodyHandlers::ofInputStream,
+                this::finish, this::extractInputStream, staller);
+    }
+
+    private <T,U> void testDependent(String name, String uri, boolean sameClient,
+                                     Supplier<BodyHandler<T>> handlers,
+                                     Finisher finisher,
+                                     Extractor extractor,
+                                     Staller staller)
+            throws Exception
+    {
+        out.printf("%n%s%s%n", now(), name);
+        try {
+            testDependent(uri, sameClient, handlers, finisher, extractor, staller);
+        } catch (Error | Exception x) {
+            FAILURES.putIfAbsent(name, x);
+            throw x;
+        }
+    }
+
+    private <T,U> void testDependent(String uri, boolean sameClient,
+                                     Supplier<BodyHandler<T>> handlers,
+                                     Finisher finisher,
+                                     Extractor extractor,
+                                     Staller staller)
+            throws Exception
+    {
+        HttpClient client = null;
+        for (Where where : EnumSet.of(Where.BODY_HANDLER)) {
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            HttpRequest req = HttpRequest.
+                    newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<T> handler =
+                    new StallingBodyHandler(where.select(staller), handlers.get());
+            System.out.println("try stalling in " + where);
+            staller.acquire();
+            assert staller.willStall();
+            CompletableFuture<HttpResponse<T>> responseCF = client.sendAsync(req, handler);
+            assert !responseCF.isDone();
+            finisher.finish(where, responseCF, staller, extractor);
+        }
+    }
+
+    enum Where {
+        BODY_HANDLER, ON_SUBSCRIBE, ON_NEXT, ON_COMPLETE, ON_ERROR, GET_BODY, BODY_CF;
+        public Consumer<Where> select(Consumer<Where> consumer) {
+            return new Consumer<Where>() {
+                @Override
+                public void accept(Where where) {
+                    if (Where.this == where) {
+                        consumer.accept(where);
+                    }
+                }
+            };
+        }
+    }
+
+    interface Extractor<T> {
+        public List<String> extract(HttpResponse<T> resp);
+    }
+
+    final List<String> extractString(HttpResponse<String> resp) {
+        return List.of(resp.body());
+    }
+
+    final List<String> extractStream(HttpResponse<Stream<String>> resp) {
+        return resp.body().collect(Collectors.toList());
+    }
+
+    final List<String> extractInputStream(HttpResponse<InputStream> resp) {
+        try (InputStream is = resp.body()) {
+            return new BufferedReader(new InputStreamReader(is))
+                    .lines().collect(Collectors.toList());
+        } catch (IOException x) {
+            throw new CompletionException(x);
+        }
+    }
+
+    interface Finisher<T> {
+        public void finish(Where w,
+                           CompletableFuture<HttpResponse<T>> cf,
+                           Staller staller,
+                           Extractor extractor);
+    }
+
+    Optional<StackFrame> findFrame(Stream<StackFrame> s, String name) {
+        return s.filter((f) -> f.getClassName().contains(name))
+                .filter((f) -> f.getDeclaringClass().getModule().equals(HttpClient.class.getModule()))
+                .findFirst();
+    }
+
+    <T> void checkThreadAndStack(Thread thread,
+                                 AtomicReference<RuntimeException> failed,
+                                 T result,
+                                 Throwable error) {
+        if (Thread.currentThread() == thread) {
+            //failed.set(new RuntimeException("Dependant action was executed in " + thread));
+            List<StackFrame> httpStack = WALKER.walk(s -> s.filter(f -> f.getDeclaringClass()
+                    .getModule().equals(HttpClient.class.getModule()))
+                    .collect(Collectors.toList()));
+            if (!httpStack.isEmpty()) {
+                System.out.println("Found unexpected trace: ");
+                httpStack.forEach(f -> System.out.printf("\t%s%n", f));
+                failed.set(new RuntimeException("Dependant action has unexpected frame in " +
+                        Thread.currentThread() + ": " + httpStack.get(0)));
+
+            }
+            return;
+        } else if (System.getSecurityManager() != null) {
+            Optional<StackFrame> sf = WALKER.walk(s -> findFrame(s, "PrivilegedRunnable"));
+            if (!sf.isPresent()) {
+                failed.set(new RuntimeException("Dependant action does not have expected frame in "
+                        + Thread.currentThread()));
+                return;
+            } else {
+                System.out.println("Found expected frame: " + sf.get());
+            }
+        } else {
+            List<StackFrame> httpStack = WALKER.walk(s -> s.filter(f -> f.getDeclaringClass()
+                    .getModule().equals(HttpClient.class.getModule()))
+                    .collect(Collectors.toList()));
+            if (!httpStack.isEmpty()) {
+                System.out.println("Found unexpected trace: ");
+                httpStack.forEach(f -> System.out.printf("\t%s%n", f));
+                failed.set(new RuntimeException("Dependant action has unexpected frame in " +
+                        Thread.currentThread() + ": " + httpStack.get(0)));
+
+            }
+        }
+    }
+
+    <T> void finish(Where w, CompletableFuture<HttpResponse<T>> cf,
+                    Staller staller,
+                    Extractor<T> extractor) {
+        Thread thread = Thread.currentThread();
+        AtomicReference<RuntimeException> failed = new AtomicReference<>();
+        CompletableFuture<HttpResponse<T>> done = cf.whenComplete(
+                (r,t) -> checkThreadAndStack(thread, failed, r, t));
+        assert !cf.isDone();
+        try {
+            Thread.sleep(100);
+        } catch (Throwable t) {/* don't care */}
+        assert !cf.isDone();
+        staller.release();
+        try {
+            HttpResponse<T> response = done.join();
+            List<String> result = extractor.extract(response);
+            RuntimeException error = failed.get();
+            if (error != null) {
+                throw new RuntimeException("Test failed in "
+                        + w + ": " + response, error);
+            }
+            assertEquals(result, List.of(response.request().uri().getPath()));
+        } finally {
+            staller.reset();
+        }
+    }
+
+    interface Staller extends Consumer<Where> {
+        void release();
+        void acquire();
+        void reset();
+        boolean willStall();
+    }
+
+    static final class SemaphoreStaller implements Staller {
+        final Semaphore sem = new Semaphore(1);
+        @Override
+        public void accept(Where where) {
+            System.out.println("Acquiring semaphore in "
+                    + where + " permits=" + sem.availablePermits());
+            sem.acquireUninterruptibly();
+            System.out.println("Semaphored acquired in " + where);
+        }
+
+        @Override
+        public void release() {
+            System.out.println("Releasing semaphore: permits="
+                    + sem.availablePermits());
+            sem.release();
+        }
+
+        @Override
+        public void acquire() {
+            sem.acquireUninterruptibly();
+            System.out.println("Semaphored acquired");
+        }
+
+        @Override
+        public void reset() {
+            System.out.println("Reseting semaphore: permits="
+                    + sem.availablePermits());
+            sem.drainPermits();
+            sem.release();
+            System.out.println("Semaphore reset: permits="
+                    + sem.availablePermits());
+        }
+
+        @Override
+        public boolean willStall() {
+            return sem.availablePermits() <= 0;
+        }
+
+        @Override
+        public String toString() {
+            return "SemaphoreStaller";
+        }
+    }
+
+    static final class StallingBodyHandler<T> implements BodyHandler<T> {
+        final Consumer<Where> stalling;
+        final BodyHandler<T> bodyHandler;
+        StallingBodyHandler(Consumer<Where> stalling, BodyHandler<T> bodyHandler) {
+            this.stalling = stalling;
+            this.bodyHandler = bodyHandler;
+        }
+        @Override
+        public BodySubscriber<T> apply(HttpResponse.ResponseInfo rinfo) {
+            stalling.accept(Where.BODY_HANDLER);
+            BodySubscriber<T> subscriber = bodyHandler.apply(rinfo);
+            return new StallingBodySubscriber(stalling, subscriber);
+        }
+    }
+
+    static final class StallingBodySubscriber<T> implements BodySubscriber<T> {
+        private final BodySubscriber<T> subscriber;
+        volatile boolean onSubscribeCalled;
+        final Consumer<Where> stalling;
+        StallingBodySubscriber(Consumer<Where> stalling, BodySubscriber<T> subscriber) {
+            this.stalling = stalling;
+            this.subscriber = subscriber;
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            //out.println("onSubscribe ");
+            onSubscribeCalled = true;
+            stalling.accept(Where.ON_SUBSCRIBE);
+            subscriber.onSubscribe(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            // out.println("onNext " + item);
+            assertTrue(onSubscribeCalled);
+            stalling.accept(Where.ON_NEXT);
+            subscriber.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            //out.println("onError");
+            assertTrue(onSubscribeCalled);
+            stalling.accept(Where.ON_ERROR);
+            subscriber.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            //out.println("onComplete");
+            assertTrue(onSubscribeCalled, "onComplete called before onSubscribe");
+            stalling.accept(Where.ON_COMPLETE);
+            subscriber.onComplete();
+        }
+
+        @Override
+        public CompletionStage<T> getBody() {
+            stalling.accept(Where.GET_BODY);
+            try {
+                stalling.accept(Where.BODY_CF);
+            } catch (Throwable t) {
+                return CompletableFuture.failedFuture(t);
+            }
+            return subscriber.getBody();
+        }
+    }
+
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/1.1
+        HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h1_chunkHandler = new HTTP_ChunkedHandler();
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(h1_fixedLengthHandler, "/http1/fixed");
+        httpTestServer.addHandler(h1_chunkHandler, "/http1/chunk");
+        httpURI_fixed = "http://" + httpTestServer.serverAuthority() + "/http1/fixed/x";
+        httpURI_chunk = "http://" + httpTestServer.serverAuthority() + "/http1/chunk/x";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
+        httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
+        httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed/x";
+        httpsURI_chunk = "https://" + httpsTestServer.serverAuthority() + "/https1/chunk/x";
+
+        // HTTP/2
+        HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed/x";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk/x";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/x";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk/x";
+
+        serverCount.addAndGet(4);
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        sharedClient = null;
+        httpTestServer.stop();
+        httpsTestServer.stop();
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    static class HTTP_FixedLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            byte[] resp = t.getRequestURI().getPath().getBytes(StandardCharsets.UTF_8);
+            t.sendResponseHeaders(200, resp.length);  //fixed content length
+            try (OutputStream os = t.getResponseBody()) {
+                os.write(resp);
+            }
+        }
+    }
+
+    static class HTTP_ChunkedHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_ChunkedHandler received request to " + t.getRequestURI());
+            byte[] resp = t.getRequestURI().getPath().toString().getBytes(StandardCharsets.UTF_8);
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, -1); // chunked/variable
+            try (OutputStream os = t.getResponseBody()) {
+                os.write(resp);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
new file mode 100644
index 00000000000..cd75c0fb0ff
--- /dev/null
+++ b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
@@ -0,0 +1,761 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Verify that dependent synchronous actions added before the promise CF
+ *          completes are executed either asynchronously in an executor when the
+ *          CF later completes, or in the user thread that joins.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters ThrowingPublishers
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm -Djdk.internal.httpclient.debug=true DependentPromiseActionsTest
+ * @run testng/othervm/java.security.policy=dependent.policy
+  *           -Djdk.internal.httpclient.debug=true DependentPromiseActionsTest
+ */
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.StackWalker.StackFrame;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.System.err;
+import static java.lang.System.out;
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class DependentPromiseActionsTest implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    static final StackWalker WALKER =
+            StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
+
+    static final int ITERATION_COUNT = 1;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+    static volatile boolean tasksFailed;
+    static final AtomicLong serverCount = new AtomicLong();
+    static final AtomicLong clientCount = new AtomicLong();
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    private volatile HttpClient sharedClient;
+
+    static class TestExecutor implements Executor {
+        final AtomicLong tasks = new AtomicLong();
+        Executor executor;
+        TestExecutor(Executor executor) {
+            this.executor = executor;
+        }
+
+        @Override
+        public void execute(Runnable command) {
+            long id = tasks.incrementAndGet();
+            executor.execute(() -> {
+                try {
+                    command.run();
+                } catch (Throwable t) {
+                    tasksFailed = true;
+                    System.out.printf(now() + "Task %s failed: %s%n", id, t);
+                    System.err.printf(now() + "Task %s failed: %s%n", id, t);
+                    FAILURES.putIfAbsent("Task " + id, t);
+                    throw t;
+                }
+            });
+        }
+    }
+
+    @AfterClass
+    static final void printFailedTests() {
+        out.println("\n=========================");
+        try {
+            out.printf("%n%sCreated %d servers and %d clients%n",
+                    now(), serverCount.get(), clientCount.get());
+            if (FAILURES.isEmpty()) return;
+            out.println("Failed tests: ");
+            FAILURES.entrySet().forEach((e) -> {
+                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+                e.getValue().printStackTrace(out);
+                e.getValue().printStackTrace();
+            });
+            if (tasksFailed) {
+                System.out.println("WARNING: Some tasks failed");
+            }
+        } finally {
+            out.println("\n=========================\n");
+        }
+    }
+
+    private String[] uris() {
+        return new String[] {
+                http2URI_fixed,
+                http2URI_chunk,
+                https2URI_fixed,
+                https2URI_chunk,
+        };
+    }
+
+    static final class SemaphoreStallerSupplier
+            implements Supplier<SemaphoreStaller> {
+        @Override
+        public SemaphoreStaller get() {
+            return new SemaphoreStaller();
+        }
+        @Override
+        public String toString() {
+            return "SemaphoreStaller";
+        }
+    }
+
+    @DataProvider(name = "noStalls")
+    public Object[][] noThrows() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2][];
+        int i = 0;
+        for (boolean sameClient : List.of(false, true)) {
+            for (String uri: uris()) {
+                result[i++] = new Object[] {uri, sameClient};
+            }
+        }
+        assert i == uris.length * 2;
+        return result;
+    }
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2][];
+        int i = 0;
+        Supplier<? extends Staller> s = new SemaphoreStallerSupplier();
+        for (Supplier<? extends Staller> staller : List.of(s)) {
+            for (boolean sameClient : List.of(false, true)) {
+                for (String uri : uris()) {
+                    result[i++] = new Object[]{uri, sameClient, staller};
+                }
+            }
+        }
+        assert i == uris.length * 2;
+        return result;
+    }
+
+    private HttpClient makeNewClient() {
+        clientCount.incrementAndGet();
+        return HttpClient.newBuilder()
+                .executor(executor)
+                .sslContext(sslContext)
+                .build();
+    }
+
+    HttpClient newHttpClient(boolean share) {
+        if (!share) return makeNewClient();
+        HttpClient shared = sharedClient;
+        if (shared != null) return shared;
+        synchronized (this) {
+            shared = sharedClient;
+            if (shared == null) {
+                shared = sharedClient = makeNewClient();
+            }
+            return shared;
+        }
+    }
+
+    @Test(dataProvider = "noStalls")
+    public void testNoStalls(String uri, boolean sameClient)
+            throws Exception {
+        HttpClient client = null;
+        out.printf("%ntestNoStalls(%s, %b)%n", uri, sameClient);
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<Stream<String>> handler =
+                    new StallingBodyHandler((w) -> {},
+                            BodyHandlers.ofLines());
+            Map<HttpRequest, CompletableFuture<HttpResponse<Stream<String>>>> pushPromises =
+                    new ConcurrentHashMap<>();
+            PushPromiseHandler<Stream<String>> pushHandler = new PushPromiseHandler<>() {
+                @Override
+                public void applyPushPromise(HttpRequest initiatingRequest,
+                                             HttpRequest pushPromiseRequest,
+                                             Function<BodyHandler<Stream<String>>,
+                                                     CompletableFuture<HttpResponse<Stream<String>>>>
+                                                     acceptor) {
+                    pushPromises.putIfAbsent(pushPromiseRequest, acceptor.apply(handler));
+                }
+            };
+            HttpResponse<Stream<String>> response =
+                    client.sendAsync(req, BodyHandlers.ofLines(), pushHandler).get();
+            String body = response.body().collect(Collectors.joining("|"));
+            assertEquals(URI.create(body).getPath(), URI.create(uri).getPath());
+            for (HttpRequest promised : pushPromises.keySet()) {
+                out.printf("%s Received promise: %s%n\tresponse: %s%n",
+                        now(), promised, pushPromises.get(promised).get());
+                String promisedBody = pushPromises.get(promised).get().body()
+                        .collect(Collectors.joining("|"));
+                assertEquals(promisedBody, promised.uri().toASCIIString());
+            }
+            assertEquals(3, pushPromises.size());
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsStringAsync(String uri,
+                                  boolean sameClient,
+                                  Supplier<Staller> stallers)
+            throws Exception
+    {
+        String test = format("testAsStringAsync(%s, %b, %s)",
+                uri, sameClient, stallers);
+        testDependent(test, uri, sameClient, BodyHandlers::ofString,
+                this::finish, this::extractString, stallers);
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsLinesAsync(String uri,
+                                 boolean sameClient,
+                                 Supplier<Staller> stallers)
+            throws Exception
+    {
+        String test = format("testAsLinesAsync(%s, %b, %s)",
+                uri, sameClient, stallers);
+        testDependent(test, uri, sameClient, BodyHandlers::ofLines,
+                this::finish, this::extractStream, stallers);
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsInputStreamAsync(String uri,
+                                       boolean sameClient,
+                                       Supplier<Staller> stallers)
+            throws Exception
+    {
+        String test = format("testAsInputStreamAsync(%s, %b, %s)",
+                uri, sameClient, stallers);
+        testDependent(test, uri, sameClient, BodyHandlers::ofInputStream,
+                this::finish, this::extractInputStream, stallers);
+    }
+
+    private <T,U> void testDependent(String name, String uri, boolean sameClient,
+                                     Supplier<BodyHandler<T>> handlers,
+                                     Finisher finisher,
+                                     Extractor<T> extractor,
+                                     Supplier<Staller> stallers)
+            throws Exception
+    {
+        out.printf("%n%s%s%n", now(), name);
+        try {
+            testDependent(uri, sameClient, handlers, finisher, extractor, stallers);
+        } catch (Error | Exception x) {
+            FAILURES.putIfAbsent(name, x);
+            throw x;
+        }
+    }
+
+    private <T,U> void testDependent(String uri, boolean sameClient,
+                                     Supplier<BodyHandler<T>> handlers,
+                                     Finisher finisher,
+                                     Extractor<T> extractor,
+                                     Supplier<Staller> stallers)
+            throws Exception
+    {
+        HttpClient client = null;
+        for (Where where : EnumSet.of(Where.BODY_HANDLER)) {
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            HttpRequest req = HttpRequest.
+                    newBuilder(URI.create(uri))
+                    .build();
+            StallingPushPromiseHandler<T> promiseHandler =
+                    new StallingPushPromiseHandler<>(where, handlers, stallers);
+            BodyHandler<T> handler = handlers.get();
+            System.out.println("try stalling in " + where);
+            CompletableFuture<HttpResponse<T>> responseCF =
+                    client.sendAsync(req, handler, promiseHandler);
+            assert !responseCF.isDone();
+            finisher.finish(where, responseCF, promiseHandler, extractor);
+        }
+    }
+
+    enum Where {
+        ON_PUSH_PROMISE, BODY_HANDLER, ON_SUBSCRIBE, ON_NEXT, ON_COMPLETE, ON_ERROR, GET_BODY, BODY_CF;
+        public Consumer<Where> select(Consumer<Where> consumer) {
+            return new Consumer<Where>() {
+                @Override
+                public void accept(Where where) {
+                    if (Where.this == where) {
+                        consumer.accept(where);
+                    }
+                }
+            };
+        }
+    }
+
+    static final class StallingPushPromiseHandler<T> implements PushPromiseHandler<T> {
+
+        static final class Tuple<U> {
+            public final CompletableFuture<HttpResponse<U>> response;
+            public final Staller staller;
+            public final AtomicReference<RuntimeException> failed;
+            Tuple(AtomicReference<RuntimeException> failed,
+                  CompletableFuture<HttpResponse<U>> response,
+                  Staller staller) {
+                this.response = response;
+                this.staller = staller;
+                this.failed = failed;
+            }
+        }
+
+        public final ConcurrentMap<HttpRequest, Tuple<T>> promiseMap =
+                new ConcurrentHashMap<>();
+        private final Supplier<Staller> stallers;
+        private final Supplier<BodyHandler<T>> handlers;
+        private final Where where;
+        private final Thread thread = Thread.currentThread(); // main thread
+
+        StallingPushPromiseHandler(Where where,
+                                   Supplier<BodyHandler<T>> handlers,
+                                   Supplier<Staller> stallers) {
+            this.where = where;
+            this.handlers = handlers;
+            this.stallers = stallers;
+        }
+
+        @Override
+        public void applyPushPromise(HttpRequest initiatingRequest,
+                                     HttpRequest pushPromiseRequest,
+                                     Function<BodyHandler<T>,
+                                             CompletableFuture<HttpResponse<T>>> acceptor) {
+            AtomicReference<RuntimeException> failed = new AtomicReference<>();
+            Staller staller = stallers.get();
+            staller.acquire();
+            assert staller.willStall();
+            try {
+                BodyHandler handler = new StallingBodyHandler<>(
+                        where.select(staller), handlers.get());
+                CompletableFuture<HttpResponse<T>> cf = acceptor.apply(handler);
+                Tuple<T> tuple = new Tuple(failed, cf, staller);
+                promiseMap.putIfAbsent(pushPromiseRequest, tuple);
+                CompletableFuture<?> done = cf.whenComplete(
+                        (r, t) -> checkThreadAndStack(thread, failed, r, t));
+                assert !cf.isDone();
+            } finally {
+                staller.release();
+            }
+        }
+    }
+
+    interface Extractor<T> {
+        public List<String> extract(HttpResponse<T> resp);
+    }
+
+    final List<String> extractString(HttpResponse<String> resp) {
+        return List.of(resp.body());
+    }
+
+    final List<String> extractStream(HttpResponse<Stream<String>> resp) {
+        return resp.body().collect(Collectors.toList());
+    }
+
+    final List<String> extractInputStream(HttpResponse<InputStream> resp) {
+        try (InputStream is = resp.body()) {
+            return new BufferedReader(new InputStreamReader(is))
+                    .lines().collect(Collectors.toList());
+        } catch (IOException x) {
+            throw new CompletionException(x);
+        }
+    }
+
+    interface Finisher<T> {
+        public void finish(Where w,
+                           CompletableFuture<HttpResponse<T>> cf,
+                           StallingPushPromiseHandler<T> ph,
+                           Extractor<T> extractor);
+    }
+
+    static Optional<StackFrame> findFrame(Stream<StackFrame> s, String name) {
+        return s.filter((f) -> f.getClassName().contains(name))
+                .filter((f) -> f.getDeclaringClass().getModule().equals(HttpClient.class.getModule()))
+                .findFirst();
+    }
+
+    static <T> void checkThreadAndStack(Thread thread,
+                                        AtomicReference<RuntimeException> failed,
+                                        T result,
+                                        Throwable error) {
+        if (Thread.currentThread() == thread) {
+            //failed.set(new RuntimeException("Dependant action was executed in " + thread));
+            List<StackFrame> httpStack = WALKER.walk(s -> s.filter(f -> f.getDeclaringClass()
+                    .getModule().equals(HttpClient.class.getModule()))
+                    .collect(Collectors.toList()));
+            if (!httpStack.isEmpty()) {
+                System.out.println("Found unexpected trace: ");
+                httpStack.forEach(f -> System.out.printf("\t%s%n", f));
+                failed.set(new RuntimeException("Dependant action has unexpected frame in " +
+                        Thread.currentThread() + ": " + httpStack.get(0)));
+
+            }            return;
+        } else if (System.getSecurityManager() != null) {
+            Optional<StackFrame> sf = WALKER.walk(s -> findFrame(s, "PrivilegedRunnable"));
+            if (!sf.isPresent()) {
+                failed.set(new RuntimeException("Dependant action does not have expected frame in "
+                        + Thread.currentThread()));
+                return;
+            } else {
+                System.out.println("Found expected frame: " + sf.get());
+            }
+        } else {
+            List<StackFrame> httpStack = WALKER.walk(s -> s.filter(f -> f.getDeclaringClass()
+                    .getModule().equals(HttpClient.class.getModule()))
+                    .collect(Collectors.toList()));
+            if (!httpStack.isEmpty()) {
+                System.out.println("Found unexpected trace: ");
+                httpStack.forEach(f -> System.out.printf("\t%s%n", f));
+                failed.set(new RuntimeException("Dependant action has unexpected frame in " +
+                        Thread.currentThread() + ": " + httpStack.get(0)));
+
+            }
+        }
+    }
+
+    <T> void finish(Where w,
+                    StallingPushPromiseHandler.Tuple<T> tuple,
+                    Extractor<T> extractor) {
+        AtomicReference<RuntimeException> failed = tuple.failed;
+        CompletableFuture<HttpResponse<T>> done = tuple.response;
+        Staller staller = tuple.staller;
+        try {
+            HttpResponse<T> response = done.join();
+            List<String> result = extractor.extract(response);
+            URI uri = response.uri();
+            RuntimeException error = failed.get();
+            if (error != null) {
+                throw new RuntimeException("Test failed in "
+                        + w + ": " + uri, error);
+            }
+            assertEquals(result, List.of(response.request().uri().toASCIIString()));
+        } finally {
+            staller.reset();
+        }
+    }
+
+    <T> void finish(Where w,
+                    CompletableFuture<HttpResponse<T>> cf,
+                    StallingPushPromiseHandler<T> ph,
+                    Extractor<T> extractor) {
+        HttpResponse<T> response = cf.join();
+        List<String> result = extractor.extract(response);
+        for (HttpRequest req : ph.promiseMap.keySet()) {
+            finish(w, ph.promiseMap.get(req), extractor);
+        }
+        assertEquals(ph.promiseMap.size(), 3,
+                "Expected 3 push promises for " + w + " in "
+                        + response.request().uri());
+        assertEquals(result, List.of(response.request().uri().toASCIIString()));
+
+    }
+
+    interface Staller extends Consumer<Where> {
+        void release();
+        void acquire();
+        void reset();
+        boolean willStall();
+    }
+
+    static final class SemaphoreStaller implements Staller {
+        final Semaphore sem = new Semaphore(1);
+        @Override
+        public void accept(Where where) {
+            sem.acquireUninterruptibly();
+        }
+
+        @Override
+        public void release() {
+            sem.release();
+        }
+
+        @Override
+        public void acquire() {
+            sem.acquireUninterruptibly();
+        }
+
+        @Override
+        public void reset() {
+            sem.drainPermits();
+            sem.release();
+        }
+
+        @Override
+        public boolean willStall() {
+            return sem.availablePermits() <= 0;
+        }
+
+        @Override
+        public String toString() {
+            return "SemaphoreStaller";
+        }
+    }
+
+    static final class StallingBodyHandler<T> implements BodyHandler<T> {
+        final Consumer<Where> stalling;
+        final BodyHandler<T> bodyHandler;
+        StallingBodyHandler(Consumer<Where> stalling, BodyHandler<T> bodyHandler) {
+            this.stalling = stalling;
+            this.bodyHandler = bodyHandler;
+        }
+        @Override
+        public BodySubscriber<T> apply(HttpResponse.ResponseInfo rinfo) {
+            stalling.accept(Where.BODY_HANDLER);
+            BodySubscriber<T> subscriber = bodyHandler.apply(rinfo);
+            return new StallingBodySubscriber(stalling, subscriber);
+        }
+    }
+
+    static final class StallingBodySubscriber<T> implements BodySubscriber<T> {
+        private final BodySubscriber<T> subscriber;
+        volatile boolean onSubscribeCalled;
+        final Consumer<Where> stalling;
+        StallingBodySubscriber(Consumer<Where> stalling, BodySubscriber<T> subscriber) {
+            this.stalling = stalling;
+            this.subscriber = subscriber;
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            //out.println("onSubscribe ");
+            onSubscribeCalled = true;
+            stalling.accept(Where.ON_SUBSCRIBE);
+            subscriber.onSubscribe(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            // out.println("onNext " + item);
+            assertTrue(onSubscribeCalled);
+            stalling.accept(Where.ON_NEXT);
+            subscriber.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            //out.println("onError");
+            assertTrue(onSubscribeCalled);
+            stalling.accept(Where.ON_ERROR);
+            subscriber.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            //out.println("onComplete");
+            assertTrue(onSubscribeCalled, "onComplete called before onSubscribe");
+            stalling.accept(Where.ON_COMPLETE);
+            subscriber.onComplete();
+        }
+
+        @Override
+        public CompletionStage<T> getBody() {
+            stalling.accept(Where.GET_BODY);
+            try {
+                stalling.accept(Where.BODY_CF);
+            } catch (Throwable t) {
+                return CompletableFuture.failedFuture(t);
+            }
+            return subscriber.getBody();
+        }
+    }
+
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/2
+        HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed/y";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk/y";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/y";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk/y";
+
+        serverCount.addAndGet(4);
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        sharedClient = null;
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    private static void pushPromiseFor(HttpTestExchange t, URI requestURI, String pushPath, boolean fixed)
+            throws IOException
+    {
+        try {
+            URI promise = new URI(requestURI.getScheme(),
+                    requestURI.getAuthority(),
+                    pushPath, null, null);
+            byte[] promiseBytes = promise.toASCIIString().getBytes(UTF_8);
+            out.printf("TestServer: %s Pushing promise: %s%n", now(), promise);
+            err.printf("TestServer: %s Pushing promise: %s%n", now(), promise);
+            HttpTestHeaders headers =  HttpTestHeaders.of(new HttpHeadersImpl());
+            if (fixed) {
+                headers.addHeader("Content-length", String.valueOf(promiseBytes.length));
+            }
+            t.serverPush(promise, headers, promiseBytes);
+        } catch (URISyntaxException x) {
+            throw new IOException(x.getMessage(), x);
+        }
+    }
+
+    static class HTTP_FixedLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            URI requestURI = t.getRequestURI();
+            for (int i = 1; i<2; i++) {
+                String path = requestURI.getPath() + "/before/promise-" + i;
+                pushPromiseFor(t, requestURI, path, true);
+            }
+            byte[] resp = t.getRequestURI().toString().getBytes(StandardCharsets.UTF_8);
+            t.sendResponseHeaders(200, resp.length);  //fixed content length
+            try (OutputStream os = t.getResponseBody()) {
+                int bytes = resp.length/3;
+                for (int i = 0; i<2; i++) {
+                    String path = requestURI.getPath() + "/after/promise-" + (i + 2);
+                    os.write(resp, i * bytes, bytes);
+                    os.flush();
+                    pushPromiseFor(t, requestURI, path, true);
+                }
+                os.write(resp, 2*bytes, resp.length - 2*bytes);
+            }
+        }
+
+    }
+
+    static class HTTP_ChunkedHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_ChunkedHandler received request to " + t.getRequestURI());
+            byte[] resp = t.getRequestURI().toString().getBytes(StandardCharsets.UTF_8);
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            URI requestURI = t.getRequestURI();
+            for (int i = 1; i<2; i++) {
+                String path = requestURI.getPath() + "/before/promise-" + i;
+                pushPromiseFor(t, requestURI, path, false);
+            }
+            t.sendResponseHeaders(200, -1); // chunked/variable
+            try (OutputStream os = t.getResponseBody()) {
+                int bytes = resp.length/3;
+                for (int i = 0; i<2; i++) {
+                    String path = requestURI.getPath() + "/after/promise-" + (i + 2);
+                    os.write(resp, i * bytes, bytes);
+                    os.flush();
+                    pushPromiseFor(t, requestURI, path, false);
+                }
+                os.write(resp, 2*bytes, resp.length - 2*bytes);
+            }
+        }
+    }
+
+
+}
diff --git a/test/jdk/java/net/httpclient/DigestEchoClient.java b/test/jdk/java/net/httpclient/DigestEchoClient.java
new file mode 100644
index 00000000000..0a51ede7843
--- /dev/null
+++ b/test/jdk/java/net/httpclient/DigestEchoClient.java
@@ -0,0 +1,700 @@
+/*
+ * Copyright (c) 2018, 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.IOException;
+import java.io.UncheckedIOException;
+import java.math.BigInteger;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublisher;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.charset.StandardCharsets;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.net.ssl.SSLContext;
+import jdk.testlibrary.SimpleSSLContext;
+import sun.net.NetProperties;
+import sun.net.www.HeaderParser;
+import static java.lang.System.out;
+import static java.lang.String.format;
+
+/**
+ * @test
+ * @summary this test verifies that a client may provides authorization
+ *          headers directly when connecting with a server.
+ * @bug 8087112
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters DigestEchoServer
+ *        ReferenceTracker DigestEchoClient
+ * @modules java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          java.base/sun.net.www.http
+ *          java.base/sun.net.www
+ *          java.base/sun.net
+ * @run main/othervm DigestEchoClient
+ * @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=
+ *                   -Djdk.http.auth.tunneling.disabledSchemes=
+ *                   DigestEchoClient
+ */
+
+public class DigestEchoClient {
+
+    static final String data[] = {
+        "Lorem ipsum",
+        "dolor sit amet",
+        "consectetur adipiscing elit, sed do eiusmod tempor",
+        "quis nostrud exercitation ullamco",
+        "laboris nisi",
+        "ut",
+        "aliquip ex ea commodo consequat." +
+        "Duis aute irure dolor in reprehenderit in voluptate velit esse" +
+        "cillum dolore eu fugiat nulla pariatur.",
+        "Excepteur sint occaecat cupidatat non proident."
+    };
+
+    static final AtomicLong serverCount = new AtomicLong();
+    static final class EchoServers {
+        final DigestEchoServer.HttpAuthType authType;
+        final DigestEchoServer.HttpAuthSchemeType authScheme;
+        final String protocolScheme;
+        final String key;
+        final DigestEchoServer server;
+        final Version serverVersion;
+
+        private EchoServers(DigestEchoServer server,
+                    Version version,
+                    String protocolScheme,
+                    DigestEchoServer.HttpAuthType authType,
+                    DigestEchoServer.HttpAuthSchemeType authScheme) {
+            this.authType = authType;
+            this.authScheme = authScheme;
+            this.protocolScheme = protocolScheme;
+            this.key = key(version, protocolScheme, authType, authScheme);
+            this.server = server;
+            this.serverVersion = version;
+        }
+
+        static String key(Version version,
+                          String protocolScheme,
+                          DigestEchoServer.HttpAuthType authType,
+                          DigestEchoServer.HttpAuthSchemeType authScheme) {
+            return String.format("%s:%s:%s:%s", version, protocolScheme, authType, authScheme);
+        }
+
+        private static EchoServers create(Version version,
+                                   String protocolScheme,
+                                   DigestEchoServer.HttpAuthType authType,
+                                   DigestEchoServer.HttpAuthSchemeType authScheme) {
+            try {
+                serverCount.incrementAndGet();
+                DigestEchoServer server =
+                    DigestEchoServer.create(version, protocolScheme, authType, authScheme);
+                return new EchoServers(server, version, protocolScheme, authType, authScheme);
+            } catch (IOException x) {
+                throw new UncheckedIOException(x);
+            }
+        }
+
+        public static DigestEchoServer of(Version version,
+                                    String protocolScheme,
+                                    DigestEchoServer.HttpAuthType authType,
+                                    DigestEchoServer.HttpAuthSchemeType authScheme) {
+            String key = key(version, protocolScheme, authType, authScheme);
+            return servers.computeIfAbsent(key, (k) ->
+                    create(version, protocolScheme, authType, authScheme)).server;
+        }
+
+        public static void stop() {
+            for (EchoServers s : servers.values()) {
+                s.server.stop();
+            }
+        }
+
+        private static final ConcurrentMap<String, EchoServers> servers = new ConcurrentHashMap<>();
+    }
+
+    final static String PROXY_DISABLED = NetProperties.get("jdk.http.auth.proxying.disabledSchemes");
+    final static String TUNNEL_DISABLED = NetProperties.get("jdk.http.auth.tunneling.disabledSchemes");
+    static {
+        System.out.println("jdk.http.auth.proxying.disabledSchemes=" + PROXY_DISABLED);
+        System.out.println("jdk.http.auth.tunneling.disabledSchemes=" + TUNNEL_DISABLED);
+    }
+
+
+
+    static final AtomicInteger NC = new AtomicInteger();
+    static final Random random = new Random();
+    static final SSLContext context;
+    static {
+        try {
+            context = new SimpleSSLContext().get();
+            SSLContext.setDefault(context);
+        } catch (Exception x) {
+            throw new ExceptionInInitializerError(x);
+        }
+    }
+    static final List<Boolean> BOOLEANS = List.of(true, false);
+
+    final boolean useSSL;
+    final DigestEchoServer.HttpAuthSchemeType authScheme;
+    final DigestEchoServer.HttpAuthType authType;
+    DigestEchoClient(boolean useSSL,
+                     DigestEchoServer.HttpAuthSchemeType authScheme,
+                     DigestEchoServer.HttpAuthType authType)
+            throws IOException {
+        this.useSSL = useSSL;
+        this.authScheme = authScheme;
+        this.authType = authType;
+    }
+
+    static final AtomicLong clientCount = new AtomicLong();
+    static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    public HttpClient newHttpClient(DigestEchoServer server) {
+        clientCount.incrementAndGet();
+        HttpClient.Builder builder = HttpClient.newBuilder();
+        builder = builder.proxy(ProxySelector.of(null));
+        if (useSSL) {
+            builder.sslContext(context);
+        }
+        switch (authScheme) {
+            case BASIC:
+                builder = builder.authenticator(DigestEchoServer.AUTHENTICATOR);
+                break;
+            case BASICSERVER:
+                // don't set the authenticator: we will handle the header ourselves.
+                // builder = builder.authenticator(DigestEchoServer.AUTHENTICATOR);
+                break;
+            default:
+                break;
+        }
+        switch (authType) {
+            case PROXY:
+                builder = builder.proxy(ProxySelector.of(server.getProxyAddress()));
+                break;
+            case PROXY305:
+                builder = builder.proxy(ProxySelector.of(server.getProxyAddress()));
+                builder = builder.followRedirects(HttpClient.Redirect.NORMAL);
+                break;
+            case SERVER307:
+                builder = builder.followRedirects(HttpClient.Redirect.NORMAL);
+                break;
+            default:
+                break;
+        }
+        return TRACKER.track(builder.build());
+    }
+
+    public static List<Version> serverVersions(Version clientVersion) {
+        if (clientVersion == Version.HTTP_1_1) {
+            return List.of(clientVersion);
+        } else {
+            return List.of(Version.values());
+        }
+    }
+
+    public static List<Version> clientVersions() {
+        return List.of(Version.values());
+    }
+
+    public static List<Boolean> expectContinue(Version serverVersion) {
+        if (serverVersion == Version.HTTP_1_1) {
+            return BOOLEANS;
+        } else {
+            // our test HTTP/2 server does not support Expect: 100-Continue
+            return List.of(Boolean.FALSE);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        HttpServerAdapters.enableServerLogging();
+        boolean useSSL = false;
+        EnumSet<DigestEchoServer.HttpAuthType> types =
+                EnumSet.complementOf(EnumSet.of(DigestEchoServer.HttpAuthType.PROXY305));
+        Throwable failed = null;
+        if (args != null && args.length >= 1) {
+            useSSL = "SSL".equals(args[0]);
+            if (args.length > 1) {
+                List<DigestEchoServer.HttpAuthType> httpAuthTypes =
+                        Stream.of(Arrays.copyOfRange(args, 1, args.length))
+                                .map(DigestEchoServer.HttpAuthType::valueOf)
+                                .collect(Collectors.toList());
+                types = EnumSet.copyOf(httpAuthTypes);
+            }
+        }
+        try {
+            for (DigestEchoServer.HttpAuthType authType : types) {
+                // The test server does not support PROXY305 properly
+                if (authType == DigestEchoServer.HttpAuthType.PROXY305) continue;
+                EnumSet<DigestEchoServer.HttpAuthSchemeType> basics =
+                        EnumSet.of(DigestEchoServer.HttpAuthSchemeType.BASICSERVER,
+                                DigestEchoServer.HttpAuthSchemeType.BASIC);
+                for (DigestEchoServer.HttpAuthSchemeType authScheme : basics) {
+                    DigestEchoClient dec = new DigestEchoClient(useSSL,
+                            authScheme,
+                            authType);
+                    for (Version clientVersion : clientVersions()) {
+                        for (Version serverVersion : serverVersions(clientVersion)) {
+                            for (boolean expectContinue : expectContinue(serverVersion)) {
+                                for (boolean async : BOOLEANS) {
+                                    for (boolean preemptive : BOOLEANS) {
+                                        dec.testBasic(clientVersion,
+                                                serverVersion, async,
+                                                expectContinue, preemptive);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                EnumSet<DigestEchoServer.HttpAuthSchemeType> digests =
+                        EnumSet.of(DigestEchoServer.HttpAuthSchemeType.DIGEST);
+                for (DigestEchoServer.HttpAuthSchemeType authScheme : digests) {
+                    DigestEchoClient dec = new DigestEchoClient(useSSL,
+                            authScheme,
+                            authType);
+                    for (Version clientVersion : clientVersions()) {
+                        for (Version serverVersion : serverVersions(clientVersion)) {
+                            for (boolean expectContinue : expectContinue(serverVersion)) {
+                                for (boolean async : BOOLEANS) {
+                                    dec.testDigest(clientVersion, serverVersion,
+                                            async, expectContinue);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } catch(Throwable t) {
+            out.println(DigestEchoServer.now()
+                    + ": Unexpected exception: " + t);
+            t.printStackTrace();
+            failed = t;
+            throw t;
+        } finally {
+            Thread.sleep(100);
+            AssertionError trackFailed = TRACKER.check(500);
+            EchoServers.stop();
+            System.out.println(" ---------------------------------------------------------- ");
+            System.out.println(String.format("DigestEchoClient %s %s", useSSL ? "SSL" : "CLEAR", types));
+            System.out.println(String.format("Created %d clients and %d servers",
+                    clientCount.get(), serverCount.get()));
+            System.out.println(String.format("basics:  %d requests sent, %d ns / req",
+                    basicCount.get(), basics.get()));
+            System.out.println(String.format("digests: %d requests sent, %d ns / req",
+                    digestCount.get(), digests.get()));
+            System.out.println(" ---------------------------------------------------------- ");
+            if (trackFailed != null) {
+                if (failed != null) {
+                    failed.addSuppressed(trackFailed);
+                    if (failed instanceof Error) throw (Error) failed;
+                    if (failed instanceof Exception) throw (Exception) failed;
+                }
+                throw trackFailed;
+            }
+        }
+    }
+
+    boolean isSchemeDisabled() {
+        String disabledSchemes;
+        if (isProxy(authType)) {
+            disabledSchemes = useSSL
+                    ? TUNNEL_DISABLED
+                    : PROXY_DISABLED;
+        } else return false;
+        if (disabledSchemes == null
+                || disabledSchemes.isEmpty()) {
+            return false;
+        }
+        String scheme;
+        switch (authScheme) {
+            case DIGEST:
+                scheme = "Digest";
+                break;
+            case BASIC:
+                scheme = "Basic";
+                break;
+            case BASICSERVER:
+                scheme = "Basic";
+                break;
+            case NONE:
+                return false;
+            default:
+                throw new InternalError("Unknown auth scheme: " + authScheme);
+        }
+        return Stream.of(disabledSchemes.split(","))
+                .map(String::trim)
+                .filter(scheme::equalsIgnoreCase)
+                .findAny()
+                .isPresent();
+    }
+
+    final static AtomicLong basics = new AtomicLong();
+    final static AtomicLong basicCount = new AtomicLong();
+    // @Test
+    void testBasic(Version clientVersion, Version serverVersion, boolean async,
+                   boolean expectContinue, boolean preemptive)
+        throws Exception
+    {
+        final boolean addHeaders = authScheme == DigestEchoServer.HttpAuthSchemeType.BASICSERVER;
+        // !preemptive has no meaning if we don't handle the authorization
+        // headers ourselves
+        if (!preemptive && !addHeaders) return;
+
+        out.println(format("*** testBasic: client: %s, server: %s, async: %s, useSSL: %s, " +
+                        "authScheme: %s, authType: %s, expectContinue: %s preemptive: %s***",
+                clientVersion, serverVersion, async, useSSL, authScheme, authType,
+                expectContinue, preemptive));
+
+        DigestEchoServer server = EchoServers.of(serverVersion,
+                useSSL ? "https" : "http", authType, authScheme);
+        URI uri = DigestEchoServer.uri(useSSL ? "https" : "http",
+                server.getServerAddress(), "/foo/");
+
+        HttpClient client = newHttpClient(server);
+        HttpResponse<String> r;
+        CompletableFuture<HttpResponse<String>> cf1;
+        String auth = null;
+
+        try {
+            for (int i=0; i<data.length; i++) {
+                out.println(DigestEchoServer.now() + " ----- iteration " + i + " -----");
+                List<String> lines = List.of(Arrays.copyOfRange(data, 0, i+1));
+                assert lines.size() == i + 1;
+                String body = lines.stream().collect(Collectors.joining("\r\n"));
+                BodyPublisher reqBody = BodyPublishers.ofString(body);
+                HttpRequest.Builder builder = HttpRequest.newBuilder(uri).version(clientVersion)
+                        .POST(reqBody).expectContinue(expectContinue);
+                boolean isTunnel = isProxy(authType) && useSSL;
+                if (addHeaders) {
+                    // handle authentication ourselves
+                    assert !client.authenticator().isPresent();
+                    if (auth == null) auth = "Basic " + getBasicAuth("arthur");
+                    try {
+                        if ((i > 0 || preemptive)
+                                && (!isTunnel || i == 0 || isSchemeDisabled())) {
+                            // In case of a SSL tunnel through proxy then only the
+                            // first request should require proxy authorization
+                            // Though this might be invalidated if the server decides
+                            // to close the connection...
+                            out.println(String.format("%s adding %s: %s",
+                                    DigestEchoServer.now(),
+                                    authorizationKey(authType),
+                                    auth));
+                            builder = builder.header(authorizationKey(authType), auth);
+                        }
+                    } catch (IllegalArgumentException x) {
+                        throw x;
+                    }
+                } else {
+                    // let the stack do the authentication
+                    assert client.authenticator().isPresent();
+                }
+                long start = System.nanoTime();
+                HttpRequest request = builder.build();
+                HttpResponse<Stream<String>> resp;
+                try {
+                    if (async) {
+                        resp = client.sendAsync(request, BodyHandlers.ofLines()).join();
+                    } else {
+                        resp = client.send(request, BodyHandlers.ofLines());
+                    }
+                } catch (Throwable t) {
+                    long stop = System.nanoTime();
+                    synchronized (basicCount) {
+                        long n = basicCount.getAndIncrement();
+                        basics.set((basics.get() * n + (stop - start)) / (n + 1));
+                    }
+                    // unwrap CompletionException
+                    if (t instanceof CompletionException) {
+                        assert t.getCause() != null;
+                        t = t.getCause();
+                    }
+                    out.println(DigestEchoServer.now()
+                            + ": Unexpected exception: " + t);
+                    throw new RuntimeException("Unexpected exception: " + t, t);
+                }
+
+                if (addHeaders && !preemptive && (i==0 || isSchemeDisabled())) {
+                    assert resp.statusCode() == 401 || resp.statusCode() == 407;
+                    Stream<String> respBody = resp.body();
+                    if (respBody != null) {
+                        System.out.printf("Response body (%s):\n", resp.statusCode());
+                        respBody.forEach(System.out::println);
+                    }
+                    System.out.println(String.format("%s received: adding header %s: %s",
+                            resp.statusCode(), authorizationKey(authType), auth));
+                    request = HttpRequest.newBuilder(uri).version(clientVersion)
+                            .POST(reqBody).header(authorizationKey(authType), auth).build();
+                    if (async) {
+                        resp = client.sendAsync(request, BodyHandlers.ofLines()).join();
+                    } else {
+                        resp = client.send(request, BodyHandlers.ofLines());
+                    }
+                }
+                final List<String> respLines;
+                try {
+                    if (isSchemeDisabled()) {
+                        if (resp.statusCode() != 407) {
+                            throw new RuntimeException("expected 407 not received");
+                        }
+                        System.out.println("Scheme disabled for [" + authType
+                                + ", " + authScheme
+                                + ", " + (useSSL ? "HTTP" : "HTTPS")
+                                + "]: Received expected " + resp.statusCode());
+                        continue;
+                    } else {
+                        System.out.println("Scheme enabled for [" + authType
+                                + ", " + authScheme
+                                + ", " + (useSSL ? "HTTPS" : "HTTP")
+                                + "]: Expecting 200, response is: " + resp);
+                        assert resp.statusCode() == 200 : "200 expected, received " + resp;
+                        respLines = resp.body().collect(Collectors.toList());
+                    }
+                } finally {
+                    long stop = System.nanoTime();
+                    synchronized (basicCount) {
+                        long n = basicCount.getAndIncrement();
+                        basics.set((basics.get() * n + (stop - start)) / (n + 1));
+                    }
+                }
+                if (!lines.equals(respLines)) {
+                    throw new RuntimeException("Unexpected response: " + respLines);
+                }
+            }
+        } finally {
+        }
+        System.out.println("OK");
+    }
+
+    String getBasicAuth(String username) {
+        StringBuilder builder = new StringBuilder(username);
+        builder.append(':');
+        for (char c : DigestEchoServer.AUTHENTICATOR.getPassword(username)) {
+            builder.append(c);
+        }
+        return Base64.getEncoder().encodeToString(builder.toString().getBytes(StandardCharsets.UTF_8));
+    }
+
+    final static AtomicLong digests = new AtomicLong();
+    final static AtomicLong digestCount = new AtomicLong();
+    // @Test
+    void testDigest(Version clientVersion, Version serverVersion,
+                    boolean async, boolean expectContinue)
+            throws Exception
+    {
+        String test = format("testDigest: client: %s, server: %s, async: %s, useSSL: %s, " +
+                             "authScheme: %s, authType: %s, expectContinue: %s",
+                              clientVersion, serverVersion, async, useSSL,
+                              authScheme, authType, expectContinue);
+        out.println("*** " + test + " ***");
+        DigestEchoServer server = EchoServers.of(serverVersion,
+                useSSL ? "https" : "http", authType, authScheme);
+
+        URI uri = DigestEchoServer.uri(useSSL ? "https" : "http",
+                server.getServerAddress(), "/foo/");
+
+        HttpClient client = newHttpClient(server);
+        HttpResponse<String> r;
+        CompletableFuture<HttpResponse<String>> cf1;
+        byte[] cnonce = new byte[16];
+        String cnonceStr = null;
+        DigestEchoServer.DigestResponse challenge = null;
+
+        try {
+            for (int i=0; i<data.length; i++) {
+                out.println(DigestEchoServer.now() + "----- iteration " + i + " -----");
+                List<String> lines = List.of(Arrays.copyOfRange(data, 0, i+1));
+                assert lines.size() == i + 1;
+                String body = lines.stream().collect(Collectors.joining("\r\n"));
+                HttpRequest.BodyPublisher reqBody = HttpRequest.BodyPublishers.ofString(body);
+                HttpRequest.Builder reqBuilder = HttpRequest
+                        .newBuilder(uri).version(clientVersion).POST(reqBody)
+                        .expectContinue(expectContinue);
+
+                boolean isTunnel = isProxy(authType) && useSSL;
+                String digestMethod = isTunnel ? "CONNECT" : "POST";
+
+                // In case of a tunnel connection only the first request
+                // which establishes the tunnel needs to authenticate with
+                // the proxy.
+                if (challenge != null && (!isTunnel || isSchemeDisabled())) {
+                    assert cnonceStr != null;
+                    String auth = digestResponse(uri, digestMethod, challenge, cnonceStr);
+                    try {
+                        reqBuilder = reqBuilder.header(authorizationKey(authType), auth);
+                    } catch (IllegalArgumentException x) {
+                        throw x;
+                    }
+                }
+
+                long start = System.nanoTime();
+                HttpRequest request = reqBuilder.build();
+                HttpResponse<Stream<String>> resp;
+                if (async) {
+                    resp = client.sendAsync(request, BodyHandlers.ofLines()).join();
+                } else {
+                    resp = client.send(request, BodyHandlers.ofLines());
+                }
+                System.out.println(resp);
+                assert challenge != null || resp.statusCode() == 401 || resp.statusCode() == 407
+                        : "challenge=" + challenge + ", resp=" + resp + ", test=[" + test + "]";
+                if (resp.statusCode() == 401 || resp.statusCode() == 407) {
+                    // This assert may need to be relaxed if our server happened to
+                    // decide to close the tunnel connection, in which case we would
+                    // receive 407 again...
+                    assert challenge == null || !isTunnel || isSchemeDisabled()
+                            : "No proxy auth should be required after establishing an SSL tunnel";
+
+                    System.out.println("Received " + resp.statusCode() + " answering challenge...");
+                    random.nextBytes(cnonce);
+                    cnonceStr = new BigInteger(1, cnonce).toString(16);
+                    System.out.println("Response headers: " + resp.headers());
+                    Optional<String> authenticateOpt = resp.headers().firstValue(authenticateKey(authType));
+                    String authenticate = authenticateOpt.orElseThrow(
+                            () -> new RuntimeException(authenticateKey(authType) + ": not found"));
+                    assert authenticate.startsWith("Digest ");
+                    HeaderParser hp = new HeaderParser(authenticate.substring("Digest ".length()));
+                    String qop = hp.findValue("qop");
+                    String nonce = hp.findValue("nonce");
+                    if (qop == null && nonce == null) {
+                        throw new RuntimeException("QOP and NONCE not found");
+                    }
+                    challenge = DigestEchoServer.DigestResponse
+                            .create(authenticate.substring("Digest ".length()));
+                    String auth = digestResponse(uri, digestMethod, challenge, cnonceStr);
+                    try {
+                        request = HttpRequest.newBuilder(uri).version(clientVersion)
+                            .POST(reqBody).header(authorizationKey(authType), auth).build();
+                    } catch (IllegalArgumentException x) {
+                        throw x;
+                    }
+
+                    if (async) {
+                        resp = client.sendAsync(request, BodyHandlers.ofLines()).join();
+                    } else {
+                        resp = client.send(request, BodyHandlers.ofLines());
+                    }
+                    System.out.println(resp);
+                }
+                final List<String> respLines;
+                try {
+                    if (isSchemeDisabled()) {
+                        if (resp.statusCode() != 407) {
+                            throw new RuntimeException("expected 407 not received");
+                        }
+                        System.out.println("Scheme disabled for [" + authType
+                                + ", " + authScheme +
+                                ", " + (useSSL ? "HTTP" : "HTTPS")
+                                + "]: Received expected " + resp.statusCode());
+                        continue;
+                    } else {
+                        assert resp.statusCode() == 200;
+                        respLines = resp.body().collect(Collectors.toList());
+                    }
+                } finally {
+                    long stop = System.nanoTime();
+                    synchronized (digestCount) {
+                        long n = digestCount.getAndIncrement();
+                        digests.set((digests.get() * n + (stop - start)) / (n + 1));
+                    }
+                }
+                if (!lines.equals(respLines)) {
+                    throw new RuntimeException("Unexpected response: " + respLines);
+                }
+            }
+        } finally {
+        }
+        System.out.println("OK");
+    }
+
+    // WARNING: This is not a full fledged implementation of DIGEST.
+    // It does contain bugs and inaccuracy.
+    static String digestResponse(URI uri, String method, DigestEchoServer.DigestResponse challenge, String cnonce)
+            throws NoSuchAlgorithmException {
+        int nc = NC.incrementAndGet();
+        DigestEchoServer.DigestResponse response1 = new DigestEchoServer.DigestResponse("earth",
+                "arthur", challenge.nonce, cnonce, String.valueOf(nc), uri.toASCIIString(),
+                challenge.algorithm, challenge.qop, challenge.opaque, null);
+        String response = DigestEchoServer.DigestResponse.computeDigest(true, method,
+                DigestEchoServer.AUTHENTICATOR.getPassword("arthur"), response1);
+        String auth = "Digest username=\"arthur\", realm=\"earth\""
+                + ", response=\"" + response + "\", uri=\""+uri.toASCIIString()+"\""
+                + ", qop=\"" + response1.qop + "\", cnonce=\"" + response1.cnonce
+                + "\", nc=\"" + nc + "\", nonce=\"" + response1.nonce + "\"";
+        if (response1.opaque != null) {
+            auth = auth + ", opaque=\"" + response1.opaque + "\"";
+        }
+        return auth;
+    }
+
+    static String authenticateKey(DigestEchoServer.HttpAuthType authType) {
+        switch (authType) {
+            case SERVER: return "www-authenticate";
+            case SERVER307: return "www-authenticate";
+            case PROXY: return "proxy-authenticate";
+            case PROXY305: return "proxy-authenticate";
+            default: throw new InternalError("authType: " + authType);
+        }
+    }
+
+    static String authorizationKey(DigestEchoServer.HttpAuthType authType) {
+        switch (authType) {
+            case SERVER: return "authorization";
+            case SERVER307: return "Authorization";
+            case PROXY: return "Proxy-Authorization";
+            case PROXY305: return "proxy-Authorization";
+            default: throw new InternalError("authType: " + authType);
+        }
+    }
+
+    static boolean isProxy(DigestEchoServer.HttpAuthType authType) {
+        switch (authType) {
+            case SERVER: return false;
+            case SERVER307: return false;
+            case PROXY: return true;
+            case PROXY305: return true;
+            default: throw new InternalError("authType: " + authType);
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/DigestEchoClientSSL.java b/test/jdk/java/net/httpclient/DigestEchoClientSSL.java
new file mode 100644
index 00000000000..f2d3b1b07c2
--- /dev/null
+++ b/test/jdk/java/net/httpclient/DigestEchoClientSSL.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8087112
+ * @summary this test verifies that a client may provides authorization
+ *          headers directly when connecting with a server over SSL.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext DigestEchoServer
+ *        DigestEchoClient ReferenceTracker DigestEchoClientSSL
+ * @modules java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          java.base/sun.net.www.http
+ *          java.base/sun.net.www
+ *          java.base/sun.net
+ * @run main/othervm DigestEchoClientSSL SSL
+ * @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=
+ *                   -Djdk.http.auth.tunneling.disabledSchemes=
+ *                   DigestEchoClientSSL SSL PROXY
+ */
+
+public class DigestEchoClientSSL {
+    public static void main(String[] args) throws Exception {
+        assert "SSL".equals(args[0]);
+        DigestEchoClient.main(args);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/DigestEchoServer.java b/test/jdk/java/net/httpclient/DigestEchoServer.java
new file mode 100644
index 00000000000..0c026e2a312
--- /dev/null
+++ b/test/jdk/java/net/httpclient/DigestEchoServer.java
@@ -0,0 +1,1774 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+import com.sun.net.httpserver.BasicAuthenticator;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsParameters;
+import com.sun.net.httpserver.HttpsServer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.math.BigInteger;
+import java.net.Authenticator;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.PasswordAuthentication;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Random;
+import java.util.StringTokenizer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.net.ssl.SSLContext;
+import sun.net.www.HeaderParser;
+import java.net.http.HttpClient.Version;
+
+/**
+ * A simple HTTP server that supports Basic or Digest authentication.
+ * By default this server will echo back whatever is present
+ * in the request body. Note that the Digest authentication is
+ * a test implementation implemented only for tests purposes.
+ * @author danielfuchs
+ */
+public abstract class DigestEchoServer implements HttpServerAdapters {
+
+    public static final boolean DEBUG =
+            Boolean.parseBoolean(System.getProperty("test.debug", "false"));
+    public enum HttpAuthType {
+        SERVER, PROXY, SERVER307, PROXY305
+        /* add PROXY_AND_SERVER and SERVER_PROXY_NONE */
+    };
+    public enum HttpAuthSchemeType { NONE, BASICSERVER, BASIC, DIGEST };
+    public static final HttpAuthType DEFAULT_HTTP_AUTH_TYPE = HttpAuthType.SERVER;
+    public static final String DEFAULT_PROTOCOL_TYPE = "https";
+    public static final HttpAuthSchemeType DEFAULT_SCHEME_TYPE = HttpAuthSchemeType.DIGEST;
+
+    public static class HttpTestAuthenticator extends Authenticator {
+        private final String realm;
+        private final String username;
+        // Used to prevent incrementation of 'count' when calling the
+        // authenticator from the server side.
+        private final ThreadLocal<Boolean> skipCount = new ThreadLocal<>();
+        // count will be incremented every time getPasswordAuthentication()
+        // is called from the client side.
+        final AtomicInteger count = new AtomicInteger();
+
+        public HttpTestAuthenticator(String realm, String username) {
+            this.realm = realm;
+            this.username = username;
+        }
+        @Override
+        protected PasswordAuthentication getPasswordAuthentication() {
+            if (skipCount.get() == null || skipCount.get().booleanValue() == false) {
+                System.out.println("Authenticator called: " + count.incrementAndGet());
+            }
+            return new PasswordAuthentication(getUserName(),
+                    new char[] {'d','e','n', 't'});
+        }
+        // Called by the server side to get the password of the user
+        // being authentified.
+        public final char[] getPassword(String user) {
+            if (user.equals(username)) {
+                skipCount.set(Boolean.TRUE);
+                try {
+                    return getPasswordAuthentication().getPassword();
+                } finally {
+                    skipCount.set(Boolean.FALSE);
+                }
+            }
+            throw new SecurityException("User unknown: " + user);
+        }
+        public final String getUserName() {
+            return username;
+        }
+        public final String getRealm() {
+            return realm;
+        }
+    }
+
+    public static final HttpTestAuthenticator AUTHENTICATOR;
+    static {
+        AUTHENTICATOR = new HttpTestAuthenticator("earth", "arthur");
+    }
+
+
+    final HttpTestServer       serverImpl; // this server endpoint
+    final DigestEchoServer     redirect;   // the target server where to redirect 3xx
+    final HttpTestHandler      delegate;   // unused
+    final String               key;
+
+    DigestEchoServer(String key,
+                             HttpTestServer server,
+                             DigestEchoServer target,
+                             HttpTestHandler delegate) {
+        this.key = key;
+        this.serverImpl = server;
+        this.redirect = target;
+        this.delegate = delegate;
+    }
+
+    public static void main(String[] args)
+            throws IOException {
+
+        DigestEchoServer server = create(Version.HTTP_1_1,
+                DEFAULT_PROTOCOL_TYPE,
+                DEFAULT_HTTP_AUTH_TYPE,
+                AUTHENTICATOR,
+                DEFAULT_SCHEME_TYPE);
+        try {
+            System.out.println("Server created at " + server.getAddress());
+            System.out.println("Strike <Return> to exit");
+            System.in.read();
+        } finally {
+            System.out.println("stopping server");
+            server.stop();
+        }
+    }
+
+    private static String toString(HttpTestHeaders headers) {
+        return headers.entrySet().stream()
+                .map((e) -> e.getKey() + ": " + e.getValue())
+                .collect(Collectors.joining("\n"));
+    }
+
+    public static DigestEchoServer create(Version version,
+                                          String protocol,
+                                          HttpAuthType authType,
+                                          HttpAuthSchemeType schemeType)
+            throws IOException {
+        return create(version, protocol, authType, AUTHENTICATOR, schemeType);
+    }
+
+    public static DigestEchoServer create(Version version,
+                                          String protocol,
+                                          HttpAuthType authType,
+                                          HttpTestAuthenticator auth,
+                                          HttpAuthSchemeType schemeType)
+            throws IOException {
+        return create(version, protocol, authType, auth, schemeType, null);
+    }
+
+    public static DigestEchoServer create(Version version,
+                                        String protocol,
+                                        HttpAuthType authType,
+                                        HttpTestAuthenticator auth,
+                                        HttpAuthSchemeType schemeType,
+                                        HttpTestHandler delegate)
+            throws IOException {
+        Objects.requireNonNull(authType);
+        Objects.requireNonNull(auth);
+        switch(authType) {
+            // A server that performs Server Digest authentication.
+            case SERVER: return createServer(version, protocol, authType, auth,
+                                             schemeType, delegate, "/");
+            // A server that pretends to be a Proxy and performs
+            // Proxy Digest authentication. If protocol is HTTPS,
+            // then this will create a HttpsProxyTunnel that will
+            // handle the CONNECT request for tunneling.
+            case PROXY: return createProxy(version, protocol, authType, auth,
+                                           schemeType, delegate, "/");
+            // A server that sends 307 redirect to a server that performs
+            // Digest authentication.
+            // Note: 301 doesn't work here because it transforms POST into GET.
+            case SERVER307: return createServerAndRedirect(version,
+                                                        protocol,
+                                                        HttpAuthType.SERVER,
+                                                        auth, schemeType,
+                                                        delegate, 307);
+            // A server that sends 305 redirect to a proxy that performs
+            // Digest authentication.
+            // Note: this is not correctly stubbed/implemented in this test.
+            case PROXY305:  return createServerAndRedirect(version,
+                                                        protocol,
+                                                        HttpAuthType.PROXY,
+                                                        auth, schemeType,
+                                                        delegate, 305);
+            default:
+                throw new InternalError("Unknown server type: " + authType);
+        }
+    }
+
+
+    /**
+     * The SocketBindableFactory ensures that the local port used by an HttpServer
+     * or a proxy ServerSocket previously created by the current test/VM will not
+     * get reused by a subsequent test in the same VM.
+     * This is to avoid having the test client trying to reuse cached connections.
+     */
+    private static abstract class SocketBindableFactory<B> {
+        private static final int MAX = 10;
+        private static final CopyOnWriteArrayList<String> addresses =
+                new CopyOnWriteArrayList<>();
+        protected B createInternal() throws IOException {
+            final int max = addresses.size() + MAX;
+            final List<B> toClose = new ArrayList<>();
+            try {
+                for (int i = 1; i <= max; i++) {
+                    B bindable = createBindable();
+                    InetSocketAddress address = getAddress(bindable);
+                    String key = "localhost:" + address.getPort();
+                    if (addresses.addIfAbsent(key)) {
+                        System.out.println("Socket bound to: " + key
+                                + " after " + i + " attempt(s)");
+                        return bindable;
+                    }
+                    System.out.println("warning: address " + key
+                            + " already used. Retrying bind.");
+                    // keep the port bound until we get a port that we haven't
+                    // used already
+                    toClose.add(bindable);
+                }
+            } finally {
+                // if we had to retry, then close the socket we're not
+                // going to use.
+                for (B b : toClose) {
+                    try { close(b); } catch (Exception x) { /* ignore */ }
+                }
+            }
+            throw new IOException("Couldn't bind socket after " + max + " attempts: "
+                    + "addresses used before: " + addresses);
+        }
+
+        protected abstract B createBindable() throws IOException;
+
+        protected abstract InetSocketAddress getAddress(B bindable);
+
+        protected abstract void close(B bindable) throws IOException;
+    }
+
+    /*
+     * Used to create ServerSocket for a proxy.
+     */
+    private static final class ServerSocketFactory
+    extends SocketBindableFactory<ServerSocket> {
+        private static final ServerSocketFactory instance = new ServerSocketFactory();
+
+        static ServerSocket create() throws IOException {
+            return instance.createInternal();
+        }
+
+        @Override
+        protected ServerSocket createBindable() throws IOException {
+            ServerSocket ss = new ServerSocket();
+            ss.setReuseAddress(false);
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+            return ss;
+        }
+
+        @Override
+        protected InetSocketAddress getAddress(ServerSocket socket) {
+            return new InetSocketAddress(socket.getInetAddress(), socket.getLocalPort());
+        }
+
+        @Override
+        protected void close(ServerSocket socket) throws IOException {
+            socket.close();
+        }
+    }
+
+    /*
+     * Used to create HttpServer
+     */
+    private static abstract class H1ServerFactory<S extends HttpServer>
+            extends SocketBindableFactory<S> {
+        @Override
+        protected S createBindable() throws IOException {
+            S server = newHttpServer();
+            server.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
+            return server;
+        }
+
+        @Override
+        protected InetSocketAddress getAddress(S server) {
+            return server.getAddress();
+        }
+
+        @Override
+        protected void close(S server) throws IOException {
+            server.stop(1);
+        }
+
+        /*
+         * Returns a HttpServer or a HttpsServer in different subclasses.
+         */
+        protected abstract S newHttpServer() throws IOException;
+    }
+
+    /*
+     * Used to create Http2TestServer
+     */
+    private static abstract class H2ServerFactory<S extends Http2TestServer>
+            extends SocketBindableFactory<S> {
+        @Override
+        protected S createBindable() throws IOException {
+            final S server;
+            try {
+                server = newHttpServer();
+            } catch (IOException io) {
+                throw io;
+            } catch (Exception x) {
+                throw new IOException(x);
+            }
+            return server;
+        }
+
+        @Override
+        protected InetSocketAddress getAddress(S server) {
+            return server.getAddress();
+        }
+
+        @Override
+        protected void close(S server) throws IOException {
+            server.stop();
+        }
+
+        /*
+         * Returns a HttpServer or a HttpsServer in different subclasses.
+         */
+        protected abstract S newHttpServer() throws Exception;
+    }
+
+    private static final class Http2ServerFactory extends H2ServerFactory<Http2TestServer> {
+        private static final Http2ServerFactory instance = new Http2ServerFactory();
+
+        static Http2TestServer create() throws IOException {
+            return instance.createInternal();
+        }
+
+        @Override
+        protected Http2TestServer newHttpServer() throws Exception {
+            return new Http2TestServer("localhost", false, 0);
+        }
+    }
+
+    private static final class Https2ServerFactory extends H2ServerFactory<Http2TestServer> {
+        private static final Https2ServerFactory instance = new Https2ServerFactory();
+
+        static Http2TestServer create() throws IOException {
+            return instance.createInternal();
+        }
+
+        @Override
+        protected Http2TestServer newHttpServer() throws Exception {
+            return new Http2TestServer("localhost", true, 0);
+        }
+    }
+
+    private static final class Http1ServerFactory extends H1ServerFactory<HttpServer> {
+        private static final Http1ServerFactory instance = new Http1ServerFactory();
+
+        static HttpServer create() throws IOException {
+            return instance.createInternal();
+        }
+
+        @Override
+        protected HttpServer newHttpServer() throws IOException {
+            return HttpServer.create();
+        }
+    }
+
+    private static final class Https1ServerFactory extends H1ServerFactory<HttpsServer> {
+        private static final Https1ServerFactory instance = new Https1ServerFactory();
+
+        static HttpsServer create() throws IOException {
+            return instance.createInternal();
+        }
+
+        @Override
+        protected HttpsServer newHttpServer() throws IOException {
+            return HttpsServer.create();
+        }
+    }
+
+    static Http2TestServer createHttp2Server(String protocol) throws IOException {
+        final Http2TestServer server;
+        if ("http".equalsIgnoreCase(protocol)) {
+            server = Http2ServerFactory.create();
+        } else if ("https".equalsIgnoreCase(protocol)) {
+            server = Https2ServerFactory.create();
+        } else {
+            throw new InternalError("unsupported protocol: " + protocol);
+        }
+        return server;
+    }
+
+    static HttpTestServer createHttpServer(Version version, String protocol)
+            throws IOException
+    {
+        switch(version) {
+            case HTTP_1_1:
+                return HttpTestServer.of(createHttp1Server(protocol));
+            case HTTP_2:
+                return HttpTestServer.of(createHttp2Server(protocol));
+            default:
+                throw new InternalError("Unexpected version: " + version);
+        }
+    }
+
+    static HttpServer createHttp1Server(String protocol) throws IOException {
+        final HttpServer server;
+        if ("http".equalsIgnoreCase(protocol)) {
+            server = Http1ServerFactory.create();
+        } else if ("https".equalsIgnoreCase(protocol)) {
+            server = configure(Https1ServerFactory.create());
+        } else {
+            throw new InternalError("unsupported protocol: " + protocol);
+        }
+        return server;
+    }
+
+    static HttpsServer configure(HttpsServer server) throws IOException {
+        try {
+            SSLContext ctx = SSLContext.getDefault();
+            server.setHttpsConfigurator(new Configurator(ctx));
+        } catch (NoSuchAlgorithmException ex) {
+            throw new IOException(ex);
+        }
+        return server;
+    }
+
+
+    static void setContextAuthenticator(HttpTestContext ctxt,
+                                        HttpTestAuthenticator auth) {
+        final String realm = auth.getRealm();
+        com.sun.net.httpserver.Authenticator authenticator =
+            new BasicAuthenticator(realm) {
+                @Override
+                public boolean checkCredentials(String username, String pwd) {
+                    return auth.getUserName().equals(username)
+                           && new String(auth.getPassword(username)).equals(pwd);
+                }
+        };
+        ctxt.setAuthenticator(authenticator);
+    }
+
+    public static DigestEchoServer createServer(Version version,
+                                        String protocol,
+                                        HttpAuthType authType,
+                                        HttpTestAuthenticator auth,
+                                        HttpAuthSchemeType schemeType,
+                                        HttpTestHandler delegate,
+                                        String path)
+            throws IOException {
+        Objects.requireNonNull(authType);
+        Objects.requireNonNull(auth);
+
+        HttpTestServer impl = createHttpServer(version, protocol);
+        String key = String.format("DigestEchoServer[PID=%s,PORT=%s]:%s:%s:%s:%s",
+                ProcessHandle.current().pid(),
+                impl.getAddress().getPort(),
+                version, protocol, authType, schemeType);
+        final DigestEchoServer server = new DigestEchoServerImpl(key, impl, null, delegate);
+        final HttpTestHandler handler =
+                server.createHandler(schemeType, auth, authType, false);
+        HttpTestContext context = impl.addHandler(handler, path);
+        server.configureAuthentication(context, schemeType, auth, authType);
+        impl.start();
+        return server;
+    }
+
+    public static DigestEchoServer createProxy(Version version,
+                                        String protocol,
+                                        HttpAuthType authType,
+                                        HttpTestAuthenticator auth,
+                                        HttpAuthSchemeType schemeType,
+                                        HttpTestHandler delegate,
+                                        String path)
+            throws IOException {
+        Objects.requireNonNull(authType);
+        Objects.requireNonNull(auth);
+
+        if (version == Version.HTTP_2 && protocol.equalsIgnoreCase("http")) {
+            System.out.println("WARNING: can't use HTTP/1.1 proxy with unsecure HTTP/2 server");
+            version = Version.HTTP_1_1;
+        }
+        HttpTestServer impl = createHttpServer(version, protocol);
+        String key = String.format("DigestEchoServer[PID=%s,PORT=%s]:%s:%s:%s:%s",
+                ProcessHandle.current().pid(),
+                impl.getAddress().getPort(),
+                version, protocol, authType, schemeType);
+        final DigestEchoServer server = "https".equalsIgnoreCase(protocol)
+                ? new HttpsProxyTunnel(key, impl, null, delegate)
+                : new DigestEchoServerImpl(key, impl, null, delegate);
+
+        final HttpTestHandler hh = server.createHandler(HttpAuthSchemeType.NONE,
+                                         null, HttpAuthType.SERVER,
+                                         server instanceof HttpsProxyTunnel);
+        HttpTestContext ctxt = impl.addHandler(hh, path);
+        server.configureAuthentication(ctxt, schemeType, auth, authType);
+        impl.start();
+
+        return server;
+    }
+
+    public static DigestEchoServer createServerAndRedirect(
+                                        Version version,
+                                        String protocol,
+                                        HttpAuthType targetAuthType,
+                                        HttpTestAuthenticator auth,
+                                        HttpAuthSchemeType schemeType,
+                                        HttpTestHandler targetDelegate,
+                                        int code300)
+            throws IOException {
+        Objects.requireNonNull(targetAuthType);
+        Objects.requireNonNull(auth);
+
+        // The connection between client and proxy can only
+        // be a plain connection: SSL connection to proxy
+        // is not supported by our client connection.
+        String targetProtocol = targetAuthType == HttpAuthType.PROXY
+                                          ? "http"
+                                          : protocol;
+        DigestEchoServer redirectTarget =
+                (targetAuthType == HttpAuthType.PROXY)
+                ? createProxy(version, protocol, targetAuthType,
+                              auth, schemeType, targetDelegate, "/")
+                : createServer(version, targetProtocol, targetAuthType,
+                               auth, schemeType, targetDelegate, "/");
+        HttpTestServer impl = createHttpServer(version, protocol);
+        String key = String.format("RedirectingServer[PID=%s,PORT=%s]:%s:%s:%s:%s",
+                ProcessHandle.current().pid(),
+                impl.getAddress().getPort(),
+                version, protocol,
+                HttpAuthType.SERVER, code300)
+                + "->" + redirectTarget.key;
+        final DigestEchoServer redirectingServer =
+                 new DigestEchoServerImpl(key, impl, redirectTarget, null);
+        InetSocketAddress redirectAddr = redirectTarget.getAddress();
+        URL locationURL = url(targetProtocol, redirectAddr, "/");
+        final HttpTestHandler hh = redirectingServer.create300Handler(key, locationURL,
+                                             HttpAuthType.SERVER, code300);
+        impl.addHandler(hh,"/");
+        impl.start();
+        return redirectingServer;
+    }
+
+    public abstract InetSocketAddress getServerAddress();
+    public abstract InetSocketAddress getProxyAddress();
+    public abstract InetSocketAddress getAddress();
+    public abstract void stop();
+    public abstract Version getServerVersion();
+
+    private static class DigestEchoServerImpl extends DigestEchoServer {
+        DigestEchoServerImpl(String key,
+                             HttpTestServer server,
+                             DigestEchoServer target,
+                             HttpTestHandler delegate) {
+            super(key, Objects.requireNonNull(server), target, delegate);
+        }
+
+        public InetSocketAddress getAddress() {
+            return new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                    serverImpl.getAddress().getPort());
+        }
+
+        public InetSocketAddress getServerAddress() {
+            return new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                    serverImpl.getAddress().getPort());
+        }
+
+        public InetSocketAddress getProxyAddress() {
+            return new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                    serverImpl.getAddress().getPort());
+        }
+
+        public Version getServerVersion() {
+            return serverImpl.getVersion();
+        }
+
+        public void stop() {
+            serverImpl.stop();
+            if (redirect != null) {
+                redirect.stop();
+            }
+        }
+    }
+
+    protected void writeResponse(HttpTestExchange he) throws IOException {
+        if (delegate == null) {
+            he.sendResponseHeaders(HttpURLConnection.HTTP_OK, -1);
+            he.getResponseBody().write(he.getRequestBody().readAllBytes());
+        } else {
+            delegate.handle(he);
+        }
+    }
+
+    private HttpTestHandler createHandler(HttpAuthSchemeType schemeType,
+                                      HttpTestAuthenticator auth,
+                                      HttpAuthType authType,
+                                      boolean tunelled) {
+        return new HttpNoAuthHandler(key, authType, tunelled);
+    }
+
+    void configureAuthentication(HttpTestContext ctxt,
+                                 HttpAuthSchemeType schemeType,
+                                 HttpTestAuthenticator auth,
+                                 HttpAuthType authType) {
+        switch(schemeType) {
+            case DIGEST:
+                // DIGEST authentication is handled by the handler.
+                ctxt.addFilter(new HttpDigestFilter(key, auth, authType));
+                break;
+            case BASIC:
+                // BASIC authentication is handled by the filter.
+                ctxt.addFilter(new HttpBasicFilter(key, auth, authType));
+                break;
+            case BASICSERVER:
+                switch(authType) {
+                    case PROXY: case PROXY305:
+                        // HttpServer can't support Proxy-type authentication
+                        // => we do as if BASIC had been specified, and we will
+                        //    handle authentication in the handler.
+                        ctxt.addFilter(new HttpBasicFilter(key, auth, authType));
+                        break;
+                    case SERVER: case SERVER307:
+                        if (ctxt.getVersion() == Version.HTTP_1_1) {
+                            // Basic authentication is handled by HttpServer
+                            // directly => the filter should not perform
+                            // authentication again.
+                            setContextAuthenticator(ctxt, auth);
+                            ctxt.addFilter(new HttpNoAuthFilter(key, authType));
+                        } else {
+                            ctxt.addFilter(new HttpBasicFilter(key, auth, authType));
+                        }
+                        break;
+                    default:
+                        throw new InternalError(key + ": Invalid combination scheme="
+                             + schemeType + " authType=" + authType);
+                }
+            case NONE:
+                // No authentication at all.
+                ctxt.addFilter(new HttpNoAuthFilter(key, authType));
+                break;
+            default:
+                throw new InternalError(key + ": No such scheme: " + schemeType);
+        }
+    }
+
+    private HttpTestHandler create300Handler(String key, URL proxyURL,
+                                             HttpAuthType type, int code300)
+            throws MalformedURLException
+    {
+        return new Http3xxHandler(key, proxyURL, type, code300);
+    }
+
+    // Abstract HTTP filter class.
+    private abstract static class AbstractHttpFilter extends HttpTestFilter {
+
+        final HttpAuthType authType;
+        final String type;
+        public AbstractHttpFilter(HttpAuthType authType, String type) {
+            this.authType = authType;
+            this.type = type;
+        }
+
+        String getLocation() {
+            return "Location";
+        }
+        String getAuthenticate() {
+            return authType == HttpAuthType.PROXY
+                    ? "Proxy-Authenticate" : "WWW-Authenticate";
+        }
+        String getAuthorization() {
+            return authType == HttpAuthType.PROXY
+                    ? "Proxy-Authorization" : "Authorization";
+        }
+        int getUnauthorizedCode() {
+            return authType == HttpAuthType.PROXY
+                    ? HttpURLConnection.HTTP_PROXY_AUTH
+                    : HttpURLConnection.HTTP_UNAUTHORIZED;
+        }
+        String getKeepAlive() {
+            return "keep-alive";
+        }
+        String getConnection() {
+            return authType == HttpAuthType.PROXY
+                    ? "Proxy-Connection" : "Connection";
+        }
+        protected abstract boolean isAuthentified(HttpTestExchange he) throws IOException;
+        protected abstract void requestAuthentication(HttpTestExchange he) throws IOException;
+        protected void accept(HttpTestExchange he, HttpChain chain) throws IOException {
+            chain.doFilter(he);
+        }
+
+        @Override
+        public String description() {
+            return "Filter for " + type;
+        }
+        @Override
+        public void doFilter(HttpTestExchange he, HttpChain chain) throws IOException {
+            try {
+                System.out.println(type + ": Got " + he.getRequestMethod()
+                    + ": " + he.getRequestURI()
+                    + "\n" + DigestEchoServer.toString(he.getRequestHeaders()));
+
+                // Assert only a single value for Expect. Not directly related
+                // to digest authentication, but verifies good client behaviour.
+                List<String> expectValues = he.getRequestHeaders().get("Expect");
+                if (expectValues != null && expectValues.size() > 1) {
+                    throw new IOException("Expect:  " + expectValues);
+                }
+
+                if (!isAuthentified(he)) {
+                    try {
+                        requestAuthentication(he);
+                        he.sendResponseHeaders(getUnauthorizedCode(), -1);
+                        System.out.println(type
+                            + ": Sent back " + getUnauthorizedCode());
+                    } finally {
+                        he.close();
+                    }
+                } else {
+                    accept(he, chain);
+                }
+            } catch (RuntimeException | Error | IOException t) {
+               System.err.println(type
+                    + ": Unexpected exception while handling request: " + t);
+               t.printStackTrace(System.err);
+               he.close();
+               throw t;
+            }
+        }
+
+    }
+
+    // WARNING: This is not a full fledged implementation of DIGEST.
+    // It does contain bugs and inaccuracy.
+    final static class DigestResponse {
+        final String realm;
+        final String username;
+        final String nonce;
+        final String cnonce;
+        final String nc;
+        final String uri;
+        final String algorithm;
+        final String response;
+        final String qop;
+        final String opaque;
+
+        public DigestResponse(String realm, String username, String nonce,
+                              String cnonce, String nc, String uri,
+                              String algorithm, String qop, String opaque,
+                              String response) {
+            this.realm = realm;
+            this.username = username;
+            this.nonce = nonce;
+            this.cnonce = cnonce;
+            this.nc = nc;
+            this.uri = uri;
+            this.algorithm = algorithm;
+            this.qop = qop;
+            this.opaque = opaque;
+            this.response = response;
+        }
+
+        String getAlgorithm(String defval) {
+            return algorithm == null ? defval : algorithm;
+        }
+        String getQoP(String defval) {
+            return qop == null ? defval : qop;
+        }
+
+        // Code stolen from DigestAuthentication:
+
+        private static final char charArray[] = {
+            '0', '1', '2', '3', '4', '5', '6', '7',
+            '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+        };
+
+        private static String encode(String src, char[] passwd, MessageDigest md) {
+            try {
+                md.update(src.getBytes("ISO-8859-1"));
+            } catch (java.io.UnsupportedEncodingException uee) {
+                assert false;
+            }
+            if (passwd != null) {
+                byte[] passwdBytes = new byte[passwd.length];
+                for (int i=0; i<passwd.length; i++)
+                    passwdBytes[i] = (byte)passwd[i];
+                md.update(passwdBytes);
+                Arrays.fill(passwdBytes, (byte)0x00);
+            }
+            byte[] digest = md.digest();
+
+            StringBuilder res = new StringBuilder(digest.length * 2);
+            for (int i = 0; i < digest.length; i++) {
+                int hashchar = ((digest[i] >>> 4) & 0xf);
+                res.append(charArray[hashchar]);
+                hashchar = (digest[i] & 0xf);
+                res.append(charArray[hashchar]);
+            }
+            return res.toString();
+        }
+
+        public static String computeDigest(boolean isRequest,
+                                            String reqMethod,
+                                            char[] password,
+                                            DigestResponse params)
+            throws NoSuchAlgorithmException
+        {
+
+            String A1, HashA1;
+            String algorithm = params.getAlgorithm("MD5");
+            boolean md5sess = algorithm.equalsIgnoreCase ("MD5-sess");
+
+            MessageDigest md = MessageDigest.getInstance(md5sess?"MD5":algorithm);
+
+            if (params.username == null) {
+                throw new IllegalArgumentException("missing username");
+            }
+            if (params.realm == null) {
+                throw new IllegalArgumentException("missing realm");
+            }
+            if (params.uri == null) {
+                throw new IllegalArgumentException("missing uri");
+            }
+            if (params.nonce == null) {
+                throw new IllegalArgumentException("missing nonce");
+            }
+
+            A1 = params.username + ":" + params.realm + ":";
+            HashA1 = encode(A1, password, md);
+
+            String A2;
+            if (isRequest) {
+                A2 = reqMethod + ":" + params.uri;
+            } else {
+                A2 = ":" + params.uri;
+            }
+            String HashA2 = encode(A2, null, md);
+            String combo, finalHash;
+
+            if ("auth".equals(params.qop)) { /* RRC2617 when qop=auth */
+                if (params.cnonce == null) {
+                    throw new IllegalArgumentException("missing nonce");
+                }
+                if (params.nc == null) {
+                    throw new IllegalArgumentException("missing nonce");
+                }
+                combo = HashA1+ ":" + params.nonce + ":" + params.nc + ":" +
+                            params.cnonce + ":auth:" +HashA2;
+
+            } else { /* for compatibility with RFC2069 */
+                combo = HashA1 + ":" +
+                           params.nonce + ":" +
+                           HashA2;
+            }
+            finalHash = encode(combo, null, md);
+            return finalHash;
+        }
+
+        public static DigestResponse create(String raw) {
+            String username, realm, nonce, nc, uri, response, cnonce,
+                   algorithm, qop, opaque;
+            HeaderParser parser = new HeaderParser(raw);
+            username = parser.findValue("username");
+            realm = parser.findValue("realm");
+            nonce = parser.findValue("nonce");
+            nc = parser.findValue("nc");
+            uri = parser.findValue("uri");
+            cnonce = parser.findValue("cnonce");
+            response = parser.findValue("response");
+            algorithm = parser.findValue("algorithm");
+            qop = parser.findValue("qop");
+            opaque = parser.findValue("opaque");
+            return new DigestResponse(realm, username, nonce, cnonce, nc, uri,
+                                      algorithm, qop, opaque, response);
+        }
+
+    }
+
+    private static class HttpNoAuthFilter extends AbstractHttpFilter {
+
+        static String type(String key, HttpAuthType authType) {
+            String type = authType == HttpAuthType.SERVER
+                    ? "NoAuth Server Filter" : "NoAuth Proxy Filter";
+            return "["+type+"]:"+key;
+        }
+
+        public HttpNoAuthFilter(String key, HttpAuthType authType) {
+            super(authType, type(key, authType));
+        }
+
+        @Override
+        protected boolean isAuthentified(HttpTestExchange he) throws IOException {
+            return true;
+        }
+
+        @Override
+        protected void requestAuthentication(HttpTestExchange he) throws IOException {
+            throw new InternalError("Should not com here");
+        }
+
+        @Override
+        public String description() {
+            return "Passthrough Filter";
+        }
+
+    }
+
+    // An HTTP Filter that performs Basic authentication
+    private static class HttpBasicFilter extends AbstractHttpFilter {
+
+        static String type(String key, HttpAuthType authType) {
+            String type = authType == HttpAuthType.SERVER
+                    ? "Basic Server Filter" : "Basic Proxy Filter";
+            return "["+type+"]:"+key;
+        }
+
+        private final HttpTestAuthenticator auth;
+        public HttpBasicFilter(String key, HttpTestAuthenticator auth,
+                               HttpAuthType authType) {
+            super(authType, type(key, authType));
+            this.auth = auth;
+        }
+
+        @Override
+        protected void requestAuthentication(HttpTestExchange he)
+            throws IOException {
+            he.getResponseHeaders().addHeader(getAuthenticate(),
+                 "Basic realm=\"" + auth.getRealm() + "\"");
+            System.out.println(type + ": Requesting Basic Authentication "
+                 + he.getResponseHeaders().firstValue(getAuthenticate()));
+        }
+
+        @Override
+        protected boolean isAuthentified(HttpTestExchange he) {
+            if (he.getRequestHeaders().containsKey(getAuthorization())) {
+                List<String> authorization =
+                    he.getRequestHeaders().get(getAuthorization());
+                for (String a : authorization) {
+                    System.out.println(type + ": processing " + a);
+                    int sp = a.indexOf(' ');
+                    if (sp < 0) return false;
+                    String scheme = a.substring(0, sp);
+                    if (!"Basic".equalsIgnoreCase(scheme)) {
+                        System.out.println(type + ": Unsupported scheme '"
+                                           + scheme +"'");
+                        return false;
+                    }
+                    if (a.length() <= sp+1) {
+                        System.out.println(type + ": value too short for '"
+                                            + scheme +"'");
+                        return false;
+                    }
+                    a = a.substring(sp+1);
+                    return validate(a);
+                }
+                return false;
+            }
+            return false;
+        }
+
+        boolean validate(String a) {
+            byte[] b = Base64.getDecoder().decode(a);
+            String userpass = new String (b);
+            int colon = userpass.indexOf (':');
+            String uname = userpass.substring (0, colon);
+            String pass = userpass.substring (colon+1);
+            return auth.getUserName().equals(uname) &&
+                   new String(auth.getPassword(uname)).equals(pass);
+        }
+
+        @Override
+        public String description() {
+            return "Filter for BASIC authentication: " + type;
+        }
+
+    }
+
+
+    // An HTTP Filter that performs Digest authentication
+    // WARNING: This is not a full fledged implementation of DIGEST.
+    // It does contain bugs and inaccuracy.
+    private static class HttpDigestFilter extends AbstractHttpFilter {
+
+        static String type(String key, HttpAuthType authType) {
+            String type = authType == HttpAuthType.SERVER
+                    ? "Digest Server Filter" : "Digest Proxy Filter";
+            return "["+type+"]:"+key;
+        }
+
+        // This is a very basic DIGEST - used only for the purpose of testing
+        // the client implementation. Therefore we can get away with never
+        // updating the server nonce as it makes the implementation of the
+        // server side digest simpler.
+        private final HttpTestAuthenticator auth;
+        private final byte[] nonce;
+        private final String ns;
+        public HttpDigestFilter(String key, HttpTestAuthenticator auth, HttpAuthType authType) {
+            super(authType, type(key, authType));
+            this.auth = auth;
+            nonce = new byte[16];
+            new Random(Instant.now().toEpochMilli()).nextBytes(nonce);
+            ns = new BigInteger(1, nonce).toString(16);
+        }
+
+        @Override
+        protected void requestAuthentication(HttpTestExchange he)
+                throws IOException {
+            String separator;
+            Version v = he.getExchangeVersion();
+            if (v == Version.HTTP_1_1) {
+                separator = "\r\n    ";
+            } else if (v == Version.HTTP_2) {
+                separator = " ";
+            } else {
+                throw new InternalError(String.valueOf(v));
+            }
+            he.getResponseHeaders().addHeader(getAuthenticate(),
+                 "Digest realm=\"" + auth.getRealm() + "\","
+                 + separator + "qop=\"auth\","
+                 + separator + "nonce=\"" + ns +"\"");
+            System.out.println(type + ": Requesting Digest Authentication "
+                 + he.getResponseHeaders()
+                    .firstValue(getAuthenticate())
+                    .orElse("null"));
+        }
+
+        @Override
+        protected boolean isAuthentified(HttpTestExchange he) {
+            if (he.getRequestHeaders().containsKey(getAuthorization())) {
+                List<String> authorization = he.getRequestHeaders().get(getAuthorization());
+                for (String a : authorization) {
+                    System.out.println(type + ": processing " + a);
+                    int sp = a.indexOf(' ');
+                    if (sp < 0) return false;
+                    String scheme = a.substring(0, sp);
+                    if (!"Digest".equalsIgnoreCase(scheme)) {
+                        System.out.println(type + ": Unsupported scheme '" + scheme +"'");
+                        return false;
+                    }
+                    if (a.length() <= sp+1) {
+                        System.out.println(type + ": value too short for '" + scheme +"'");
+                        return false;
+                    }
+                    a = a.substring(sp+1);
+                    DigestResponse dgr = DigestResponse.create(a);
+                    return validate(he.getRequestURI(), he.getRequestMethod(), dgr);
+                }
+                return false;
+            }
+            return false;
+        }
+
+        boolean validate(URI uri, String reqMethod, DigestResponse dg) {
+            if (!"MD5".equalsIgnoreCase(dg.getAlgorithm("MD5"))) {
+                System.out.println(type + ": Unsupported algorithm "
+                                   + dg.algorithm);
+                return false;
+            }
+            if (!"auth".equalsIgnoreCase(dg.getQoP("auth"))) {
+                System.out.println(type + ": Unsupported qop "
+                                   + dg.qop);
+                return false;
+            }
+            try {
+                if (!dg.nonce.equals(ns)) {
+                    System.out.println(type + ": bad nonce returned by client: "
+                                    + nonce + " expected " + ns);
+                    return false;
+                }
+                if (dg.response == null) {
+                    System.out.println(type + ": missing digest response.");
+                    return false;
+                }
+                char[] pa = auth.getPassword(dg.username);
+                return verify(uri, reqMethod, dg, pa);
+            } catch(IllegalArgumentException | SecurityException
+                    | NoSuchAlgorithmException e) {
+                System.out.println(type + ": " + e.getMessage());
+                return false;
+            }
+        }
+
+
+        boolean verify(URI uri, String reqMethod, DigestResponse dg, char[] pw)
+            throws NoSuchAlgorithmException {
+            String response = DigestResponse.computeDigest(true, reqMethod, pw, dg);
+            if (!dg.response.equals(response)) {
+                System.out.println(type + ": bad response returned by client: "
+                                    + dg.response + " expected " + response);
+                return false;
+            } else {
+                // A real server would also verify the uri=<request-uri>
+                // parameter - but this is just a test...
+                System.out.println(type + ": verified response " + response);
+            }
+            return true;
+        }
+
+
+        @Override
+        public String description() {
+            return "Filter for DIGEST authentication: " + type;
+        }
+    }
+
+    // Abstract HTTP handler class.
+    private abstract static class AbstractHttpHandler implements HttpTestHandler {
+
+        final HttpAuthType authType;
+        final String type;
+        public AbstractHttpHandler(HttpAuthType authType, String type) {
+            this.authType = authType;
+            this.type = type;
+        }
+
+        String getLocation() {
+            return "Location";
+        }
+
+        @Override
+        public void handle(HttpTestExchange he) throws IOException {
+            try {
+                sendResponse(he);
+            } catch (RuntimeException | Error | IOException t) {
+               System.err.println(type
+                    + ": Unexpected exception while handling request: " + t);
+               t.printStackTrace(System.err);
+               throw t;
+            } finally {
+                he.close();
+            }
+        }
+
+        protected abstract void sendResponse(HttpTestExchange he) throws IOException;
+
+    }
+
+    static String stype(String type, String key, HttpAuthType authType, boolean tunnelled) {
+        type = type + (authType == HttpAuthType.SERVER
+                       ? " Server" : " Proxy")
+                + (tunnelled ? " Tunnelled" : "");
+        return "["+type+"]:"+key;
+    }
+
+    private class HttpNoAuthHandler extends AbstractHttpHandler {
+
+        // true if this server is behind a proxy tunnel.
+        final boolean tunnelled;
+        public HttpNoAuthHandler(String key, HttpAuthType authType, boolean tunnelled) {
+            super(authType, stype("NoAuth", key, authType, tunnelled));
+            this.tunnelled = tunnelled;
+        }
+
+        @Override
+        protected void sendResponse(HttpTestExchange he) throws IOException {
+            if (DEBUG) {
+                System.out.println(type + ": headers are: "
+                        + DigestEchoServer.toString(he.getRequestHeaders()));
+            }
+            if (authType == HttpAuthType.SERVER && tunnelled) {
+                // Verify that the client doesn't send us proxy-* headers
+                // used to establish the proxy tunnel
+                Optional<String> proxyAuth = he.getRequestHeaders()
+                        .keySet().stream()
+                        .filter("proxy-authorization"::equalsIgnoreCase)
+                        .findAny();
+                if (proxyAuth.isPresent()) {
+                    System.out.println(type + " found "
+                            + proxyAuth.get() + ": failing!");
+                    throw new IOException(proxyAuth.get()
+                            + " found by " + type + " for "
+                            + he.getRequestURI());
+                }
+            }
+            DigestEchoServer.this.writeResponse(he);
+        }
+
+    }
+
+    // A dummy HTTP Handler that redirects all incoming requests
+    // by sending a back 3xx response code (301, 305, 307 etc..)
+    private class Http3xxHandler extends AbstractHttpHandler {
+
+        private final URL redirectTargetURL;
+        private final int code3XX;
+        public Http3xxHandler(String key, URL proxyURL, HttpAuthType authType, int code300) {
+            super(authType, stype("Server" + code300, key, authType, false));
+            this.redirectTargetURL = proxyURL;
+            this.code3XX = code300;
+        }
+
+        int get3XX() {
+            return code3XX;
+        }
+
+        @Override
+        public void sendResponse(HttpTestExchange he) throws IOException {
+            System.out.println(type + ": Got " + he.getRequestMethod()
+                    + ": " + he.getRequestURI()
+                    + "\n" + DigestEchoServer.toString(he.getRequestHeaders()));
+            System.out.println(type + ": Redirecting to "
+                               + (authType == HttpAuthType.PROXY305
+                                    ? "proxy" : "server"));
+            he.getResponseHeaders().addHeader(getLocation(),
+                redirectTargetURL.toExternalForm().toString());
+            he.sendResponseHeaders(get3XX(), -1);
+            System.out.println(type + ": Sent back " + get3XX() + " "
+                 + getLocation() + ": " + redirectTargetURL.toExternalForm().toString());
+        }
+    }
+
+    static class Configurator extends HttpsConfigurator {
+        public Configurator(SSLContext ctx) {
+            super(ctx);
+        }
+
+        @Override
+        public void configure (HttpsParameters params) {
+            params.setSSLParameters (getSSLContext().getSupportedSSLParameters());
+        }
+    }
+
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    static class  ProxyAuthorization {
+        final HttpAuthSchemeType schemeType;
+        final HttpTestAuthenticator authenticator;
+        private final byte[] nonce;
+        private final String ns;
+        private final String key;
+
+        ProxyAuthorization(String key, HttpAuthSchemeType schemeType, HttpTestAuthenticator auth) {
+            this.key = key;
+            this.schemeType = schemeType;
+            this.authenticator = auth;
+            nonce = new byte[16];
+            new Random(Instant.now().toEpochMilli()).nextBytes(nonce);
+            ns = new BigInteger(1, nonce).toString(16);
+        }
+
+        String doBasic(Optional<String> authorization) {
+            String offset = "proxy-authorization: basic ";
+            String authstring = authorization.orElse("");
+            if (!authstring.toLowerCase(Locale.US).startsWith(offset)) {
+                return "Proxy-Authenticate: BASIC " + "realm=\""
+                        + authenticator.getRealm() +"\"";
+            }
+            authstring = authstring
+                    .substring(offset.length())
+                    .trim();
+            byte[] base64 = Base64.getDecoder().decode(authstring);
+            String up = new String(base64, StandardCharsets.UTF_8);
+            int colon = up.indexOf(':');
+            if (colon < 1) {
+                return "Proxy-Authenticate: BASIC " + "realm=\""
+                        + authenticator.getRealm() +"\"";
+            }
+            String u = up.substring(0, colon);
+            String p = up.substring(colon+1);
+            char[] pw = authenticator.getPassword(u);
+            if (!p.equals(new String(pw))) {
+                return "Proxy-Authenticate: BASIC " + "realm=\""
+                        + authenticator.getRealm() +"\"";
+            }
+            System.out.println(now() + key + " Proxy basic authentication success");
+            return null;
+        }
+
+        String doDigest(Optional<String> authorization) {
+            String offset = "proxy-authorization: digest ";
+            String authstring = authorization.orElse("");
+            if (!authstring.toLowerCase(Locale.US).startsWith(offset)) {
+                return "Proxy-Authenticate: " +
+                        "Digest realm=\"" + authenticator.getRealm() + "\","
+                        + "\r\n    qop=\"auth\","
+                        + "\r\n    nonce=\"" + ns +"\"";
+            }
+            authstring = authstring
+                    .substring(offset.length())
+                    .trim();
+            boolean validated = false;
+            try {
+                DigestResponse dgr = DigestResponse.create(authstring);
+                validated = validate("CONNECT", dgr);
+            } catch (Throwable t) {
+                t.printStackTrace();
+            }
+            if (!validated) {
+                return "Proxy-Authenticate: " +
+                        "Digest realm=\"" + authenticator.getRealm() + "\","
+                        + "\r\n    qop=\"auth\","
+                        + "\r\n    nonce=\"" + ns +"\"";
+            }
+            return null;
+        }
+
+
+
+
+        boolean validate(String reqMethod, DigestResponse dg) {
+            String type = now() + this.getClass().getSimpleName() + ":" + key;
+            if (!"MD5".equalsIgnoreCase(dg.getAlgorithm("MD5"))) {
+                System.out.println(type + ": Unsupported algorithm "
+                        + dg.algorithm);
+                return false;
+            }
+            if (!"auth".equalsIgnoreCase(dg.getQoP("auth"))) {
+                System.out.println(type + ": Unsupported qop "
+                        + dg.qop);
+                return false;
+            }
+            try {
+                if (!dg.nonce.equals(ns)) {
+                    System.out.println(type + ": bad nonce returned by client: "
+                            + nonce + " expected " + ns);
+                    return false;
+                }
+                if (dg.response == null) {
+                    System.out.println(type + ": missing digest response.");
+                    return false;
+                }
+                char[] pa = authenticator.getPassword(dg.username);
+                return verify(type, reqMethod, dg, pa);
+            } catch(IllegalArgumentException | SecurityException
+                    | NoSuchAlgorithmException e) {
+                System.out.println(type + ": " + e.getMessage());
+                return false;
+            }
+        }
+
+
+        boolean verify(String type, String reqMethod, DigestResponse dg, char[] pw)
+                throws NoSuchAlgorithmException {
+            String response = DigestResponse.computeDigest(true, reqMethod, pw, dg);
+            if (!dg.response.equals(response)) {
+                System.out.println(type + ": bad response returned by client: "
+                        + dg.response + " expected " + response);
+                return false;
+            } else {
+                // A real server would also verify the uri=<request-uri>
+                // parameter - but this is just a test...
+                System.out.println(type + ": verified response " + response);
+            }
+            return true;
+        }
+
+        public boolean authorize(StringBuilder response, String requestLine, String headers) {
+            String message = "<html><body><p>Authorization Failed%s</p></body></html>\r\n";
+            if (authenticator == null && schemeType != HttpAuthSchemeType.NONE) {
+                message = String.format(message, " No Authenticator Set");
+                response.append("HTTP/1.1 407 Proxy Authentication Failed\r\n");
+                response.append("Content-Length: ")
+                        .append(message.getBytes(StandardCharsets.UTF_8).length)
+                        .append("\r\n\r\n");
+                response.append(message);
+                return false;
+            }
+            Optional<String> authorization = Stream.of(headers.split("\r\n"))
+                    .filter((k) -> k.toLowerCase(Locale.US).startsWith("proxy-authorization:"))
+                    .findFirst();
+            String authenticate = null;
+            switch(schemeType) {
+                case BASIC:
+                case BASICSERVER:
+                    authenticate = doBasic(authorization);
+                    break;
+                case DIGEST:
+                    authenticate = doDigest(authorization);
+                    break;
+                case NONE:
+                    response.append("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+                    return true;
+                default:
+                    throw new InternalError("Unknown scheme type: " + schemeType);
+            }
+            if (authenticate != null) {
+                message = String.format(message, "");
+                response.append("HTTP/1.1 407 Proxy Authentication Required\r\n");
+                response.append("Content-Length: ")
+                        .append(message.getBytes(StandardCharsets.UTF_8).length)
+                        .append("\r\n")
+                        .append(authenticate)
+                        .append("\r\n\r\n");
+                response.append(message);
+                return false;
+            }
+            response.append("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+            return true;
+        }
+    }
+
+    public interface TunnelingProxy {
+        InetSocketAddress getProxyAddress();
+        void stop();
+    }
+
+    // This is a bit hacky: HttpsProxyTunnel is an HTTPTestServer hidden
+    // behind a fake proxy that only understands CONNECT requests.
+    // The fake proxy is just a server socket that intercept the
+    // CONNECT and then redirect streams to the real server.
+    static class HttpsProxyTunnel extends DigestEchoServer
+            implements Runnable, TunnelingProxy {
+
+        final ServerSocket ss;
+        final CopyOnWriteArrayList<CompletableFuture<Void>> connectionCFs
+                = new CopyOnWriteArrayList<>();
+        volatile ProxyAuthorization authorization;
+        volatile boolean stopped;
+        public HttpsProxyTunnel(String key, HttpTestServer server, DigestEchoServer target,
+                                HttpTestHandler delegate)
+                throws IOException {
+            this(key, server, target, delegate, ServerSocketFactory.create());
+        }
+        private HttpsProxyTunnel(String key, HttpTestServer server, DigestEchoServer target,
+                                HttpTestHandler delegate, ServerSocket ss)
+                throws IOException {
+            super("HttpsProxyTunnel:" + ss.getLocalPort() + ":" + key,
+                    server, target, delegate);
+            System.out.flush();
+            System.err.println("WARNING: HttpsProxyTunnel is an experimental test class");
+            this.ss = ss;
+            start();
+        }
+
+        final void start() throws IOException {
+            Thread t = new Thread(this, "ProxyThread");
+            t.setDaemon(true);
+            t.start();
+        }
+
+        @Override
+        public Version getServerVersion() {
+            // serverImpl is not null when this proxy
+            // serves a single server. It will be null
+            // if this proxy can serve multiple servers.
+            if (serverImpl != null) return serverImpl.getVersion();
+            return null;
+        }
+
+        @Override
+        public void stop() {
+            stopped = true;
+            if (serverImpl != null) {
+                serverImpl.stop();
+            }
+            if (redirect != null) {
+                redirect.stop();
+            }
+            try {
+                ss.close();
+            } catch (IOException ex) {
+                if (DEBUG) ex.printStackTrace(System.out);
+            }
+        }
+
+
+        @Override
+        void configureAuthentication(HttpTestContext ctxt,
+                                     HttpAuthSchemeType schemeType,
+                                     HttpTestAuthenticator auth,
+                                     HttpAuthType authType) {
+            if (authType == HttpAuthType.PROXY || authType == HttpAuthType.PROXY305) {
+                authorization = new ProxyAuthorization(key, schemeType, auth);
+            } else {
+                super.configureAuthentication(ctxt, schemeType, auth, authType);
+            }
+        }
+
+        boolean authorize(StringBuilder response, String requestLine, String headers) {
+            if (authorization != null) {
+                return authorization.authorize(response, requestLine, headers);
+            }
+            response.append("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+            return true;
+        }
+
+        // Pipe the input stream to the output stream.
+        private synchronized Thread pipe(InputStream is, OutputStream os, char tag, CompletableFuture<Void> end) {
+            return new Thread("TunnelPipe("+tag+")") {
+                @Override
+                public void run() {
+                    try {
+                        try {
+                            int c;
+                            while ((c = is.read()) != -1) {
+                                os.write(c);
+                                os.flush();
+                                // if DEBUG prints a + or a - for each transferred
+                                // character.
+                                if (DEBUG) System.out.print(tag);
+                            }
+                            is.close();
+                        } finally {
+                            os.close();
+                        }
+                    } catch (IOException ex) {
+                        if (DEBUG) ex.printStackTrace(System.out);
+                    } finally {
+                        end.complete(null);
+                    }
+                }
+            };
+        }
+
+        @Override
+        public InetSocketAddress getAddress() {
+            return new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                    ss.getLocalPort());
+        }
+        @Override
+        public InetSocketAddress getProxyAddress() {
+            return getAddress();
+        }
+        @Override
+        public InetSocketAddress getServerAddress() {
+            // serverImpl can be null if this proxy can serve
+            // multiple servers.
+            if (serverImpl != null) {
+                return serverImpl.getAddress();
+            }
+            return null;
+        }
+
+
+        // This is a bit shaky. It doesn't handle continuation
+        // lines, but our client shouldn't send any.
+        // Read a line from the input stream, swallowing the final
+        // \r\n sequence. Stops at the first \n, doesn't complain
+        // if it wasn't preceded by '\r'.
+        //
+        String readLine(InputStream r) throws IOException {
+            StringBuilder b = new StringBuilder();
+            int c;
+            while ((c = r.read()) != -1) {
+                if (c == '\n') break;
+                b.appendCodePoint(c);
+            }
+            if (b.codePointAt(b.length() -1) == '\r') {
+                b.delete(b.length() -1, b.length());
+            }
+            return b.toString();
+        }
+
+        @Override
+        public void run() {
+            Socket clientConnection = null;
+            try {
+                while (!stopped) {
+                    System.out.println(now() + "Tunnel: Waiting for client");
+                    Socket toClose;
+                    try {
+                        toClose = clientConnection = ss.accept();
+                    } catch (IOException io) {
+                        if (DEBUG || !stopped) io.printStackTrace(System.out);
+                        break;
+                    }
+                    System.out.println(now() + "Tunnel: Client accepted");
+                    StringBuilder headers = new StringBuilder();
+                    Socket targetConnection = null;
+                    InputStream  ccis = clientConnection.getInputStream();
+                    OutputStream ccos = clientConnection.getOutputStream();
+                    Writer w = new OutputStreamWriter(
+                                   clientConnection.getOutputStream(), "UTF-8");
+                    PrintWriter pw = new PrintWriter(w);
+                    System.out.println(now() + "Tunnel: Reading request line");
+                    String requestLine = readLine(ccis);
+                    System.out.println(now() + "Tunnel: Request line: " + requestLine);
+                    if (requestLine.startsWith("CONNECT ")) {
+                        // We should probably check that the next word following
+                        // CONNECT is the host:port of our HTTPS serverImpl.
+                        // Some improvement for a followup!
+                        StringTokenizer tokenizer = new StringTokenizer(requestLine);
+                        String connect = tokenizer.nextToken();
+                        assert connect.equalsIgnoreCase("connect");
+                        String hostport = tokenizer.nextToken();
+                        InetSocketAddress targetAddress;
+                        try {
+                            URI uri = new URI("https", hostport, "/", null, null);
+                            int port = uri.getPort();
+                            port = port == -1 ? 443 : port;
+                            targetAddress = new InetSocketAddress(uri.getHost(), port);
+                            if (serverImpl != null) {
+                                assert targetAddress.getHostString()
+                                        .equalsIgnoreCase(serverImpl.getAddress().getHostString());
+                                assert targetAddress.getPort() == serverImpl.getAddress().getPort();
+                            }
+                        } catch (Throwable x) {
+                            System.err.printf("Bad target address: \"%s\" in \"%s\"%n",
+                                    hostport, requestLine);
+                            toClose.close();
+                            continue;
+                        }
+
+                        // Read all headers until we find the empty line that
+                        // signals the end of all headers.
+                        String line = requestLine;
+                        while(!line.equals("")) {
+                            System.out.println(now() + "Tunnel: Reading header: "
+                                               + (line = readLine(ccis)));
+                            headers.append(line).append("\r\n");
+                        }
+
+                        StringBuilder response = new StringBuilder();
+                        final boolean authorize = authorize(response, requestLine, headers.toString());
+                        if (!authorize) {
+                            System.out.println(now() + "Tunnel: Sending "
+                                    + response);
+                            // send the 407 response
+                            pw.print(response.toString());
+                            pw.flush();
+                            toClose.close();
+                            continue;
+                        }
+                        System.out.println(now()
+                                + "Tunnel connecting to target server at "
+                                + targetAddress.getAddress() + ":" + targetAddress.getPort());
+                        targetConnection = new Socket(
+                                targetAddress.getAddress(),
+                                targetAddress.getPort());
+
+                        // Then send the 200 OK response to the client
+                        System.out.println(now() + "Tunnel: Sending "
+                                           + response);
+                        pw.print(response);
+                        pw.flush();
+                    } else {
+                        // This should not happen. If it does then just print an
+                        // error - both on out and err, and close the accepted
+                        // socket
+                        System.out.println("WARNING: Tunnel: Unexpected status line: "
+                                + requestLine + " received by "
+                                + ss.getLocalSocketAddress()
+                                + " from "
+                                + toClose.getRemoteSocketAddress()
+                                + " - closing accepted socket");
+                        // Print on err
+                        System.err.println("WARNING: Tunnel: Unexpected status line: "
+                                             + requestLine + " received by "
+                                           + ss.getLocalSocketAddress()
+                                           + " from "
+                                           + toClose.getRemoteSocketAddress());
+                        // close accepted socket.
+                        toClose.close();
+                        System.err.println("Tunnel: accepted socket closed.");
+                        continue;
+                    }
+
+                    // Pipe the input stream of the client connection to the
+                    // output stream of the target connection and conversely.
+                    // Now the client and target will just talk to each other.
+                    System.out.println(now() + "Tunnel: Starting tunnel pipes");
+                    CompletableFuture<Void> end, end1, end2;
+                    Thread t1 = pipe(ccis, targetConnection.getOutputStream(), '+',
+                            end1 = new CompletableFuture<>());
+                    Thread t2 = pipe(targetConnection.getInputStream(), ccos, '-',
+                            end2 = new CompletableFuture<>());
+                    end = CompletableFuture.allOf(end1, end2);
+                    end.whenComplete(
+                            (r,t) -> {
+                                try { toClose.close(); } catch (IOException x) { }
+                                finally {connectionCFs.remove(end);}
+                            });
+                    connectionCFs.add(end);
+                    t1.start();
+                    t2.start();
+                }
+            } catch (Throwable ex) {
+                try {
+                    ss.close();
+                } catch (IOException ex1) {
+                    ex.addSuppressed(ex1);
+                }
+                ex.printStackTrace(System.err);
+            } finally {
+                System.out.println(now() + "Tunnel: exiting (stopped=" + stopped + ")");
+                connectionCFs.forEach(cf -> cf.complete(null));
+            }
+        }
+    }
+
+    /**
+     * Creates a TunnelingProxy that can serve multiple servers.
+     * The server address is extracted from the CONNECT request line.
+     * @param authScheme The authentication scheme supported by the proxy.
+     *                   Typically one of DIGEST, BASIC, NONE.
+     * @return A new TunnelingProxy able to serve multiple servers.
+     * @throws IOException If the proxy could not be created.
+     */
+    public static TunnelingProxy createHttpsProxyTunnel(HttpAuthSchemeType authScheme)
+            throws IOException {
+        HttpsProxyTunnel result = new HttpsProxyTunnel("", null, null, null);
+        if (authScheme != HttpAuthSchemeType.NONE) {
+            result.configureAuthentication(null,
+                                           authScheme,
+                                           AUTHENTICATOR,
+                                           HttpAuthType.PROXY);
+        }
+        return result;
+    }
+
+    private static String protocol(String protocol) {
+        if ("http".equalsIgnoreCase(protocol)) return "http";
+        else if ("https".equalsIgnoreCase(protocol)) return "https";
+        else throw new InternalError("Unsupported protocol: " + protocol);
+    }
+
+    public static URL url(String protocol, InetSocketAddress address,
+                          String path) throws MalformedURLException {
+        return new URL(protocol(protocol),
+                address.getHostString(),
+                address.getPort(), path);
+    }
+
+    public static URI uri(String protocol, InetSocketAddress address,
+                          String path) throws URISyntaxException {
+        return new URI(protocol(protocol) + "://" +
+                address.getHostString() + ":" +
+                address.getPort() + path);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/EchoHandler.java b/test/jdk/java/net/httpclient/EchoHandler.java
index 2fb3a9a1acc..bb4fe5a98dc 100644
--- a/test/jdk/java/net/httpclient/EchoHandler.java
+++ b/test/jdk/java/net/httpclient/EchoHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
 
 import com.sun.net.httpserver.*;
 import java.net.*;
-import jdk.incubator.http.*;
+import java.net.http.*;
 import java.io.*;
 import java.util.concurrent.*;
 import javax.net.ssl.*;
@@ -33,8 +33,8 @@
 import java.util.List;
 import java.util.Random;
 import jdk.testlibrary.SimpleSSLContext;
-import static jdk.incubator.http.HttpRequest.*;
-import static jdk.incubator.http.HttpResponse.*;
+import static java.net.http.HttpRequest.*;
+import static java.net.http.HttpResponse.*;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/test/jdk/java/net/httpclient/EncodedCharsInURI.java b/test/jdk/java/net/httpclient/EncodedCharsInURI.java
new file mode 100644
index 00000000000..9ab34f26c18
--- /dev/null
+++ b/test/jdk/java/net/httpclient/EncodedCharsInURI.java
@@ -0,0 +1,518 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8199683
+ * @summary Tests that escaped characters in URI are correctly
+ *          handled (not re-escaped and not unescaped)
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters EncodedCharsInURI
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm
+ *        -Djdk.httpclient.HttpClient.log=headers EncodedCharsInURI
+ */
+//*        -Djdk.internal.httpclient.debug=true
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublisher;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Locale;
+import java.util.StringTokenizer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static java.lang.String.format;
+import static java.lang.System.in;
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class EncodedCharsInURI implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;   // HTTPS/1.1
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    DummyServer    httpDummyServer;    // HTTP/1.1    [ 2 servers ]
+    DummyServer    httpsDummyServer;   // HTTPS/1.1
+    String httpURI_fixed;
+    String httpURI_chunk;
+    String httpsURI_fixed;
+    String httpsURI_chunk;
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+    String httpDummy;
+    String httpsDummy;
+
+    static final int ITERATION_COUNT = 1;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+    static volatile boolean tasksFailed;
+    static final AtomicLong serverCount = new AtomicLong();
+    static final AtomicLong clientCount = new AtomicLong();
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    private volatile HttpClient sharedClient;
+
+    static class TestExecutor implements Executor {
+        final AtomicLong tasks = new AtomicLong();
+        Executor executor;
+        TestExecutor(Executor executor) {
+            this.executor = executor;
+        }
+
+        @Override
+        public void execute(Runnable command) {
+            long id = tasks.incrementAndGet();
+            executor.execute(() -> {
+                try {
+                    command.run();
+                } catch (Throwable t) {
+                    tasksFailed = true;
+                    System.out.printf(now() + "Task %s failed: %s%n", id, t);
+                    System.err.printf(now() + "Task %s failed: %s%n", id, t);
+                    FAILURES.putIfAbsent("Task " + id, t);
+                    throw t;
+                }
+            });
+        }
+    }
+
+    @AfterClass
+    static final void printFailedTests() {
+        out.println("\n=========================");
+        try {
+            out.printf("%n%sCreated %d servers and %d clients%n",
+                    now(), serverCount.get(), clientCount.get());
+            if (FAILURES.isEmpty()) return;
+            out.println("Failed tests: ");
+            FAILURES.entrySet().forEach((e) -> {
+                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+                e.getValue().printStackTrace(out);
+            });
+            if (tasksFailed) {
+                System.out.println("WARNING: Some tasks failed");
+            }
+        } finally {
+            out.println("\n=========================\n");
+        }
+    }
+
+    private String[] uris() {
+        return new String[] {
+                httpDummy,
+                httpsDummy,
+                httpURI_fixed,
+                httpURI_chunk,
+                httpsURI_fixed,
+                httpsURI_chunk,
+                http2URI_fixed,
+                http2URI_chunk,
+                https2URI_fixed,
+                https2URI_chunk,
+        };
+    }
+
+    @DataProvider(name = "noThrows")
+    public Object[][] noThrows() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2][];
+        //Object[][] result = new Object[uris.length][];
+        int i = 0;
+        for (boolean sameClient : List.of(false, true)) {
+            //if (!sameClient) continue;
+            for (String uri: uris()) {
+                result[i++] = new Object[] {uri, sameClient};
+            }
+        }
+        assert i == uris.length * 2;
+        // assert i == uris.length ;
+        return result;
+    }
+
+    private HttpClient makeNewClient() {
+        clientCount.incrementAndGet();
+        return HttpClient.newBuilder()
+                .executor(executor)
+                .proxy(NO_PROXY)
+                .sslContext(sslContext)
+                .build();
+    }
+
+    HttpClient newHttpClient(boolean share) {
+        if (!share) return makeNewClient();
+        HttpClient shared = sharedClient;
+        if (shared != null) return shared;
+        synchronized (this) {
+            shared = sharedClient;
+            if (shared == null) {
+                shared = sharedClient = makeNewClient();
+            }
+            return shared;
+        }
+    }
+
+    final String ENCODED = "/01%252F03/";
+
+    @Test(dataProvider = "noThrows")
+    public void testEncodedChars(String uri, boolean sameClient)
+            throws Exception {
+        HttpClient client = null;
+        out.printf("%n%s testEncodedChars(%s, %b)%n", now(), uri, sameClient);
+        uri = uri + ENCODED;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            BodyPublisher bodyPublisher = BodyPublishers.ofString(uri);
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .POST(bodyPublisher)
+                    .build();
+            BodyHandler<String> handler = BodyHandlers.ofString();
+            CompletableFuture<HttpResponse<String>> responseCF = client.sendAsync(req, handler);
+            HttpResponse<String> response = responseCF.join();
+            String body = response.body();
+            if (!uri.contains(body)) {
+                System.err.println("Test failed: " + response);
+                throw new RuntimeException(uri + " doesn't contain '" + body + "'");
+            } else {
+                System.out.println("Found expected " + body + " in " + uri);
+            }
+        }
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/1.1
+        HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h1_chunkHandler = new HTTP_ChunkedHandler();
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(h1_fixedLengthHandler, "/http1/fixed");
+        httpTestServer.addHandler(h1_chunkHandler, "/http1/chunk");
+        httpURI_fixed = "http://" + httpTestServer.serverAuthority() + "/http1/fixed/x";
+        httpURI_chunk = "http://" + httpTestServer.serverAuthority() + "/http1/chunk/x";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
+        httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
+        httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed/x";
+        httpsURI_chunk = "https://" + httpsTestServer.serverAuthority() + "/https1/chunk/x";
+
+        // HTTP/2
+        HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed/x";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk/x";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/x";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk/x";
+
+        // DummyServer
+        httpDummyServer = DummyServer.create(sa);
+        httpsDummyServer = DummyServer.create(sa, sslContext);
+        httpDummy = "http://" + httpDummyServer.serverAuthority() + "/http1/dummy/x";
+        httpsDummy = "https://" + httpsDummyServer.serverAuthority() + "/https1/dummy/x";
+
+
+        serverCount.addAndGet(6);
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+        httpDummyServer.start();
+        httpsDummyServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        sharedClient = null;
+        httpTestServer.stop();
+        httpsTestServer.stop();
+        http2TestServer.stop();
+        https2TestServer.stop();
+        httpDummyServer.stopServer();
+        httpsDummyServer.stopServer();
+    }
+
+    static class HTTP_FixedLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+            byte[] req;
+            try (InputStream is = t.getRequestBody()) {
+                req = is.readAllBytes();
+            }
+            String uri = new String(req, UTF_8);
+            byte[] resp = t.getRequestURI().toString().getBytes(UTF_8);
+            if (!uri.contains(t.getRequestURI().toString())) {
+                t.sendResponseHeaders(404, resp.length);
+            } else {
+                t.sendResponseHeaders(200, resp.length);  //fixed content length
+            }
+            try (OutputStream os = t.getResponseBody()) {
+                os.write(resp);
+            }
+        }
+    }
+
+    static class HTTP_ChunkedHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_ChunkedHandler received request to " + t.getRequestURI());
+            byte[] resp;
+            try (InputStream is = t.getRequestBody()) {
+                resp = is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, -1); // chunked/variable
+            try (OutputStream os = t.getResponseBody()) {
+                os.write(resp);
+            }
+        }
+    }
+
+    static class DummyServer extends Thread {
+        final ServerSocket ss;
+        final boolean secure;
+        ConcurrentLinkedQueue<Socket> connections = new ConcurrentLinkedQueue<>();
+        volatile boolean stopped;
+        DummyServer(ServerSocket ss, boolean secure) {
+            super("DummyServer[" + ss.getLocalPort()+"]");
+            this.secure = secure;
+            this.ss = ss;
+        }
+
+        // This is a bit shaky. It doesn't handle continuation
+        // lines, but our client shouldn't send any.
+        // Read a line from the input stream, swallowing the final
+        // \r\n sequence. Stops at the first \n, doesn't complain
+        // if it wasn't preceded by '\r'.
+        //
+        String readLine(InputStream r) throws IOException {
+            StringBuilder b = new StringBuilder();
+            int c;
+            while ((c = r.read()) != -1) {
+                if (c == '\n') break;
+                b.appendCodePoint(c);
+            }
+            if (b.codePointAt(b.length() -1) == '\r') {
+                b.delete(b.length() -1, b.length());
+            }
+            return b.toString();
+        }
+
+        @Override
+        public void run() {
+            try {
+                while(!stopped) {
+                    Socket clientConnection = ss.accept();
+                    connections.add(clientConnection);
+                    System.out.println(now() + getName() + ": Client accepted");
+                    StringBuilder headers = new StringBuilder();
+                    Socket targetConnection = null;
+                    InputStream  ccis = clientConnection.getInputStream();
+                    OutputStream ccos = clientConnection.getOutputStream();
+                    Writer w = new OutputStreamWriter(
+                            clientConnection.getOutputStream(), "UTF-8");
+                    PrintWriter pw = new PrintWriter(w);
+                    System.out.println(now() + getName() + ": Reading request line");
+                    String requestLine = readLine(ccis);
+                    System.out.println(now() + getName() + ": Request line: " + requestLine);
+
+                    StringTokenizer tokenizer = new StringTokenizer(requestLine);
+                    String method = tokenizer.nextToken();
+                    assert method.equalsIgnoreCase("POST") || method.equalsIgnoreCase("GET");
+                    String path = tokenizer.nextToken();
+                    URI uri;
+                    try {
+                        String hostport = serverAuthority();
+                        uri = new URI((secure ? "https" : "http") +"://" + hostport + path);
+                    } catch (Throwable x) {
+                        System.err.printf("Bad target address: \"%s\" in \"%s\"%n",
+                                path, requestLine);
+                        clientConnection.close();
+                        continue;
+                    }
+
+                    // Read all headers until we find the empty line that
+                    // signals the end of all headers.
+                    String line = requestLine;
+                    while (!line.equals("")) {
+                        System.out.println(now() + getName() + ": Reading header: "
+                                + (line = readLine(ccis)));
+                        headers.append(line).append("\r\n");
+                    }
+
+                    StringBuilder response = new StringBuilder();
+
+                    int index = headers.toString()
+                            .toLowerCase(Locale.US)
+                            .indexOf("content-length: ");
+                    byte[] b = uri.toString().getBytes(UTF_8);
+                    if (index >= 0) {
+                        index = index + "content-length: ".length();
+                        String cl = headers.toString().substring(index);
+                        StringTokenizer tk = new StringTokenizer(cl);
+                        int len = Integer.parseInt(tk.nextToken());
+                        assert len < b.length * 2;
+                        System.out.println(now() + getName()
+                                + ": received body: "
+                                + new String(ccis.readNBytes(len), UTF_8));
+                    }
+                    System.out.println(now()
+                            + getName() + ": sending back " + uri);
+
+                    response.append("HTTP/1.1 200 OK\r\nContent-Length: ")
+                            .append(b.length)
+                            .append("\r\n\r\n");
+
+                    // Then send the 200 OK response to the client
+                    System.out.println(now() + getName() + ": Sending "
+                            + response);
+                    pw.print(response);
+                    pw.flush();
+                    ccos.write(b);
+                    ccos.flush();
+                    ccos.close();
+                    connections.remove(clientConnection);
+                    clientConnection.close();
+                }
+            } catch (Throwable t) {
+                if (!stopped) {
+                    System.out.println(now() + getName() + ": failed: " + t);
+                    t.printStackTrace();
+                    try {
+                        stopServer();
+                    } catch (Throwable e) {
+
+                    }
+                }
+            } finally {
+                System.out.println(now() + getName() + ": exiting");
+            }
+        }
+
+        void close(Socket s) {
+            try {
+                s.close();
+            } catch(Throwable t) {
+
+            }
+        }
+        public void stopServer() throws IOException {
+            stopped = true;
+            ss.close();
+            connections.forEach(this::close);
+        }
+
+        public String serverAuthority() {
+            return InetAddress.getLoopbackAddress().getHostName() + ":"
+                    + ss.getLocalPort();
+        }
+
+        static DummyServer create(InetSocketAddress sa) throws IOException {
+            ServerSocket ss = ServerSocketFactory.getDefault()
+                    .createServerSocket(sa.getPort(), -1, sa.getAddress());
+            return  new DummyServer(ss, false);
+        }
+
+        static DummyServer create(InetSocketAddress sa, SSLContext sslContext) throws IOException {
+            ServerSocket ss = sslContext.getServerSocketFactory()
+                    .createServerSocket(sa.getPort(), -1, sa.getAddress());
+            return new DummyServer(ss, true);
+        }
+
+
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/EscapedOctetsInURI.java b/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
new file mode 100644
index 00000000000..a82ca0acffc
--- /dev/null
+++ b/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Preserve URI component escaped octets when converting to HTTP headers
+ * @bug 8198716
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          jdk.httpserver
+ * @library /lib/testlibrary http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm
+ *       -Djdk.httpclient.HttpClient.log=reqeusts,headers
+ *       EscapedOctetsInURI
+ */
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import javax.net.ssl.SSLContext;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static org.testng.Assert.assertEquals;
+
+public class EscapedOctetsInURI {
+
+    SSLContext sslContext;
+    HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    HttpsServer httpsTestServer;       // HTTPS/1.1
+    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI;
+    String httpsURI;
+    String http2URI;
+    String https2URI;
+
+    static final String[][] pathsAndQueryStrings = new String[][] {
+        // partial-path       URI query
+        {  "/001/noSpace", "?noQuotedOctets" },
+        {  "/002/noSpace", "?name=chegar,address=Dublin%20Ireland", },
+        {  "/003/noSpace", "?target=http%3A%2F%2Fwww.w3.org%2Fns%2Foa%23hasBody" },
+
+        {  "/010/with%20space", "?noQuotedOctets" },
+        {  "/011/with%20space", "?name=chegar,address=Dublin%20Ireland" },
+        {  "/012/with%20space", "?target=http%3A%2F%2Fwww.w3.org%2Fns%2Foa%23hasBody" },
+    };
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        List<Object[]> list = new ArrayList<>();
+
+        for (boolean sameClient : new boolean[] { false, true }) {
+            Arrays.asList(pathsAndQueryStrings).stream()
+                    .map(e -> new Object[] {httpURI + e[0] + e[1], sameClient})
+                    .forEach(list::add);
+            Arrays.asList(pathsAndQueryStrings).stream()
+                    .map(e -> new Object[] {httpsURI + e[0] + e[1], sameClient})
+                    .forEach(list::add);
+            Arrays.asList(pathsAndQueryStrings).stream()
+                    .map(e -> new Object[] {http2URI + e[0] + e[1], sameClient})
+                    .forEach(list::add);
+            Arrays.asList(pathsAndQueryStrings).stream()
+                    .map(e -> new Object[] {https2URI + e[0] + e[1], sameClient})
+                    .forEach(list::add);
+        }
+        return list.stream().toArray(Object[][]::new);
+    }
+
+    static final int ITERATION_COUNT = 3; // checks upgrade and re-use
+
+    @Test(dataProvider = "variants")
+    void test(String uriString, boolean sameClient) throws Exception {
+        // The single-argument factory requires any illegal characters in its
+        // argument to be quoted and preserves any escaped octets and other
+        // characters that are present.
+        URI uri = URI.create(uriString);
+
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = HttpClient.newBuilder()
+                        .proxy(NO_PROXY)
+                        .sslContext(sslContext)
+                        .build();
+
+            HttpRequest request = HttpRequest.newBuilder(uri).build();
+            HttpResponse<String> resp = client.send(request, BodyHandlers.ofString());
+
+            out.println("Got response: " + resp);
+            out.println("Got body: " + resp.body());
+            assertEquals(resp.statusCode(), 200,
+                    "Expected 200, got:" + resp.statusCode());
+
+            // the response body should contain the exact escaped request URI
+            URI retrievedURI = URI.create(resp.body());
+            assertEquals(retrievedURI.getRawPath(),  uri.getRawPath());
+            assertEquals(retrievedURI.getRawQuery(), uri.getRawQuery());
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    void testAsync(String uriString, boolean sameClient) {
+        URI uri = URI.create(uriString);
+
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = HttpClient.newBuilder()
+                        .proxy(NO_PROXY)
+                        .sslContext(sslContext)
+                        .build();
+
+            HttpRequest request = HttpRequest.newBuilder(uri).build();
+
+            client.sendAsync(request, BodyHandlers.ofString())
+                  .thenApply(response -> {
+                      out.println("Got response: " + response);
+                      out.println("Got body: " + response.body());
+                      assertEquals(response.statusCode(), 200);
+                      return response.body(); })
+                  .thenApply(body -> URI.create(body))
+                  .thenAccept(retrievedURI -> {
+                      // the body should contain the exact escaped request URI
+                      assertEquals(retrievedURI.getRawPath(), uri.getRawPath());
+                      assertEquals(retrievedURI.getRawQuery(), uri.getRawQuery()); })
+                  .join();
+        }
+    }
+
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpServer.create(sa, 0);
+        httpTestServer.createContext("/http1", new Http1ASCIIUriStringHandler());
+        httpURI = "http://" + serverAuthority(httpTestServer) + "/http1";
+
+        httpsTestServer = HttpsServer.create(sa, 0);
+        httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer.createContext("/https1", new Http1ASCIIUriStringHandler());
+        httpsURI = "https://" + serverAuthority(httpsTestServer) + "/https1";
+
+        http2TestServer = new Http2TestServer("localhost", false, 0);
+        http2TestServer.addHandler(new HttpASCIIUriStringHandler(), "/http2");
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2";
+
+        https2TestServer = new Http2TestServer("localhost", true, 0);
+        https2TestServer.addHandler(new HttpASCIIUriStringHandler(), "/https2");
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop(0);
+        httpsTestServer.stop(0);
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    /** A handler that returns as its body the exact escaped request URI. */
+    static class Http1ASCIIUriStringHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            String asciiUriString = t.getRequestURI().toASCIIString();
+            out.println("Http1ASCIIUriString received, asciiUriString: " + asciiUriString);
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                is.readAllBytes();
+                byte[] bytes = asciiUriString.getBytes(US_ASCII);
+                t.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+    }
+
+    /** A handler that returns as its body the exact escaped request URI. */
+    static class HttpASCIIUriStringHandler implements Http2Handler {
+        @Override
+        public void handle(Http2TestExchange t) throws IOException {
+            String asciiUriString = t.getRequestURI().toASCIIString();
+            out.println("Http2ASCIIUriString received, asciiUriString: " + asciiUriString);
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                is.readAllBytes();
+                byte[] bytes = asciiUriString.getBytes(US_ASCII);
+                t.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/ExpectContinue.java b/test/jdk/java/net/httpclient/ExpectContinue.java
new file mode 100644
index 00000000000..8715b4b10fe
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ExpectContinue.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Basic test for Expect 100-Continue ( HTTP/1.1 only )
+ * @modules java.net.http
+ *          jdk.httpserver
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm ExpectContinue
+ */
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.List;
+import javax.net.ssl.SSLContext;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static org.testng.Assert.assertEquals;
+
+public class ExpectContinue {
+
+    SSLContext sslContext;
+    HttpServer httpTestServer;         // HTTP/1.1    [ 2 servers ]
+    HttpsServer httpsTestServer;       // HTTPS/1.1
+    String httpURI;
+    String httpsURI;
+
+    @DataProvider(name = "positive")
+    public Object[][] positive() {
+        return new Object[][] {
+                { httpURI,  false, "Billy" },
+                { httpURI,  false, "Bob"   },
+                { httpURI,  true,  "Jimmy" },
+                { httpsURI, true,  "Jack"  },
+        };
+    }
+
+    @Test(dataProvider = "positive")
+    void test(String uriString, boolean expectedContinue, String data)
+        throws Exception
+    {
+        out.printf("test(%s, %s, %s): starting%n", uriString, expectedContinue, data);
+        HttpClient client = HttpClient.newBuilder()
+                .sslContext(sslContext)
+                .build();
+
+        URI uri = URI.create(uriString);
+        HttpRequest request = HttpRequest.newBuilder(uri)
+                .expectContinue(expectedContinue)
+                .POST(BodyPublishers.ofString(data))
+                .build();
+
+        HttpResponse<String> response = client.send(request,
+                                                    BodyHandlers.ofString());
+        System.out.println("First response: " + response);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(response.body(), data);
+
+        // again with the same request, to ensure no Expect header duplication
+        response = client.send(request, BodyHandlers.ofString());
+        System.out.println("Second response: " + response);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(response.body(), data);
+    }
+
+    @Test(dataProvider = "positive")
+    void testAsync(String uriString, boolean expectedContinue, String data) {
+        out.printf("test(%s, %s, %s): starting%n", uriString, expectedContinue, data);
+        HttpClient client = HttpClient.newBuilder()
+                .sslContext(sslContext)
+                .build();
+
+        URI uri = URI.create(uriString);
+        HttpRequest request = HttpRequest.newBuilder(uri)
+                .expectContinue(expectedContinue)
+                .POST(BodyPublishers.ofString(data))
+                .build();
+
+        HttpResponse<String> response = client.sendAsync(request,
+                BodyHandlers.ofString()).join();
+        System.out.println("First response: " + response);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(response.body(), data);
+
+        // again with the same request, to ensure no Expect header duplication
+        response = client.sendAsync(request, BodyHandlers.ofString()).join();
+        System.out.println("Second response: " + response);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(response.body(), data);
+    }
+
+    // -- Infrastructure
+
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpServer.create(sa, 0);
+        httpTestServer.createContext("/http1/ec", new Http1ExpectContinueHandler());
+        httpURI = "http://" + serverAuthority(httpTestServer) + "/http1/ec";
+
+        httpsTestServer = HttpsServer.create(sa, 0);
+        httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer.createContext("/https1/ec", new Http1ExpectContinueHandler());
+        httpsURI = "https://" + serverAuthority(httpsTestServer) + "/https1/ec";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop(0);
+        httpsTestServer.stop(0);
+    }
+
+    static class Http1ExpectContinueHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                byte[] bytes = is.readAllBytes();
+
+                List<String> expect = t.getRequestHeaders().get("Expect");
+                if (expect != null && expect.size() != 1) {
+                    System.out.println("Server: Expect: " + expect);
+                    Throwable ex = new AssertionError("Expect: " + expect);
+                    ex.printStackTrace();
+                    t.sendResponseHeaders(500, 0);
+                } else {
+                    t.sendResponseHeaders(200, bytes.length);
+                    os.write(bytes);
+                }
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
index 97a015400df..1d6aba7eb04 100644
--- a/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
+++ b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -39,9 +40,9 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import jdk.testlibrary.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -50,8 +51,8 @@
 import javax.net.ssl.SSLContext;
 import static java.util.stream.Collectors.joining;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromPublisher;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static java.net.http.HttpRequest.BodyPublishers.fromPublisher;
+import static java.net.http.HttpResponse.BodyHandlers.ofString;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
@@ -61,9 +62,9 @@
  * @test
  * @summary Basic tests for Flow adapter Publishers
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary http2/server
@@ -119,7 +120,7 @@ void testByteBufferPublisherUnknownLength(String url) {
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
                 .POST(fromPublisher(new BBPublisher(body))).build();
 
-        HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+        HttpResponse<String> response = client.sendAsync(request, ofString(UTF_8)).join();
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -135,7 +136,7 @@ void testByteBufferPublisherFixedLength(String url) {
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
                 .POST(fromPublisher(new BBPublisher(body), cl)).build();
 
-        HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+        HttpResponse<String> response = client.sendAsync(request, ofString(UTF_8)).join();
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -152,7 +153,7 @@ void testMappedByteBufferPublisherUnknownLength(String url) {
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
                 .POST(fromPublisher(new MBBPublisher(body))).build();
 
-        HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+        HttpResponse<String> response = client.sendAsync(request, ofString(UTF_8)).join();
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -168,7 +169,7 @@ void testMappedByteBufferPublisherFixedLength(String url) {
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
                 .POST(fromPublisher(new MBBPublisher(body), cl)).build();
 
-        HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+        HttpResponse<String> response = client.sendAsync(request, ofString(UTF_8)).join();
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -189,11 +190,10 @@ void testPublishTooFew(String url) throws InterruptedException {
                 .POST(fromPublisher(new BBPublisher(body), cl)).build();
 
         try {
-            HttpResponse<String> response = client.send(request, asString(UTF_8));
+            HttpResponse<String> response = client.send(request, ofString(UTF_8));
             fail("Unexpected response: " + response);
         } catch (IOException expected) {
-            assertTrue(expected.getMessage().contains("Too few bytes returned"),
-                       "Exception message:[" + expected.toString() + "]");
+            assertMessage(expected, "Too few bytes returned");
         }
     }
 
@@ -207,11 +207,17 @@ void testPublishTooMany(String url) throws InterruptedException {
                 .POST(fromPublisher(new BBPublisher(body), cl)).build();
 
         try {
-            HttpResponse<String> response = client.send(request, asString(UTF_8));
+            HttpResponse<String> response = client.send(request, ofString(UTF_8));
             fail("Unexpected response: " + response);
         } catch (IOException expected) {
-            assertTrue(expected.getMessage().contains("Too many bytes in request body"),
-                    "Exception message:[" + expected.toString() + "]");
+            assertMessage(expected, "Too many bytes in request body");
+        }
+    }
+
+    private void assertMessage(Throwable t, String contains) {
+        if (!t.getMessage().contains(contains)) {
+            String error = "Exception message:[" + t.toString() + "] doesn't contain [" + contains + "]";
+            throw new AssertionError(error, t);
         }
     }
 
@@ -328,31 +334,34 @@ public void cancel() {
         }
     }
 
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
     @BeforeTest
     public void setup() throws Exception {
         sslContext = new SimpleSSLContext().get();
         if (sslContext == null)
             throw new AssertionError("Unexpected null sslContext");
 
-        InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(),0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/echo", new Http1EchoHandler());
-        httpURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/echo";
+        httpURI = "http://" + serverAuthority(httpTestServer) + "/http1/echo";
 
         httpsTestServer = HttpsServer.create(sa, 0);
         httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
         httpsTestServer.createContext("/https1/echo", new Http1EchoHandler());
-        httpsURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/echo";
+        httpsURI = "https://" + serverAuthority(httpsTestServer) + "/https1/echo";
 
-        http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+        http2TestServer = new Http2TestServer("localhost", false, 0);
         http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
-        int port = http2TestServer.getAddress().getPort();
-        http2URI = "http://127.0.0.1:" + port + "/http2/echo";
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/echo";
 
-        https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+        https2TestServer = new Http2TestServer("localhost", true, 0);
         https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
-        port = https2TestServer.getAddress().getPort();
-        https2URI = "https://127.0.0.1:" + port + "/https2/echo";
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/echo";
 
         httpTestServer.start();
         httpsTestServer.start();
diff --git a/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
index 73fbb54758a..e0a5aaad585 100644
--- a/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
+++ b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
@@ -26,11 +26,13 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
 import java.util.function.Function;
@@ -40,11 +42,12 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscribers;
 import jdk.testlibrary.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -52,7 +55,6 @@
 import org.testng.annotations.Test;
 import javax.net.ssl.SSLContext;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
@@ -61,15 +63,15 @@
  * @test
  * @summary Basic tests for Flow adapter Subscribers
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary http2/server
  * @build Http2TestServer
  * @build jdk.testlibrary.SimpleSSLContext
- * @run testng/othervm FlowAdapterSubscriberTest
+ * @run testng/othervm -Djdk.internal.httpclient.debug=true FlowAdapterSubscriberTest
  */
 
 public class FlowAdapterSubscriberTest {
@@ -83,6 +85,14 @@ public class FlowAdapterSubscriberTest {
     String httpsURI;
     String http2URI;
     String https2URI;
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
 
     @DataProvider(name = "uris")
     public Object[][] variants() {
@@ -98,17 +108,18 @@ public Object[][] variants() {
 
     @Test
     public void testNull() {
-        assertThrows(NPE, () -> BodyHandler.fromSubscriber(null));
-        assertThrows(NPE, () -> BodyHandler.fromSubscriber(null, Function.identity()));
-        assertThrows(NPE, () -> BodyHandler.fromSubscriber(new ListSubscriber(), null));
-        assertThrows(NPE, () -> BodyHandler.fromSubscriber(null, null));
-
-        assertThrows(NPE, () -> BodySubscriber.fromSubscriber(null));
-        assertThrows(NPE, () -> BodySubscriber.fromSubscriber(null, Function.identity()));
-        assertThrows(NPE, () -> BodySubscriber.fromSubscriber(new ListSubscriber(), null));
-        assertThrows(NPE, () -> BodySubscriber.fromSubscriber(null, null));
-
-        Subscriber subscriber = BodySubscriber.fromSubscriber(new ListSubscriber());
+        System.out.printf(now() + "testNull() starting%n");
+        assertThrows(NPE, () -> BodyHandlers.fromSubscriber(null));
+        assertThrows(NPE, () -> BodyHandlers.fromSubscriber(null, Function.identity()));
+        assertThrows(NPE, () -> BodyHandlers.fromSubscriber(new ListSubscriber(), null));
+        assertThrows(NPE, () -> BodyHandlers.fromSubscriber(null, null));
+
+        assertThrows(NPE, () -> BodySubscribers.fromSubscriber(null));
+        assertThrows(NPE, () -> BodySubscribers.fromSubscriber(null, Function.identity()));
+        assertThrows(NPE, () -> BodySubscribers.fromSubscriber(new ListSubscriber(), null));
+        assertThrows(NPE, () -> BodySubscribers.fromSubscriber(null, null));
+
+        Subscriber subscriber = BodySubscribers.fromSubscriber(new ListSubscriber());
         assertThrows(NPE, () -> subscriber.onSubscribe(null));
         assertThrows(NPE, () -> subscriber.onNext(null));
         assertThrows(NPE, () -> subscriber.onError(null));
@@ -118,13 +129,14 @@ public void testNull() {
 
     @Test(dataProvider = "uris")
     void testListWithFinisher(String url) {
+        System.out.printf(now() + "testListWithFinisher(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("May the luck of the Irish be with you!")).build();
+                .POST(BodyPublishers.ofString("May the luck of the Irish be with you!")).build();
 
         ListSubscriber subscriber = new ListSubscriber();
         HttpResponse<String> response = client.sendAsync(request,
-                BodyHandler.fromSubscriber(subscriber, Supplier::get)).join();
+                BodyHandlers.fromSubscriber(subscriber, Supplier::get)).join();
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -133,13 +145,14 @@ void testListWithFinisher(String url) {
 
     @Test(dataProvider = "uris")
     void testListWithoutFinisher(String url) {
+        System.out.printf(now() + "testListWithoutFinisher(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("May the luck of the Irish be with you!")).build();
+                .POST(BodyPublishers.ofString("May the luck of the Irish be with you!")).build();
 
         ListSubscriber subscriber = new ListSubscriber();
         HttpResponse<Void> response = client.sendAsync(request,
-                BodyHandler.fromSubscriber(subscriber)).join();
+                BodyHandlers.fromSubscriber(subscriber)).join();
         String text = subscriber.get();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -148,13 +161,14 @@ void testListWithoutFinisher(String url) {
 
     @Test(dataProvider = "uris")
     void testListWithFinisherBlocking(String url) throws Exception {
+        System.out.printf(now() + "testListWithFinisherBlocking(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("May the luck of the Irish be with you!")).build();
+                .POST(BodyPublishers.ofString("May the luck of the Irish be with you!")).build();
 
         ListSubscriber subscriber = new ListSubscriber();
         HttpResponse<String> response = client.send(request,
-                BodyHandler.fromSubscriber(subscriber, Supplier::get));
+                BodyHandlers.fromSubscriber(subscriber, Supplier::get));
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -163,13 +177,14 @@ void testListWithFinisherBlocking(String url) throws Exception {
 
     @Test(dataProvider = "uris")
     void testListWithoutFinisherBlocking(String url) throws Exception {
+        System.out.printf(now() + "testListWithoutFinisherBlocking(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("May the luck of the Irish be with you!")).build();
+                .POST(BodyPublishers.ofString("May the luck of the Irish be with you!")).build();
 
         ListSubscriber subscriber = new ListSubscriber();
         HttpResponse<Void> response = client.send(request,
-                BodyHandler.fromSubscriber(subscriber));
+                BodyHandlers.fromSubscriber(subscriber));
         String text = subscriber.get();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -180,13 +195,14 @@ void testListWithoutFinisherBlocking(String url) throws Exception {
 
     @Test(dataProvider = "uris")
     void testCollectionWithFinisher(String url) {
+        System.out.printf(now() + "testCollectionWithFinisher(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("What's the craic?")).build();
+                .POST(BodyPublishers.ofString("What's the craic?")).build();
 
         CollectionSubscriber subscriber = new CollectionSubscriber();
         HttpResponse<String> response = client.sendAsync(request,
-                BodyHandler.fromSubscriber(subscriber, CollectionSubscriber::get)).join();
+                BodyHandlers.fromSubscriber(subscriber, CollectionSubscriber::get)).join();
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -195,13 +211,14 @@ void testCollectionWithFinisher(String url) {
 
     @Test(dataProvider = "uris")
     void testCollectionWithoutFinisher(String url) {
+        System.out.printf(now() + "testCollectionWithoutFinisher(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("What's the craic?")).build();
+                .POST(BodyPublishers.ofString("What's the craic?")).build();
 
         CollectionSubscriber subscriber = new CollectionSubscriber();
         HttpResponse<Void> response = client.sendAsync(request,
-                BodyHandler.fromSubscriber(subscriber)).join();
+                BodyHandlers.fromSubscriber(subscriber)).join();
         String text = subscriber.get();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -210,13 +227,14 @@ void testCollectionWithoutFinisher(String url) {
 
     @Test(dataProvider = "uris")
     void testCollectionWithFinisherBlocking(String url) throws Exception {
+        System.out.printf(now() + "testCollectionWithFinisherBlocking(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("What's the craic?")).build();
+                .POST(BodyPublishers.ofString("What's the craic?")).build();
 
         CollectionSubscriber subscriber = new CollectionSubscriber();
         HttpResponse<String> response = client.send(request,
-                BodyHandler.fromSubscriber(subscriber, CollectionSubscriber::get));
+                BodyHandlers.fromSubscriber(subscriber, CollectionSubscriber::get));
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -225,13 +243,14 @@ void testCollectionWithFinisherBlocking(String url) throws Exception {
 
     @Test(dataProvider = "uris")
     void testCollectionWithoutFinisheBlocking(String url) throws Exception {
+        System.out.printf(now() + "testCollectionWithoutFinisheBlocking(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("What's the craic?")).build();
+                .POST(BodyPublishers.ofString("What's the craic?")).build();
 
         CollectionSubscriber subscriber = new CollectionSubscriber();
         HttpResponse<Void> response = client.send(request,
-                BodyHandler.fromSubscriber(subscriber));
+                BodyHandlers.fromSubscriber(subscriber));
         String text = subscriber.get();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -242,13 +261,14 @@ void testCollectionWithoutFinisheBlocking(String url) throws Exception {
 
     @Test(dataProvider = "uris")
     void testIterableWithFinisher(String url) {
+        System.out.printf(now() + "testIterableWithFinisher(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("We're sucking diesel now!")).build();
+                .POST(BodyPublishers.ofString("We're sucking diesel now!")).build();
 
         IterableSubscriber subscriber = new IterableSubscriber();
         HttpResponse<String> response = client.sendAsync(request,
-                BodyHandler.fromSubscriber(subscriber, Supplier::get)).join();
+                BodyHandlers.fromSubscriber(subscriber, Supplier::get)).join();
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -257,13 +277,14 @@ void testIterableWithFinisher(String url) {
 
     @Test(dataProvider = "uris")
     void testIterableWithoutFinisher(String url) {
+        System.out.printf(now() + "testIterableWithoutFinisher(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("We're sucking diesel now!")).build();
+                .POST(BodyPublishers.ofString("We're sucking diesel now!")).build();
 
         IterableSubscriber subscriber = new IterableSubscriber();
         HttpResponse<Void> response = client.sendAsync(request,
-                BodyHandler.fromSubscriber(subscriber)).join();
+                BodyHandlers.fromSubscriber(subscriber)).join();
         String text = subscriber.get();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -272,13 +293,14 @@ void testIterableWithoutFinisher(String url) {
 
     @Test(dataProvider = "uris")
     void testIterableWithFinisherBlocking(String url) throws Exception {
+        System.out.printf(now() + "testIterableWithFinisherBlocking(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("We're sucking diesel now!")).build();
+                .POST(BodyPublishers.ofString("We're sucking diesel now!")).build();
 
         IterableSubscriber subscriber = new IterableSubscriber();
         HttpResponse<String> response = client.send(request,
-                BodyHandler.fromSubscriber(subscriber, Supplier::get));
+                BodyHandlers.fromSubscriber(subscriber, Supplier::get));
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -286,14 +308,15 @@ void testIterableWithFinisherBlocking(String url) throws Exception {
     }
 
     @Test(dataProvider = "uris")
-    void testIterableWithoutFinisherBlocking(String url) throws Exception{
+    void testIterableWithoutFinisherBlocking(String url) throws Exception {
+        System.out.printf(now() + "testIterableWithoutFinisherBlocking(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("We're sucking diesel now!")).build();
+                .POST(BodyPublishers.ofString("We're sucking diesel now!")).build();
 
         IterableSubscriber subscriber = new IterableSubscriber();
         HttpResponse<Void> response = client.send(request,
-                BodyHandler.fromSubscriber(subscriber));
+                BodyHandlers.fromSubscriber(subscriber));
         String text = subscriber.get();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -304,13 +327,14 @@ void testIterableWithoutFinisherBlocking(String url) throws Exception{
 
     @Test(dataProvider = "uris")
     void testObjectWithFinisher(String url) {
+        System.out.printf(now() + "testObjectWithFinisher(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("May the wind always be at your back.")).build();
+                .POST(BodyPublishers.ofString("May the wind always be at your back.")).build();
 
         ObjectSubscriber subscriber = new ObjectSubscriber();
         HttpResponse<String> response = client.sendAsync(request,
-                BodyHandler.fromSubscriber(subscriber, ObjectSubscriber::get)).join();
+                BodyHandlers.fromSubscriber(subscriber, ObjectSubscriber::get)).join();
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -319,13 +343,14 @@ void testObjectWithFinisher(String url) {
 
     @Test(dataProvider = "uris")
     void testObjectWithoutFinisher(String url) {
+        System.out.printf(now() + "testObjectWithoutFinisher(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("May the wind always be at your back.")).build();
+                .POST(BodyPublishers.ofString("May the wind always be at your back.")).build();
 
         ObjectSubscriber subscriber = new ObjectSubscriber();
         HttpResponse<Void> response = client.sendAsync(request,
-                BodyHandler.fromSubscriber(subscriber)).join();
+                BodyHandlers.fromSubscriber(subscriber)).join();
         String text = subscriber.get();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -334,13 +359,14 @@ void testObjectWithoutFinisher(String url) {
 
     @Test(dataProvider = "uris")
     void testObjectWithFinisherBlocking(String url) throws Exception {
+        System.out.printf(now() + "testObjectWithFinisherBlocking(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("May the wind always be at your back.")).build();
+                .POST(BodyPublishers.ofString("May the wind always be at your back.")).build();
 
         ObjectSubscriber subscriber = new ObjectSubscriber();
         HttpResponse<String> response = client.send(request,
-                BodyHandler.fromSubscriber(subscriber, ObjectSubscriber::get));
+                BodyHandlers.fromSubscriber(subscriber, ObjectSubscriber::get));
         String text = response.body();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
@@ -349,19 +375,55 @@ void testObjectWithFinisherBlocking(String url) throws Exception {
 
     @Test(dataProvider = "uris")
     void testObjectWithoutFinisherBlocking(String url) throws Exception {
+        System.out.printf(now() + "testObjectWithoutFinisherBlocking(%s) starting%n", url);
         HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
-                .POST(fromString("May the wind always be at your back.")).build();
+                .POST(BodyPublishers.ofString("May the wind always be at your back.")).build();
 
         ObjectSubscriber subscriber = new ObjectSubscriber();
         HttpResponse<Void> response = client.send(request,
-                BodyHandler.fromSubscriber(subscriber));
+                BodyHandlers.fromSubscriber(subscriber));
         String text = subscriber.get();
         System.out.println(text);
         assertEquals(response.statusCode(), 200);
         assertTrue(text.length() != 0);  // what else can be asserted!
     }
 
+
+    // -- mapping using convenience handlers
+
+    @Test(dataProvider = "uris")
+    void mappingFromByteArray(String url) throws Exception {
+        System.out.printf(now() + "mappingFromByteArray(%s) starting%n", url);
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString("We're sucking diesel now!")).build();
+
+        client.sendAsync(request, BodyHandlers.fromSubscriber(BodySubscribers.ofByteArray(),
+                    bas -> new String(bas.getBody().toCompletableFuture().join(), UTF_8)))
+                .thenApply(FlowAdapterSubscriberTest::assert200ResponseCode)
+                .thenApply(HttpResponse::body)
+                .thenAccept(body -> assertEquals(body, "We're sucking diesel now!"))
+                .join();
+    }
+
+    @Test(dataProvider = "uris")
+    void mappingFromInputStream(String url) throws Exception {
+        System.out.printf(now() + "mappingFromInputStream(%s) starting%n", url);
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString("May the wind always be at your back.")).build();
+
+        client.sendAsync(request, BodyHandlers.fromSubscriber(BodySubscribers.ofInputStream(),
+                    ins -> {
+                        InputStream is = ins.getBody().toCompletableFuture().join();
+                        return new String(uncheckedReadAllBytes(is), UTF_8); } ))
+                .thenApply(FlowAdapterSubscriberTest::assert200ResponseCode)
+                .thenApply(HttpResponse::body)
+                .thenAccept(body -> assertEquals(body, "May the wind always be at your back."))
+                .join();
+    }
+
     /** An abstract Subscriber that converts all received data into a String. */
     static abstract class AbstractSubscriber implements Supplier<String> {
         protected volatile Flow.Subscription subscription;
@@ -434,31 +496,47 @@ static void uncheckedWrite(ByteArrayOutputStream baos, byte[] ba) {
         }
     }
 
+    static byte[] uncheckedReadAllBytes(InputStream is) {
+        try {
+            return is.readAllBytes();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    static final <T> HttpResponse<T> assert200ResponseCode(HttpResponse<T> response) {
+        assertEquals(response.statusCode(), 200);
+        return response;
+    }
+
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
     @BeforeTest
     public void setup() throws Exception {
         sslContext = new SimpleSSLContext().get();
         if (sslContext == null)
             throw new AssertionError("Unexpected null sslContext");
 
-        InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/echo", new Http1EchoHandler());
-        httpURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/echo";
+        httpURI = "http://" + serverAuthority(httpTestServer) + "/http1/echo";
 
         httpsTestServer = HttpsServer.create(sa, 0);
         httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
         httpsTestServer.createContext("/https1/echo", new Http1EchoHandler());
-        httpsURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/echo";
+        httpsURI = "https://" + serverAuthority(httpsTestServer) + "/https1/echo";
 
-        http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+        http2TestServer = new Http2TestServer("localhost", false, 0);
         http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
-        int port = http2TestServer.getAddress().getPort();
-        http2URI = "http://127.0.0.1:" + port + "/http2/echo";
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/echo";
 
-        https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+        https2TestServer = new Http2TestServer("localhost", true, 0);
         https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
-        port = https2TestServer.getAddress().getPort();
-        https2URI = "https://127.0.0.1:" + port + "/https2/echo";
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/echo";
 
         httpTestServer.start();
         httpsTestServer.start();
diff --git a/test/jdk/java/net/httpclient/FlowAdaptersCompileOnly.java b/test/jdk/java/net/httpclient/FlowAdaptersCompileOnly.java
index 71abe22e73a..52003a621a1 100644
--- a/test/jdk/java/net/httpclient/FlowAdaptersCompileOnly.java
+++ b/test/jdk/java/net/httpclient/FlowAdaptersCompileOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -21,15 +21,20 @@
  * questions.
  */
 
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Flow;
 import java.util.function.Function;
-import jdk.incubator.http.HttpRequest.BodyPublisher;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
 
 /*
  * @test
@@ -40,31 +45,31 @@
 public class FlowAdaptersCompileOnly {
 
     static void makesSureDifferentGenericSignaturesCompile() {
-        BodyPublisher.fromPublisher(new BBPublisher());
-        BodyPublisher.fromPublisher(new MBBPublisher());
-
-        BodyHandler.fromSubscriber(new ListSubscriber());
-        BodyHandler.fromSubscriber(new CollectionSubscriber());
-        BodyHandler.fromSubscriber(new IterableSubscriber());
-        BodyHandler.fromSubscriber(new ObjectSubscriber());
-
-        BodySubscriber.fromSubscriber(new ListSubscriber());
-        BodySubscriber.fromSubscriber(new CollectionSubscriber());
-        BodySubscriber.fromSubscriber(new IterableSubscriber());
-        BodySubscriber.fromSubscriber(new ObjectSubscriber());
-
-        BodyPublisher.fromPublisher(new BBPublisher(), 1);
-        BodyPublisher.fromPublisher(new MBBPublisher(), 1);
-
-        BodyHandler.fromSubscriber(new ListSubscriber(), Function.identity());
-        BodyHandler.fromSubscriber(new CollectionSubscriber(), Function.identity());
-        BodyHandler.fromSubscriber(new IterableSubscriber(), Function.identity());
-        BodyHandler.fromSubscriber(new ObjectSubscriber(), Function.identity());
-
-        BodySubscriber.fromSubscriber(new ListSubscriber(), Function.identity());
-        BodySubscriber.fromSubscriber(new CollectionSubscriber(), Function.identity());
-        BodySubscriber.fromSubscriber(new IterableSubscriber(), Function.identity());
-        BodySubscriber.fromSubscriber(new ObjectSubscriber(), Function.identity());
+        BodyPublishers.fromPublisher(new BBPublisher());
+        BodyPublishers.fromPublisher(new MBBPublisher());
+
+        BodyHandlers.fromSubscriber(new ListSubscriber());
+        BodyHandlers.fromSubscriber(new CollectionSubscriber());
+        BodyHandlers.fromSubscriber(new IterableSubscriber());
+        BodyHandlers.fromSubscriber(new ObjectSubscriber());
+
+        BodySubscribers.fromSubscriber(new ListSubscriber());
+        BodySubscribers.fromSubscriber(new CollectionSubscriber());
+        BodySubscribers.fromSubscriber(new IterableSubscriber());
+        BodySubscribers.fromSubscriber(new ObjectSubscriber());
+
+        BodyPublishers.fromPublisher(new BBPublisher(), 1);
+        BodyPublishers.fromPublisher(new MBBPublisher(), 1);
+
+        BodyHandlers.fromSubscriber(new ListSubscriber(), Function.identity());
+        BodyHandlers.fromSubscriber(new CollectionSubscriber(), Function.identity());
+        BodyHandlers.fromSubscriber(new IterableSubscriber(), Function.identity());
+        BodyHandlers.fromSubscriber(new ObjectSubscriber(), Function.identity());
+
+        BodySubscribers.fromSubscriber(new ListSubscriber(), Function.identity());
+        BodySubscribers.fromSubscriber(new CollectionSubscriber(), Function.identity());
+        BodySubscribers.fromSubscriber(new IterableSubscriber(), Function.identity());
+        BodySubscribers.fromSubscriber(new ObjectSubscriber(), Function.identity());
     }
 
     static class BBPublisher implements Flow.Publisher<ByteBuffer> {
@@ -104,4 +109,97 @@ static class ObjectSubscriber implements Flow.Subscriber<Object> {
         @Override public void onError(Throwable throwable) { }
         @Override public void onComplete() { }
     }
+
+    // ---
+
+    static final Function<ListSubscriber,Integer> f1 = subscriber -> 1;
+    static final Function<ListSubscriber,Number> f2 = subscriber -> 2;
+    static final Function<ListSubscriberX,Integer> f3 = subscriber -> 3;
+    static final Function<ListSubscriberX,Number> f4 = subscriber -> 4;
+
+    static class ListSubscriberX extends ListSubscriber {
+        int getIntegerX() { return 5; }
+    }
+
+    static void makesSureDifferentGenericFunctionSignaturesCompile() {
+        BodyHandler<Integer> bh01 = BodyHandlers.fromSubscriber(new ListSubscriber(), s -> 6);
+        BodyHandler<Number>  bh02 = BodyHandlers.fromSubscriber(new ListSubscriber(), s -> 7);
+        BodyHandler<Integer> bh03 = BodyHandlers.fromSubscriber(new ListSubscriber(), f1);
+        BodyHandler<Number>  bh04 = BodyHandlers.fromSubscriber(new ListSubscriber(), f1);
+        BodyHandler<Number>  bh05 = BodyHandlers.fromSubscriber(new ListSubscriber(), f2);
+        BodyHandler<Integer> bh06 = BodyHandlers.fromSubscriber(new ListSubscriberX(), f1);
+        BodyHandler<Number>  bh07 = BodyHandlers.fromSubscriber(new ListSubscriberX(), f1);
+        BodyHandler<Number>  bh08 = BodyHandlers.fromSubscriber(new ListSubscriberX(), f2);
+        BodyHandler<Integer> bh09 = BodyHandlers.fromSubscriber(new ListSubscriberX(), ListSubscriberX::getIntegerX);
+        BodyHandler<Number>  bh10 = BodyHandlers.fromSubscriber(new ListSubscriberX(), ListSubscriberX::getIntegerX);
+        BodyHandler<Integer> bh11 = BodyHandlers.fromSubscriber(new ListSubscriberX(), f3);
+        BodyHandler<Number>  bh12 = BodyHandlers.fromSubscriber(new ListSubscriberX(), f3);
+        BodyHandler<Number>  bh13 = BodyHandlers.fromSubscriber(new ListSubscriberX(), f4);
+
+        BodySubscriber<Integer> bs01 = BodySubscribers.fromSubscriber(new ListSubscriber(), s -> 6);
+        BodySubscriber<Number>  bs02 = BodySubscribers.fromSubscriber(new ListSubscriber(), s -> 7);
+        BodySubscriber<Integer> bs03 = BodySubscribers.fromSubscriber(new ListSubscriber(), f1);
+        BodySubscriber<Number>  bs04 = BodySubscribers.fromSubscriber(new ListSubscriber(), f1);
+        BodySubscriber<Number>  bs05 = BodySubscribers.fromSubscriber(new ListSubscriber(), f2);
+        BodySubscriber<Integer> bs06 = BodySubscribers.fromSubscriber(new ListSubscriberX(), f1);
+        BodySubscriber<Number>  bs07 = BodySubscribers.fromSubscriber(new ListSubscriberX(), f1);
+        BodySubscriber<Number>  bs08 = BodySubscribers.fromSubscriber(new ListSubscriberX(), f2);
+        BodySubscriber<Integer> bs09 = BodySubscribers.fromSubscriber(new ListSubscriberX(), ListSubscriberX::getIntegerX);
+        BodySubscriber<Number>  bs10 = BodySubscribers.fromSubscriber(new ListSubscriberX(), ListSubscriberX::getIntegerX);
+        BodySubscriber<Integer> bs11 = BodySubscribers.fromSubscriber(new ListSubscriberX(), f3);
+        BodySubscriber<Number>  bs12 = BodySubscribers.fromSubscriber(new ListSubscriberX(), f3);
+        BodySubscriber<Number>  bs13 = BodySubscribers.fromSubscriber(new ListSubscriberX(), f4);
+    }
+
+    // ---
+
+    static class NumberSubscriber implements Flow.Subscriber<List<ByteBuffer>> {
+        @Override public void onSubscribe(Flow.Subscription subscription) { }
+        @Override public void onNext(List<ByteBuffer> item) { }
+        @Override public void onError(Throwable throwable) { }
+        @Override public void onComplete() { }
+        public Number getNumber() { return null; }
+    }
+
+    static class IntegerSubscriber extends NumberSubscriber {
+        @Override public void onSubscribe(Flow.Subscription subscription) { }
+        @Override public void onNext(List<ByteBuffer> item) { }
+        @Override public void onError(Throwable throwable) { }
+        @Override public void onComplete() { }
+        public Integer getInteger() { return null; }
+    }
+
+    static class LongSubscriber extends NumberSubscriber {
+        @Override public void onSubscribe(Flow.Subscription subscription) { }
+        @Override public void onNext(List<ByteBuffer> item) { }
+        @Override public void onError(Throwable throwable) { }
+        @Override public void onComplete() { }
+        public Long getLong() { return null; }
+    }
+
+    static final Function<NumberSubscriber,Number> numMapper = sub -> sub.getNumber();
+    static final Function<IntegerSubscriber,Integer> intMapper = sub -> sub.getInteger();
+    static final Function<LongSubscriber,Long> longMapper = sub -> sub.getLong();
+
+    public void makesSureDifferentGenericSubscriberSignaturesCompile()
+        throws Exception
+    {
+        HttpClient client = null;
+        HttpRequest request = null;
+        IntegerSubscriber sub1 = new IntegerSubscriber();
+
+        HttpResponse<Integer> r1 = client.send(request, BodyHandlers.fromSubscriber(sub1, IntegerSubscriber::getInteger));
+        HttpResponse<Number>  r2 = client.send(request, BodyHandlers.fromSubscriber(sub1, IntegerSubscriber::getInteger));
+        HttpResponse<Number>  r3 = client.send(request, BodyHandlers.fromSubscriber(sub1, NumberSubscriber::getNumber));
+        HttpResponse<Integer> r4 = client.send(request, BodyHandlers.fromSubscriber(sub1, intMapper));
+        HttpResponse<Number>  r5 = client.send(request, BodyHandlers.fromSubscriber(sub1, intMapper));
+        HttpResponse<Number>  r6 = client.send(request, BodyHandlers.fromSubscriber(sub1, numMapper));
+
+        // compiles but makes little sense. Just what you get with any usage of `? super`
+        final Function<Object,Number> objectMapper = sub -> 1;
+        client.sendAsync(request, BodyHandlers.fromSubscriber(sub1, objectMapper));
+
+        // does not compile, as expected ( uncomment to see )
+        //HttpResponse<Number> r7 = client.send(request, BodyHandler.fromSubscriber(sub1, longMapper));
+    }
 }
diff --git a/test/jdk/java/net/httpclient/HandshakeFailureTest.java b/test/jdk/java/net/httpclient/HandshakeFailureTest.java
index 760e5a947c2..adfc7a9147d 100644
--- a/test/jdk/java/net/httpclient/HandshakeFailureTest.java
+++ b/test/jdk/java/net/httpclient/HandshakeFailureTest.java
@@ -28,18 +28,20 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URI;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpClient.Version;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpRequest;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpResponse;
+import java.net.http.HttpRequest;
 import static java.lang.System.out;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
+import static java.net.http.HttpResponse.BodyHandlers.discarding;
 
 /**
  * @test
@@ -63,7 +65,7 @@ public static void main(String[] args) throws Exception {
         for (AbstractServer server : servers) {
             try (server) {
                 out.format("%n%n------ Testing with server:%s ------%n", server);
-                URI uri = new URI("https://127.0.0.1:" + server.getPort() + "/");
+                URI uri = new URI("https://localhost:" + server.getPort() + "/");
 
                 test.testSyncSameClient(uri, Version.HTTP_1_1);
                 test.testSyncSameClient(uri, Version.HTTP_2);
@@ -87,7 +89,7 @@ void testSyncSameClient(URI uri, Version version) throws Exception {
                                              .version(version)
                                              .build();
             try {
-                HttpResponse<Void> response = client.send(request, discard(null));
+                HttpResponse<Void> response = client.send(request, discarding());
                 String msg = String.format("UNEXPECTED response=%s%n", response);
                 throw new RuntimeException(msg);
             } catch (SSLHandshakeException expected) {
@@ -106,7 +108,7 @@ void testSyncDiffClient(URI uri, Version version) throws Exception {
                                              .version(version)
                                              .build();
             try {
-                HttpResponse<Void> response = client.send(request, discard(null));
+                HttpResponse<Void> response = client.send(request, discarding());
                 String msg = String.format("UNEXPECTED response=%s%n", response);
                 throw new RuntimeException(msg);
             } catch (SSLHandshakeException expected) {
@@ -124,7 +126,7 @@ void testAsyncSameClient(URI uri, Version version) throws Exception {
                                              .version(version)
                                              .build();
             CompletableFuture<HttpResponse<Void>> response =
-                        client.sendAsync(request, discard(null));
+                        client.sendAsync(request, discarding());
             try {
                 response.join();
                 String msg = String.format("UNEXPECTED response=%s%n", response);
@@ -150,7 +152,7 @@ void testAsyncDiffClient(URI uri, Version version) throws Exception {
                                              .version(version)
                                              .build();
             CompletableFuture<HttpResponse<Void>> response =
-                    client.sendAsync(request, discard(null));
+                    client.sendAsync(request, discarding());
             try {
                 response.join();
                 String msg = String.format("UNEXPECTED response=%s%n", response);
@@ -173,6 +175,8 @@ static abstract class AbstractServer extends Thread implements AutoCloseable {
 
         AbstractServer(String name, ServerSocket ss) throws IOException {
             super(name);
+            ss.setReuseAddress(false);
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             this.ss = ss;
             this.start();
         }
@@ -198,7 +202,7 @@ static class PlainServer extends AbstractServer {
         private volatile int count;
 
         PlainServer() throws IOException {
-            super("PlainServer", new ServerSocket(0));
+            super("PlainServer", new ServerSocket());
         }
 
         @Override
@@ -265,7 +269,7 @@ static SSLContext createUntrustingContext() {
         }
 
         SSLServer() throws IOException {
-            super("SSLServer", factory.createServerSocket(0));
+            super("SSLServer", factory.createServerSocket());
         }
 
         @Override
diff --git a/test/jdk/java/net/httpclient/HeadersTest.java b/test/jdk/java/net/httpclient/HeadersTest.java
index d724873e447..f7192805e7f 100644
--- a/test/jdk/java/net/httpclient/HeadersTest.java
+++ b/test/jdk/java/net/httpclient/HeadersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -21,24 +21,298 @@
  * questions.
  */
 
-import jdk.incubator.http.HttpRequest;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
 import java.net.URI;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
 
 /**
  * @test
  * @bug 8087112
- * @summary Basic test for headers
+ * @summary Basic test for headers, uri, and duration
  */
 public class HeadersTest {
 
     static final URI TEST_URI = URI.create("http://www.foo.com/");
+    static final HttpClient client = HttpClient.newBuilder().proxy(NO_PROXY).build();
 
-    static void bad(String name) {
+    static final class HttpHeadersStub extends HttpHeaders {
+        Map<String, List<String>> map;
+        HttpHeadersStub(Map<String, List<String>> map) {
+            this.map = map;
+        }
+        @Override
+        public Map<String, List<String>> map() {
+            return map;
+        }
+    }
+
+    static void bad(String name) throws Exception {
         HttpRequest.Builder builder = HttpRequest.newBuilder(TEST_URI);
         try {
             builder.header(name, "foo");
             throw new RuntimeException("Expected IAE for header:" + name);
-        } catch (IllegalArgumentException expected) { }
+        } catch (IllegalArgumentException expected)  {
+            System.out.println("Got expected IAE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return "GET";
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return TEST_URI;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    Map<String, List<String>> map = Map.of(name, List.of("foo"));
+                    return new HttpHeadersStub(map);
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected IAE for header:" + name);
+        } catch (IllegalArgumentException expected) {
+            System.out.println("Got expected IAE: " + expected);
+        }
+    }
+
+    static void badValue(String value) throws Exception {
+        HttpRequest.Builder builder = HttpRequest.newBuilder(TEST_URI);
+        try {
+            builder.header("x-bad", value);
+            throw new RuntimeException("Expected IAE for header x-bad: "
+                    + value.replace("\r", "\\r")
+                    .replace("\n", "\\n"));
+        } catch (IllegalArgumentException expected)  {
+            System.out.println("Got expected IAE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return "GET";
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return TEST_URI;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    Map<String, List<String>> map = Map.of("x-bad", List.of(value));
+                    return new HttpHeadersStub(map);
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected IAE for header x-bad:"
+                    + value.replace("\r", "\\r")
+                    .replace("\n", "\\n"));
+        } catch (IllegalArgumentException expected) {
+            System.out.println("Got expected IAE: " + expected);
+        }
+    }
+
+    static void nullName() throws Exception {
+        HttpRequest.Builder builder = HttpRequest.newBuilder(TEST_URI);
+        try {
+            builder.header(null, "foo");
+            throw new RuntimeException("Expected NPE for null header name");
+        } catch (NullPointerException expected)  {
+            System.out.println("Got expected NPE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return "GET";
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return TEST_URI;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    Map<String, List<String>> map = new HashMap<>();
+                    map.put(null, List.of("foo"));
+                    return new HttpHeadersStub(map);
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected NPE for null header name");
+        } catch (NullPointerException expected) {
+            System.out.println("Got expected NPE: " + expected);
+        }
+    }
+
+    static void nullValue() throws Exception {
+        HttpRequest.Builder builder = HttpRequest.newBuilder(TEST_URI);
+        try {
+            builder.header("x-bar", null);
+            throw new RuntimeException("Expected NPE for null header value");
+        } catch (NullPointerException expected)  {
+            System.out.println("Got expected NPE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return "GET";
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return TEST_URI;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    Map<String, List<String>> map = new HashMap<>();
+                    map.put("x-bar", null);
+                    return new HttpHeadersStub(map);
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected NPE for null header values");
+        } catch (NullPointerException expected) {
+            System.out.println("Got expected NPE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return "GET";
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return TEST_URI;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    List<String> values = new ArrayList<>();
+                    values.add("foo");
+                    values.add(null);
+                    return new HttpHeadersStub(Map.of("x-bar", values));
+                }
+            };
+            client
+                    .send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected NPE for null header value");
+        } catch (NullPointerException expected) {
+            System.out.println("Got expected NPE: " + expected);
+        }
+    }
+
+    static void nullHeaders() throws Exception {
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return "GET";
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return TEST_URI;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    return new HttpHeadersStub(null);
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected NPE for null header name");
+        } catch (NullPointerException expected) {
+            System.out.println("Got expected NPE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return "GET";
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return TEST_URI;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    return null;
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected NPE for null header name");
+        } catch (NullPointerException expected) {
+            System.out.println("Got expected NPE: " + expected);
+        }
     }
 
     static void good(String name) {
@@ -50,7 +324,219 @@ static void good(String name) {
         }
     }
 
-    public static void main(String[] args) {
+    static void goodValue(String value) {
+        HttpRequest.Builder builder = HttpRequest.newBuilder(TEST_URI);
+        try {
+            builder.header("x-good", value);
+        } catch (IllegalArgumentException e) {
+            throw new RuntimeException("Unexpected IAE for x-good: " + value);
+        }
+    }
+
+    static void badURI() throws Exception {
+        HttpRequest.Builder builder = HttpRequest.newBuilder();
+        URI uri = URI.create(TEST_URI.toString().replace("http", "ftp"));
+        try {
+            builder.uri(uri);
+            throw new RuntimeException("Expected IAE for uri: " + uri);
+        } catch (IllegalArgumentException expected)  {
+            System.out.println("Got expected IAE: " + expected);
+        }
+        try {
+            HttpRequest.newBuilder(uri);
+            throw new RuntimeException("Expected IAE for uri: " + uri);
+        } catch (IllegalArgumentException expected)  {
+            System.out.println("Got expected IAE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return "GET";
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return uri;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    Map<String, List<String>> map = Map.of("x-good", List.of("foo"));
+                    return new HttpHeadersStub(map);
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected IAE for uri:" + uri);
+        } catch (IllegalArgumentException expected) {
+            System.out.println("Got expected IAE: " + expected);
+        }
+    }
+
+    static void nullURI() throws Exception {
+        HttpRequest.Builder builder = HttpRequest.newBuilder();
+        try {
+            builder.uri(null);
+            throw new RuntimeException("Expected NPE for null URI");
+        } catch (NullPointerException expected)  {
+            System.out.println("Got expected NPE: " + expected);
+        }
+        try {
+            HttpRequest.newBuilder(null);
+            throw new RuntimeException("Expected NPE for null uri");
+        } catch (NullPointerException expected)  {
+            System.out.println("Got expected NPE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return "GET";
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return null;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    Map<String, List<String>> map = Map.of("x-good", List.of("foo"));
+                    return new HttpHeadersStub(map);
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected NPE for null uri");
+        } catch (NullPointerException expected) {
+            System.out.println("Got expected NPE: " + expected);
+        }
+    }
+
+    static void badTimeout() throws Exception {
+        HttpRequest.Builder builder = HttpRequest.newBuilder(TEST_URI);
+        Duration zero = Duration.ofSeconds(0);
+        Duration negative = Duration.ofSeconds(-10);
+        for (Duration bad : List.of(zero, negative)) {
+            try {
+                builder.timeout(zero);
+                throw new RuntimeException("Expected IAE for timeout: " + bad);
+            } catch (IllegalArgumentException expected) {
+                System.out.println("Got expected IAE: " + expected);
+            }
+            try {
+                HttpRequest req = new HttpRequest() {
+                    @Override
+                    public Optional<BodyPublisher> bodyPublisher() {
+                        return Optional.of(BodyPublishers.noBody());
+                    }
+
+                    @Override
+                    public String method() {
+                        return "GET";
+                    }
+
+                    @Override
+                    public Optional<Duration> timeout() {
+                        return Optional.of(bad);
+                    }
+
+                    @Override
+                    public boolean expectContinue() {
+                        return false;
+                    }
+
+                    @Override
+                    public URI uri() {
+                        return TEST_URI;
+                    }
+
+                    @Override
+                    public Optional<HttpClient.Version> version() {
+                        return Optional.empty();
+                    }
+
+                    @Override
+                    public HttpHeaders headers() {
+                        Map<String, List<String>> map = Map.of("x-good", List.of("foo"));
+                        return new HttpHeadersStub(map);
+                    }
+                };
+                client.send(req, HttpResponse.BodyHandlers.ofString());
+                throw new RuntimeException("Expected IAE for timeout:" + bad);
+            } catch (IllegalArgumentException expected) {
+                System.out.println("Got expected IAE: " + expected);
+            }
+        }
+    }
+
+    static void nullTimeout() throws Exception {
+        HttpRequest.Builder builder = HttpRequest.newBuilder(TEST_URI);
+        try {
+            builder.timeout(null);
+            throw new RuntimeException("Expected NPE for null timeout");
+        } catch (NullPointerException expected) {
+            System.out.println("Got expected NPE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override
+                public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+
+                @Override
+                public String method() {
+                    return "GET";
+                }
+
+                @Override
+                public Optional<Duration> timeout() {
+                    return null;
+                }
+
+                @Override
+                public boolean expectContinue() {
+                    return false;
+                }
+
+                @Override
+                public URI uri() {
+                    return TEST_URI;
+                }
+
+                @Override
+                public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+
+                @Override
+                public HttpHeaders headers() {
+                    Map<String, List<String>> map = Map.of("x-good", List.of("foo"));
+                    return new HttpHeadersStub(map);
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected NPE for null timeout");
+        } catch (NullPointerException expected) {
+            System.out.println("Got expected NPE: " + expected);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
         bad("bad:header");
         bad("Foo\n");
         good("X-Foo!");
@@ -60,5 +546,16 @@ public static void main(String[] args) {
         bad("Bar\r\n");
         good("Hello#world");
         good("Qwer#ert");
+        badValue("blah\r\n blah");
+        goodValue("blah blah");
+        goodValue("blah  blah");
+        goodValue("\"blah\\\"  \\\"blah\"");
+        nullName();
+        nullValue();
+        nullHeaders();
+        badURI();
+        nullURI();
+        badTimeout();
+        nullTimeout();
     }
 }
diff --git a/test/jdk/java/net/httpclient/HeadersTest1.java b/test/jdk/java/net/httpclient/HeadersTest1.java
index 61df6ad26a8..79932dfc92f 100644
--- a/test/jdk/java/net/httpclient/HeadersTest1.java
+++ b/test/jdk/java/net/httpclient/HeadersTest1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,19 +24,20 @@
 /*
  * @test
  * @bug 8153142 8195138
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          jdk.httpserver
  * @run testng/othervm HeadersTest1
  */
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -48,7 +49,7 @@
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import org.testng.annotations.Test;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static java.net.http.HttpResponse.BodyHandlers.ofString;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -58,10 +59,12 @@
 public class HeadersTest1 {
 
     private static final String RESPONSE = "Hello world";
+    private static final String QUOTED = "a=\"quote\", b=\"\\\"quote\\\"  \\\"quote\\\"  codec\"";
 
     @Test
     public void test() throws Exception {
-        HttpServer server = HttpServer.create(new InetSocketAddress(0), 10);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        HttpServer server = HttpServer.create(addr, 10);
         Handler h = new Handler();
         server.createContext("/test", h);
         int port = server.getAddress().getPort();
@@ -75,14 +78,15 @@ public void test() throws Exception {
                                       .build();
 
         try {
-            URI uri = new URI("http://127.0.0.1:" + Integer.toString(port) + "/test/foo");
+            URI uri = new URI("http://localhost:" + port + "/test/foo");
             HttpRequest req = HttpRequest.newBuilder(uri)
                                          .headers("X-Bar", "foo1")
                                          .headers("X-Bar", "foo2")
+                                         .headers("X-Quote",QUOTED)
                                          .GET()
                                          .build();
 
-            HttpResponse<?> resp = client.send(req, asString());
+            HttpResponse<?> resp = client.send(req, ofString());
             if (resp.statusCode() != 200) {
                 throw new RuntimeException("Expected 200, got: " + resp.statusCode());
             }
@@ -123,6 +127,10 @@ public void test() throws Exception {
             assertTrue(multiline.get(0).contains(" foo=\"bar\""));
             assertTrue(multiline.get(0).contains(" bar=\"foo\""));
             assertTrue(multiline.get(0).contains(" foobar=\"barfoo\""));
+
+            // quote
+            List<String> quote = hd.allValues("X-Quote-Response");
+            assertEquals(quote, List.of(QUOTED));
         } finally {
             server.stop(0);
             e.shutdownNow();
@@ -143,12 +151,20 @@ public void handle(HttpExchange he) throws IOException {
                 he.close();
                 return;
             }
+            l = he.getRequestHeaders().get("X-Quote");
+            if (l.isEmpty() || l.size() != 1 || !QUOTED.equals(l.get(0))) {
+                System.out.println("Bad X-Quote: " + l);
+                he.sendResponseHeaders(500, -1);
+                he.close();
+                return;
+            }
             Headers h = he.getResponseHeaders();
             h.add("X-Foo-Response", "resp1");
             h.add("X-Foo-Response", "resp2");
             h.add("X-multi-line-response", "Custom foo=\"bar\","
                     + "\r\n    bar=\"foo\","
                     + "\r\n    foobar=\"barfoo\"");
+            h.add("X-Quote-Response", he.getRequestHeaders().getFirst("X-Quote"));
             he.sendResponseHeaders(200, RESPONSE.length());
             OutputStream os = he.getResponseBody();
             os.write(RESPONSE.getBytes(US_ASCII));
diff --git a/test/jdk/java/net/httpclient/HeadersTest2.java b/test/jdk/java/net/httpclient/HeadersTest2.java
index 54ebac13d68..96d47e6eefb 100644
--- a/test/jdk/java/net/httpclient/HeadersTest2.java
+++ b/test/jdk/java/net/httpclient/HeadersTest2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -27,8 +27,8 @@
  * @summary Basic test for headers
  */
 
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpRequest;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
 import java.net.URI;
 import java.util.List;
 import java.util.Iterator;
diff --git a/test/jdk/java/net/httpclient/HttpClientBuilderTest.java b/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
index b0aaefdd90a..8a0398d14ce 100644
--- a/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -21,19 +21,33 @@
  * questions.
  */
 
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.Authenticator;
 import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.InetSocketAddress;
 import java.net.ProxySelector;
+import java.net.URI;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.time.Duration;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpClient.Redirect;
-import jdk.incubator.http.HttpClient.Version;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpClient.Version;
 import jdk.testlibrary.SimpleSSLContext;
 import org.testng.annotations.Test;
 import static org.testng.Assert.*;
@@ -48,6 +62,9 @@
 
 public class HttpClientBuilderTest {
 
+    static final Class<NullPointerException> NPE = NullPointerException.class;
+    static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
+
     @Test
     public void testDefaults() throws Exception {
         List<HttpClient> clients = List.of(HttpClient.newHttpClient(),
@@ -69,14 +86,14 @@ public void testDefaults() throws Exception {
     @Test
     public void testNull() throws Exception {
         HttpClient.Builder builder = HttpClient.newBuilder();
-        assertThrows(NullPointerException.class, () -> builder.authenticator(null));
-        assertThrows(NullPointerException.class, () -> builder.cookieHandler(null));
-        assertThrows(NullPointerException.class, () -> builder.executor(null));
-        assertThrows(NullPointerException.class, () -> builder.proxy(null));
-        assertThrows(NullPointerException.class, () -> builder.sslParameters(null));
-        assertThrows(NullPointerException.class, () -> builder.followRedirects(null));
-        assertThrows(NullPointerException.class, () -> builder.sslContext(null));
-        assertThrows(NullPointerException.class, () -> builder.version(null));
+        assertThrows(NPE, () -> builder.authenticator(null));
+        assertThrows(NPE, () -> builder.cookieHandler(null));
+        assertThrows(NPE, () -> builder.executor(null));
+        assertThrows(NPE, () -> builder.proxy(null));
+        assertThrows(NPE, () -> builder.sslParameters(null));
+        assertThrows(NPE, () -> builder.followRedirects(null));
+        assertThrows(NPE, () -> builder.sslContext(null));
+        assertThrows(NPE, () -> builder.version(null));
     }
 
     static class TestAuthenticator extends Authenticator { }
@@ -90,7 +107,7 @@ public void testAuthenticator() {
         Authenticator b = new TestAuthenticator();
         builder.authenticator(b);
         assertTrue(builder.build().authenticator().get() == b);
-        assertThrows(NullPointerException.class, () -> builder.authenticator(null));
+        assertThrows(NPE, () -> builder.authenticator(null));
         Authenticator c = new TestAuthenticator();
         builder.authenticator(c);
         assertTrue(builder.build().authenticator().get() == c);
@@ -105,7 +122,7 @@ public void testCookieHandler() {
         CookieHandler b = new CookieManager();
         builder.cookieHandler(b);
         assertTrue(builder.build().cookieHandler().get() == b);
-        assertThrows(NullPointerException.class, () -> builder.cookieHandler(null));
+        assertThrows(NPE, () -> builder.cookieHandler(null));
         CookieManager c = new CookieManager();
         builder.cookieHandler(c);
         assertTrue(builder.build().cookieHandler().get() == c);
@@ -124,7 +141,7 @@ public void testExecutor() {
         TestExecutor b = new TestExecutor();
         builder.executor(b);
         assertTrue(builder.build().executor().get() == b);
-        assertThrows(NullPointerException.class, () -> builder.executor(null));
+        assertThrows(NPE, () -> builder.executor(null));
         TestExecutor c = new TestExecutor();
         builder.executor(c);
         assertTrue(builder.build().executor().get() == c);
@@ -139,7 +156,7 @@ public void testProxySelector() {
         ProxySelector b = ProxySelector.of(InetSocketAddress.createUnresolved("foo", 80));
         builder.proxy(b);
         assertTrue(builder.build().proxy().get() == b);
-        assertThrows(NullPointerException.class, () -> builder.proxy(null));
+        assertThrows(NPE, () -> builder.proxy(null));
         ProxySelector c = ProxySelector.of(InetSocketAddress.createUnresolved("bar", 80));
         builder.proxy(c);
         assertTrue(builder.build().proxy().get() == c);
@@ -159,7 +176,7 @@ public void testSSLParameters() {
         builder.sslParameters(b);
         assertTrue(builder.build().sslParameters() != b);
         assertTrue(builder.build().sslParameters().getEnableRetransmissions());
-        assertThrows(NullPointerException.class, () -> builder.sslParameters(null));
+        assertThrows(NPE, () -> builder.sslParameters(null));
         SSLParameters c = new SSLParameters();
         c.setProtocols(new String[] { "C" });
         builder.sslParameters(c);
@@ -176,7 +193,7 @@ public void testSSLContext() throws Exception {
         SSLContext b = (new SimpleSSLContext()).get();
         builder.sslContext(b);
         assertTrue(builder.build().sslContext() == b);
-        assertThrows(NullPointerException.class, () -> builder.sslContext(null));
+        assertThrows(NPE, () -> builder.sslContext(null));
         SSLContext c = (new SimpleSSLContext()).get();
         builder.sslContext(c);
         assertTrue(builder.build().sslContext() == c);
@@ -189,11 +206,9 @@ public void testFollowRedirects() {
         assertTrue(builder.build().followRedirects() == Redirect.ALWAYS);
         builder.followRedirects(Redirect.NEVER);
         assertTrue(builder.build().followRedirects() == Redirect.NEVER);
-        assertThrows(NullPointerException.class, () -> builder.followRedirects(null));
-        builder.followRedirects(Redirect.SAME_PROTOCOL);
-        assertTrue(builder.build().followRedirects() == Redirect.SAME_PROTOCOL);
-        builder.followRedirects(Redirect.SECURE);
-        assertTrue(builder.build().followRedirects() == Redirect.SECURE);
+        assertThrows(NPE, () -> builder.followRedirects(null));
+        builder.followRedirects(Redirect.NORMAL);
+        assertTrue(builder.build().followRedirects() == Redirect.NORMAL);
     }
 
     @Test
@@ -203,7 +218,7 @@ public void testVersion() {
         assertTrue(builder.build().version() == Version.HTTP_2);
         builder.version(Version.HTTP_1_1);
         assertTrue(builder.build().version() == Version.HTTP_1_1);
-        assertThrows(NullPointerException.class, () -> builder.version(null));
+        assertThrows(NPE, () -> builder.version(null));
         builder.version(Version.HTTP_2);
         assertTrue(builder.build().version() == Version.HTTP_2);
         builder.version(Version.HTTP_1_1);
@@ -213,10 +228,10 @@ public void testVersion() {
     @Test
     static void testPriority() throws Exception {
         HttpClient.Builder builder = HttpClient.newBuilder();
-        assertThrows(IllegalArgumentException.class, () -> builder.priority(-1));
-        assertThrows(IllegalArgumentException.class, () -> builder.priority(0));
-        assertThrows(IllegalArgumentException.class, () -> builder.priority(257));
-        assertThrows(IllegalArgumentException.class, () -> builder.priority(500));
+        assertThrows(IAE, () -> builder.priority(-1));
+        assertThrows(IAE, () -> builder.priority(0));
+        assertThrows(IAE, () -> builder.priority(257));
+        assertThrows(IAE, () -> builder.priority(500));
 
         builder.priority(1);
         builder.build();
@@ -224,6 +239,90 @@ static void testPriority() throws Exception {
         builder.build();
     }
 
+    // ---
+
+    static final URI uri = URI.create("http://foo.com/");
+
+    @Test
+    static void testHttpClientSendArgs() throws Exception {
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder(uri).build();
+
+        assertThrows(NPE, () -> client.send(null, BodyHandlers.discarding()));
+        assertThrows(NPE, () -> client.send(request, null));
+        assertThrows(NPE, () -> client.send(null, null));
+
+        assertThrows(NPE, () -> client.sendAsync(null, BodyHandlers.discarding()));
+        assertThrows(NPE, () -> client.sendAsync(request, null));
+        assertThrows(NPE, () -> client.sendAsync(null, null));
+
+        assertThrows(NPE, () -> client.sendAsync(null, BodyHandlers.discarding(), null));
+        assertThrows(NPE, () -> client.sendAsync(request, null, null));
+        assertThrows(NPE, () -> client.sendAsync(null, null, null));
+
+        // CONNECT is disallowed in the implementation, since it is used for
+        // tunneling, and is handled separately for security checks.
+        HttpRequest connectRequest = new HttpConnectRequest();
+        assertThrows(IAE, () -> client.send(connectRequest, BodyHandlers.discarding()));
+        assertThrows(IAE, () -> client.sendAsync(connectRequest, BodyHandlers.discarding()));
+        assertThrows(IAE, () -> client.sendAsync(connectRequest, BodyHandlers.discarding(), null));
+    }
+
+    static class HttpConnectRequest extends HttpRequest {
+        @Override public Optional<BodyPublisher> bodyPublisher() { return Optional.empty(); }
+        @Override public String method() { return "CONNECT"; }
+        @Override public Optional<Duration> timeout() { return Optional.empty(); }
+        @Override public boolean expectContinue() { return false; }
+        @Override public URI uri() { return URI.create("http://foo.com/"); }
+        @Override public Optional<Version> version() { return Optional.empty(); }
+        private final FixedHttpHeaders headers = new FixedHttpHeaders();
+        @Override public HttpHeaders headers() { return headers; }
+        public class FixedHttpHeaders extends HttpHeaders {
+            private final Map<String, List<String>> map =
+                    new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+            @Override
+            public Map<String, List<String>> map() {
+                return map;
+            }
+        }
+    }
+
+    // ---
+
+    static final Class<UnsupportedOperationException> UOE =
+            UnsupportedOperationException.class;
+
+    @Test
+    static void testUnsupportedWebSocket() throws Exception {
+        //  @implSpec The default implementation of this method throws
+        // {@code UnsupportedOperationException}.
+        assertThrows(UOE, () -> (new MockHttpClient()).newWebSocketBuilder());
+    }
+
+    static class MockHttpClient extends HttpClient {
+        @Override public Optional<CookieHandler> cookieHandler() { return null; }
+        @Override public Redirect followRedirects() { return null; }
+        @Override public Optional<ProxySelector> proxy() { return null; }
+        @Override public SSLContext sslContext() { return null; }
+        @Override public SSLParameters sslParameters() { return null; }
+        @Override public Optional<Authenticator> authenticator() { return null; }
+        @Override public Version version() { return null; }
+        @Override public Optional<Executor> executor() { return null; }
+        @Override public <T> HttpResponse<T>
+        send(HttpRequest request, BodyHandler<T> responseBodyHandler)
+                throws IOException, InterruptedException {
+            return null;
+        }
+        @Override public <T> CompletableFuture<HttpResponse<T>>
+        sendAsync(HttpRequest request, BodyHandler<T> responseBodyHandler) {
+            return null;
+        }
+        @Override
+        public <T> CompletableFuture<HttpResponse<T>>
+        sendAsync(HttpRequest x, BodyHandler<T> y, PushPromiseHandler<T> z) {
+            return null;
+        }
+    }
 
     /* ---- standalone entry point ---- */
 
diff --git a/test/jdk/java/net/httpclient/HttpEchoHandler.java b/test/jdk/java/net/httpclient/HttpEchoHandler.java
index 914d89161ac..e375cca2d95 100644
--- a/test/jdk/java/net/httpclient/HttpEchoHandler.java
+++ b/test/jdk/java/net/httpclient/HttpEchoHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
 
 import com.sun.net.httpserver.*;
 import java.net.*;
-import jdk.incubator.http.*;
+import java.net.http.*;
 import java.io.*;
 import java.util.concurrent.*;
 import javax.net.ssl.*;
@@ -33,13 +33,15 @@
 import java.util.List;
 import java.util.Random;
 import jdk.testlibrary.SimpleSSLContext;
-import static jdk.incubator.http.HttpRequest.*;
-import static jdk.incubator.http.HttpResponse.*;
+import static java.net.http.HttpRequest.*;
+import static java.net.http.HttpResponse.*;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class HttpEchoHandler implements HttpHandler {
+    static final Path CWD = Paths.get(".");
+
     public HttpEchoHandler() {}
 
     @Override
@@ -53,7 +55,7 @@ public void handle(HttpExchange t)
             map1.add("X-Hello", "world");
             map1.add("X-Bye", "universe");
             String fixedrequest = map.getFirst("XFixed");
-            File outfile = File.createTempFile("foo", "bar");
+            File outfile = Files.createTempFile(CWD, "foo", "bar").toFile();
             FileOutputStream fos = new FileOutputStream(outfile);
             int count = (int) is.transferTo(fos);
             is.close();
diff --git a/test/jdk/java/net/httpclient/HttpInputStreamTest.java b/test/jdk/java/net/httpclient/HttpInputStreamTest.java
index 150cfabaf12..710b6ade80b 100644
--- a/test/jdk/java/net/httpclient/HttpInputStreamTest.java
+++ b/test/jdk/java/net/httpclient/HttpInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -26,10 +26,10 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Iterator;
@@ -78,7 +78,7 @@ public HttpInputStreamHandler(int maxBuffers) {
 
         @Override
         public HttpResponse.BodySubscriber<InputStream>
-                apply(int i, HttpHeaders hh) {
+                apply(HttpResponse.ResponseInfo rinfo) {
             return new HttpResponseInputStream(maxBuffers);
         }
 
@@ -293,11 +293,11 @@ public static void main(String[] args) throws Exception {
         // This example shows how to return an InputStream that can be used to
         // start reading the response body before the response is fully received.
         // In comparison, the snipet below (which uses
-        // HttpResponse.BodyHandler.asString()) obviously will not return before the
+        // HttpResponse.BodyHandlers.ofString()) obviously will not return before the
         // response body is fully read:
         //
         // System.out.println(
-        //    client.sendAsync(request, HttpResponse.BodyHandler.asString()).get().body());
+        //    client.sendAsync(request, HttpResponse.BodyHandlers.ofString()).get().body());
 
         CompletableFuture<HttpResponse<InputStream>> handle =
             client.sendAsync(request, new HttpInputStreamHandler(3));
diff --git a/test/jdk/java/net/httpclient/HttpRequestBuilderTest.java b/test/jdk/java/net/httpclient/HttpRequestBuilderTest.java
index b2023783d63..a3134397bcf 100644
--- a/test/jdk/java/net/httpclient/HttpRequestBuilderTest.java
+++ b/test/jdk/java/net/httpclient/HttpRequestBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,7 +22,7 @@
  */
 
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
+import java.net.http.HttpClient;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.function.BiFunction;
@@ -30,9 +30,9 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import jdk.incubator.http.HttpRequest;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.noBody;
+import java.net.http.HttpRequest;
+import static java.net.http.HttpRequest.BodyPublishers.ofString;
+import static java.net.http.HttpRequest.BodyPublishers.noBody;
 
 /**
  * @test
@@ -155,8 +155,7 @@ public static void main(String[] args) throws Exception {
                         (String[]) new String[] {"foo"},
                         IllegalArgumentException.class);
 
-        builder = test1("DELETE", builder, builder::DELETE,
-                        noBody(), null);
+        test0("DELETE", () -> HttpRequest.newBuilder(TEST_URI).DELETE().build(), null);
 
         builder = test1("POST", builder, builder::POST,
                         noBody(), null);
@@ -167,10 +166,6 @@ public static void main(String[] args) throws Exception {
         builder = test2("method", builder, builder::method, "GET",
                         noBody(), null);
 
-        builder = test1("DELETE", builder, builder::DELETE,
-                        (HttpRequest.BodyPublisher)null,
-                        NullPointerException.class);
-
         builder = test1("POST", builder, builder::POST,
                         (HttpRequest.BodyPublisher)null,
                         NullPointerException.class);
@@ -204,12 +199,12 @@ public static void main(String[] args) throws Exception {
                         NullPointerException.class);
 
         builder = test2("method", builder, builder::method, null,
-                        fromString("foo"),
+                        ofString("foo"),
                         NullPointerException.class);
 // see JDK-8170093
 //
 //        builder = test2("method", builder, builder::method, "foo",
-//                       HttpRequest.BodyProcessor.fromString("foo"),
+//                       HttpRequest.BodyProcessor.ofString("foo"),
 //                       IllegalArgumentException.class);
 //
 //        builder.build();
@@ -223,40 +218,40 @@ public static void main(String[] args) throws Exception {
                () -> HttpRequest.newBuilder(TEST_URI).GET(),
                "GET");
 
-        method("newBuilder(TEST_URI).POST(fromString(\"\")).GET().build().method() == GET",
-               () -> HttpRequest.newBuilder(TEST_URI).POST(fromString("")).GET(),
+        method("newBuilder(TEST_URI).POST(ofString(\"\")).GET().build().method() == GET",
+               () -> HttpRequest.newBuilder(TEST_URI).POST(ofString("")).GET(),
                "GET");
 
-        method("newBuilder(TEST_URI).PUT(fromString(\"\")).GET().build().method() == GET",
-               () -> HttpRequest.newBuilder(TEST_URI).PUT(fromString("")).GET(),
+        method("newBuilder(TEST_URI).PUT(ofString(\"\")).GET().build().method() == GET",
+               () -> HttpRequest.newBuilder(TEST_URI).PUT(ofString("")).GET(),
                "GET");
 
-        method("newBuilder(TEST_URI).DELETE(fromString(\"\")).GET().build().method() == GET",
-               () -> HttpRequest.newBuilder(TEST_URI).DELETE(fromString("")).GET(),
+        method("newBuilder(TEST_URI).DELETE().GET().build().method() == GET",
+               () -> HttpRequest.newBuilder(TEST_URI).DELETE().GET(),
                "GET");
 
-        method("newBuilder(TEST_URI).POST(fromString(\"\")).build().method() == POST",
-               () -> HttpRequest.newBuilder(TEST_URI).POST(fromString("")),
+        method("newBuilder(TEST_URI).POST(ofString(\"\")).build().method() == POST",
+               () -> HttpRequest.newBuilder(TEST_URI).POST(ofString("")),
                "POST");
 
-        method("newBuilder(TEST_URI).PUT(fromString(\"\")).build().method() == PUT",
-               () -> HttpRequest.newBuilder(TEST_URI).PUT(fromString("")),
+        method("newBuilder(TEST_URI).PUT(ofString(\"\")).build().method() == PUT",
+               () -> HttpRequest.newBuilder(TEST_URI).PUT(ofString("")),
                "PUT");
 
-        method("newBuilder(TEST_URI).DELETE(fromString(\"\")).build().method() == DELETE",
-               () -> HttpRequest.newBuilder(TEST_URI).DELETE(fromString("")),
+        method("newBuilder(TEST_URI).DELETE().build().method() == DELETE",
+               () -> HttpRequest.newBuilder(TEST_URI).DELETE(),
                "DELETE");
 
-        method("newBuilder(TEST_URI).GET().POST(fromString(\"\")).build().method() == POST",
-               () -> HttpRequest.newBuilder(TEST_URI).GET().POST(fromString("")),
+        method("newBuilder(TEST_URI).GET().POST(ofString(\"\")).build().method() == POST",
+               () -> HttpRequest.newBuilder(TEST_URI).GET().POST(ofString("")),
                "POST");
 
-        method("newBuilder(TEST_URI).GET().PUT(fromString(\"\")).build().method() == PUT",
-               () -> HttpRequest.newBuilder(TEST_URI).GET().PUT(fromString("")),
+        method("newBuilder(TEST_URI).GET().PUT(ofString(\"\")).build().method() == PUT",
+               () -> HttpRequest.newBuilder(TEST_URI).GET().PUT(ofString("")),
                "PUT");
 
-        method("newBuilder(TEST_URI).GET().DELETE(fromString(\"\")).build().method() == DELETE",
-               () -> HttpRequest.newBuilder(TEST_URI).GET().DELETE(fromString("")),
+        method("newBuilder(TEST_URI).GET().DELETE().build().method() == DELETE",
+               () -> HttpRequest.newBuilder(TEST_URI).GET().DELETE(),
                "DELETE");
 
 
diff --git a/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java b/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java
index 3480fabeffe..90f301f3d87 100644
--- a/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java
+++ b/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java
@@ -21,12 +21,12 @@
  * questions.
  */
 
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -63,7 +63,7 @@ public static void main(String[] args) throws InterruptedException, ExecutionExc
     @Test
     public static void testOnError() throws InterruptedException, ExecutionException {
         CountDownLatch latch = new CountDownLatch(1);
-        BodySubscriber<InputStream> isb = BodySubscriber.asInputStream();
+        BodySubscriber<InputStream> isb = BodySubscribers.ofInputStream();
         ErrorTestSubscription s = new ErrorTestSubscription(isb);
         CompletionStage<Throwable> cs =
                 isb.getBody().thenApplyAsync((is) -> s.accept(latch, is));
@@ -158,7 +158,7 @@ static InputStream close(InputStream is) {
     public static void testCloseAndSubscribe()
             throws InterruptedException, ExecutionException
     {
-        BodySubscriber<InputStream> isb = BodySubscriber.asInputStream();
+        BodySubscriber<InputStream> isb = BodySubscribers.ofInputStream();
         TestCancelOnCloseSubscription s = new TestCancelOnCloseSubscription();
         InputStream is = isb.getBody()
                 .thenApply(HttpResponseInputStreamTest::close)
@@ -187,7 +187,7 @@ static byte[] readAllBytes(InputStream is) {
     public static void testSubscribeAndClose()
             throws InterruptedException, ExecutionException
     {
-        BodySubscriber<InputStream> isb = BodySubscriber.asInputStream();
+        BodySubscriber<InputStream> isb = BodySubscribers.ofInputStream();
         TestCancelOnCloseSubscription s = new TestCancelOnCloseSubscription();
         InputStream is = isb.getBody().toCompletableFuture().get();
         isb.onSubscribe(s);
diff --git a/test/jdk/java/net/httpclient/HttpServerAdapters.java b/test/jdk/java/net/httpclient/HttpServerAdapters.java
new file mode 100644
index 00000000000..a09a65cdae6
--- /dev/null
+++ b/test/jdk/java/net/httpclient/HttpServerAdapters.java
@@ -0,0 +1,614 @@
+/*
+ * Copyright (c) 2018, 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 com.sun.net.httpserver.Filter;
+import com.sun.net.httpserver.Headers;
+import com.sun.net.httpserver.HttpContext;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+
+import java.net.InetAddress;
+import java.io.ByteArrayInputStream;
+import java.net.http.HttpClient.Version;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.UncheckedIOException;
+import java.math.BigInteger;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+/**
+ * Defines an adaptation layers so that a test server handlers and filters
+ * can be implemented independently of the underlying server version.
+ * <p>
+ * For instance:
+ * <pre>{@code
+ *
+ *  URI http1URI, http2URI;
+ *
+ *  InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+ *  HttpTestServer server1 = HttpTestServer.of(HttpServer.create(sa, 0));
+ *  HttpTestContext context = server.addHandler(new HttpTestEchoHandler(), "/http1/echo");
+ *  http2URI = "http://localhost:" + server1.getAddress().getPort() + "/http1/echo";
+ *
+ *  Http2TestServer http2TestServer = new Http2TestServer("localhost", false, 0);
+ *  HttpTestServer server2 = HttpTestServer.of(http2TestServer);
+ *  server2.addHandler(new HttpTestEchoHandler(), "/http2/echo");
+ *  http1URI = "http://localhost:" + server2.getAddress().getPort() + "/http2/echo";
+ *
+ *  }</pre>
+ */
+public interface HttpServerAdapters {
+
+    static final boolean PRINTSTACK =
+            Boolean.getBoolean("jdk.internal.httpclient.debug");
+
+    static void uncheckedWrite(ByteArrayOutputStream baos, byte[] ba) {
+        try {
+            baos.write(ba);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    static void printBytes(PrintStream out, String prefix, byte[] bytes) {
+        int padding = 4 + 4 - (bytes.length % 4);
+        padding = padding > 4 ? padding - 4 : 4;
+        byte[] bigbytes = new byte[bytes.length + padding];
+        System.arraycopy(bytes, 0, bigbytes, padding, bytes.length);
+        out.println(prefix + bytes.length + " "
+                    + new BigInteger(bigbytes).toString(16));
+    }
+
+    /**
+     * A version agnostic adapter class for HTTP Headers.
+     */
+    public static abstract class HttpTestHeaders {
+        public abstract Optional<String> firstValue(String name);
+        public abstract void addHeader(String name, String value);
+        public abstract Set<String> keySet();
+        public abstract Set<Map.Entry<String, List<String>>> entrySet();
+        public abstract List<String> get(String name);
+        public abstract boolean containsKey(String name);
+
+        public static HttpTestHeaders of(Headers headers) {
+            return new Http1TestHeaders(headers);
+        }
+        public static HttpTestHeaders of(HttpHeadersImpl headers) {
+            return new Http2TestHeaders(headers);
+        }
+
+        private final static class Http1TestHeaders extends HttpTestHeaders {
+            private final Headers headers;
+            Http1TestHeaders(Headers h) { this.headers = h; }
+            @Override
+            public Optional<String> firstValue(String name) {
+                if (headers.containsKey(name)) {
+                    return Optional.ofNullable(headers.getFirst(name));
+                }
+                return Optional.empty();
+            }
+            @Override
+            public void addHeader(String name, String value) {
+                headers.add(name, value);
+            }
+
+            @Override
+            public Set<String> keySet() { return headers.keySet(); }
+            @Override
+            public Set<Map.Entry<String, List<String>>> entrySet() {
+                return headers.entrySet();
+            }
+            @Override
+            public List<String> get(String name) {
+                return headers.get(name);
+            }
+            @Override
+            public boolean containsKey(String name) {
+                return headers.containsKey(name);
+            }
+        }
+        private final static class Http2TestHeaders extends HttpTestHeaders {
+            private final HttpHeadersImpl headers;
+            Http2TestHeaders(HttpHeadersImpl h) { this.headers = h; }
+            @Override
+            public Optional<String> firstValue(String name) {
+                return headers.firstValue(name);
+            }
+            @Override
+            public void addHeader(String name, String value) {
+                headers.addHeader(name, value);
+            }
+            public Set<String> keySet() { return headers.map().keySet(); }
+            @Override
+            public Set<Map.Entry<String, List<String>>> entrySet() {
+                return headers.map().entrySet();
+            }
+            @Override
+            public List<String> get(String name) {
+                return headers.allValues(name);
+            }
+            @Override
+            public boolean containsKey(String name) {
+                return headers.firstValue(name).isPresent();
+            }
+        }
+    }
+
+    /**
+     * A version agnostic adapter class for HTTP Server Exchange.
+     */
+    public static abstract class HttpTestExchange {
+        public abstract Version getServerVersion();
+        public abstract Version getExchangeVersion();
+        public abstract InputStream   getRequestBody();
+        public abstract OutputStream  getResponseBody();
+        public abstract HttpTestHeaders getRequestHeaders();
+        public abstract HttpTestHeaders getResponseHeaders();
+        public abstract void sendResponseHeaders(int code, int contentLength) throws IOException;
+        public abstract URI getRequestURI();
+        public abstract String getRequestMethod();
+        public abstract void close();
+        public void serverPush(URI uri, HttpTestHeaders headers, byte[] body) {
+            ByteArrayInputStream bais = new ByteArrayInputStream(body);
+            serverPush(uri, headers, bais);
+        }
+        public void serverPush(URI uri, HttpTestHeaders headers, InputStream body) {
+            throw new UnsupportedOperationException("serverPush with " + getExchangeVersion());
+        }
+        public boolean serverPushAllowed() {
+            return false;
+        }
+        public static HttpTestExchange of(HttpExchange exchange) {
+            return new Http1TestExchange(exchange);
+        }
+        public static HttpTestExchange of(Http2TestExchange exchange) {
+            return new Http2TestExchangeImpl(exchange);
+        }
+
+        abstract void doFilter(Filter.Chain chain) throws IOException;
+
+        // implementations...
+        private static final class Http1TestExchange extends HttpTestExchange {
+            private final HttpExchange exchange;
+            Http1TestExchange(HttpExchange exch) {
+                this.exchange = exch;
+            }
+            @Override
+            public Version getServerVersion() { return Version.HTTP_1_1; }
+            @Override
+            public Version getExchangeVersion() { return Version.HTTP_1_1; }
+            @Override
+            public InputStream getRequestBody() {
+                return exchange.getRequestBody();
+            }
+            @Override
+            public OutputStream getResponseBody() {
+                return exchange.getResponseBody();
+            }
+            @Override
+            public HttpTestHeaders getRequestHeaders() {
+                return HttpTestHeaders.of(exchange.getRequestHeaders());
+            }
+            @Override
+            public HttpTestHeaders getResponseHeaders() {
+                return HttpTestHeaders.of(exchange.getResponseHeaders());
+            }
+            @Override
+            public void sendResponseHeaders(int code, int contentLength) throws IOException {
+                if (contentLength == 0) contentLength = -1;
+                else if (contentLength < 0) contentLength = 0;
+                exchange.sendResponseHeaders(code, contentLength);
+            }
+            @Override
+            void doFilter(Filter.Chain chain) throws IOException {
+                chain.doFilter(exchange);
+            }
+            @Override
+            public void close() { exchange.close(); }
+            @Override
+            public URI getRequestURI() { return exchange.getRequestURI(); }
+            @Override
+            public String getRequestMethod() { return exchange.getRequestMethod(); }
+            @Override
+            public String toString() {
+                return this.getClass().getSimpleName() + ": " + exchange.toString();
+            }
+        }
+
+        private static final class Http2TestExchangeImpl extends HttpTestExchange {
+            private final Http2TestExchange exchange;
+            Http2TestExchangeImpl(Http2TestExchange exch) {
+                this.exchange = exch;
+            }
+            @Override
+            public Version getServerVersion() { return Version.HTTP_2; }
+            @Override
+            public Version getExchangeVersion() { return Version.HTTP_2; }
+            @Override
+            public InputStream getRequestBody() {
+                return exchange.getRequestBody();
+            }
+            @Override
+            public OutputStream getResponseBody() {
+                return exchange.getResponseBody();
+            }
+            @Override
+            public HttpTestHeaders getRequestHeaders() {
+                return HttpTestHeaders.of(exchange.getRequestHeaders());
+            }
+            @Override
+            public HttpTestHeaders getResponseHeaders() {
+                return HttpTestHeaders.of(exchange.getResponseHeaders());
+            }
+            @Override
+            public void sendResponseHeaders(int code, int contentLength) throws IOException {
+                if (contentLength == 0) contentLength = -1;
+                else if (contentLength < 0) contentLength = 0;
+                exchange.sendResponseHeaders(code, contentLength);
+            }
+            @Override
+            public boolean serverPushAllowed() {
+                return exchange.serverPushAllowed();
+            }
+            @Override
+            public void serverPush(URI uri, HttpTestHeaders headers, InputStream body) {
+                HttpHeadersImpl headersImpl;
+                if (headers instanceof HttpTestHeaders.Http2TestHeaders) {
+                    headersImpl = ((HttpTestHeaders.Http2TestHeaders)headers).headers.deepCopy();
+                } else {
+                    headersImpl = new HttpHeadersImpl();
+                    for (Map.Entry<String, List<String>> e : headers.entrySet()) {
+                        String name = e.getKey();
+                        for (String v : e.getValue()) {
+                            headersImpl.addHeader(name, v);
+                        }
+                    }
+                }
+                exchange.serverPush(uri, headersImpl, body);
+            }
+            void doFilter(Filter.Chain filter) throws IOException {
+                throw new IOException("cannot use HTTP/1.1 filter with HTTP/2 server");
+            }
+            @Override
+            public void close() { exchange.close();}
+            @Override
+            public URI getRequestURI() { return exchange.getRequestURI(); }
+            @Override
+            public String getRequestMethod() { return exchange.getRequestMethod(); }
+            @Override
+            public String toString() {
+                return this.getClass().getSimpleName() + ": " + exchange.toString();
+            }
+        }
+
+    }
+
+
+    /**
+     * A version agnostic adapter class for HTTP Server Handlers.
+     */
+    public interface HttpTestHandler {
+        void handle(HttpTestExchange t) throws IOException;
+
+        default HttpHandler toHttpHandler() {
+            return (t) -> doHandle(HttpTestExchange.of(t));
+        }
+        default Http2Handler toHttp2Handler() {
+            return (t) -> doHandle(HttpTestExchange.of(t));
+        }
+        private void doHandle(HttpTestExchange t) throws IOException {
+            try {
+                handle(t);
+            } catch (Throwable x) {
+                System.out.println("WARNING: exception caught in HttpTestHandler::handle " + x);
+                System.err.println("WARNING: exception caught in HttpTestHandler::handle " + x);
+                if (PRINTSTACK && !expectException(t)) x.printStackTrace(System.out);
+                throw x;
+            }
+        }
+    }
+
+
+    public static class HttpTestEchoHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                byte[] bytes = is.readAllBytes();
+                printBytes(System.out,"Echo server got "
+                        + t.getExchangeVersion() + " bytes: ", bytes);
+                if (t.getRequestHeaders().firstValue("Content-type").isPresent()) {
+                    t.getResponseHeaders().addHeader("Content-type",
+                            t.getRequestHeaders().firstValue("Content-type").get());
+                }
+                t.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+    }
+
+    public static boolean expectException(HttpTestExchange e) {
+        HttpTestHeaders h = e.getRequestHeaders();
+        Optional<String> expectException = h.firstValue("X-expect-exception");
+        if (expectException.isPresent()) {
+            return expectException.get().equalsIgnoreCase("true");
+        }
+        return false;
+    }
+
+    /**
+     * A version agnostic adapter class for HTTP Server Filter Chains.
+     */
+    public abstract class HttpChain {
+
+        public abstract void doFilter(HttpTestExchange exchange) throws IOException;
+        public static HttpChain of(Filter.Chain chain) {
+            return new Http1Chain(chain);
+        }
+
+        public static HttpChain of(List<HttpTestFilter> filters, HttpTestHandler handler) {
+            return new Http2Chain(filters, handler);
+        }
+
+        private static class Http1Chain extends HttpChain {
+            final Filter.Chain chain;
+            Http1Chain(Filter.Chain chain) {
+                this.chain = chain;
+            }
+            @Override
+            public void doFilter(HttpTestExchange exchange) throws IOException {
+                try {
+                    exchange.doFilter(chain);
+                } catch (Throwable t) {
+                    System.out.println("WARNING: exception caught in Http1Chain::doFilter " + t);
+                    System.err.println("WARNING: exception caught in Http1Chain::doFilter " + t);
+                    if (PRINTSTACK && !expectException(exchange)) t.printStackTrace(System.out);
+                    throw t;
+                }
+            }
+        }
+
+        private static class Http2Chain extends HttpChain {
+            ListIterator<HttpTestFilter> iter;
+            HttpTestHandler handler;
+            Http2Chain(List<HttpTestFilter> filters, HttpTestHandler handler) {
+                this.iter = filters.listIterator();
+                this.handler = handler;
+            }
+            @Override
+            public void doFilter(HttpTestExchange exchange) throws IOException {
+                try {
+                    if (iter.hasNext()) {
+                        iter.next().doFilter(exchange, this);
+                    } else {
+                        handler.handle(exchange);
+                    }
+                } catch (Throwable t) {
+                    System.out.println("WARNING: exception caught in Http2Chain::doFilter " + t);
+                    System.err.println("WARNING: exception caught in Http2Chain::doFilter " + t);
+                    if (PRINTSTACK && !expectException(exchange)) t.printStackTrace(System.out);
+                    throw t;
+                }
+            }
+        }
+
+    }
+
+    /**
+     * A version agnostic adapter class for HTTP Server Filters.
+     */
+    public abstract class HttpTestFilter {
+
+        public abstract String description();
+
+        public abstract void doFilter(HttpTestExchange exchange, HttpChain chain) throws IOException;
+
+        public Filter toFilter() {
+            return new Filter() {
+                @Override
+                public void doFilter(HttpExchange exchange, Chain chain) throws IOException {
+                    HttpTestFilter.this.doFilter(HttpTestExchange.of(exchange), HttpChain.of(chain));
+                }
+                @Override
+                public String description() {
+                    return HttpTestFilter.this.description();
+                }
+            };
+        }
+    }
+
+    /**
+     * A version agnostic adapter class for HTTP Server Context.
+     */
+    public static abstract class HttpTestContext {
+        public abstract String getPath();
+        public abstract void addFilter(HttpTestFilter filter);
+        public abstract Version getVersion();
+
+        // will throw UOE if the server is HTTP/2
+        public abstract void setAuthenticator(com.sun.net.httpserver.Authenticator authenticator);
+    }
+
+    /**
+     * A version agnostic adapter class for HTTP Servers.
+     */
+    public static abstract class HttpTestServer {
+        private static final class ServerLogging {
+            private static final Logger logger = Logger.getLogger("com.sun.net.httpserver");
+            static void enableLogging() {
+                logger.setLevel(Level.FINE);
+                Stream.of(Logger.getLogger("").getHandlers())
+                        .forEach(h -> h.setLevel(Level.ALL));
+            }
+        }
+
+        public abstract void start();
+        public abstract void stop();
+        public abstract HttpTestContext addHandler(HttpTestHandler handler, String root);
+        public abstract InetSocketAddress getAddress();
+        public abstract Version getVersion();
+
+        public String serverAuthority() {
+            return InetAddress.getLoopbackAddress().getHostName() + ":"
+                    + getAddress().getPort();
+        }
+
+        public static HttpTestServer of(HttpServer server) {
+            return new Http1TestServer(server);
+        }
+
+        public static HttpTestServer of(Http2TestServer server) {
+            return new Http2TestServerImpl(server);
+        }
+
+        private static class Http1TestServer extends  HttpTestServer {
+            private final HttpServer impl;
+            Http1TestServer(HttpServer server) {
+                this.impl = server;
+            }
+            @Override
+            public void start() {
+                System.out.println("Http1TestServer: start");
+                impl.start();
+            }
+            @Override
+            public void stop() {
+                System.out.println("Http1TestServer: stop");
+                impl.stop(0);
+            }
+            @Override
+            public HttpTestContext addHandler(HttpTestHandler handler, String path) {
+                System.out.println("Http1TestServer[" + getAddress()
+                        + "]::addHandler " + handler + ", " + path);
+                return new Http1TestContext(impl.createContext(path, handler.toHttpHandler()));
+            }
+            @Override
+            public InetSocketAddress getAddress() {
+                return new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                        impl.getAddress().getPort());
+            }
+            public Version getVersion() { return Version.HTTP_1_1; }
+        }
+
+        private static class Http1TestContext extends HttpTestContext {
+            private final HttpContext context;
+            Http1TestContext(HttpContext ctxt) {
+                this.context = ctxt;
+            }
+            @Override public String getPath() {
+                return context.getPath();
+            }
+            @Override
+            public void addFilter(HttpTestFilter filter) {
+                System.out.println("Http1TestContext::addFilter " + filter.description());
+                context.getFilters().add(filter.toFilter());
+            }
+            @Override
+            public void setAuthenticator(com.sun.net.httpserver.Authenticator authenticator) {
+                context.setAuthenticator(authenticator);
+            }
+            @Override public Version getVersion() { return Version.HTTP_1_1; }
+        }
+
+        private static class Http2TestServerImpl extends  HttpTestServer {
+            private final Http2TestServer impl;
+            Http2TestServerImpl(Http2TestServer server) {
+                this.impl = server;
+            }
+            @Override
+            public void start() {
+                System.out.println("Http2TestServerImpl: start");
+                impl.start();
+            }
+            @Override
+            public void stop() {
+                System.out.println("Http2TestServerImpl: stop");
+                impl.stop();
+            }
+            @Override
+            public HttpTestContext addHandler(HttpTestHandler handler, String path) {
+                System.out.println("Http2TestServerImpl[" + getAddress()
+                                   + "]::addHandler " + handler + ", " + path);
+                Http2TestContext context = new Http2TestContext(handler, path);
+                impl.addHandler(context.toHttp2Handler(), path);
+                return context;
+            }
+            @Override
+            public InetSocketAddress getAddress() {
+                return new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                        impl.getAddress().getPort());
+            }
+            public Version getVersion() { return Version.HTTP_2; }
+        }
+
+        private static class Http2TestContext
+                extends HttpTestContext implements HttpTestHandler {
+            private final HttpTestHandler handler;
+            private final String path;
+            private final List<HttpTestFilter> filters = new CopyOnWriteArrayList<>();
+            Http2TestContext(HttpTestHandler hdl, String path) {
+                this.handler = hdl;
+                this.path = path;
+            }
+            @Override
+            public String getPath() { return path; }
+            @Override
+            public void addFilter(HttpTestFilter filter) {
+                System.out.println("Http2TestContext::addFilter " + filter.description());
+                filters.add(filter);
+            }
+            @Override
+            public void handle(HttpTestExchange exchange) throws IOException {
+                System.out.println("Http2TestContext::handle " + exchange);
+                HttpChain.of(filters, handler).doFilter(exchange);
+            }
+            @Override
+            public void setAuthenticator(com.sun.net.httpserver.Authenticator authenticator) {
+                throw new UnsupportedOperationException("Can't set HTTP/1.1 authenticator on HTTP/2 context");
+            }
+            @Override public Version getVersion() { return Version.HTTP_2; }
+        }
+    }
+
+    public static void enableServerLogging() {
+        System.setProperty("java.util.logging.SimpleFormatter.format",
+                "%4$s [%1$tb %1$td, %1$tl:%1$tM:%1$tS.%1$tN] %2$s: %5$s%6$s%n");
+        HttpTestServer.ServerLogging.enableLogging();
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/HttpsTunnelTest.java b/test/jdk/java/net/httpclient/HttpsTunnelTest.java
new file mode 100644
index 00000000000..d582e41745f
--- /dev/null
+++ b/test/jdk/java/net/httpclient/HttpsTunnelTest.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2018, 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 com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import javax.net.ssl.SSLContext;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import static java.lang.String.format;
+import static java.lang.System.out;
+
+/**
+ * @test
+ * @summary This test verifies that if an h2 connection going through a
+ *          proxy P is downgraded to HTTP/1.1, then a new h2 request
+ *          going to a different host through the same proxy will not
+ *          be preemptively downgraded. That, is the stack should attempt
+ *          a new h2 connection to the new host.
+ * @bug 8196967
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters DigestEchoServer HttpsTunnelTest
+ * @modules java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          java.base/sun.net.www.http
+ *          java.base/sun.net.www
+ *          java.base/sun.net
+ * @run main/othervm -Djdk.internal.httpclient.debug=true HttpsTunnelTest
+ */
+
+public class HttpsTunnelTest implements HttpServerAdapters {
+
+    static final String data[] = {
+        "Lorem ipsum",
+        "dolor sit amet",
+        "consectetur adipiscing elit, sed do eiusmod tempor",
+        "quis nostrud exercitation ullamco",
+        "laboris nisi",
+        "ut",
+        "aliquip ex ea commodo consequat." +
+        "Duis aute irure dolor in reprehenderit in voluptate velit esse" +
+        "cillum dolore eu fugiat nulla pariatur.",
+        "Excepteur sint occaecat cupidatat non proident."
+    };
+
+    static final SSLContext context;
+    static {
+        try {
+            context = new SimpleSSLContext().get();
+            SSLContext.setDefault(context);
+        } catch (Exception x) {
+            throw new ExceptionInInitializerError(x);
+        }
+    }
+
+    HttpsTunnelTest() {
+    }
+
+    public HttpClient newHttpClient(ProxySelector ps) {
+        HttpClient.Builder builder = HttpClient
+                .newBuilder()
+                .sslContext(context)
+                .proxy(ps);
+        return builder.build();
+    }
+
+    public static void main(String[] args) throws Exception {
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        HttpsServer server1 = HttpsServer.create(sa, 0);
+        server1.setHttpsConfigurator(new HttpsConfigurator(context));
+        HttpTestServer http1Server =
+                HttpTestServer.of(server1);
+        http1Server.addHandler(new HttpTestEchoHandler(), "/");
+        http1Server.start();
+        HttpTestServer http2Server = HttpTestServer.of(
+                new Http2TestServer("localhost", true, 0));
+        http2Server.addHandler(new HttpTestEchoHandler(), "/");
+        http2Server.start();
+
+        DigestEchoServer.TunnelingProxy proxy = DigestEchoServer.createHttpsProxyTunnel(
+                DigestEchoServer.HttpAuthSchemeType.NONE);
+
+        try {
+            URI uri1 = new URI("https://" + http1Server.serverAuthority() + "/foo/https1");
+            URI uri2 = new URI("https://" + http2Server.serverAuthority() + "/foo/https2");
+            ProxySelector ps = ProxySelector.of(proxy.getProxyAddress());
+                    //HttpClient.Builder.NO_PROXY;
+            HttpsTunnelTest test = new HttpsTunnelTest();
+            HttpClient client = test.newHttpClient(ps);
+            out.println("Proxy is: " + ps.select(uri2));
+
+            List<String> lines = List.of(Arrays.copyOfRange(data, 0, data.length));
+            assert lines.size() == data.length;
+            String body = lines.stream().collect(Collectors.joining("\r\n"));
+            HttpRequest.BodyPublisher reqBody = HttpRequest.BodyPublishers.ofString(body);
+            HttpRequest req1 = HttpRequest
+                    .newBuilder(uri1)
+                    .version(Version.HTTP_2)
+                    .POST(reqBody)
+                    .build();
+            out.println("\nPosting to HTTP/1.1 server at: " + req1);
+            HttpResponse<Stream<String>> response = client.send(req1, BodyHandlers.ofLines());
+            out.println("Checking response...");
+            if (response.statusCode() != 200) {
+                throw new RuntimeException("Unexpected status code: " + response);
+            }
+            if (response.version() != Version.HTTP_1_1) {
+                throw new RuntimeException("Unexpected protocol version: "
+                        + response.version());
+            }
+            List<String> respLines = response.body().collect(Collectors.toList());
+            if (!lines.equals(respLines)) {
+                throw new RuntimeException("Unexpected response 1: " + respLines);
+            }
+            HttpRequest.BodyPublisher reqBody2 = HttpRequest.BodyPublishers.ofString(body);
+            HttpRequest req2 = HttpRequest
+                    .newBuilder(uri2)
+                    .version(Version.HTTP_2)
+                    .POST(reqBody2)
+                    .build();
+            out.println("\nPosting to HTTP/2 server at: " + req2);
+            response = client.send(req2, BodyHandlers.ofLines());
+            out.println("Checking response...");
+            if (response.statusCode() != 200) {
+                throw new RuntimeException("Unexpected status code: " + response);
+            }
+            if (response.version() != Version.HTTP_2) {
+                throw new RuntimeException("Unexpected protocol version: "
+                        + response.version());
+            }
+            respLines = response.body().collect(Collectors.toList());
+            if (!lines.equals(respLines)) {
+                throw new RuntimeException("Unexpected response 2: " + respLines);
+            }
+        } catch(Throwable t) {
+            out.println("Unexpected exception: exiting: " + t);
+            t.printStackTrace();
+            throw t;
+        } finally {
+            proxy.stop();
+            http1Server.stop();
+            http2Server.stop();
+        }
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/ImmutableFlowItems.java b/test/jdk/java/net/httpclient/ImmutableFlowItems.java
new file mode 100644
index 00000000000..b90b1f61102
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ImmutableFlowItems.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Tests response body subscribers's onNext's Lists are unmodifiable,
+ *          and that the buffers are read-only
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm ImmutableFlowItems
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Flow;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
+import javax.net.ssl.SSLContext;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.*;
+
+public class ImmutableFlowItems {
+
+    SSLContext sslContext;
+    HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    HttpsServer httpsTestServer;       // HTTPS/1.1
+    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI_fixed;
+    String httpURI_chunk;
+    String httpsURI_fixed;
+    String httpsURI_chunk;
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        return new Object[][]{
+                { httpURI_fixed   },
+                { httpURI_chunk   },
+                { httpsURI_fixed  },
+                { httpsURI_chunk  },
+                { http2URI_fixed  },
+                { http2URI_chunk  },
+                { https2URI_fixed },
+                { https2URI_chunk },
+        };
+    }
+
+    static final String BODY = "You'll never plough a field by turning it over in your mind.";
+
+    HttpClient newHttpClient() {
+        return HttpClient.newBuilder()
+                .sslContext(sslContext)
+                .build();
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsString(String uri) throws Exception {
+        HttpClient client = newHttpClient();
+
+        HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                .build();
+
+        BodyHandler<String> handler = new CRSBodyHandler();
+        client.sendAsync(req, handler)
+                .thenApply(HttpResponse::body)
+                .thenAccept(body -> assertEquals(body, BODY))
+                .join();
+    }
+
+    static class CRSBodyHandler implements BodyHandler<String> {
+        @Override
+        public BodySubscriber<String> apply(HttpResponse.ResponseInfo rinfo) {
+            assertEquals(rinfo.statusCode(), 200);
+            return new CRSBodySubscriber();
+        }
+    }
+
+    static class CRSBodySubscriber implements BodySubscriber<String> {
+        private final BodySubscriber<String> ofString = BodySubscribers.ofString(UTF_8);
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            ofString.onSubscribe(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            assertUnmodifiableList(item);
+            long c = item.stream().filter(ByteBuffer::isReadOnly).count();
+            assertEquals(c, item.size(), "Unexpected writable buffer in: " +item);
+            ofString.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            ofString.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            ofString.onComplete();
+        }
+
+        @Override
+        public CompletionStage<String> getBody() {
+            return ofString.getBody();
+        }
+    }
+
+    static final Class<UnsupportedOperationException> UOE = UnsupportedOperationException.class;
+
+    static void assertUnmodifiableList(List<ByteBuffer> list) {
+        assertNotNull(list);
+        ByteBuffer b = list.get(0);
+        assertNotNull(b);
+        assertThrows(UOE, () -> list.add(ByteBuffer.wrap(new byte[0])));
+        assertThrows(UOE, () -> list.remove(b));
+    }
+
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/1.1
+        HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler();
+        HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler();
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpServer.create(sa, 0);
+        httpTestServer.createContext("/http1/fixed", h1_fixedLengthHandler);
+        httpTestServer.createContext("/http1/chunk", h1_chunkHandler);
+        httpURI_fixed = "http://" + serverAuthority(httpTestServer) + "/http1/fixed";
+        httpURI_chunk = "http://" + serverAuthority(httpTestServer) + "/http1/chunk";
+
+        httpsTestServer = HttpsServer.create(sa, 0);
+        httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer.createContext("/https1/fixed", h1_fixedLengthHandler);
+        httpsTestServer.createContext("/https1/chunk", h1_chunkHandler);
+        httpsURI_fixed = "https://" + serverAuthority(httpsTestServer) + "/https1/fixed";
+        httpsURI_chunk = "https://" + serverAuthority(httpsTestServer) + "/https1/chunk";
+
+        // HTTP/2
+        Http2Handler h2_fixedLengthHandler = new HTTP2_FixedLengthHandler();
+        Http2Handler h2_chunkedHandler = new HTTP2_VariableHandler();
+
+        http2TestServer = new Http2TestServer("localhost", false, 0);
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk";
+
+        https2TestServer = new Http2TestServer("localhost", true, 0);
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop(0);
+        httpsTestServer.stop(0);
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    static class HTTP1_FixedLengthHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            out.println("HTTP1_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                is.readAllBytes();
+                byte[] bytes = BODY.getBytes(UTF_8);
+                t.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+    }
+
+    static class HTTP1_ChunkedHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            out.println("HTTP1_ChunkedHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                is.readAllBytes();
+                byte[] bytes = BODY.getBytes(UTF_8);
+                t.sendResponseHeaders(200, 0);
+                os.write(bytes);
+            }
+        }
+    }
+
+    static class HTTP2_FixedLengthHandler implements Http2Handler {
+        @Override
+        public void handle(Http2TestExchange t) throws IOException {
+            out.println("HTTP2_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                is.readAllBytes();
+                byte[] bytes = BODY.getBytes(UTF_8);
+                t.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+    }
+
+    static class HTTP2_VariableHandler implements Http2Handler {
+        @Override
+        public void handle(Http2TestExchange t) throws IOException {
+            out.println("HTTP2_VariableHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                is.readAllBytes();
+                byte[] bytes = BODY.getBytes(UTF_8);
+                t.sendResponseHeaders(200, 0); // variable
+                os.write(bytes);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/ImmutableHeaders.java b/test/jdk/java/net/httpclient/ImmutableHeaders.java
index 48304ad1afc..e8d2e5166bb 100644
--- a/test/jdk/java/net/httpclient/ImmutableHeaders.java
+++ b/test/jdk/java/net/httpclient/ImmutableHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 8087112
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          jdk.httpserver
  * @run main/othervm ImmutableHeaders
  * @summary ImmutableHeaders
@@ -37,21 +37,26 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
-import jdk.incubator.http.*;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.List;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
 
 public class ImmutableHeaders {
 
     final static String RESPONSE = "Hello world";
 
     public static void main(String[] args) throws Exception {
-        HttpServer server = HttpServer.create(new InetSocketAddress(0), 10);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        HttpServer server = HttpServer.create(addr, 10);
         ExecutorService serverExecutor = Executors.newCachedThreadPool();
         ExecutorService clientExecutor = Executors.newCachedThreadPool();
         server.createContext("/test", new ImmutableHeadersHandler());
@@ -65,7 +70,7 @@ public static void main(String[] args) throws Exception {
                                       .build();
 
         try {
-            URI uri = new URI("http://127.0.0.1:" + port + "/test/foo");
+            URI uri = new URI("http://localhost:" + port + "/test/foo");
             HttpRequest req = HttpRequest.newBuilder(uri)
                                          .headers("X-Foo", "bar")
                                          .headers("X-Bar", "foo")
@@ -81,7 +86,7 @@ public static void main(String[] args) throws Exception {
                 throw new RuntimeException("Test failed");
             } catch (UnsupportedOperationException ex) {
             }
-            HttpResponse resp = client.send(req, discard(null));
+            HttpResponse resp = client.send(req, BodyHandlers.discarding());
             try {
                 HttpHeaders hd = resp.headers();
                 List<String> v = hd.allValues("X-Foo-Response");
diff --git a/test/jdk/java/net/httpclient/InterruptedBlockingSend.java b/test/jdk/java/net/httpclient/InterruptedBlockingSend.java
index b3514eac0b5..9d4ba92b1ed 100644
--- a/test/jdk/java/net/httpclient/InterruptedBlockingSend.java
+++ b/test/jdk/java/net/httpclient/InterruptedBlockingSend.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -21,16 +21,19 @@
  * questions.
  */
 
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse.BodyHandlers;
 import static java.lang.System.out;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
 
 /**
  * @test
  * @summary Basic test for interrupted blocking send
+ * @run main/othervm InterruptedBlockingSend
  */
 
 public class InterruptedBlockingSend {
@@ -39,15 +42,17 @@ public class InterruptedBlockingSend {
 
     public static void main(String[] args) throws Exception {
         HttpClient client = HttpClient.newHttpClient();
-        try (ServerSocket ss = new ServerSocket(0, 20)) {
+        try (ServerSocket ss = new ServerSocket()) {
+            ss.setReuseAddress(false);
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port = ss.getLocalPort();
-            URI uri = new URI("http://127.0.0.1:" + port + "/");
+            URI uri = new URI("http://localhost:" + port + "/");
 
             HttpRequest request = HttpRequest.newBuilder(uri).build();
 
             Thread t = new Thread(() -> {
                 try {
-                    client.send(request, discard(null));
+                    client.send(request, BodyHandlers.discarding());
                 } catch (InterruptedException e) {
                     throwable = e;
                 } catch (Throwable th) {
diff --git a/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java b/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
new file mode 100644
index 00000000000..6fe02853199
--- /dev/null
+++ b/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
@@ -0,0 +1,561 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Tests an asynchronous BodySubscriber that completes
+ *          immediately with an InputStream which issues bad
+ *          requests
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext ReferenceTracker
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm InvalidInputStreamSubscriptionRequest
+ */
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Publisher;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+
+public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;   // HTTPS/1.1
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI_fixed;
+    String httpURI_chunk;
+    String httpsURI_fixed;
+    String httpsURI_chunk;
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    static final int ITERATION_COUNT = 3;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+    static volatile boolean tasksFailed;
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+
+    static class TestExecutor implements Executor {
+        final AtomicLong tasks = new AtomicLong();
+        Executor executor;
+        TestExecutor(Executor executor) {
+            this.executor = executor;
+        }
+
+        @Override
+        public void execute(Runnable command) {
+            long id = tasks.incrementAndGet();
+            executor.execute(() -> {
+                try {
+                    command.run();
+                } catch (Throwable t) {
+                    tasksFailed = true;
+                    System.out.printf(now() + "Task %s failed: %s%n", id, t);
+                    System.err.printf(now() + "Task %s failed: %s%n", id, t);
+                    FAILURES.putIfAbsent("Task " + id, t);
+                    throw t;
+                }
+            });
+        }
+    }
+
+    @AfterClass
+    static final void printFailedTests() {
+        out.println("\n=========================");
+        try {
+            out.println("Failed tasks: ");
+            FAILURES.entrySet().forEach((e) -> {
+                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+                e.getValue().printStackTrace(out);
+            });
+            if (tasksFailed) {
+                System.out.println("WARNING: Some tasks failed");
+            }
+        } finally {
+            out.println("\n=========================\n");
+        }
+    }
+
+    interface BHS extends Supplier<BodyHandler<InputStream>> {
+        static BHS of(BHS impl, String name) {
+            return new BHSImpl(impl, name);
+        }
+    }
+
+    static final class BHSImpl implements BHS {
+        final BHS supplier;
+        final String name;
+        BHSImpl(BHS impl, String name) {
+            this.supplier = impl;
+            this.name = name;
+        }
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        @Override
+        public BodyHandler<InputStream> get() {
+            return supplier.get();
+        }
+    }
+
+    static final Supplier<BodyHandler<InputStream>> OF_INPUTSTREAM =
+            BHS.of(BodyHandlers::ofInputStream, "BodyHandlers::ofInputStream");
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        return new Object[][]{
+                { httpURI_fixed,    false, OF_INPUTSTREAM },
+                { httpURI_chunk,    false, OF_INPUTSTREAM },
+                { httpsURI_fixed,   false, OF_INPUTSTREAM },
+                { httpsURI_chunk,   false, OF_INPUTSTREAM },
+                { http2URI_fixed,   false, OF_INPUTSTREAM },
+                { http2URI_chunk,   false, OF_INPUTSTREAM },
+                { https2URI_fixed,  false, OF_INPUTSTREAM },
+                { https2URI_chunk,  false, OF_INPUTSTREAM },
+
+                { httpURI_fixed,    true, OF_INPUTSTREAM },
+                { httpURI_chunk,    true, OF_INPUTSTREAM },
+                { httpsURI_fixed,   true, OF_INPUTSTREAM },
+                { httpsURI_chunk,   true, OF_INPUTSTREAM },
+                { http2URI_fixed,   true, OF_INPUTSTREAM },
+                { http2URI_chunk,   true, OF_INPUTSTREAM },
+                { https2URI_fixed,  true, OF_INPUTSTREAM },
+                { https2URI_chunk,  true, OF_INPUTSTREAM },
+        };
+    }
+
+    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    HttpClient newHttpClient() {
+        return TRACKER.track(HttpClient.newBuilder()
+                .proxy(HttpClient.Builder.NO_PROXY)
+                .executor(executor)
+                .sslContext(sslContext)
+                .build());
+    }
+
+    @Test(dataProvider = "variants")
+    public void testNoBody(String uri, boolean sameClient, BHS handlers)
+            throws Exception
+    {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<InputStream> handler = handlers.get();
+            BodyHandler<InputStream> badHandler = (rspinfo) ->
+                    new BadBodySubscriber<>(handler.apply(rspinfo));
+            try {
+                HttpResponse<InputStream> response = client.send(req, badHandler);
+                try (InputStream is = response.body()) {
+                    String body = new String(is.readAllBytes(), UTF_8);
+                    assertEquals(body, "");
+                    if (uri.endsWith("/chunk")
+                            && response.version() == HttpClient.Version.HTTP_1_1) {
+                        // with /fixed and 0 length
+                        // there's no need for any call to request()
+                        throw new RuntimeException("Expected IAE not thrown");
+                    }
+                }
+            } catch (Exception x) {
+                Throwable cause = x;
+                if (x instanceof CompletionException || x instanceof ExecutionException) {
+                    cause = x.getCause();
+                }
+                if (cause instanceof IOException && cause.getCause() != null) {
+                    cause = cause.getCause();
+                }
+                if (cause instanceof IllegalArgumentException) {
+                    System.out.println("Got expected exception: " + cause);
+                } else throw x;
+            }
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testNoBodyAsync(String uri, boolean sameClient, BHS handlers)
+            throws Exception
+    {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<InputStream> handler = handlers.get();
+            BodyHandler<InputStream> badHandler = (rspinfo) ->
+                    new BadBodySubscriber<>(handler.apply(rspinfo));
+            CompletableFuture<HttpResponse<InputStream>> response =
+                    client.sendAsync(req, badHandler);
+            CompletableFuture<String> result = response.thenCompose(
+                            (responsePublisher) -> {
+                                try (InputStream is = responsePublisher.body()) {
+                                    return CompletableFuture.completedFuture(
+                                            new String(is.readAllBytes(), UTF_8));
+                                } catch (Exception x) {
+                                    return CompletableFuture.failedFuture(x);
+                                }
+                            });
+            try {
+                // Get the final result and compare it with the expected body
+                assertEquals(result.get(), "");
+                if (uri.endsWith("/chunk")
+                        && response.get().version() == HttpClient.Version.HTTP_1_1) {
+                    // with /fixed and 0 length
+                    // there's no need for any call to request()
+                    throw new RuntimeException("Expected IAE not thrown");
+                }
+            } catch (Exception x) {
+                Throwable cause = x;
+                if (x instanceof CompletionException || x instanceof ExecutionException) {
+                    cause = x.getCause();
+                }
+                if (cause instanceof IOException && cause.getCause() != null) {
+                    cause = cause.getCause();
+                }
+                if (cause instanceof IllegalArgumentException) {
+                    System.out.println("Got expected exception: " + cause);
+                } else throw x;
+            }
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsString(String uri, boolean sameClient, BHS handlers)
+            throws Exception
+    {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri+"/withBody"))
+                    .build();
+            BodyHandler<InputStream> handler = handlers.get();
+            BodyHandler<InputStream> badHandler = (rspinfo) ->
+                    new BadBodySubscriber<>(handler.apply(rspinfo));
+            try {
+                HttpResponse<InputStream> response = client.send(req, badHandler);
+                try (InputStream is = response.body()) {
+                    String body = new String(is.readAllBytes(), UTF_8);
+                    assertEquals(body, WITH_BODY);
+                    throw new RuntimeException("Expected IAE not thrown");
+                }
+            } catch (Exception x) {
+                Throwable cause = x;
+                if (x instanceof CompletionException || x instanceof ExecutionException) {
+                    cause = x.getCause();
+                }
+                if (cause instanceof IOException && cause.getCause() != null) {
+                    cause = cause.getCause();
+                }
+                if (cause instanceof IllegalArgumentException) {
+                    System.out.println("Got expected exception: " + cause);
+                } else throw x;
+            }
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsStringAsync(String uri, boolean sameClient, BHS handlers)
+            throws Exception
+    {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri+"/withBody"))
+                    .build();
+            BodyHandler<InputStream> handler = handlers.get();
+            BodyHandler<InputStream> badHandler = (rspinfo) ->
+                    new BadBodySubscriber<>(handler.apply(rspinfo));
+            CompletableFuture<String> result = client.sendAsync(req, badHandler)
+                    .thenCompose((responsePublisher) -> {
+                        try (InputStream is = responsePublisher.body()) {
+                            return CompletableFuture.completedFuture(
+                                    new String(is.readAllBytes(), UTF_8));
+                        } catch (Exception x) {
+                            return CompletableFuture.failedFuture(x);
+                        }
+                    });
+            // Get the final result and compare it with the expected body
+            try {
+                String body = result.get();
+                assertEquals(body, WITH_BODY);
+                throw new RuntimeException("Expected IAE not thrown");
+            } catch (Exception x) {
+                Throwable cause = x;
+                if (x instanceof CompletionException || x instanceof ExecutionException) {
+                    cause = x.getCause();
+                }
+                if (cause instanceof IOException && cause.getCause() != null) {
+                    cause = cause.getCause();
+                }
+                if (cause instanceof IllegalArgumentException) {
+                    System.out.println("Got expected exception: " + cause);
+                } else throw x;
+            }
+        }
+    }
+
+    static final class BadSubscription implements Flow.Subscription {
+        Flow.Subscription subscription;
+        Executor executor;
+        BadSubscription(Flow.Subscription subscription) {
+            this.subscription = subscription;
+        }
+
+        @Override
+        public void request(long n) {
+            if (executor == null) {
+                subscription.request(-n);
+            } else {
+                executor.execute(() -> subscription.request(-n));
+            }
+        }
+
+        @Override
+        public void cancel() {
+            subscription.cancel();
+        }
+    }
+
+    static final class BadBodySubscriber<T> implements BodySubscriber<T> {
+        final BodySubscriber<T> subscriber;
+        BadBodySubscriber(BodySubscriber<T> subscriber) {
+            this.subscriber = subscriber;
+        }
+
+        @Override
+        public CompletionStage<T> getBody() {
+            return subscriber.getBody();
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            System.out.println("Subscription is: " + subscription);
+            subscriber.onSubscribe(new BadSubscription(subscription));
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            subscriber.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            subscriber.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            subscriber.onComplete();
+        }
+    }
+
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/1.1
+        HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h1_chunkHandler = new HTTP_VariableLengthHandler();
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler( h1_fixedLengthHandler, "/http1/fixed");
+        httpTestServer.addHandler(h1_chunkHandler,"/http1/chunk");
+        httpURI_fixed = "http://" + httpTestServer.serverAuthority() + "/http1/fixed";
+        httpURI_chunk = "http://" + httpTestServer.serverAuthority() + "/http1/chunk";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
+        httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
+        httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed";
+        httpsURI_chunk = "https://" + httpsTestServer.serverAuthority() + "/https1/chunk";
+
+        // HTTP/2
+        HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h2_chunkedHandler = new HTTP_VariableLengthHandler();
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        AssertionError fail = TRACKER.check(500);
+        try {
+            httpTestServer.stop();
+            httpsTestServer.stop();
+            http2TestServer.stop();
+            https2TestServer.stop();
+        } finally {
+            if (fail != null) {
+                throw fail;
+            }
+        }
+    }
+
+    static final String WITH_BODY = "Lorem ipsum dolor sit amet, consectetur" +
+            " adipiscing elit, sed do eiusmod tempor incididunt ut labore et" +
+            " dolore magna aliqua. Ut enim ad minim veniam, quis nostrud" +
+            " exercitation ullamco laboris nisi ut aliquip ex ea" +
+            " commodo consequat. Duis aute irure dolor in reprehenderit in " +
+            "voluptate velit esse cillum dolore eu fugiat nulla pariatur." +
+            " Excepteur sint occaecat cupidatat non proident, sunt in culpa qui" +
+            " officia deserunt mollit anim id est laborum.";
+
+    static class HTTP_FixedLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            if (t.getRequestURI().getPath().endsWith("/withBody")) {
+                byte[] bytes = WITH_BODY.getBytes(UTF_8);
+                t.sendResponseHeaders(200, bytes.length);  // body
+                try (OutputStream os = t.getResponseBody()) {
+                    os.write(bytes);
+                }
+            } else {
+                t.sendResponseHeaders(200, 0);  //no body
+            }
+        }
+    }
+
+    static class HTTP_VariableLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_VariableLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, -1);  //chunked or variable
+            if (t.getRequestURI().getPath().endsWith("/withBody")) {
+                byte[] bytes = WITH_BODY.getBytes(UTF_8);
+                try (OutputStream os = t.getResponseBody()) {
+                    int chunkLen = bytes.length/10;
+                    if (chunkLen == 0) {
+                        os.write(bytes);
+                    } else {
+                        int count = 0;
+                        for (int i=0; i<10; i++) {
+                            os.write(bytes, count, chunkLen);
+                            os.flush();
+                            count += chunkLen;
+                        }
+                        os.write(bytes, count, bytes.length % chunkLen);
+                        count += bytes.length % chunkLen;
+                        assert count == bytes.length;
+                    }
+                }
+            } else {
+                t.getResponseBody().close();   // no body
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/InvalidSSLContextTest.java b/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
new file mode 100644
index 00000000000..24fda7ca092
--- /dev/null
+++ b/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Test to ensure the HTTP client throws an appropriate SSL exception
+ *          when SSL context is not valid.
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm -Djdk.internal.httpclient.debug=true InvalidSSLContextTest
+ */
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLSocket;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import static java.net.http.HttpClient.Version.HTTP_2;
+
+
+public class InvalidSSLContextTest {
+
+    SSLContext sslContext;
+    volatile SSLServerSocket sslServerSocket;
+    volatile String uri;
+
+    @DataProvider(name = "versions")
+    public Object[][] versions() {
+        return new Object[][]{
+                { HTTP_1_1 },
+                { HTTP_2   }
+        };
+    }
+
+    @Test(dataProvider = "versions")
+    public void testSync(Version version) throws Exception {
+        // client-side uses a different context to that of the server-side
+        HttpClient client = HttpClient.newBuilder()
+                .sslContext(SSLContext.getDefault())
+                .build();
+
+        HttpRequest request = HttpRequest.newBuilder(URI.create(uri))
+                .version(version)
+                .build();
+
+        try {
+            HttpResponse<?> response = client.send(request, BodyHandlers.discarding());
+            Assert.fail("UNEXPECTED response" + response);
+        } catch (SSLException sslex) {
+            System.out.println("Caught expected: " + sslex);
+        }
+    }
+
+    @Test(dataProvider = "versions")
+    public void testAsync(Version version) throws Exception {
+        // client-side uses a different context to that of the server-side
+        HttpClient client = HttpClient.newBuilder()
+                .sslContext(SSLContext.getDefault())
+                .build();
+
+        HttpRequest request = HttpRequest.newBuilder(URI.create(uri))
+                .version(version)
+                .build();
+
+        assertExceptionally(SSLException.class,
+                            client.sendAsync(request, BodyHandlers.discarding()));
+    }
+
+    static void assertExceptionally(Class<? extends Throwable> clazz,
+                                    CompletableFuture<?> stage) {
+        stage.handle((result, error) -> {
+            if (result != null) {
+                Assert.fail("UNEXPECTED result: " + result);
+                return null;
+            }
+            if (error instanceof CompletionException) {
+                Throwable cause = error.getCause();
+                if (cause == null) {
+                    Assert.fail("Unexpected null cause: " + error);
+                }
+                assertException(clazz, cause);
+            } else {
+                assertException(clazz, error);
+            }
+            return null;
+        }).join();
+    }
+
+    static void assertException(Class<? extends Throwable> clazz, Throwable t) {
+        if (t == null) {
+            Assert.fail("Expected " + clazz + ", caught nothing");
+        }
+        if (!clazz.isInstance(t)) {
+            Assert.fail("Expected " + clazz + ", caught " + t);
+        }
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // server-side uses a different context to that of the client-side
+        sslServerSocket = (SSLServerSocket)sslContext
+                .getServerSocketFactory()
+                .createServerSocket();
+        sslServerSocket.setReuseAddress(false);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        sslServerSocket.bind(addr);
+        uri = "https://localhost:" + sslServerSocket.getLocalPort() + "/";
+
+        Thread t = new Thread("SSL-Server-Side") {
+            @Override
+            public void run() {
+                while (true) {
+                    try {
+                        SSLSocket s = (SSLSocket) sslServerSocket.accept();
+                        System.out.println("SERVER: accepted: " + s);
+                        // artificially slow down the handshake reply to mimic
+                        // a slow(ish) network, and hopefully delay the
+                        // SequentialScheduler on in the client.
+                        Thread.sleep(500);
+                        s.startHandshake();
+                        s.close();
+                        Assert.fail("SERVER: UNEXPECTED ");
+                    } catch (SSLHandshakeException he) {
+                        System.out.println("SERVER: caught expected " + he);
+                    } catch (IOException e) {
+                        System.out.println("SERVER: caught: " + e);
+                        if (!sslServerSocket.isClosed()) {
+                            throw new UncheckedIOException(e);
+                        }
+                        break;
+                    } catch (InterruptedException ie) {
+                        throw new RuntimeException(ie);
+                    }
+                }
+            }
+        };
+        t.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        sslServerSocket.close();
+    }
+}
diff --git a/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java b/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
new file mode 100644
index 00000000000..1415529e8ac
--- /dev/null
+++ b/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
@@ -0,0 +1,493 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8201186
+ * @summary Tests an asynchronous BodySubscriber that completes
+ *          immediately with a Publisher<List<ByteBuffer>> whose
+ *          subscriber issues bad requests
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext ReferenceTracker
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm InvalidSubscriptionRequest
+ */
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Publisher;
+import java.util.function.Supplier;
+
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+
+public class InvalidSubscriptionRequest implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;   // HTTPS/1.1
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI_fixed;
+    String httpURI_chunk;
+    String httpsURI_fixed;
+    String httpsURI_chunk;
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    static final int ITERATION_COUNT = 3;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = Executors.newCachedThreadPool();
+
+    interface BHS extends Supplier<BodyHandler<Publisher<List<ByteBuffer>>>> {
+        static BHS of(BHS impl, String name) {
+            return new BHSImpl(impl, name);
+        }
+    }
+
+    static final class BHSImpl implements BHS {
+        final BHS supplier;
+        final String name;
+        BHSImpl(BHS impl, String name) {
+            this.supplier = impl;
+            this.name = name;
+        }
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        @Override
+        public BodyHandler<Publisher<List<ByteBuffer>>> get() {
+            return supplier.get();
+        }
+    }
+
+    static final Supplier<BodyHandler<Publisher<List<ByteBuffer>>>> OF_PUBLISHER_API =
+            BHS.of(BodyHandlers::ofPublisher, "BodyHandlers::ofPublisher");
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        return new Object[][]{
+                { httpURI_fixed,    false, OF_PUBLISHER_API },
+                { httpURI_chunk,    false, OF_PUBLISHER_API },
+                { httpsURI_fixed,   false, OF_PUBLISHER_API },
+                { httpsURI_chunk,   false, OF_PUBLISHER_API },
+                { http2URI_fixed,   false, OF_PUBLISHER_API },
+                { http2URI_chunk,   false, OF_PUBLISHER_API },
+                { https2URI_fixed,  false, OF_PUBLISHER_API },
+                { https2URI_chunk,  false, OF_PUBLISHER_API },
+
+                { httpURI_fixed,    true, OF_PUBLISHER_API },
+                { httpURI_chunk,    true, OF_PUBLISHER_API },
+                { httpsURI_fixed,   true, OF_PUBLISHER_API },
+                { httpsURI_chunk,   true, OF_PUBLISHER_API },
+                { http2URI_fixed,   true, OF_PUBLISHER_API },
+                { http2URI_chunk,   true, OF_PUBLISHER_API },
+                { https2URI_fixed,  true, OF_PUBLISHER_API },
+                { https2URI_chunk,  true, OF_PUBLISHER_API },
+        };
+    }
+
+    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    HttpClient newHttpClient() {
+        return TRACKER.track(HttpClient.newBuilder()
+                         .proxy(HttpClient.Builder.NO_PROXY)
+                         .executor(executor)
+                         .sslContext(sslContext)
+                         .build());
+    }
+
+    @Test(dataProvider = "variants")
+    public void testNoBody(String uri, boolean sameClient, BHS handlers) throws Exception {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<Publisher<List<ByteBuffer>>> handler = handlers.get();
+            HttpResponse<Publisher<List<ByteBuffer>>> response = client.send(req, handler);
+            // We can reuse our BodySubscribers implementations to subscribe to the
+            // Publisher<List<ByteBuffer>>
+            BodySubscriber<String> ofString = new BadBodySubscriber<>(BodySubscribers.ofString(UTF_8));
+            // get the Publisher<List<ByteBuffer>> and
+            // subscribe to it.
+            response.body().subscribe(ofString);
+            // Get the final result and compare it with the expected body
+            try {
+                String body = ofString.getBody().toCompletableFuture().get();
+                assertEquals(body, "");
+                if (uri.endsWith("/chunk")
+                        && response.version() == HttpClient.Version.HTTP_1_1) {
+                    // with /fixed and 0 length
+                    // there's no need for any call to request()
+                    throw new RuntimeException("Expected IAE not thrown");
+                }
+            } catch (Exception x) {
+                Throwable cause = x;
+                if (x instanceof CompletionException || x instanceof ExecutionException) {
+                    cause = x.getCause();
+                }
+                if (cause instanceof IllegalArgumentException) {
+                    System.out.println("Got expected exception: " + cause);
+                } else throw x;
+            }
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testNoBodyAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<Publisher<List<ByteBuffer>>> handler = handlers.get();
+            // We can reuse our BodySubscribers implementations to subscribe to the
+            // Publisher<List<ByteBuffer>>
+            BodySubscriber<String> ofString =
+                    new BadBodySubscriber<>(BodySubscribers.ofString(UTF_8));
+            CompletableFuture<HttpResponse<Publisher<List<ByteBuffer>>>> response =
+                    client.sendAsync(req, handler);
+            CompletableFuture<String> result = response.thenCompose(
+                            (responsePublisher) -> {
+                                // get the Publisher<List<ByteBuffer>> and
+                                // subscribe to it.
+                                responsePublisher.body().subscribe(ofString);
+                                return ofString.getBody();
+                            });
+            try {
+                // Get the final result and compare it with the expected body
+                assertEquals(result.get(), "");
+                if (uri.endsWith("/chunk")
+                        && response.get().version() == HttpClient.Version.HTTP_1_1) {
+                    // with /fixed and 0 length
+                    // there's no need for any call to request()
+                    throw new RuntimeException("Expected IAE not thrown");
+                }
+            } catch (Exception x) {
+                Throwable cause = x;
+                if (x instanceof CompletionException || x instanceof ExecutionException) {
+                    cause = x.getCause();
+                }
+                if (cause instanceof IllegalArgumentException) {
+                    System.out.println("Got expected exception: " + cause);
+                } else throw x;
+            }
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsString(String uri, boolean sameClient, BHS handlers) throws Exception {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri+"/withBody"))
+                    .build();
+            BodyHandler<Publisher<List<ByteBuffer>>> handler = handlers.get();
+            HttpResponse<Publisher<List<ByteBuffer>>> response = client.send(req, handler);
+            // We can reuse our BodySubscribers implementations to subscribe to the
+            // Publisher<List<ByteBuffer>>
+            BodySubscriber<String> ofString = new BadBodySubscriber<>(
+                    BodySubscribers.ofString(UTF_8));
+            // get the Publisher<List<ByteBuffer>> and
+            // subscribe to it.
+            response.body().subscribe(ofString);
+            // Get the final result and compare it with the expected body
+            try {
+                String body = ofString.getBody().toCompletableFuture().get();
+                assertEquals(body, WITH_BODY);
+                throw new RuntimeException("Expected IAE not thrown");
+            } catch (Exception x) {
+                Throwable cause = x;
+                if (x instanceof CompletionException || x instanceof ExecutionException) {
+                    cause = x.getCause();
+                }
+                if (cause instanceof IllegalArgumentException) {
+                    System.out.println("Got expected exception: " + cause);
+                } else throw x;
+            }
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsStringAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri+"/withBody"))
+                    .build();
+            BodyHandler<Publisher<List<ByteBuffer>>> handler = handlers.get();
+            // We can reuse our BodySubscribers implementations to subscribe to the
+            // Publisher<List<ByteBuffer>>
+            BodySubscriber<String> ofString =
+                    new BadBodySubscriber<>(BodySubscribers.ofString(UTF_8));
+            CompletableFuture<String> result = client.sendAsync(req, handler)
+                    .thenCompose((responsePublisher) -> {
+                        // get the Publisher<List<ByteBuffer>> and
+                        // subscribe to it.
+                        responsePublisher.body().subscribe(ofString);
+                        return ofString.getBody();
+                    });
+            // Get the final result and compare it with the expected body
+            try {
+                String body = result.get();
+                assertEquals(body, WITH_BODY);
+                throw new RuntimeException("Expected IAE not thrown");
+            } catch (Exception x) {
+                Throwable cause = x;
+                if (x instanceof CompletionException || x instanceof ExecutionException) {
+                    cause = x.getCause();
+                }
+                if (cause instanceof IllegalArgumentException) {
+                    System.out.println("Got expected exception: " + cause);
+                } else throw x;
+            }
+        }
+    }
+
+    static final class BadSubscription implements Flow.Subscription {
+        Flow.Subscription subscription;
+        Executor executor;
+        BadSubscription(Flow.Subscription subscription) {
+            this.subscription = subscription;
+        }
+
+        @Override
+        public void request(long n) {
+            if (executor == null) {
+                subscription.request(-n);
+            } else {
+                executor.execute(() -> subscription.request(-n));
+            }
+        }
+
+        @Override
+        public void cancel() {
+            subscription.cancel();
+        }
+    }
+
+    static final class BadBodySubscriber<T> implements BodySubscriber<T> {
+        final BodySubscriber<T> subscriber;
+        BadBodySubscriber(BodySubscriber<T> subscriber) {
+            this.subscriber = subscriber;
+        }
+
+        @Override
+        public CompletionStage<T> getBody() {
+            return subscriber.getBody();
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            System.out.println("Subscription is: " + subscription);
+            subscriber.onSubscribe(new BadSubscription(subscription));
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            subscriber.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            subscriber.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            subscriber.onComplete();
+        }
+    }
+
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/1.1
+        HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h1_chunkHandler = new HTTP_VariableLengthHandler();
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler( h1_fixedLengthHandler, "/http1/fixed");
+        httpTestServer.addHandler(h1_chunkHandler,"/http1/chunk");
+        httpURI_fixed = "http://" + httpTestServer.serverAuthority() + "/http1/fixed";
+        httpURI_chunk = "http://" + httpTestServer.serverAuthority() + "/http1/chunk";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
+        httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
+        httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed";
+        httpsURI_chunk = "https://" + httpsTestServer.serverAuthority() + "/https1/chunk";
+
+        // HTTP/2
+        HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h2_chunkedHandler = new HTTP_VariableLengthHandler();
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        AssertionError fail = TRACKER.check(500);
+        try {
+            httpTestServer.stop();
+            httpsTestServer.stop();
+            http2TestServer.stop();
+            https2TestServer.stop();
+        } finally {
+            if (fail != null) {
+                throw fail;
+            }
+        }
+    }
+
+    static final String WITH_BODY = "Lorem ipsum dolor sit amet, consectetur" +
+            " adipiscing elit, sed do eiusmod tempor incididunt ut labore et" +
+            " dolore magna aliqua. Ut enim ad minim veniam, quis nostrud" +
+            " exercitation ullamco laboris nisi ut aliquip ex ea" +
+            " commodo consequat. Duis aute irure dolor in reprehenderit in " +
+            "voluptate velit esse cillum dolore eu fugiat nulla pariatur." +
+            " Excepteur sint occaecat cupidatat non proident, sunt in culpa qui" +
+            " officia deserunt mollit anim id est laborum.";
+
+    static class HTTP_FixedLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            if (t.getRequestURI().getPath().endsWith("/withBody")) {
+                byte[] bytes = WITH_BODY.getBytes(UTF_8);
+                t.sendResponseHeaders(200, bytes.length);  // body
+                try (OutputStream os = t.getResponseBody()) {
+                    os.write(bytes);
+                }
+            } else {
+                t.sendResponseHeaders(200, 0);  //no body
+            }
+        }
+    }
+
+    static class HTTP_VariableLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_VariableLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, -1);  //chunked or variable
+            if (t.getRequestURI().getPath().endsWith("/withBody")) {
+                byte[] bytes = WITH_BODY.getBytes(UTF_8);
+                try (OutputStream os = t.getResponseBody()) {
+                    int chunkLen = bytes.length/10;
+                    if (chunkLen == 0) {
+                        os.write(bytes);
+                    } else {
+                        int count = 0;
+                        for (int i=0; i<10; i++) {
+                            os.write(bytes, count, chunkLen);
+                            os.flush();
+                            count += chunkLen;
+                        }
+                        os.write(bytes, count, bytes.length % chunkLen);
+                        count += bytes.length % chunkLen;
+                        assert count == bytes.length;
+                    }
+                }
+            } else {
+                t.getResponseBody().close();   // no body
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/LightWeightHttpServer.java b/test/jdk/java/net/httpclient/LightWeightHttpServer.java
index 38242dd5221..39d2990c748 100644
--- a/test/jdk/java/net/httpclient/LightWeightHttpServer.java
+++ b/test/jdk/java/net/httpclient/LightWeightHttpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -38,6 +38,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.file.Path;
 import java.util.HashSet;
@@ -81,7 +82,7 @@ public static void initServer() throws IOException {
         logger.addHandler(ch);
 
         String root = System.getProperty("test.src", ".") + "/docs";
-        InetSocketAddress addr = new InetSocketAddress(0);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpServer = HttpServer.create(addr, 0);
         if (httpServer instanceof HttpsServer) {
             throw new RuntimeException("should not be httpsserver");
@@ -118,8 +119,8 @@ public static void initServer() throws IOException {
         System.out.println("HTTP server port = " + port);
         httpsport = httpsServer.getAddress().getPort();
         System.out.println("HTTPS server port = " + httpsport);
-        httproot = "http://127.0.0.1:" + port + "/";
-        httpsroot = "https://127.0.0.1:" + httpsport + "/";
+        httproot = "http://localhost:" + port + "/";
+        httpsroot = "https://localhost:" + httpsport + "/";
 
         proxy = new ProxyServer(0, false);
         proxyPort = proxy.getPort();
diff --git a/test/jdk/java/net/httpclient/LineAdaptersCompileOnly.java b/test/jdk/java/net/httpclient/LineAdaptersCompileOnly.java
new file mode 100644
index 00000000000..4796452a77e
--- /dev/null
+++ b/test/jdk/java/net/httpclient/LineAdaptersCompileOnly.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2018, 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.util.concurrent.Flow;
+import java.util.function.Function;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
+import static java.util.function.Function.identity;
+import static java.nio.charset.StandardCharsets.*;
+
+/*
+ * @test
+ * @summary Basic test for Flow adapters with generic type parameters
+ * @compile LineAdaptersCompileOnly.java
+ */
+
+public class LineAdaptersCompileOnly {
+
+    public static void main(String[] args) {
+        makesSureDifferentGenericSignaturesCompile();
+    }
+
+    static void makesSureDifferentGenericSignaturesCompile() {
+        BodyHandlers.fromLineSubscriber(new StringSubscriber());
+        BodyHandlers.fromLineSubscriber(new CharSequenceSubscriber());
+        BodyHandlers.fromLineSubscriber(new ObjectSubscriber());
+
+        BodySubscribers.fromLineSubscriber(new StringSubscriber());
+        BodySubscribers.fromLineSubscriber(new CharSequenceSubscriber());
+        BodySubscribers.fromLineSubscriber(new ObjectSubscriber());
+
+        BodyHandlers.fromLineSubscriber(new StringSubscriber(),       identity(), "\n");
+        BodyHandlers.fromLineSubscriber(new CharSequenceSubscriber(), identity(), "\r\n");
+        BodyHandlers.fromLineSubscriber(new ObjectSubscriber(),       identity(), "\n");
+        BodyHandlers.fromLineSubscriber(new StringSubscriber(),       identity(), null);
+        BodyHandlers.fromLineSubscriber(new CharSequenceSubscriber(), identity(), null);
+        BodyHandlers.fromLineSubscriber(new ObjectSubscriber(),       identity(), null);
+
+        BodySubscribers.fromLineSubscriber(new StringSubscriber(),       identity(), UTF_8,    "\n");
+        BodySubscribers.fromLineSubscriber(new CharSequenceSubscriber(), identity(), UTF_16,   "\r\n");
+        BodySubscribers.fromLineSubscriber(new ObjectSubscriber(),       identity(), US_ASCII, "\n");
+        BodySubscribers.fromLineSubscriber(new StringSubscriber(),       identity(), UTF_8,    null);
+        BodySubscribers.fromLineSubscriber(new CharSequenceSubscriber(), identity(), UTF_16,   null);
+        BodySubscribers.fromLineSubscriber(new ObjectSubscriber(),       identity(), US_ASCII, null);
+    }
+
+    static class StringSubscriber implements Flow.Subscriber<String> {
+        @Override public void onSubscribe(Flow.Subscription subscription) { }
+        @Override public void onNext(String item) { }
+        @Override public void onError(Throwable throwable) { }
+        @Override public void onComplete() { }
+    }
+
+    static class CharSequenceSubscriber implements Flow.Subscriber<CharSequence> {
+        @Override public void onSubscribe(Flow.Subscription subscription) { }
+        @Override public void onNext(CharSequence item) { }
+        @Override public void onError(Throwable throwable) { }
+        @Override public void onComplete() { }
+    }
+
+    static class ObjectSubscriber implements Flow.Subscriber<Object> {
+        @Override public void onSubscribe(Flow.Subscription subscription) { }
+        @Override public void onNext(Object item) { }
+        @Override public void onError(Throwable throwable) { }
+        @Override public void onComplete() { }
+    }
+
+    // ---
+
+    static final Function<StringSubscriber,Integer> f1 = subscriber -> 1;
+    static final Function<StringSubscriber,Number> f2 = subscriber -> 2;
+    static final Function<StringSubscriberX,Integer> f3 = subscriber -> 3;
+    static final Function<StringSubscriberX,Number> f4 = subscriber -> 4;
+
+    static class StringSubscriberX extends StringSubscriber {
+        int getIntegerX() { return 5; }
+    }
+
+    static void makesSureDifferentGenericFunctionSignaturesCompile() {
+        BodyHandler<Integer> bh01 = BodyHandlers.fromLineSubscriber(new StringSubscriber(), s -> 6, "\n");
+        BodyHandler<Number>  bh02 = BodyHandlers.fromLineSubscriber(new StringSubscriber(), s -> 7, "\n");
+        BodyHandler<Integer> bh03 = BodyHandlers.fromLineSubscriber(new StringSubscriber(), f1, "\n");
+        BodyHandler<Number>  bh04 = BodyHandlers.fromLineSubscriber(new StringSubscriber(), f1, "\n");
+        BodyHandler<Number>  bh05 = BodyHandlers.fromLineSubscriber(new StringSubscriber(), f2, "\n");
+        BodyHandler<Integer> bh06 = BodyHandlers.fromLineSubscriber(new StringSubscriberX(), f1, "\n");
+        BodyHandler<Number>  bh07 = BodyHandlers.fromLineSubscriber(new StringSubscriberX(), f1, "\n");
+        BodyHandler<Number>  bh08 = BodyHandlers.fromLineSubscriber(new StringSubscriberX(), f2, "\n");
+        BodyHandler<Integer> bh09 = BodyHandlers.fromLineSubscriber(new StringSubscriberX(), StringSubscriberX::getIntegerX, "\n");
+        BodyHandler<Number>  bh10 = BodyHandlers.fromLineSubscriber(new StringSubscriberX(), StringSubscriberX::getIntegerX, "\n");
+        BodyHandler<Integer> bh11 = BodyHandlers.fromLineSubscriber(new StringSubscriberX(), f3, "\n");
+        BodyHandler<Number>  bh12 = BodyHandlers.fromLineSubscriber(new StringSubscriberX(), f3, "\n");
+        BodyHandler<Number>  bh13 = BodyHandlers.fromLineSubscriber(new StringSubscriberX(), f4, "\n");
+
+        BodySubscriber<Integer> bs01 = BodySubscribers.fromLineSubscriber(new StringSubscriber(), s -> 6, UTF_8, "\n");
+        BodySubscriber<Number>  bs02 = BodySubscribers.fromLineSubscriber(new StringSubscriber(), s -> 7, UTF_8, "\n");
+        BodySubscriber<Integer> bs03 = BodySubscribers.fromLineSubscriber(new StringSubscriber(), f1, UTF_8, "\n");
+        BodySubscriber<Number>  bs04 = BodySubscribers.fromLineSubscriber(new StringSubscriber(), f1, UTF_8, "\n");
+        BodySubscriber<Number>  bs05 = BodySubscribers.fromLineSubscriber(new StringSubscriber(), f2, UTF_8, "\n");
+        BodySubscriber<Integer> bs06 = BodySubscribers.fromLineSubscriber(new StringSubscriberX(), f1, UTF_8, "\n");
+        BodySubscriber<Number>  bs07 = BodySubscribers.fromLineSubscriber(new StringSubscriberX(), f1, UTF_8, "\n");
+        BodySubscriber<Number>  bs08 = BodySubscribers.fromLineSubscriber(new StringSubscriberX(), f2, UTF_8, "\n");
+        BodySubscriber<Integer> bs09 = BodySubscribers.fromLineSubscriber(new StringSubscriberX(), StringSubscriberX::getIntegerX, UTF_8, "\n");
+        BodySubscriber<Number>  bs10 = BodySubscribers.fromLineSubscriber(new StringSubscriberX(), StringSubscriberX::getIntegerX, UTF_8, "\n");
+        BodySubscriber<Integer> bs11 = BodySubscribers.fromLineSubscriber(new StringSubscriberX(), f3, UTF_8, "\n");
+        BodySubscriber<Number>  bs12 = BodySubscribers.fromLineSubscriber(new StringSubscriberX(), f3, UTF_8, "\n");
+        BodySubscriber<Number>  bs13 = BodySubscribers.fromLineSubscriber(new StringSubscriberX(), f4, UTF_8, "\n");
+    }
+}
diff --git a/test/jdk/java/net/httpclient/LineBodyHandlerTest.java b/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
new file mode 100644
index 00000000000..2d1ad9574b9
--- /dev/null
+++ b/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
@@ -0,0 +1,697 @@
+/*
+ * Copyright (c) 2018, 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.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.StringReader;
+import java.io.UncheckedIOException;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Flow;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.net.ssl.SSLContext;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static java.nio.charset.StandardCharsets.UTF_16;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.net.http.HttpRequest.BodyPublishers.ofString;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
+
+/*
+ * @test
+ * @summary Basic tests for line adapter subscribers as created by
+ *          the BodyHandlers returned by BodyHandler::fromLineSubscriber
+ *          and BodyHandler::asLines
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          jdk.httpserver
+ * @library /lib/testlibrary http2/server
+ * @build Http2TestServer LineBodyHandlerTest HttpServerAdapters
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm LineBodyHandlerTest
+ */
+
+public class LineBodyHandlerTest implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;   // HTTPS/1.1
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI;
+    String httpsURI;
+    String http2URI;
+    String https2URI;
+
+    @DataProvider(name = "uris")
+    public Object[][] variants() {
+        return new Object[][]{
+                { httpURI   },
+                { httpsURI  },
+                { http2URI  },
+                { https2URI },
+        };
+    }
+
+    static final Class<NullPointerException> NPE = NullPointerException.class;
+    static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
+
+    @Test
+    public void testNull() {
+        assertThrows(NPE, () -> BodyHandlers.fromLineSubscriber(null));
+        assertNotNull(BodyHandlers.fromLineSubscriber(new StringSubscriber()));
+        assertThrows(NPE, () -> BodyHandlers.fromLineSubscriber(null, Function.identity(), "\n"));
+        assertThrows(NPE, () -> BodyHandlers.fromLineSubscriber(new StringSubscriber(), null, "\n"));
+        assertNotNull(BodyHandlers.fromLineSubscriber(new StringSubscriber(), Function.identity(), null));
+        assertThrows(NPE, () -> BodyHandlers.fromLineSubscriber(null, null, "\n"));
+        assertThrows(NPE, () -> BodyHandlers.fromLineSubscriber(null, Function.identity(), null));
+        assertThrows(NPE, () -> BodyHandlers.fromLineSubscriber(new StringSubscriber(), null, null));
+
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(null));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(null, Function.identity(),
+                Charset.defaultCharset(), System.lineSeparator()));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(new StringSubscriber(), null,
+                Charset.defaultCharset(), System.lineSeparator()));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(new StringSubscriber(), Function.identity(),
+                null, System.lineSeparator()));
+        assertNotNull(BodySubscribers.fromLineSubscriber(new StringSubscriber(), Function.identity(),
+                Charset.defaultCharset(), null));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(null, null,
+                Charset.defaultCharset(), System.lineSeparator()));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(null, Function.identity(),
+                null, System.lineSeparator()));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(null, Function.identity(),
+                Charset.defaultCharset(), null));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(new StringSubscriber(), null,
+                null, System.lineSeparator()));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(new StringSubscriber(), null,
+                Charset.defaultCharset(), null));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(new StringSubscriber(), Function.identity(),
+                null, null));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(new StringSubscriber(), null, null, null));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(null, Function.identity(),
+                null, null));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(null, null,
+                Charset.defaultCharset(), null));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(null, null,
+                null, System.lineSeparator()));
+        assertThrows(NPE, () -> BodySubscribers.fromLineSubscriber(null, null, null, null));
+    }
+
+    @Test
+    public void testIAE() {
+        assertThrows(IAE, () -> BodyHandlers.fromLineSubscriber(new StringSubscriber(), Function.identity(),""));
+        assertThrows(IAE, () -> BodyHandlers.fromLineSubscriber(new CharSequenceSubscriber(), Function.identity(),""));
+        assertThrows(IAE, () -> BodyHandlers.fromLineSubscriber(new ObjectSubscriber(), Function.identity(), ""));
+        assertThrows(IAE, () -> BodySubscribers.fromLineSubscriber(new StringSubscriber(), Function.identity(),
+                    StandardCharsets.UTF_8, ""));
+        assertThrows(IAE, () -> BodySubscribers.fromLineSubscriber(new CharSequenceSubscriber(), Function.identity(),
+                    StandardCharsets.UTF_16, ""));
+        assertThrows(IAE, () -> BodySubscribers.fromLineSubscriber(new ObjectSubscriber(), Function.identity(),
+                    StandardCharsets.US_ASCII, ""));
+    }
+
+    private static final List<String> lines(String text, String eol) {
+        if (eol == null) {
+            return new BufferedReader(new StringReader(text)).lines().collect(Collectors.toList());
+        } else {
+            String replaced = text.replace(eol, "|");
+            int i=0;
+            while(replaced.endsWith("||")) {
+                replaced = replaced.substring(0,replaced.length()-1);
+                i++;
+            }
+            List<String> res = List.of(replaced.split("\\|"));
+            if (i > 0) {
+                res = new ArrayList<>(res);
+                for (int j=0; j<i; j++) res.add("");
+            }
+            return res;
+        }
+    }
+
+    @Test(dataProvider = "uris")
+    void testStringWithFinisher(String url) {
+        String body = "May the luck of the Irish be with you!";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext)
+                .build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body))
+                .build();
+
+        StringSubscriber subscriber = new StringSubscriber();
+        CompletableFuture<HttpResponse<String>> cf
+                = client.sendAsync(request, BodyHandlers.fromLineSubscriber(
+                        subscriber, Supplier::get, "\n"));
+        assertNoObtrusion(cf);
+        HttpResponse<String> response = cf.join();
+        String text = response.body();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(text, body);
+        assertEquals(subscriber.list, lines(body, "\n"));
+    }
+
+    @Test(dataProvider = "uris")
+    void testAsStream(String url) {
+        String body = "May the luck of the Irish be with you!";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext)
+                .build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body))
+                .build();
+
+        CompletableFuture<HttpResponse<Stream<String>>> cf
+                = client.sendAsync(request, BodyHandlers.ofLines());
+        assertNoObtrusion(cf);
+        HttpResponse<Stream<String>> response = cf.join();
+        Stream<String> stream = response.body();
+        List<String> list = stream.collect(Collectors.toList());
+        String text = list.stream().collect(Collectors.joining("|"));
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(text, body);
+        assertEquals(list, List.of(body));
+        assertEquals(list, lines(body, null));
+    }
+
+    @Test(dataProvider = "uris")
+    void testStringWithFinisher2(String url) {
+        String body = "May the luck\r\n\r\n of the Irish be with you!";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body))
+                .build();
+
+        StringSubscriber subscriber = new StringSubscriber();
+        CompletableFuture<HttpResponse<Void>> cf
+                = client.sendAsync(request,
+                                   BodyHandlers.fromLineSubscriber(subscriber));
+        assertNoObtrusion(cf);
+        HttpResponse<Void> response = cf.join();
+        String text = subscriber.get();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(text, body.replace("\r\n", "\n"));
+        assertEquals(subscriber.list, lines(body, null));
+    }
+
+    @Test(dataProvider = "uris")
+    void testAsStreamWithCRLF(String url) {
+        String body = "May the luck\r\n\r\n of the Irish be with you!";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body))
+                .build();
+
+        CompletableFuture<HttpResponse<Stream<String>>> cf
+                = client.sendAsync(request, BodyHandlers.ofLines());
+        assertNoObtrusion(cf);
+        HttpResponse<Stream<String>> response = cf.join();
+        Stream<String> stream = response.body();
+        List<String> list = stream.collect(Collectors.toList());
+        String text = list.stream().collect(Collectors.joining("|"));
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(text, "May the luck|| of the Irish be with you!");
+        assertEquals(list, List.of("May the luck",
+                                   "",
+                                   " of the Irish be with you!"));
+        assertEquals(list, lines(body, null));
+    }
+
+    @Test(dataProvider = "uris")
+    void testStringWithFinisherBlocking(String url) throws Exception {
+        String body = "May the luck of the Irish be with you!";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body)).build();
+
+        StringSubscriber subscriber = new StringSubscriber();
+        HttpResponse<String> response = client.send(request,
+                BodyHandlers.fromLineSubscriber(subscriber, Supplier::get, "\n"));
+        String text = response.body();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(text, "May the luck of the Irish be with you!");
+        assertEquals(subscriber.list, lines(body, "\n"));
+    }
+
+    @Test(dataProvider = "uris")
+    void testStringWithoutFinisherBlocking(String url) throws Exception {
+        String body = "May the luck of the Irish be with you!";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body)).build();
+
+        StringSubscriber subscriber = new StringSubscriber();
+        HttpResponse<Void> response = client.send(request,
+                BodyHandlers.fromLineSubscriber(subscriber));
+        String text = subscriber.get();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(text, "May the luck of the Irish be with you!");
+        assertEquals(subscriber.list, lines(body, null));
+    }
+
+    // Subscriber<Object>
+
+    @Test(dataProvider = "uris")
+    void testAsStreamWithMixedCRLF(String url) {
+        String body = "May\r\n the wind\r\n always be\rat your back.\r\r";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body))
+                .build();
+
+        CompletableFuture<HttpResponse<Stream<String>>> cf
+                = client.sendAsync(request, BodyHandlers.ofLines());
+        assertNoObtrusion(cf);
+        HttpResponse<Stream<String>> response = cf.join();
+        Stream<String> stream = response.body();
+        List<String> list = stream.collect(Collectors.toList());
+        String text = list.stream().collect(Collectors.joining("|"));
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertTrue(text.length() != 0);  // what else can be asserted!
+        assertEquals(text, "May| the wind| always be|at your back.|");
+        assertEquals(list, List.of("May",
+                                   " the wind",
+                                   " always be",
+                                   "at your back.",
+                                   ""));
+        assertEquals(list, lines(body, null));
+    }
+
+    @Test(dataProvider = "uris")
+    void testAsStreamWithMixedCRLF_UTF8(String url) {
+        String body = "May\r\n the wind\r\n always be\rat your back.\r\r";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .header("Content-type", "text/text; charset=UTF-8")
+                .POST(BodyPublishers.ofString(body, UTF_8)).build();
+
+        CompletableFuture<HttpResponse<Stream<String>>> cf
+                = client.sendAsync(request, BodyHandlers.ofLines());
+        assertNoObtrusion(cf);
+        HttpResponse<Stream<String>> response = cf.join();
+        Stream<String> stream = response.body();
+        List<String> list = stream.collect(Collectors.toList());
+        String text = list.stream().collect(Collectors.joining("|"));
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertTrue(text.length() != 0);  // what else can be asserted!
+        assertEquals(text, "May| the wind| always be|at your back.|");
+        assertEquals(list, List.of("May",
+                                   " the wind",
+                                   " always be",
+                                   "at your back.", ""));
+        assertEquals(list, lines(body, null));
+    }
+
+    @Test(dataProvider = "uris")
+    void testAsStreamWithMixedCRLF_UTF16(String url) {
+        String body = "May\r\n the wind\r\n always be\rat your back.\r\r";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .header("Content-type", "text/text; charset=UTF-16")
+                .POST(BodyPublishers.ofString(body, UTF_16)).build();
+
+        CompletableFuture<HttpResponse<Stream<String>>> cf
+                = client.sendAsync(request, BodyHandlers.ofLines());
+        assertNoObtrusion(cf);
+        HttpResponse<Stream<String>> response = cf.join();
+        Stream<String> stream = response.body();
+        List<String> list = stream.collect(Collectors.toList());
+        String text = list.stream().collect(Collectors.joining("|"));
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertTrue(text.length() != 0);  // what else can be asserted!
+        assertEquals(text, "May| the wind| always be|at your back.|");
+        assertEquals(list, List.of("May",
+                                   " the wind",
+                                   " always be",
+                                   "at your back.",
+                                   ""));
+        assertEquals(list, lines(body, null));
+    }
+
+    @Test(dataProvider = "uris")
+    void testObjectWithFinisher(String url) {
+        String body = "May\r\n the wind\r\n always be\rat your back.";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body))
+                .build();
+
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        CompletableFuture<HttpResponse<String>> cf
+                = client.sendAsync(request, BodyHandlers.fromLineSubscriber(
+                        subscriber, ObjectSubscriber::get, "\r\n"));
+        assertNoObtrusion(cf);
+        HttpResponse<String> response = cf.join();
+        String text = response.body();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertTrue(text.length() != 0);  // what else can be asserted!
+        assertEquals(text, "May\n the wind\n always be\rat your back.");
+        assertEquals(subscriber.list, List.of("May",
+                                              " the wind",
+                                              " always be\rat your back."));
+        assertEquals(subscriber.list, lines(body, "\r\n"));
+    }
+
+    @Test(dataProvider = "uris")
+    void testObjectWithFinisher_UTF16(String url) {
+        String body = "May\r\n the wind\r\n always be\rat your back.\r\r";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .header("Content-type", "text/text; charset=UTF-16")
+                .POST(BodyPublishers.ofString(body, UTF_16)).build();
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        CompletableFuture<HttpResponse<String>> cf
+                = client.sendAsync(request, BodyHandlers.fromLineSubscriber(
+                        subscriber, ObjectSubscriber::get, null));
+        assertNoObtrusion(cf);
+        HttpResponse<String> response = cf.join();
+        String text = response.body();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertTrue(text.length() != 0);  // what else can be asserted!
+        assertEquals(text, "May\n the wind\n always be\nat your back.\n");
+        assertEquals(subscriber.list, List.of("May",
+                                              " the wind",
+                                              " always be",
+                                              "at your back.",
+                                              ""));
+        assertEquals(subscriber.list, lines(body, null));
+    }
+
+    @Test(dataProvider = "uris")
+    void testObjectWithoutFinisher(String url) {
+        String body = "May\r\n the wind\r\n always be\rat your back.";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext)
+                .build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body))
+                .build();
+
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        CompletableFuture<HttpResponse<Void>> cf
+                = client.sendAsync(request,
+                                   BodyHandlers.fromLineSubscriber(subscriber));
+        assertNoObtrusion(cf);
+        HttpResponse<Void> response = cf.join();
+        String text = subscriber.get();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertTrue(text.length() != 0);  // what else can be asserted!
+        assertEquals(text, "May\n the wind\n always be\nat your back.");
+        assertEquals(subscriber.list, List.of("May",
+                                              " the wind",
+                                              " always be",
+                                              "at your back."));
+        assertEquals(subscriber.list, lines(body, null));
+    }
+
+    @Test(dataProvider = "uris")
+    void testObjectWithFinisherBlocking(String url) throws Exception {
+        String body = "May\r\n the wind\r\n always be\nat your back.";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext)
+                .build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body))
+                .build();
+
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        HttpResponse<String> response = client.send(request,
+                BodyHandlers.fromLineSubscriber(subscriber,
+                                               ObjectSubscriber::get,
+                                   "\r\n"));
+        String text = response.body();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertTrue(text.length() != 0);  // what else can be asserted!
+        assertEquals(text, "May\n the wind\n always be\nat your back.");
+        assertEquals(subscriber.list, List.of("May",
+                                              " the wind",
+                                              " always be\nat your back."));
+        assertEquals(subscriber.list, lines(body, "\r\n"));
+    }
+
+    @Test(dataProvider = "uris")
+    void testObjectWithoutFinisherBlocking(String url) throws Exception {
+        String body = "May\r\n the wind\r\n always be\nat your back.";
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext)
+                .build();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(body))
+                .build();
+
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        HttpResponse<Void> response = client.send(request,
+                BodyHandlers.fromLineSubscriber(subscriber));
+        String text = subscriber.get();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertTrue(text.length() != 0);  // what else can be asserted!
+        assertEquals(text, "May\n the wind\n always be\nat your back.");
+        assertEquals(subscriber.list, List.of("May",
+                                              " the wind",
+                                              " always be",
+                                              "at your back."));
+        assertEquals(subscriber.list, lines(body, null));
+    }
+
+    static private final String LINE = "Bient\u00f4t nous plongerons dans les" +
+            " fr\u00f4\ud801\udc00des t\u00e9n\u00e8bres, ";
+
+    static private final String bigtext() {
+        StringBuilder res = new StringBuilder((LINE.length() + 1) * 50);
+        for (int i = 0; i<50; i++) {
+            res.append(LINE);
+            if (i%2 == 0) res.append("\r\n");
+        }
+        return res.toString();
+    }
+
+    @Test(dataProvider = "uris")
+    void testBigTextFromLineSubscriber(String url) {
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext)
+                .build();
+        String bigtext = bigtext();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(bigtext))
+                .build();
+
+        StringSubscriber subscriber = new StringSubscriber();
+        CompletableFuture<HttpResponse<String>> cf
+                = client.sendAsync(request, BodyHandlers.fromLineSubscriber(
+                        subscriber, Supplier::get, "\r\n"));
+        assertNoObtrusion(cf);
+        HttpResponse<String> response = cf.join();
+        String text = response.body();
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(text, bigtext.replace("\r\n", "\n"));
+        assertEquals(subscriber.list, lines(bigtext, "\r\n"));
+    }
+
+    @Test(dataProvider = "uris")
+    void testBigTextAsStream(String url) {
+        HttpClient client = HttpClient.newBuilder().sslContext(sslContext)
+                .build();
+        String bigtext = bigtext();
+        HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+                .POST(BodyPublishers.ofString(bigtext))
+                .build();
+
+        CompletableFuture<HttpResponse<Stream<String>>> cf
+                = client.sendAsync(request, BodyHandlers.ofLines());
+        assertNoObtrusion(cf);
+        HttpResponse<Stream<String>> response = cf.join();
+        Stream<String> stream = response.body();
+        List<String> list = stream.collect(Collectors.toList());
+        String text = list.stream().collect(Collectors.joining("|"));
+        System.out.println(text);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(text, bigtext.replace("\r\n", "|"));
+        assertEquals(list, List.of(bigtext.split("\r\n")));
+        assertEquals(list, lines(bigtext, null));
+    }
+
+    /** An abstract Subscriber that converts all received data into a String. */
+    static abstract class AbstractSubscriber implements Supplier<String> {
+        protected volatile Flow.Subscription subscription;
+        protected final StringBuilder baos = new StringBuilder();
+        protected volatile String text;
+        protected volatile RuntimeException error;
+        protected final List<Object> list = new CopyOnWriteArrayList<>();
+
+        public void onSubscribe(Flow.Subscription subscription) {
+            this.subscription = subscription;
+            subscription.request(Long.MAX_VALUE);
+        }
+        public void onError(Throwable throwable) {
+            System.out.println(this + " onError: " + throwable);
+            error = new RuntimeException(throwable);
+        }
+        public void onComplete() {
+            System.out.println(this + " onComplete");
+            text = baos.toString();
+        }
+        @Override public String get() {
+            if (error != null) throw error;
+            return text;
+        }
+    }
+
+    static class StringSubscriber extends AbstractSubscriber
+            implements Flow.Subscriber<String>, Supplier<String>
+    {
+        @Override public void onNext(String item) {
+            System.out.print(this + " onNext: \"" + item + "\"");
+            if (baos.length() != 0) baos.append('\n');
+            baos.append(item);
+            list.add(item);
+        }
+    }
+
+    static class CharSequenceSubscriber extends AbstractSubscriber
+            implements Flow.Subscriber<CharSequence>, Supplier<String>
+    {
+        @Override public void onNext(CharSequence item) {
+            System.out.print(this + " onNext: " + item);
+            if (baos.length() != 0) baos.append('\n');
+            baos.append(item);
+            list.add(item);
+        }
+    }
+
+    static class ObjectSubscriber extends AbstractSubscriber
+            implements Flow.Subscriber<Object>, Supplier<String>
+    {
+        @Override public void onNext(Object item) {
+            System.out.print(this + " onNext: " + item);
+            if (baos.length() != 0) baos.append('\n');
+            baos.append(item);
+            list.add(item);
+        }
+    }
+
+
+    static void uncheckedWrite(ByteArrayOutputStream baos, byte[] ba) {
+        try {
+            baos.write(ba);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(new HttpTestEchoHandler(), "/http1/echo");
+        httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/echo";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(new HttpTestEchoHandler(),"/https1/echo");
+        httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/echo";
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(new HttpTestEchoHandler(), "/http2/echo");
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/echo";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(new HttpTestEchoHandler(), "/https2/echo");
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/echo";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop();
+        httpsTestServer.stop();
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    static void printBytes(PrintStream out, String prefix, byte[] bytes) {
+        int padding = 4 + 4 - (bytes.length % 4);
+        padding = padding > 4 ? padding - 4 : 4;
+        byte[] bigbytes = new byte[bytes.length + padding];
+        System.arraycopy(bytes, 0, bigbytes, padding, bytes.length);
+        out.println(prefix + bytes.length + " "
+                    + new BigInteger(bigbytes).toString(16));
+    }
+
+    private static void assertNoObtrusion(CompletableFuture<?> cf) {
+        assertThrows(UnsupportedOperationException.class,
+                     () -> cf.obtrudeException(new RuntimeException()));
+        assertThrows(UnsupportedOperationException.class,
+                     () -> cf.obtrudeValue(null));
+    }
+}
diff --git a/test/jdk/java/net/httpclient/LineStreamsAndSurrogatesTest.java b/test/jdk/java/net/httpclient/LineStreamsAndSurrogatesTest.java
new file mode 100644
index 00000000000..0f52cde8c43
--- /dev/null
+++ b/test/jdk/java/net/httpclient/LineStreamsAndSurrogatesTest.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright (c) 2018, 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.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.MalformedInputException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.SubmissionPublisher;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.testng.annotations.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_16;
+import static org.testng.Assert.assertEquals;
+
+/*
+ * @test
+ * @summary tests for BodySubscribers returned by asLines.
+ *       In particular tests that surrogate characters are handled
+ *       correctly.
+ * @modules java.net.http java.logging
+ * @run testng/othervm LineStreamsAndSurrogatesTest
+ */
+
+public class LineStreamsAndSurrogatesTest {
+
+
+    static final Class<NullPointerException> NPE = NullPointerException.class;
+
+    private static final List<String> lines(String text) {
+        return new BufferedReader(new StringReader(text)).lines().collect(Collectors.toList());
+    }
+
+    @Test
+    void testUncomplete() throws Exception {
+        // Uses U+10400 which is encoded as the surrogate pair U+D801 U+DC00
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r les\n\n" +
+                " fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\ud801\udc00";
+        Charset charset = UTF_8;
+
+        BodySubscriber<Stream<String>> bodySubscriber = BodySubscribers.ofLines(charset);
+        AtomicReference<Throwable> errorRef = new AtomicReference<>();
+        Runnable run = () -> {
+            try {
+                SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+                byte[] sbytes = text.getBytes(charset);
+                byte[] bytes = Arrays.copyOfRange(sbytes, 0, sbytes.length - 1);
+                publisher.subscribe(bodySubscriber);
+                System.out.println("Publishing " + bytes.length + " bytes");
+                for (int i = 0; i < bytes.length; i++) {
+                    // ensure that surrogates are split over several buffers.
+                    publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+                }
+                publisher.close();
+            } catch(Throwable t) {
+                errorRef.set(t);
+            }
+        };
+        Thread thread = new Thread(run,"Publishing");
+        thread.start();
+        try {
+            Stream<String> stream = bodySubscriber.getBody().toCompletableFuture().get();
+            List<String> list = stream.collect(Collectors.toList());
+            String resp = list.stream().collect(Collectors.joining(""));
+            System.out.println("***** Got: " + resp);
+
+            byte[] sbytes = text.getBytes(UTF_8);
+            byte[] bytes = Arrays.copyOfRange(sbytes, 0, sbytes.length - 1);
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(bais, charset));
+            String resp2 = reader.lines().collect(Collectors.joining(""));
+            System.out.println("***** Got2: " + resp2);
+
+            assertEquals(resp, resp2);
+            assertEquals(list, List.of("Bient\u00f4t",
+                                       " nous plongerons",
+                                       " dans",
+                                       " les",
+                                       "",
+                                       " fr\u00f4\ud801\udc00des",
+                                       " t\u00e9n\u00e8bres\ufffd"));
+        } catch (ExecutionException x) {
+            Throwable cause = x.getCause();
+            if (cause instanceof MalformedInputException) {
+                throw new RuntimeException("Unexpected MalformedInputException", cause);
+            }
+            throw x;
+        }
+        if (errorRef.get() != null) {
+            throw new RuntimeException("Unexpected exception", errorRef.get());
+        }
+    }
+
+    @Test
+    void testStream1() throws Exception {
+        // Uses U+10400 which is encoded as the surrogate pair U+D801 U+DC00
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r\r les\n\n" +
+                " fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres";
+        Charset charset = UTF_8;
+
+        BodySubscriber<Stream<String>> bodySubscriber = BodySubscribers.ofLines(charset);
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(charset);
+        AtomicReference<Throwable> errorRef = new AtomicReference<>();
+        Runnable run = () -> {
+            try {
+                publisher.subscribe(bodySubscriber);
+                System.out.println("Publishing " + bytes.length + " bytes");
+                for (int i = 0; i < bytes.length; i++) {
+                    // ensure that surrogates are split over several buffers.
+                    publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+                }
+                publisher.close();
+            } catch(Throwable t) {
+                errorRef.set(t);
+            }
+        };
+
+        Stream<String> stream = bodySubscriber.getBody().toCompletableFuture().get();
+        Thread thread = new Thread(run,"Publishing");
+        thread.start();
+        List<String> list = stream.collect(Collectors.toList());
+        String resp = list.stream().collect(Collectors.joining("|"));
+        System.out.println("***** Got: " + resp);
+        assertEquals(resp, text.replace("\r\n", "|")
+                               .replace("\n","|")
+                               .replace("\r","|"));
+        assertEquals(list, List.of("Bient\u00f4t",
+                " nous plongerons",
+                " dans",
+                "",
+                " les",
+                "",
+                " fr\u00f4\ud801\udc00des",
+                " t\u00e9n\u00e8bres"));
+        assertEquals(list, lines(text));
+        if (errorRef.get() != null) {
+            throw new RuntimeException("Unexpected exception", errorRef.get());
+        }
+    }
+
+
+    @Test
+    void testStream2() throws Exception {
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r\r" +
+                " les fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\r\r";
+        Charset charset = UTF_8;
+
+        BodySubscriber<Stream<String>> bodySubscriber = BodySubscribers.ofLines(charset);
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(charset);
+        AtomicReference<Throwable> errorRef = new AtomicReference<>();
+        Runnable run = () -> {
+            try {
+                publisher.subscribe(bodySubscriber);
+                System.out.println("Publishing " + bytes.length + " bytes");
+                for (int i = 0; i < bytes.length; i++) {
+                    // ensure that surrogates are split over several buffers.
+                    publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+                }
+                publisher.close();
+            } catch(Throwable t) {
+                errorRef.set(t);
+            }
+        };
+
+        Stream<String> stream = bodySubscriber.getBody().toCompletableFuture().get();
+        Thread thread = new Thread(run,"Publishing");
+        thread.start();
+        List<String> list = stream.collect(Collectors.toList());
+        String resp = list.stream().collect(Collectors.joining(""));
+        System.out.println("***** Got: " + resp);
+        String expected = Stream.of(text.split("\r\n|\r|\n"))
+                .collect(Collectors.joining(""));
+        assertEquals(resp, expected);
+        assertEquals(list, List.of("Bient\u00f4t",
+                " nous plongerons",
+                " dans",
+                "",
+                " les fr\u00f4\ud801\udc00des",
+                " t\u00e9n\u00e8bres",
+                ""));
+        assertEquals(list, lines(text));
+        if (errorRef.get() != null) {
+            throw new RuntimeException("Unexpected exception", errorRef.get());
+        }
+    }
+
+    @Test
+    void testStream3_UTF16() throws Exception {
+        // Uses U+10400 which is encoded as the surrogate pair U+D801 U+DC00
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r\r" +
+                " les\n\n fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres";
+        Charset charset = UTF_16;
+
+        BodySubscriber<Stream<String>> bodySubscriber = BodySubscribers.ofLines(charset);
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(charset);
+        AtomicReference<Throwable> errorRef = new AtomicReference<>();
+        Runnable run = () -> {
+            try {
+                publisher.subscribe(bodySubscriber);
+                System.out.println("Publishing " + bytes.length + " bytes");
+                for (int i = 0; i < bytes.length; i++) {
+                    // ensure that surrogates are split over several buffers.
+                    publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+                }
+                publisher.close();
+            } catch(Throwable t) {
+                errorRef.set(t);
+            }
+        };
+
+        Stream<String> stream = bodySubscriber.getBody().toCompletableFuture().get();
+        Thread thread = new Thread(run,"Publishing");
+        thread.start();
+        List<String> list = stream.collect(Collectors.toList());
+        String resp = list.stream().collect(Collectors.joining(""));
+        System.out.println("***** Got: " + resp);
+        assertEquals(resp, text.replace("\n","").replace("\r",""));
+        assertEquals(list, List.of("Bient\u00f4t",
+                " nous plongerons",
+                " dans",
+                "",
+                " les",
+                "",
+                " fr\u00f4\ud801\udc00des",
+                " t\u00e9n\u00e8bres"));
+        assertEquals(list, lines(text));
+        if (errorRef.get() != null) {
+            throw new RuntimeException("Unexpected exception", errorRef.get());
+        }
+    }
+
+
+    @Test
+    void testStream4_UTF16() throws Exception {
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r\r" +
+                " les fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\r\r";
+        Charset charset = UTF_16;
+
+        BodySubscriber<Stream<String>> bodySubscriber = BodySubscribers.ofLines(charset);
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(charset);
+        AtomicReference<Throwable> errorRef = new AtomicReference<>();
+        Runnable run = () -> {
+            try {
+                publisher.subscribe(bodySubscriber);
+                System.out.println("Publishing " + bytes.length + " bytes");
+                for (int i = 0; i < bytes.length; i++) {
+                    // ensure that surrogates are split over several buffers.
+                    publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+                }
+                publisher.close();
+            } catch(Throwable t) {
+                errorRef.set(t);
+            }
+        };
+
+        Stream<String> stream = bodySubscriber.getBody().toCompletableFuture().get();
+        Thread thread = new Thread(run,"Publishing");
+        thread.start();
+        List<String> list = stream.collect(Collectors.toList());
+        String resp = list.stream().collect(Collectors.joining(""));
+        System.out.println("***** Got: " + resp);
+        String expected = Stream.of(text.split("\r\n|\r|\n"))
+                .collect(Collectors.joining(""));
+        assertEquals(resp, expected);
+        assertEquals(list, List.of("Bient\u00f4t",
+                " nous plongerons",
+                " dans",
+                "",
+                " les fr\u00f4\ud801\udc00des",
+                " t\u00e9n\u00e8bres",
+                ""));
+        assertEquals(list, lines(text));
+        if (errorRef.get() != null) {
+            throw new RuntimeException("Unexpected exception", errorRef.get());
+        }
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/LineSubscribersAndSurrogatesTest.java b/test/jdk/java/net/httpclient/LineSubscribersAndSurrogatesTest.java
new file mode 100644
index 00000000000..ddd06be8abb
--- /dev/null
+++ b/test/jdk/java/net/httpclient/LineSubscribersAndSurrogatesTest.java
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 2018, 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.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.UncheckedIOException;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.nio.ByteBuffer;
+import java.nio.charset.MalformedInputException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Flow;
+import java.util.concurrent.SubmissionPublisher;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.testng.annotations.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_16;
+import static org.testng.Assert.assertEquals;
+
+/*
+ * @test
+ * @summary tests for BodySubscribers returned by fromLineSubscriber.
+ *       In particular tests that surrogate characters are handled
+ *       correctly.
+ * @modules java.net.http java.logging
+ * @run testng/othervm LineSubscribersAndSurrogatesTest
+ */
+
+public class LineSubscribersAndSurrogatesTest {
+
+
+    static final Class<NullPointerException> NPE = NullPointerException.class;
+
+    private static final List<String> lines(String text, String eol) {
+        if (eol == null) {
+            return new BufferedReader(new StringReader(text)).lines().collect(Collectors.toList());
+        } else {
+            String replaced = text.replace(eol, "|");
+            int i=0;
+            while(replaced.endsWith("||")) {
+                replaced = replaced.substring(0,replaced.length()-1);
+                i++;
+            }
+            List<String> res = List.of(replaced.split("\\|"));
+            if (i > 0) {
+                res = new ArrayList<>(res);
+                for (int j=0; j<i; j++) res.add("");
+            }
+            return res;
+        }
+    }
+
+    @Test
+    void testIncomplete() throws Exception {
+        // Uses U+10400 which is encoded as the surrogate pair U+D801 U+DC00
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" +
+                " les\n\n fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\ud801\udc00";
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        BodySubscriber<String> bodySubscriber = BodySubscribers.fromLineSubscriber(
+                subscriber, Supplier::get, UTF_8, null);
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] sbytes = text.getBytes(UTF_8);
+        byte[] bytes = Arrays.copyOfRange(sbytes,0, sbytes.length - 1);
+        publisher.subscribe(bodySubscriber);
+        System.out.println("Publishing " + bytes.length + " bytes");
+        for (int i=0; i<bytes.length; i++) {
+            // ensure that surrogates are split over several buffers.
+            publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+        }
+        publisher.close();
+        try {
+            String resp = bodySubscriber.getBody().toCompletableFuture().get();
+            System.out.println("***** Got: " + resp);
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(bais, UTF_8));
+            String resp2 = reader.lines().collect(Collectors.joining(""));
+            assertEquals(resp, resp2);
+            assertEquals(subscriber.list, List.of("Bient\u00f4t",
+                    " nous plongerons",
+                    " dans",
+                    " les",
+                    "",
+                    " fr\u00f4\ud801\udc00des",
+                    " t\u00e9n\u00e8bres\ufffd"));
+        } catch (ExecutionException x) {
+            Throwable cause = x.getCause();
+            if (cause instanceof MalformedInputException) {
+                throw new RuntimeException("Unexpected MalformedInputException thrown", cause);
+            }
+            throw x;
+        }
+    }
+
+
+    @Test
+    void testStringWithFinisherLF() throws Exception {
+        // Uses U+10400 which is encoded as the surrogate pair U+D801 U+DC00
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" +
+                " les\n\n fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\r";
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        BodySubscriber<String> bodySubscriber = BodySubscribers.fromLineSubscriber(
+                subscriber, Supplier::get, UTF_8, "\n");
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(UTF_8);
+        publisher.subscribe(bodySubscriber);
+        System.out.println("Publishing " + bytes.length + " bytes");
+        for (int i=0; i<bytes.length; i++) {
+            // ensure that surrogates are split over several buffers.
+            publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+        }
+        publisher.close();
+        String resp = bodySubscriber.getBody().toCompletableFuture().get();
+        System.out.println("***** Got: " + resp);
+        List<String> expected = List.of("Bient\u00f4t\r",
+                " nous plongerons\r",
+                " dans\r les",
+                "",
+                " fr\u00f4\ud801\udc00des\r",
+                " t\u00e9n\u00e8bres\r");
+        assertEquals(subscriber.list, expected);
+        assertEquals(resp, Stream.of(text.split("\n")).collect(Collectors.joining("")));
+        assertEquals(resp, expected.stream().collect(Collectors.joining("")));
+        assertEquals(subscriber.list, lines(text, "\n"));
+    }
+
+
+    @Test
+    void testStringWithFinisherCR() throws Exception {
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" +
+                " les fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\r\r";
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        BodySubscriber<String> bodySubscriber = BodySubscribers.fromLineSubscriber(
+                subscriber, Supplier::get, UTF_8, "\r");
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(UTF_8);
+        publisher.subscribe(bodySubscriber);
+        System.out.println("Publishing " + bytes.length + " bytes");
+        for (int i=0; i<bytes.length; i++) {
+            // ensure that surrogates are split over several buffers.
+            publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+        }
+        publisher.close();
+        String resp = bodySubscriber.getBody().toCompletableFuture().get();
+        System.out.println("***** Got: " + resp);
+        assertEquals(resp, text.replace("\r", ""));
+        assertEquals(subscriber.list, List.of("Bient\u00f4t",
+                "\n nous plongerons",
+                "\n dans",
+                " les fr\u00f4\ud801\udc00des",
+                "\n t\u00e9n\u00e8bres",
+                ""));
+        assertEquals(subscriber.list, lines(text, "\r"));
+    }
+
+    @Test
+    void testStringWithFinisherCRLF() throws Exception {
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" +
+                " les fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres";
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        BodySubscriber<String> bodySubscriber = BodySubscribers.fromLineSubscriber(
+                subscriber, Supplier::get, UTF_8, "\r\n");
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(UTF_8);
+        publisher.subscribe(bodySubscriber);
+        System.out.println("Publishing " + bytes.length + " bytes");
+        for (int i=0; i<bytes.length; i++) {
+            // ensure that surrogates are split over several buffers.
+            publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+        }
+        publisher.close();
+        String resp = bodySubscriber.getBody().toCompletableFuture().get();
+        System.out.println("***** Got: " + resp);
+        assertEquals(resp, text.replace("\r\n",""));
+        assertEquals(subscriber.list, List.of("Bient\u00f4t",
+                " nous plongerons",
+                " dans\r les fr\u00f4\ud801\udc00des",
+                " t\u00e9n\u00e8bres"));
+        assertEquals(subscriber.list, lines(text, "\r\n"));
+    }
+
+
+    @Test
+    void testStringWithFinisherBR() throws Exception {
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" +
+                " les\r\r fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres";
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        BodySubscriber<String> bodySubscriber = BodySubscribers.fromLineSubscriber(
+                subscriber, Supplier::get, UTF_8, null);
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(UTF_8);
+        publisher.subscribe(bodySubscriber);
+        System.out.println("Publishing " + bytes.length + " bytes");
+        for (int i=0; i<bytes.length; i++) {
+            // ensure that surrogates are split over several buffers.
+            publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+        }
+        publisher.close();
+        String resp = bodySubscriber.getBody().toCompletableFuture().get();
+        System.out.println("***** Got: " + resp);
+        List<String> expected = List.of("Bient\u00f4t",
+                " nous plongerons",
+                " dans",
+                " les",
+                "",
+                " fr\u00f4\ud801\udc00des",
+                " t\u00e9n\u00e8bres");
+        assertEquals(subscriber.list, expected);
+        assertEquals(resp, expected.stream().collect(Collectors.joining("")));
+        assertEquals(subscriber.list, lines(text, null));
+    }
+
+    @Test
+    void testStringWithFinisherBR_UTF_16() throws Exception {
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" +
+                " les\r\r fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres\r\r";
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        BodySubscriber<String> bodySubscriber = BodySubscribers.fromLineSubscriber(
+                subscriber, Supplier::get, UTF_16, null);
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(UTF_16);
+        publisher.subscribe(bodySubscriber);
+        System.out.println("Publishing " + bytes.length + " bytes");
+        for (int i=0; i<bytes.length; i++) {
+            // ensure that surrogates are split over several buffers.
+            publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+        }
+        publisher.close();
+        String resp = bodySubscriber.getBody().toCompletableFuture().get();
+        System.out.println("***** Got: " + resp);
+        List<String> expected = List.of("Bient\u00f4t",
+                " nous plongerons",
+                " dans",
+                " les",
+                "",
+                " fr\u00f4\ud801\udc00des",
+                " t\u00e9n\u00e8bres",
+                "");
+        assertEquals(resp, expected.stream().collect(Collectors.joining("")));
+        assertEquals(subscriber.list, expected);
+        assertEquals(subscriber.list, lines(text, null));
+    }
+
+    void testStringWithoutFinisherBR() throws Exception {
+        String text = "Bient\u00f4t\r\n nous plongerons\r\n dans\r" +
+                " les\r\r fr\u00f4\ud801\udc00des\r\n t\u00e9n\u00e8bres";
+        ObjectSubscriber subscriber = new ObjectSubscriber();
+        BodySubscriber<Void> bodySubscriber = BodySubscribers.fromLineSubscriber(subscriber);
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        byte[] bytes = text.getBytes(UTF_8);
+        publisher.subscribe(bodySubscriber);
+        System.out.println("Publishing " + bytes.length + " bytes");
+        for (int i = 0; i < bytes.length; i++) {
+            // ensure that surrogates are split over several buffers.
+            publisher.submit(List.of(ByteBuffer.wrap(bytes, i, 1)));
+        }
+        publisher.close();
+        Void resp = bodySubscriber.getBody().toCompletableFuture().get();
+        System.out.println("***** Got: " + resp);
+        List<String> expected = List.of("Bient\u00f4t",
+                " nous plongerons",
+                " dans",
+                " les",
+                "",
+                " fr\u00f4\ud801\udc00des",
+                " t\u00e9n\u00e8bres");
+        assertEquals(subscriber.text, expected.stream().collect(Collectors.joining("")));
+        assertEquals(subscriber.list, expected);
+        assertEquals(subscriber.list, lines(text, null));
+    }
+
+
+    /** An abstract Subscriber that converts all received data into a String. */
+    static abstract class AbstractSubscriber implements Supplier<String> {
+        protected final List<Object> list = new CopyOnWriteArrayList<>();
+        protected volatile Flow.Subscription subscription;
+        protected final StringBuilder baos = new StringBuilder();
+        protected volatile String text;
+        protected volatile RuntimeException error;
+
+        public void onSubscribe(Flow.Subscription subscription) {
+            this.subscription = subscription;
+            subscription.request(Long.MAX_VALUE);
+        }
+        public void onError(Throwable throwable) {
+            System.out.println(this + " onError: " + throwable);
+            error = new RuntimeException(throwable);
+        }
+        public void onComplete() {
+            System.out.println(this + " onComplete");
+            text = baos.toString();
+        }
+        @Override public String get() {
+            if (error != null) throw error;
+            return text;
+        }
+        public final List<?> list() {
+            return list;
+        }
+    }
+
+    static class StringSubscriber extends AbstractSubscriber
+            implements Flow.Subscriber<String>, Supplier<String>
+    {
+        @Override public void onNext(String item) {
+            System.out.println(this + " onNext: \""
+                    + item.replace("\n","\\n")
+                          .replace("\r", "\\r")
+                    + "\"");
+            baos.append(item);
+            list.add(item);
+        }
+    }
+
+    static class CharSequenceSubscriber extends AbstractSubscriber
+            implements Flow.Subscriber<CharSequence>, Supplier<String>
+    {
+        @Override public void onNext(CharSequence item) {
+            System.out.println(this + " onNext: \""
+                    + item.toString().replace("\n","\\n")
+                    .replace("\r", "\\r")
+                    + "\"");
+            baos.append(item);
+            list.add(item);
+        }
+    }
+
+    static class ObjectSubscriber extends AbstractSubscriber
+            implements Flow.Subscriber<Object>, Supplier<String>
+    {
+        @Override public void onNext(Object item) {
+            System.out.println(this + " onNext: \""
+                    + item.toString().replace("\n","\\n")
+                    .replace("\r", "\\r")
+                    + "\"");
+            baos.append(item);
+            list.add(item);
+        }
+    }
+
+
+    static void uncheckedWrite(ByteArrayOutputStream baos, byte[] ba) {
+        try {
+            baos.write(ba);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/ManyRequests.java b/test/jdk/java/net/httpclient/ManyRequests.java
index dfcd2acd0bc..55c96c36532 100644
--- a/test/jdk/java/net/httpclient/ManyRequests.java
+++ b/test/jdk/java/net/httpclient/ManyRequests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8087112 8180044
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary/ /
@@ -47,10 +47,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.util.Arrays;
 import java.util.Formatter;
 import java.util.HashMap;
@@ -61,8 +64,6 @@
 import java.util.concurrent.CompletableFuture;
 import javax.net.ssl.SSLContext;
 import jdk.testlibrary.SimpleSSLContext;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromByteArray;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asByteArray;
 
 public class ManyRequests {
 
@@ -78,7 +79,7 @@ public static void main(String[] args) throws Exception {
                          + ", XFixed=" + XFIXED);
         SSLContext ctx = new SimpleSSLContext().get();
 
-        InetSocketAddress addr = new InetSocketAddress(0);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         HttpsServer server = HttpsServer.create(addr, 0);
         server.setHttpsConfigurator(new Configurator(ctx));
 
@@ -129,7 +130,7 @@ protected void close(HttpExchange t, InputStream is) throws IOException {
 
     static void test(HttpsServer server, HttpClient client) throws Exception {
         int port = server.getAddress().getPort();
-        URI baseURI = new URI("https://127.0.0.1:" + port + "/foo/x");
+        URI baseURI = new URI("https://localhost:" + port + "/foo/x");
         server.createContext("/foo", new TestEchoHandler());
         server.start();
 
@@ -144,7 +145,7 @@ static void test(HttpsServer server, HttpClient client) throws Exception {
             URI uri = new URI(baseURI.toString() + String.valueOf(i+1));
             HttpRequest r = HttpRequest.newBuilder(uri)
                                        .header("XFixed", "true")
-                                       .POST(fromByteArray(buf))
+                                       .POST(BodyPublishers.ofByteArray(buf))
                                        .build();
             bodies.put(r, buf);
 
@@ -152,7 +153,7 @@ static void test(HttpsServer server, HttpClient client) throws Exception {
                 limiter.whenOkToSend()
                        .thenCompose((v) -> {
                            System.out.println("Client: sendAsync: " + r.uri());
-                           return client.sendAsync(r, asByteArray());
+                           return client.sendAsync(r, BodyHandlers.ofByteArray());
                        })
                        .thenCompose((resp) -> {
                            limiter.requestComplete();
diff --git a/test/jdk/java/net/httpclient/ManyRequests2.java b/test/jdk/java/net/httpclient/ManyRequests2.java
index af0189147b3..dcbe1f42a5e 100644
--- a/test/jdk/java/net/httpclient/ManyRequests2.java
+++ b/test/jdk/java/net/httpclient/ManyRequests2.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8087112 8180044
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary/ /
diff --git a/test/jdk/java/net/httpclient/ManyRequestsLegacy.java b/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
index 16707741095..01fe8d8c31f 100644
--- a/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
+++ b/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 +23,7 @@
 
 /*
  * @test
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary/ /
@@ -48,32 +48,29 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.InetAddress;
 import java.net.URI;
 import java.net.URLConnection;
-import java.security.NoSuchAlgorithmException;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSession;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpClient.Version;
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
 import java.net.InetSocketAddress;
 import java.util.Arrays;
 import java.util.Formatter;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Random;
-import java.util.concurrent.ExecutorService;
 import java.util.logging.Logger;
 import java.util.logging.Level;
 import jdk.testlibrary.SimpleSSLContext;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromByteArray;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asByteArray;
 
 public class ManyRequestsLegacy {
 
@@ -94,7 +91,7 @@ public boolean verify(String hostname, SSLSession session) {
                     return true;
                 }
             });
-        InetSocketAddress addr = new InetSocketAddress(0);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         HttpsServer server = HttpsServer.create(addr, 0);
         server.setHttpsConfigurator(new Configurator(ctx));
 
@@ -116,7 +113,7 @@ public boolean verify(String hostname, SSLSession session) {
     static final boolean XFIXED = Boolean.getBoolean("test.XFixed");
 
     static class LegacyHttpClient {
-        static final class LegacyHttpResponse extends HttpResponse<byte[]> {
+        static final class LegacyHttpResponse implements HttpResponse<byte[]> {
             final HttpRequest request;
             final byte[] response;
             final int statusCode;
@@ -139,12 +136,8 @@ private <T> T error() {
             @Override
             public byte[] body() {return response;}
             @Override
-            public SSLParameters sslParameters() {
-                try {
-                    return SSLContext.getDefault().getDefaultSSLParameters();
-                } catch (NoSuchAlgorithmException ex) {
-                    throw new UnsupportedOperationException(ex);
-                }
+            public Optional<SSLSession> sslSession() {
+                return Optional.empty(); // for now
             }
             @Override
             public URI uri() { return request.uri();}
@@ -225,7 +218,7 @@ protected void close(HttpExchange t, InputStream is) throws IOException {
 
     static void test(HttpsServer server, LegacyHttpClient client) throws Exception {
         int port = server.getAddress().getPort();
-        URI baseURI = new URI("https://127.0.0.1:" + port + "/foo/x");
+        URI baseURI = new URI("https://localhost:" + port + "/foo/x");
         server.createContext("/foo", new TestEchoHandler());
         server.start();
 
@@ -240,7 +233,7 @@ static void test(HttpsServer server, LegacyHttpClient client) throws Exception {
             URI uri = new URI(baseURI.toString() + String.valueOf(i+1));
             HttpRequest r = HttpRequest.newBuilder(uri)
                                        .header("XFixed", "true")
-                                       .POST(fromByteArray(buf))
+                                       .POST(BodyPublishers.ofByteArray(buf))
                                        .build();
             bodies.put(r, buf);
 
diff --git a/test/jdk/java/net/httpclient/MappingResponseSubscriber.java b/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
new file mode 100644
index 00000000000..cfdd917667a
--- /dev/null
+++ b/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
@@ -0,0 +1,348 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * @summary Tests mapped response subscriber
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm
+ *       -Djdk.internal.httpclient.debug=true
+ *      MappingResponseSubscriber
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscribers;
+import  java.net.http.HttpResponse.BodySubscriber;
+import java.util.function.Function;
+import javax.net.ssl.SSLContext;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class MappingResponseSubscriber {
+
+    SSLContext sslContext;
+    HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    HttpsServer httpsTestServer;       // HTTPS/1.1
+    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI_fixed;
+    String httpURI_chunk;
+    String httpsURI_fixed;
+    String httpsURI_chunk;
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    static final int ITERATION_COUNT = 10;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = Executors.newCachedThreadPool();
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        return new Object[][]{
+                { httpURI_fixed,    false },
+                { httpURI_chunk,    false },
+                { httpsURI_fixed,   false },
+                { httpsURI_chunk,   false },
+                { http2URI_fixed,   false },
+                { http2URI_chunk,   false },
+                { https2URI_fixed,  false,},
+                { https2URI_chunk,  false },
+
+                { httpURI_fixed,    true },
+                { httpURI_chunk,    true },
+                { httpsURI_fixed,   true },
+                { httpsURI_chunk,   true },
+                { http2URI_fixed,   true },
+                { http2URI_chunk,   true },
+                { https2URI_fixed,  true,},
+                { https2URI_chunk,  true },
+        };
+    }
+
+    HttpClient newHttpClient() {
+        return HttpClient.newBuilder()
+                         .executor(executor)
+                         .sslContext(sslContext)
+                         .build();
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsBytes(String uri, boolean sameClient) throws Exception {
+        HttpClient client = null;
+        for (int i = 0; i < ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                                         .build();
+            BodyHandler<byte[]> handler = new CRSBodyHandler();
+            HttpResponse<byte[]> response = client.send(req, handler);
+            byte[] body = response.body();
+            assertEquals(body, bytes);
+        }
+    }
+
+    static class CRSBodyHandler implements BodyHandler<byte[]> {
+        @Override
+        public BodySubscriber<byte[]> apply(HttpResponse.ResponseInfo rinfo) {
+            assertEquals(rinfo.statusCode(), 200);
+            return BodySubscribers.mapping(
+                new CRSBodySubscriber(), (s) -> s.getBytes(UTF_8)
+            );
+        }
+    }
+
+    static class CRSBodySubscriber implements BodySubscriber<String> {
+        private final BodySubscriber<String> ofString = BodySubscribers.ofString(UTF_8);
+        volatile boolean onSubscribeCalled;
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            //out.println("onSubscribe ");
+            onSubscribeCalled = true;
+            ofString.onSubscribe(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+           // out.println("onNext " + item);
+            assertTrue(onSubscribeCalled);
+            ofString.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            //out.println("onError");
+            assertTrue(onSubscribeCalled);
+            ofString.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            //out.println("onComplete");
+            assertTrue(onSubscribeCalled, "onComplete called before onSubscribe");
+            ofString.onComplete();
+        }
+
+        @Override
+        public CompletionStage<String> getBody() {
+            return ofString.getBody();
+        }
+    }
+
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/1.1
+        HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler();
+        HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler();
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpServer.create(sa, 0);
+        httpTestServer.createContext("/http1/fixed", h1_fixedLengthHandler);
+        httpTestServer.createContext("/http1/chunk", h1_chunkHandler);
+        httpURI_fixed = "http://" + serverAuthority(httpTestServer) + "/http1/fixed";
+        httpURI_chunk = "http://" + serverAuthority(httpTestServer) + "/http1/chunk";
+
+        httpsTestServer = HttpsServer.create(sa, 0);
+        httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer.createContext("/https1/fixed", h1_fixedLengthHandler);
+        httpsTestServer.createContext("/https1/chunk", h1_chunkHandler);
+        httpsURI_fixed = "https://" + serverAuthority(httpsTestServer) + "/https1/fixed";
+        httpsURI_chunk = "https://" + serverAuthority(httpsTestServer) + "/https1/chunk";
+
+        // HTTP/2
+        Http2Handler h2_fixedLengthHandler = new HTTP2_FixedLengthHandler();
+        Http2Handler h2_chunkedHandler = new HTTP2_VariableHandler();
+
+        http2TestServer = new Http2TestServer("localhost", false, 0);
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk";
+
+        https2TestServer = new Http2TestServer("localhost", true, 0);
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop(0);
+        httpsTestServer.stop(0);
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    static byte[] bytes;
+
+    static {
+        bytes = new byte[128 * 1024];
+        int b = 'A';
+
+        for (int i=0; i< bytes.length; i++) {
+            bytes[i] = (byte)b;
+            b = b == 'Z'? 'A' : b + 1;
+        }
+    }
+
+    static class HTTP1_FixedLengthHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            out.println("HTTP1_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, bytes.length);  //no body
+            OutputStream os = t.getResponseBody();
+            os.write(bytes);
+            os.close();
+        }
+    }
+
+    static class HTTP1_ChunkedHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            out.println("HTTP1_ChunkedHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, 0); // chunked
+            OutputStream os = t.getResponseBody();
+            os.write(bytes);
+            os.close();
+        }
+    }
+
+    static class HTTP2_FixedLengthHandler implements Http2Handler {
+        @Override
+        public void handle(Http2TestExchange t) throws IOException {
+            out.println("HTTP2_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, 0); // chunked
+            OutputStream os = t.getResponseBody();
+            os.write(bytes);
+            os.close();
+        }
+    }
+
+    static class HTTP2_VariableHandler implements Http2Handler {
+        @Override
+        public void handle(Http2TestExchange t) throws IOException {
+            out.println("HTTP2_VariableHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, bytes.length);  //no body
+            OutputStream os = t.getResponseBody();
+            os.write(bytes);
+            os.close();
+        }
+    }
+
+    // -- Compile only. Verifies generic signatures
+
+    static final Function<CharSequence,Integer> f1 = subscriber -> 1;
+    static final Function<CharSequence,Number> f2 = subscriber -> 2;
+    static final Function<String,Integer> f3 = subscriber -> 3;
+    static final Function<String,Number> f4 = subscriber -> 4;
+
+    public void compileOnly() throws Exception {
+        HttpClient client = null;
+        HttpRequest req = null;
+
+        HttpResponse<Integer> r1 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), s -> 1));
+        HttpResponse<Number>  r2 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), s -> 1));
+        HttpResponse<String>  r3 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), s -> "s"));
+        HttpResponse<CharSequence> r4 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), s -> "s"));
+
+        HttpResponse<Integer> x1 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), f1));
+        HttpResponse<Number>  x2 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), f1));
+        HttpResponse<Number>  x3 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), f2));
+        HttpResponse<Integer> x4 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), f3));
+        HttpResponse<Number>  x5 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), f3));
+        HttpResponse<Number>  x7 = client.send(req, (ri) ->
+                BodySubscribers.mapping(BodySubscribers.ofString(UTF_8), f4));
+    }
+}
diff --git a/test/jdk/java/net/httpclient/MessageHeadersTest.java b/test/jdk/java/net/httpclient/MessageHeadersTest.java
index a11511cb817..31227afadae 100644
--- a/test/jdk/java/net/httpclient/MessageHeadersTest.java
+++ b/test/jdk/java/net/httpclient/MessageHeadersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 8164704
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          jdk.httpserver
  *          java.base/sun.net.www
  * @run main MessageHeadersTest
diff --git a/test/jdk/java/net/httpclient/MethodsTest.java b/test/jdk/java/net/httpclient/MethodsTest.java
new file mode 100644
index 00000000000..fe706f24c96
--- /dev/null
+++ b/test/jdk/java/net/httpclient/MethodsTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2018, 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 jdk.internal.net.http.common.HttpHeadersImpl;
+
+import java.io.IOException;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.URI;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.Optional;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+
+
+/**
+ * @test
+ * @bug 8199135
+ * @modules java.net.http/jdk.internal.net.http.common
+ * @summary Basic test for method names
+ */
+public class MethodsTest {
+
+    static final URI TEST_URI = URI.create("http://www.foo.com/");
+    static final String FORBIDDEN = "()<>@,;:\\\"/[]?={} \t\r\n";
+    static final HttpClient client = HttpClient.newBuilder().proxy(NO_PROXY).build();
+
+    static void bad(String name) throws IOException, InterruptedException {
+        HttpRequest.Builder builder = HttpRequest.newBuilder(TEST_URI);
+        try {
+            builder.method(name, HttpRequest.BodyPublishers.noBody());
+            throw new RuntimeException("Expected IAE for method:" + name);
+        } catch (IllegalArgumentException expected) {
+            System.out.println("Got expected IAE: " + expected);
+        }
+        try {
+            HttpRequest req = new HttpRequest() {
+                @Override public Optional<BodyPublisher> bodyPublisher() {
+                    return Optional.of(BodyPublishers.noBody());
+                }
+                @Override public String method() {
+                    return name;
+                }
+                @Override public Optional<Duration> timeout() {
+                    return Optional.empty();
+                }
+                @Override public boolean expectContinue() {
+                    return false;
+                }
+                @Override public URI uri() {
+                    return TEST_URI;
+                }
+                @Override public Optional<HttpClient.Version> version() {
+                    return Optional.empty();
+                }
+                @Override public HttpHeaders headers() {
+                    return new HttpHeadersImpl();
+                }
+            };
+            client.send(req, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected IAE for method:" + name);
+        } catch (IllegalArgumentException expected) {
+            System.out.println("Got expected IAE: " + expected);
+        }
+    }
+
+    static void good(String name) {
+        HttpRequest.Builder builder = HttpRequest.newBuilder(TEST_URI);
+        try {
+            builder.method(name, HttpRequest.BodyPublishers.noBody());
+        } catch (IllegalArgumentException e) {
+            throw new RuntimeException("Unexpected IAE for header:" + name);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        bad("bad:method");
+        bad("Foo\n");
+        good("X-Foo!");
+        good("Bar~");
+        good("x");
+        bad(" ");
+        bad("x y");
+        bad("x\t");
+        bad("Bar\r\n");
+        good("Hello#world");
+        good("Qwer#ert");
+        bad("m\u00e9thode");
+        for (char c =0; c < 256 ; c++) {
+            if (c < 32 || FORBIDDEN.indexOf(c) > -1 || c >= 127) {
+                bad("me" + c + "thod");
+                bad(c + "thod");
+                bad("me" + c);
+            } else {
+                good("me" + c + "thod");
+                good(c + "thod");
+                good("me" + c);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/MockServer.java b/test/jdk/java/net/httpclient/MockServer.java
index f7c578f36c2..c0564f5a469 100644
--- a/test/jdk/java/net/httpclient/MockServer.java
+++ b/test/jdk/java/net/httpclient/MockServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -21,12 +21,16 @@
  * questions.
  */
 
+import com.sun.net.httpserver.HttpServer;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLServerSocket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
@@ -37,6 +41,7 @@
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
 /**
  * A cut-down Http/1 Server for testing various error situations
@@ -60,7 +65,7 @@ public class MockServer extends Thread implements Closeable {
     // to the test client.
    final String root;
 
-    // waits up to 20 seconds for something to happen
+    // waits up to 2000 seconds for something to happen
     // dont use this unless certain activity coming.
     public Connection activity() {
         for (int i = 0; i < 80 * 100; i++) {
@@ -160,7 +165,7 @@ public void run() {
                         cleanup();
                         return;
                     }
-                    String s0 = new String(buf, 0, n, StandardCharsets.ISO_8859_1);
+                    String s0 = new String(buf, 0, n, ISO_8859_1);
                     s = s + s0;
                     int i;
                     while ((i=s.indexOf(CRLF)) != -1) {
@@ -195,7 +200,7 @@ public void sendHttpResponse(int code, String body, String... headers)
             for (int i=0; i<headers.length; i+=2) {
                 r1 += headers[i] + ": " + headers[i+1] + CRLF;
             }
-            int clen = body == null ? 0 : body.length();
+            int clen = body == null ? 0 : body.getBytes(ISO_8859_1).length;
             r1 += "Content-Length: " + Integer.toString(clen) + CRLF;
             r1 += CRLF;
             if (body != null) {
@@ -208,7 +213,7 @@ public void sendHttpResponse(int code, String body, String... headers)
         public void sendIncompleteHttpResponseBody(int code) throws IOException {
             String body = "Hello World Helloworld Goodbye World";
             String r1 = "HTTP/1.1 " + Integer.toString(code) + " status" + CRLF;
-            int clen = body.length() + 10;
+            int clen = body.getBytes(ISO_8859_1).length + 10;
             r1 += "Content-Length: " + Integer.toString(clen) + CRLF;
             r1 += CRLF;
             if (body != null) {
@@ -225,7 +230,18 @@ public void sendIncompleteHttpResponseHeaders(int code)
         }
 
         public void send(String r) throws IOException {
-            os.write(r.getBytes(StandardCharsets.ISO_8859_1));
+            try {
+                os.write(r.getBytes(ISO_8859_1));
+            } catch (IOException x) {
+                IOException suppressed =
+                        new IOException("MockServer["
+                            + ss.getLocalPort()
+                            +"] Failed while writing bytes: "
+                            +  x.getMessage());
+                x.addSuppressed(suppressed);
+                System.err.println("WARNING: " + suppressed);
+                throw x;
+            }
         }
 
         public synchronized void close() {
@@ -275,7 +291,9 @@ private void cleanup() {
     }
 
     MockServer(int port, ServerSocketFactory factory, String root) throws IOException {
-        ss = factory.createServerSocket(port);
+        ss = factory.createServerSocket();
+        ss.setReuseAddress(false);
+        ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
         this.root = root; // if specified, any request which don't have this value
                           // in their statusLine will be rejected.
         sockets = Collections.synchronizedList(new LinkedList<>());
@@ -301,11 +319,15 @@ int port() {
         return ss.getLocalPort();
     }
 
+    String serverAuthority() {
+        return InetAddress.getLoopbackAddress().getHostName() + ":" + port();
+    }
+
     public String getURL() {
         if (ss instanceof SSLServerSocket) {
-            return "https://127.0.0.1:" + port() + "/foo/";
+            return "https://" + serverAuthority() + "/foo/";
         } else {
-            return "http://127.0.0.1:" + port() + "/foo/";
+            return "http://" + serverAuthority() + "/foo/";
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/MultiAuthTest.java b/test/jdk/java/net/httpclient/MultiAuthTest.java
index 6d049041981..c434591c894 100644
--- a/test/jdk/java/net/httpclient/MultiAuthTest.java
+++ b/test/jdk/java/net/httpclient/MultiAuthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,7 +23,7 @@
 
 /**
  * @test
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          jdk.httpserver
  * @run main/othervm MultiAuthTest
  * @summary Basic Authentication test with multiple clients issuing
@@ -39,15 +39,18 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.URI;
-import jdk.incubator.http.*;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
@@ -59,7 +62,8 @@ public class MultiAuthTest {
     static final String POST_BODY = "This is the POST body " + UUID.randomUUID();
 
     static HttpServer createServer(ExecutorService e, BasicAuthenticator sa) throws Exception {
-        HttpServer server = HttpServer.create(new InetSocketAddress(0), 10);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        HttpServer server = HttpServer.create(addr, 10);
         Handler h = new Handler();
         HttpContext serverContext = server.createContext("/test", h);
         serverContext.setAuthenticator(sa);
@@ -93,7 +97,7 @@ public static void main(String[] args) throws Exception {
         HttpClient client3 = HttpClient.newHttpClient();
 
         try {
-            URI uri = new URI("http://127.0.0.1:" + port + "/test/foo");
+            URI uri = new URI("http://localhost:" + port + "/test/foo");
             System.out.println("URI: " + uri);
 
             System.out.println("\nTesting with client #1, Authenticator #1");
@@ -173,9 +177,12 @@ static void test(HttpClient client,
 
         HttpResponse resp;
         try {
-            resp = client.send(req, asString());
+            resp = client.send(req, BodyHandlers.ofString());
             ok = resp.statusCode() == 200 &&
                 resp.body().equals(RESPONSE);
+            if (resp.statusCode() == 401 || resp.statusCode() == 407) {
+                throw new IOException(String.valueOf(resp));
+            }
             if (expectFailure != null) {
                 throw new RuntimeException("Expected " + expectFailure.getName()
                          +" not raised");
@@ -195,7 +202,7 @@ static void test(HttpClient client,
                  + " count=" + ca.count.get() + " (expected=" + expectCount+")");
 
         // repeat same request, should succeed but no additional authenticator calls
-        resp = client.send(req, asString());
+        resp = client.send(req, BodyHandlers.ofString());
         ok = resp.statusCode() == 200 &&
                 resp.body().equals(RESPONSE);
 
@@ -205,9 +212,9 @@ static void test(HttpClient client,
 
         // try a POST
         req = HttpRequest.newBuilder(uri)
-                         .POST(fromString(POST_BODY))
+                         .POST(BodyPublishers.ofString(POST_BODY))
                          .build();
-        resp = client.send(req, asString());
+        resp = client.send(req, BodyHandlers.ofString());
         ok = resp.statusCode() == 200;
 
         if (!ok || ca.count.get() != expectCount)
diff --git a/test/jdk/java/net/httpclient/NoBodyPartOne.java b/test/jdk/java/net/httpclient/NoBodyPartOne.java
index d2a979394db..e71225df70b 100644
--- a/test/jdk/java/net/httpclient/NoBodyPartOne.java
+++ b/test/jdk/java/net/httpclient/NoBodyPartOne.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -28,26 +28,27 @@
  * @library /lib/testlibrary http2/server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
- * @run testng/othervm -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=all NoBodyPartOne
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.httpclient.HttpClient.log=all
+ *      NoBodyPartOne
  */
 
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpResponse.BodyHandler;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
 import org.testng.annotations.Test;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asByteArray;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asFile;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
@@ -62,9 +63,10 @@ public void testAsString(String uri, boolean sameClient) throws Exception {
                 client = newHttpClient();
 
             HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
-                                         .PUT(fromString(SIMPLE_STRING))
+                                         .PUT(BodyPublishers.ofString(SIMPLE_STRING))
                                          .build();
-            BodyHandler<String> handler = i % 2 == 0 ? asString() : asString(UTF_8);
+            BodyHandler<String> handler = i % 2 == 0 ? BodyHandlers.ofString()
+                                                     : BodyHandlers.ofString(UTF_8);
             HttpResponse<String> response = client.send(req, handler);
             String body = response.body();
             assertEquals(body, "");
@@ -82,10 +84,10 @@ public void testAsFile(String uri, boolean sameClient) throws Exception {
                 client = newHttpClient();
 
             HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
-                                         .PUT(fromString(SIMPLE_STRING))
+                                         .PUT(BodyPublishers.ofString(SIMPLE_STRING))
                                          .build();
             Path p = Paths.get("NoBody_testAsFile.txt");
-            HttpResponse<Path> response = client.send(req, asFile(p));
+            HttpResponse<Path> response = client.send(req, BodyHandlers.ofFile(p));
             Path bodyPath = response.body();
             assertTrue(Files.exists(bodyPath));
             assertEquals(Files.size(bodyPath), 0);
@@ -103,9 +105,9 @@ public void testAsByteArray(String uri, boolean sameClient) throws Exception {
                 client = newHttpClient();
 
             HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
-                                         .PUT(fromString(SIMPLE_STRING))
+                                         .PUT(BodyPublishers.ofString(SIMPLE_STRING))
                                          .build();
-            HttpResponse<byte[]> response = client.send(req, asByteArray());
+            HttpResponse<byte[]> response = client.send(req, BodyHandlers.ofByteArray());
             byte[] body = response.body();
             assertEquals(body.length, 0);
         }
diff --git a/test/jdk/java/net/httpclient/NoBodyPartTwo.java b/test/jdk/java/net/httpclient/NoBodyPartTwo.java
index a9fbb95b937..e612695b513 100644
--- a/test/jdk/java/net/httpclient/NoBodyPartTwo.java
+++ b/test/jdk/java/net/httpclient/NoBodyPartTwo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -28,26 +28,25 @@
  * @library /lib/testlibrary http2/server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
- * @run testng/othervm -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=all NoBodyPartTwo
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.httpclient.HttpClient.log=all
+ *      NoBodyPartTwo
  */
 
 import java.io.InputStream;
 import java.net.URI;
 import java.util.Optional;
 import java.util.function.Consumer;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import org.testng.annotations.Test;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asByteArray;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asByteArrayConsumer;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asInputStream;
-import static jdk.incubator.http.HttpResponse.BodyHandler.buffering;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
@@ -64,14 +63,14 @@ public void testAsByteArrayConsumer(String uri, boolean sameClient) throws Excep
                 client = newHttpClient();
 
             HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
-                    .PUT(fromString(SIMPLE_STRING))
+                    .PUT(BodyPublishers.ofString(SIMPLE_STRING))
                     .build();
             Consumer<Optional<byte[]>>  consumer = oba -> {
                 consumerHasBeenCalled = true;
                 oba.ifPresent(ba -> fail("Unexpected non-empty optional:" + ba));
             };
             consumerHasBeenCalled = false;
-            client.send(req, asByteArrayConsumer(consumer));
+            client.send(req, BodyHandlers.ofByteArrayConsumer(consumer));
             assertTrue(consumerHasBeenCalled);
         }
         // We have created many clients here. Try to speed up their release.
@@ -87,9 +86,9 @@ public void testAsInputStream(String uri, boolean sameClient) throws Exception {
                 client = newHttpClient();
 
             HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
-                    .PUT(fromString(SIMPLE_STRING))
+                    .PUT(BodyPublishers.ofString(SIMPLE_STRING))
                     .build();
-            HttpResponse<InputStream> response = client.send(req, asInputStream());
+            HttpResponse<InputStream> response = client.send(req, BodyHandlers.ofInputStream());
             byte[] body = response.body().readAllBytes();
             assertEquals(body.length, 0);
         }
@@ -106,9 +105,10 @@ public void testBuffering(String uri, boolean sameClient) throws Exception {
                 client = newHttpClient();
 
             HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
-                    .PUT(fromString(SIMPLE_STRING))
+                    .PUT(BodyPublishers.ofString(SIMPLE_STRING))
                     .build();
-            HttpResponse<byte[]> response = client.send(req, buffering(asByteArray(), 1024));
+            HttpResponse<byte[]> response = client.send(req,
+                    BodyHandlers.buffering(BodyHandlers.ofByteArray(), 1024));
             byte[] body = response.body();
             assertEquals(body.length, 0);
         }
@@ -125,10 +125,10 @@ public void testDiscard(String uri, boolean sameClient) throws Exception {
                 client = newHttpClient();
 
             HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
-                    .PUT(fromString(SIMPLE_STRING))
+                    .PUT(BodyPublishers.ofString(SIMPLE_STRING))
                     .build();
             Object obj = new Object();
-            HttpResponse<Object> response = client.send(req, discard(obj));
+            HttpResponse<Object> response = client.send(req, BodyHandlers.replacing(obj));
             assertEquals(response.body(), obj);
         }
         // We have created many clients here. Try to speed up their release.
diff --git a/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemes.java b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemes.java
new file mode 100644
index 00000000000..2827aca8721
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemes.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary this test verifies that a client may provides authorization
+ *          headers directly when connecting with a server, and
+ *          it verifies that the client honor the jdk.http.auth.*.disabledSchemes
+ *          net properties.
+ * @bug 8087112
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext DigestEchoServer DigestEchoClient
+ *        ReferenceTracker ProxyAuthDisabledSchemes
+ * @modules java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          java.base/sun.net.www.http
+ *          java.base/sun.net.www
+ *          java.base/sun.net
+ * @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Basic,Digest
+ *                   -Djdk.http.auth.tunneling.disabledSchemes=Digest,Basic
+ *                   ProxyAuthDisabledSchemes
+ * @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Basic
+ *                   -Djdk.http.auth.tunneling.disabledSchemes=Basic
+ *                   ProxyAuthDisabledSchemes CLEAR PROXY
+ * @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Digest
+ *                   -Djdk.http.auth.tunneling.disabledSchemes=Digest
+ *                   ProxyAuthDisabledSchemes CLEAR PROXY
+ */
+
+public class ProxyAuthDisabledSchemes {
+    public static void main(String[] args) throws Exception {
+        DigestEchoClient.main(args);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java
new file mode 100644
index 00000000000..f3541bce7f9
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8087112
+ * @summary this test verifies that a client may provides authorization
+ *          headers directly when connecting with a server over SSL, and
+ *          it verifies that the client honor the jdk.http.auth.*.disabledSchemes
+ *          net properties.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext DigestEchoServer DigestEchoClient
+ *        ReferenceTracker ProxyAuthDisabledSchemesSSL
+ * @modules java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          java.base/sun.net.www.http
+ *          java.base/sun.net.www
+ *          java.base/sun.net
+ * @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Basic,Digest
+ *                   -Djdk.http.auth.tunneling.disabledSchemes=Digest,Basic
+ *                   ProxyAuthDisabledSchemesSSL SSL
+ * @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Basic
+ *                   -Djdk.http.auth.tunneling.disabledSchemes=Basic
+ *                   ProxyAuthDisabledSchemesSSL SSL PROXY
+ * @run main/othervm -Djdk.http.auth.proxying.disabledSchemes=Digest
+ *                   -Djdk.http.auth.tunneling.disabledSchemes=Digest
+ *                   ProxyAuthDisabledSchemesSSL SSL PROXY
+ */
+
+public class ProxyAuthDisabledSchemesSSL {
+    public static void main(String[] args) throws Exception {
+        assert "SSL".equals(args[0]);
+        DigestEchoClient.main(args);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/ProxyAuthTest.java b/test/jdk/java/net/httpclient/ProxyAuthTest.java
index d6e310ddd22..fb16ba2e2c1 100644
--- a/test/jdk/java/net/httpclient/ProxyAuthTest.java
+++ b/test/jdk/java/net/httpclient/ProxyAuthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -27,7 +27,7 @@
  * @test
  * @bug 8163561
  * @modules java.base/sun.net.www
- *          jdk.incubator.httpclient
+ *          java.net.http
  * @summary Verify that Proxy-Authenticate header is correctly handled
  * @run main/othervm ProxyAuthTest
  */
@@ -39,6 +39,7 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.Authenticator;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.Proxy;
@@ -47,27 +48,29 @@
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.util.Base64;
 import java.util.List;
 import sun.net.www.MessageHeader;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
 
 public class ProxyAuthTest {
     private static final String AUTH_USER = "user";
     private static final String AUTH_PASSWORD = "password";
 
     public static void main(String[] args) throws Exception {
-        try (ServerSocket ss = new ServerSocket(0)) {
+        try (ServerSocket ss = new ServerSocket()) {
+            ss.setReuseAddress(false);
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port = ss.getLocalPort();
             MyProxy proxy = new MyProxy(ss);
             (new Thread(proxy)).start();
             System.out.println("Proxy listening port " + port);
 
             Auth auth = new Auth();
-            InetSocketAddress paddr = new InetSocketAddress("localhost", port);
+            InetSocketAddress paddr = new InetSocketAddress(InetAddress.getLoopbackAddress(), port);
 
             URI uri = new URI("http://www.google.ie/");
             CountingProxySelector ps = CountingProxySelector.of(paddr);
@@ -76,7 +79,7 @@ public static void main(String[] args) throws Exception {
                                           .authenticator(auth)
                                           .build();
             HttpRequest req = HttpRequest.newBuilder(uri).GET().build();
-            HttpResponse<?> resp = client.sendAsync(req, discard(null)).get();
+            HttpResponse<?> resp = client.sendAsync(req, BodyHandlers.discarding()).get();
             if (resp.statusCode() != 404) {
                 throw new RuntimeException("Unexpected status code: " + resp.statusCode());
             }
diff --git a/test/jdk/java/net/httpclient/ProxyServer.java b/test/jdk/java/net/httpclient/ProxyServer.java
index c8d3dd64ca3..b931a369610 100644
--- a/test/jdk/java/net/httpclient/ProxyServer.java
+++ b/test/jdk/java/net/httpclient/ProxyServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -48,7 +48,9 @@ public ProxyServer(Integer port) throws IOException {
 
     public ProxyServer(Integer port, Boolean debug) throws IOException {
         this.debug = debug;
-        listener = new ServerSocket(port);
+        listener = new ServerSocket();
+        listener.setReuseAddress(false);
+        listener.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), port));
         this.port = listener.getLocalPort();
         setName("ProxyListener");
         setDaemon(true);
diff --git a/test/jdk/java/net/httpclient/ProxyTest.java b/test/jdk/java/net/httpclient/ProxyTest.java
index 0a992b98a7d..06091818cfe 100644
--- a/test/jdk/java/net/httpclient/ProxyTest.java
+++ b/test/jdk/java/net/httpclient/ProxyTest.java
@@ -47,13 +47,15 @@
 import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import jdk.testlibrary.SimpleSSLContext;
 
 /**
@@ -64,7 +66,7 @@
  *          Verifies that downgrading from HTTP/2 to HTTP/1.1 works through
  *          an SSL Tunnel connection when the client is HTTP/2 and the server
  *          and proxy are HTTP/1.1
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  * @library /lib/testlibrary/
  * @build jdk.testlibrary.SimpleSSLContext ProxyTest
  * @run main/othervm ProxyTest
@@ -102,7 +104,8 @@ public void handle(HttpExchange he) throws IOException {
         });
 
         server.setHttpsConfigurator(new Configurator(SSLContext.getDefault()));
-        server.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        server.bind(addr, 0);
         return server;
     }
 
@@ -162,7 +165,8 @@ public static void test(HttpServer server, HttpClient.Version version)
     {
         System.out.println("Server is: " + server.getAddress().toString());
         System.out.println("Verifying communication with server");
-        URI uri = new URI("https:/" + server.getAddress().toString() + PATH + "x");
+        URI uri = new URI("https://localhost:"
+                          + server.getAddress().getPort() + PATH + "x");
         try (InputStream is = uri.toURL().openConnection().getInputStream()) {
             String resp = new String(is.readAllBytes(), StandardCharsets.UTF_8);
             System.out.println(resp);
@@ -177,7 +181,8 @@ public static void test(HttpServer server, HttpClient.Version version)
         try {
             System.out.println("Proxy started");
             Proxy p = new Proxy(Proxy.Type.HTTP,
-                    InetSocketAddress.createUnresolved("localhost", proxy.getAddress().getPort()));
+                    InetSocketAddress.createUnresolved("localhost",
+                            proxy.getAddress().getPort()));
             System.out.println("Verifying communication with proxy");
             HttpURLConnection conn = (HttpURLConnection)uri.toURL().openConnection(p);
             try (InputStream is = conn.getInputStream()) {
@@ -192,7 +197,8 @@ public static void test(HttpServer server, HttpClient.Version version)
             System.out.println("Setting up request with HttpClient for version: "
                     + version.name());
             CountingProxySelector ps = CountingProxySelector.of(
-                    InetSocketAddress.createUnresolved("localhost", proxy.getAddress().getPort()));
+                    InetSocketAddress.createUnresolved("localhost",
+                            proxy.getAddress().getPort()));
             HttpClient client = HttpClient.newBuilder()
                 .version(version)
                 .proxy(ps)
@@ -204,7 +210,7 @@ public static void test(HttpServer server, HttpClient.Version version)
 
             System.out.println("Sending request with HttpClient");
             HttpResponse<String> response
-                = client.send(request, HttpResponse.BodyHandler.asString());
+                = client.send(request, HttpResponse.BodyHandlers.ofString());
             System.out.println("Got response");
             String resp = response.body();
             System.out.println("Received: " + resp);
@@ -226,10 +232,14 @@ static class TunnelingProxy {
         final ServerSocket ss;
         final boolean DEBUG = false;
         final HttpServer serverImpl;
+        final CopyOnWriteArrayList<CompletableFuture<Void>> connectionCFs
+                = new CopyOnWriteArrayList<>();
+        private volatile boolean stopped;
         TunnelingProxy(HttpServer serverImpl) throws IOException {
             this.serverImpl = serverImpl;
             ss = new ServerSocket();
             accept = new Thread(this::accept);
+            accept.setDaemon(true);
         }
 
         void start() throws IOException {
@@ -238,7 +248,8 @@ void start() throws IOException {
         }
 
         // Pipe the input stream to the output stream.
-        private synchronized Thread pipe(InputStream is, OutputStream os, char tag) {
+        private synchronized Thread pipe(InputStream is, OutputStream os,
+                                         char tag, CompletableFuture<Void> end) {
             return new Thread("TunnelPipe("+tag+")") {
                 @Override
                 public void run() {
@@ -258,13 +269,16 @@ public void run() {
                         }
                     } catch (IOException ex) {
                         if (DEBUG) ex.printStackTrace(System.out);
+                    } finally {
+                        end.complete(null);
                     }
                 }
             };
         }
 
         public InetSocketAddress getAddress() {
-            return new InetSocketAddress(ss.getInetAddress(), ss.getLocalPort());
+            return new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                                         ss.getLocalPort());
         }
 
         // This is a bit shaky. It doesn't handle continuation
@@ -289,18 +303,14 @@ String readLine(InputStream r) throws IOException {
         public void accept() {
             Socket clientConnection = null;
             try {
-                while (true) {
+                while (!stopped) {
                     System.out.println("Tunnel: Waiting for client");
-                    Socket previous = clientConnection;
+                    Socket toClose;
                     try {
-                        clientConnection = ss.accept();
+                        toClose = clientConnection = ss.accept();
                     } catch (IOException io) {
                         if (DEBUG) io.printStackTrace(System.out);
                         break;
-                    } finally {
-                        // we have only 1 client at a time, so it is safe
-                        // to close the previous connection here
-                        if (previous != null) previous.close();
                     }
                     System.out.println("Tunnel: Client accepted");
                     Socket targetConnection = null;
@@ -325,7 +335,7 @@ public void accept() {
 
                         // Open target connection
                         targetConnection = new Socket(
-                                serverImpl.getAddress().getAddress(),
+                                InetAddress.getLoopbackAddress(),
                                 serverImpl.getAddress().getPort());
 
                         // Then send the 200 OK response to the client
@@ -334,26 +344,45 @@ public void accept() {
                         pw.print("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
                         pw.flush();
                     } else {
-                        // This should not happen.
-                        throw new IOException("Tunnel: Unexpected status line: "
-                                           + requestLine);
+                        // This should not happen. If it does then just print an
+                        // error - both on out and err, and close the accepted
+                        // socket
+                        System.out.println("WARNING: Tunnel: Unexpected status line: "
+                                + requestLine + " received by "
+                                + ss.getLocalSocketAddress()
+                                + " from "
+                                + toClose.getRemoteSocketAddress()
+                                + " - closing accepted socket");
+                        // Print on err
+                        System.err.println("WARNING: Tunnel: Unexpected status line: "
+                                + requestLine + " received by "
+                                + ss.getLocalSocketAddress()
+                                + " from "
+                                + toClose.getRemoteSocketAddress());
+                        // close accepted socket.
+                        toClose.close();
+                        System.err.println("Tunnel: accepted socket closed.");
+                        continue;
                     }
 
                     // Pipe the input stream of the client connection to the
                     // output stream of the target connection and conversely.
                     // Now the client and target will just talk to each other.
                     System.out.println("Tunnel: Starting tunnel pipes");
-                    Thread t1 = pipe(ccis, targetConnection.getOutputStream(), '+');
-                    Thread t2 = pipe(targetConnection.getInputStream(), ccos, '-');
+                    CompletableFuture<Void> end, end1, end2;
+                    Thread t1 = pipe(ccis, targetConnection.getOutputStream(), '+',
+                            end1 = new CompletableFuture<>());
+                    Thread t2 = pipe(targetConnection.getInputStream(), ccos, '-',
+                            end2 = new CompletableFuture<>());
+                    end = CompletableFuture.allOf(end1, end2);
+                    end.whenComplete(
+                            (r,t) -> {
+                                try { toClose.close(); } catch (IOException x) { }
+                                finally {connectionCFs.remove(end);}
+                            });
+                    connectionCFs.add(end);
                     t1.start();
                     t2.start();
-
-                    // We have only 1 client... wait until it has finished before
-                    // accepting a new connection request.
-                    // System.out.println("Tunnel: Waiting for pipes to close");
-                    // t1.join();
-                    // t2.join();
-                    System.out.println("Tunnel: Done - waiting for next client");
                 }
             } catch (Throwable ex) {
                 try {
@@ -362,10 +391,14 @@ public void accept() {
                     ex.addSuppressed(ex1);
                 }
                 ex.printStackTrace(System.err);
+            } finally {
+                System.out.println("Tunnel: exiting (stopped=" + stopped + ")");
+                connectionCFs.forEach(cf -> cf.complete(null));
             }
         }
 
-        void stop() throws IOException {
+        public void stop() throws IOException {
+            stopped = true;
             ss.close();
         }
 
diff --git a/test/jdk/java/net/httpclient/RedirectMethodChange.java b/test/jdk/java/net/httpclient/RedirectMethodChange.java
new file mode 100644
index 00000000000..27d30daa706
--- /dev/null
+++ b/test/jdk/java/net/httpclient/RedirectMethodChange.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Method change during redirection
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          jdk.httpserver
+ * @library /lib/testlibrary /test/lib http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm RedirectMethodChange
+ */
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static org.testng.Assert.assertEquals;
+
+public class RedirectMethodChange implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpClient client;
+
+    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;       // HTTPS/1.1
+    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    String httpURI;
+    String httpsURI;
+    String http2URI;
+    String https2URI;
+
+    static final String RESPONSE = "Hello world";
+    static final String POST_BODY = "This is the POST body 123909090909090";
+
+    static HttpRequest.BodyPublisher getRequestBodyFor(String method) {
+        switch (method) {
+            case "GET":
+            case "DELETE":
+            case "HEAD":
+                return BodyPublishers.noBody();
+            case "POST":
+            case "PUT":
+                return BodyPublishers.ofString(POST_BODY);
+            default:
+                throw new AssertionError("Unknown method:" + method);
+        }
+    }
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        return new Object[][] {
+                { httpURI, "GET",  301, "GET"  },
+                { httpURI, "GET",  302, "GET"  },
+                { httpURI, "GET",  303, "GET"  },
+                { httpURI, "GET",  307, "GET"  },
+                { httpURI, "GET",  308, "GET"  },
+                { httpURI, "POST", 301, "GET"  },
+                { httpURI, "POST", 302, "GET"  },
+                { httpURI, "POST", 303, "GET"  },
+                { httpURI, "POST", 307, "POST" },
+                { httpURI, "POST", 308, "POST" },
+                { httpURI, "PUT",  301, "PUT"  },
+                { httpURI, "PUT",  302, "PUT"  },
+                { httpURI, "PUT",  303, "GET"  },
+                { httpURI, "PUT",  307, "PUT"  },
+                { httpURI, "PUT",  308, "PUT"  },
+
+                { httpsURI, "GET",  301, "GET"  },
+                { httpsURI, "GET",  302, "GET"  },
+                { httpsURI, "GET",  303, "GET"  },
+                { httpsURI, "GET",  307, "GET"  },
+                { httpsURI, "GET",  308, "GET"  },
+                { httpsURI, "POST", 301, "GET"  },
+                { httpsURI, "POST", 302, "GET"  },
+                { httpsURI, "POST", 303, "GET"  },
+                { httpsURI, "POST", 307, "POST" },
+                { httpsURI, "POST", 308, "POST" },
+                { httpsURI, "PUT",  301, "PUT"  },
+                { httpsURI, "PUT",  302, "PUT"  },
+                { httpsURI, "PUT",  303, "GET"  },
+                { httpsURI, "PUT",  307, "PUT"  },
+                { httpsURI, "PUT",  308, "PUT"  },
+
+                { http2URI, "GET",  301, "GET"  },
+                { http2URI, "GET",  302, "GET"  },
+                { http2URI, "GET",  303, "GET"  },
+                { http2URI, "GET",  307, "GET"  },
+                { http2URI, "GET",  308, "GET"  },
+                { http2URI, "POST", 301, "GET"  },
+                { http2URI, "POST", 302, "GET"  },
+                { http2URI, "POST", 303, "GET"  },
+                { http2URI, "POST", 307, "POST" },
+                { http2URI, "POST", 308, "POST" },
+                { http2URI, "PUT",  301, "PUT"  },
+                { http2URI, "PUT",  302, "PUT"  },
+                { http2URI, "PUT",  303, "GET"  },
+                { http2URI, "PUT",  307, "PUT"  },
+                { http2URI, "PUT",  308, "PUT"  },
+
+                { https2URI, "GET",  301, "GET"  },
+                { https2URI, "GET",  302, "GET"  },
+                { https2URI, "GET",  303, "GET"  },
+                { https2URI, "GET",  307, "GET"  },
+                { https2URI, "GET",  308, "GET"  },
+                { https2URI, "POST", 301, "GET"  },
+                { https2URI, "POST", 302, "GET"  },
+                { https2URI, "POST", 303, "GET"  },
+                { https2URI, "POST", 307, "POST" },
+                { https2URI, "POST", 308, "POST" },
+                { https2URI, "PUT",  301, "PUT"  },
+                { https2URI, "PUT",  302, "PUT"  },
+                { https2URI, "PUT",  303, "GET"  },
+                { https2URI, "PUT",  307, "PUT"  },
+                { https2URI, "PUT",  308, "PUT"  },
+        };
+    }
+
+    @Test(dataProvider = "variants")
+    public void test(String uriString,
+                     String method,
+                     int redirectCode,
+                     String expectedMethod)
+        throws Exception
+    {
+        HttpRequest req = HttpRequest.newBuilder(URI.create(uriString))
+                .method(method, getRequestBodyFor(method))
+                .header("X-Redirect-Code", Integer.toString(redirectCode))
+                .header("X-Expect-Method", expectedMethod)
+                .build();
+        HttpResponse<String> resp = client.send(req, BodyHandlers.ofString());
+
+        System.out.println("Response: " + resp + ", body: " + resp.body());
+        assertEquals(resp.statusCode(), 200);
+        assertEquals(resp.body(), RESPONSE);
+    }
+
+    // -- Infrastructure
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        client = HttpClient.newBuilder()
+                .followRedirects(HttpClient.Redirect.NORMAL)
+                .sslContext(sslContext)
+                .build();
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        String targetURI = "http://" + httpTestServer.serverAuthority() + "/http1/redirect/rmt";
+        RedirMethodChgeHandler handler = new RedirMethodChgeHandler(targetURI);
+        httpTestServer.addHandler(handler, "/http1/");
+        httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/test/rmt";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        targetURI = "https://" + httpsTestServer.serverAuthority() + "/https1/redirect/rmt";
+        handler = new RedirMethodChgeHandler(targetURI);
+        httpsTestServer.addHandler(handler,"/https1/");
+        httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/test/rmt";
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        targetURI = "http://" + http2TestServer.serverAuthority() + "/http2/redirect/rmt";
+        handler = new RedirMethodChgeHandler(targetURI);
+        http2TestServer.addHandler(handler, "/http2/");
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/test/rmt";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        targetURI = "https://" + https2TestServer.serverAuthority() + "/https2/redirect/rmt";
+        handler = new RedirMethodChgeHandler(targetURI);
+        https2TestServer.addHandler(handler, "/https2/");
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/test/rmt";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop();
+        httpsTestServer.stop();
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    /**
+     * Stateful handler.
+     *
+     * Request to "<protocol>/test/rmt" is first, with the following checked
+     * headers:
+     *   X-Redirect-Code: nnn    <the redirect code to send back>
+     *   X-Expect-Method: the method that the client should use for the next request
+     *
+     * The following request should be to "<protocol>/redirect/rmt" and should
+     * use the method indicated previously. If all ok, return a 200 response.
+     * Otherwise 50X error.
+     */
+    static class RedirMethodChgeHandler implements HttpTestHandler {
+
+        boolean inTest;
+        String expectedMethod;
+
+        final String targetURL;
+        RedirMethodChgeHandler(String targetURL) {
+            this.targetURL = targetURL;
+        }
+
+        boolean readAndCheckBody(HttpTestExchange e) throws IOException {
+            String method = e.getRequestMethod();
+            String requestBody;
+            try (InputStream is = e.getRequestBody()) {
+                requestBody = new String(is.readAllBytes(), US_ASCII);
+            }
+            if ((method.equals("POST") || method.equals("PUT"))
+                    && !requestBody.equals(POST_BODY)) {
+                Throwable ex = new RuntimeException("Unexpected request body for "
+                        + method + ": [" + requestBody +"]");
+                ex.printStackTrace();
+                e.sendResponseHeaders(503, 0);
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public synchronized void handle(HttpTestExchange he) throws IOException {
+            boolean newtest = he.getRequestURI().getPath().endsWith("/test/rmt");
+            if ((newtest && inTest) || (!newtest && !inTest)) {
+                Throwable ex = new RuntimeException("Unexpected newtest:" + newtest
+                        + ", inTest:" + inTest +  ", for " + he.getRequestURI());
+                ex.printStackTrace();
+                he.sendResponseHeaders(500, 0);
+                return;
+            }
+
+            if (newtest) {
+                HttpTestHeaders hdrs = he.getRequestHeaders();
+                String value = hdrs.firstValue("X-Redirect-Code").get();
+                int redirectCode = Integer.parseInt(value);
+                expectedMethod = hdrs.firstValue("X-Expect-Method").get();
+                if (!readAndCheckBody(he))
+                    return;
+                hdrs = he.getResponseHeaders();
+                hdrs.addHeader("Location", targetURL);
+                he.sendResponseHeaders(redirectCode, 0);
+                inTest = true;
+            } else {
+                // should be the redirect
+                if (!he.getRequestURI().getPath().endsWith("/redirect/rmt")) {
+                    Throwable ex = new RuntimeException("Unexpected redirected request, got:"
+                            + he.getRequestURI());
+                    ex.printStackTrace();
+                    he.sendResponseHeaders(501, 0);
+                } else if (!he.getRequestMethod().equals(expectedMethod)) {
+                    Throwable ex = new RuntimeException("Expected: " + expectedMethod
+                            + " Got: " + he.getRequestMethod());
+                    ex.printStackTrace();
+                    he.sendResponseHeaders(504, 0);
+                } else {
+                    if (!readAndCheckBody(he))
+                        return;
+                    he.sendResponseHeaders(200, RESPONSE.length());
+                    try (OutputStream os = he.getResponseBody()) {
+                        os.write(RESPONSE.getBytes(US_ASCII));
+                    }
+                }
+                inTest = false;
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/RedirectWithCookie.java b/test/jdk/java/net/httpclient/RedirectWithCookie.java
new file mode 100644
index 00000000000..6e7f3b2f1bb
--- /dev/null
+++ b/test/jdk/java/net/httpclient/RedirectWithCookie.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Test for cookie handling when redirecting
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          jdk.httpserver
+ * @library /lib/testlibrary /test/lib http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm
+ *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
+ *       RedirectWithCookie
+ */
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.CookieManager;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.List;
+import javax.net.ssl.SSLContext;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class RedirectWithCookie implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;       // HTTPS/1.1
+    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    String httpURI;
+    String httpsURI;
+    String http2URI;
+    String https2URI;
+
+    static final String MESSAGE = "BasicRedirectTest message body";
+    static final int ITERATIONS = 3;
+
+    @DataProvider(name = "positive")
+    public Object[][] positive() {
+        return new Object[][] {
+                { httpURI,    },
+                { httpsURI,   },
+                { http2URI,   },
+                { https2URI,  },
+        };
+    }
+
+    @Test(dataProvider = "positive")
+    void test(String uriString) throws Exception {
+        out.printf("%n---- starting (%s) ----%n", uriString);
+        HttpClient client = HttpClient.newBuilder()
+                .followRedirects(Redirect.ALWAYS)
+                .cookieHandler(new CookieManager())
+                .sslContext(sslContext)
+                .build();
+        assert client.cookieHandler().isPresent();
+
+        URI uri = URI.create(uriString);
+        HttpRequest request = HttpRequest.newBuilder(uri).build();
+        out.println("Initial request: " + request.uri());
+
+        for (int i=0; i< ITERATIONS; i++) {
+            out.println("iteration: " + i);
+            HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+
+            out.println("  Got response: " + response);
+            out.println("  Got body Path: " + response.body());
+
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.body(), MESSAGE);
+            // asserts redirected URI in response.request().uri()
+            assertTrue(response.uri().getPath().endsWith("message"));
+            assertPreviousRedirectResponses(request, response);
+        }
+    }
+
+    static void assertPreviousRedirectResponses(HttpRequest initialRequest,
+                                                HttpResponse<?> finalResponse) {
+        // there must be at least one previous response
+        finalResponse.previousResponse()
+                .orElseThrow(() -> new RuntimeException("no previous response"));
+
+        HttpResponse<?> response = finalResponse;
+        do {
+            URI uri = response.uri();
+            response = response.previousResponse().get();
+            assertTrue(300 <= response.statusCode() && response.statusCode() <= 309,
+                    "Expected 300 <= code <= 309, got:" + response.statusCode());
+            assertEquals(response.body(), null, "Unexpected body: " + response.body());
+            String locationHeader = response.headers().firstValue("Location")
+                    .orElseThrow(() -> new RuntimeException("no previous Location"));
+            assertTrue(uri.toString().endsWith(locationHeader),
+                    "URI: " + uri + ", Location: " + locationHeader);
+
+        } while (response.previousResponse().isPresent());
+
+        // initial
+        assertEquals(initialRequest, response.request(),
+                String.format("Expected initial request [%s] to equal last prev req [%s]",
+                        initialRequest, response.request()));
+    }
+
+    // -- Infrastructure
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(new CookieRedirectHandler(), "/http1/cookie/");
+        httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/redirect";
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(new CookieRedirectHandler(),"/https1/cookie/");
+        httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/cookie/redirect";
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(new CookieRedirectHandler(), "/http2/cookie/");
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/cookie/redirect";
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(new CookieRedirectHandler(), "/https2/cookie/");
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/cookie/redirect";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop();
+        httpsTestServer.stop();
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    static class CookieRedirectHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            System.out.println("CookieRedirectHandler for: " + t.getRequestURI());
+            readAllRequestData(t);
+
+            // redirecting
+            if (t.getRequestURI().getPath().endsWith("redirect")) {
+                String url = t.getRequestURI().resolve("message").toString();
+                t.getResponseHeaders().addHeader("Location", url);
+                t.getResponseHeaders().addHeader("Set-Cookie",
+                                                 "CUSTOMER=WILE_E_COYOTE");
+                t.sendResponseHeaders(302, 0);
+                return;
+            }
+
+            // not redirecting
+            try (OutputStream os = t.getResponseBody()) {
+                List<String> cookie = t.getRequestHeaders().get("Cookie");
+
+                if (cookie == null || cookie.size() == 0) {
+                    String msg = "No cookie header present";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                } else if (!cookie.get(0).equals("CUSTOMER=WILE_E_COYOTE")) {
+                    String msg = "Incorrect cookie header value:[" + cookie.get(0) + "]";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                } else {
+                    assert cookie.get(0).equals("CUSTOMER=WILE_E_COYOTE");
+                    byte[] bytes = MESSAGE.getBytes(UTF_8);
+                    t.sendResponseHeaders(200, bytes.length);
+                    os.write(bytes);
+                }
+            }
+        }
+    }
+
+    static void readAllRequestData(HttpTestExchange t) throws IOException {
+        try (InputStream is = t.getRequestBody()) {
+            is.readAllBytes();
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/ReferenceTracker.java b/test/jdk/java/net/httpclient/ReferenceTracker.java
new file mode 100644
index 00000000000..7e6d88da2b6
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ReferenceTracker.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2018, 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 jdk.internal.net.http.common.OperationTrackers;
+import jdk.internal.net.http.common.OperationTrackers.Tracker;
+
+import java.net.http.HttpClient;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.stream.Collectors;
+
+/**
+ * A small helper class to help track clients which still
+ * have pending operations at the end of a test.
+ */
+public class ReferenceTracker {
+    private final ConcurrentLinkedQueue<Tracker> TRACKERS
+            = new ConcurrentLinkedQueue<Tracker>();
+
+    public static final ReferenceTracker INSTANCE
+            = new ReferenceTracker();
+
+    public HttpClient track(HttpClient client) {
+        Tracker tracker = OperationTrackers.getTracker(client);
+        assert tracker != null;
+        TRACKERS.add(tracker);
+        return client;
+    }
+
+    public long getTrackedClientCount() {
+        return TRACKERS.size();
+    }
+
+    public StringBuilder diagnose(StringBuilder warnings) {
+        for (Tracker tracker : TRACKERS) {
+            checkOutstandingOperations(warnings, tracker);
+        }
+        return warnings;
+    }
+
+    public boolean hasOutstandingOperations() {
+        return TRACKERS.stream().anyMatch(t -> t.getOutstandingOperations() > 0);
+    }
+
+    public long getOutstandingOperationsCount() {
+        return TRACKERS.stream()
+                .map(Tracker::getOutstandingOperations)
+                .filter(n -> n > 0)
+                .collect(Collectors.summingLong(n -> n));
+    }
+
+    public long getOutstandingClientCount() {
+        return TRACKERS.stream()
+                .map(Tracker::getOutstandingOperations)
+                .filter(n -> n > 0)
+                .count();
+    }
+
+    public AssertionError check(long graceDelayMs) {
+        AssertionError fail = null;
+        if (hasOutstandingOperations()) {
+            try {
+                Thread.sleep(graceDelayMs);
+            } catch (InterruptedException x) {
+                // OK
+            }
+            StringBuilder warnings = diagnose(new StringBuilder());
+            addSummary(warnings);
+            if (hasOutstandingOperations()) {
+                fail = new AssertionError(warnings.toString());
+            }
+        } else {
+            System.out.println("PASSED: No outstanding operations found in "
+                    + getTrackedClientCount() + " clients");
+        }
+        return fail;
+    }
+
+    private void addSummary(StringBuilder warning) {
+        long activeClients = getOutstandingClientCount();
+        long operations = getOutstandingOperationsCount();
+        long tracked = getTrackedClientCount();
+        if (warning.length() > 0) warning.append("\n");
+        int pos = warning.length();
+        warning.append("Found ")
+                .append(activeClients)
+                .append(" client still active, with ")
+                .append(operations)
+                .append(" operations still pending out of ")
+                .append(tracked)
+                .append(" tracked clients.");
+        System.out.println(warning.toString().substring(pos));
+        System.err.println(warning.toString().substring(pos));
+    }
+
+    private static void checkOutstandingOperations(StringBuilder warning, Tracker tracker) {
+        if (tracker.getOutstandingOperations() > 0) {
+            if (warning.length() > 0) warning.append("\n");
+            int pos = warning.length();
+            warning.append("WARNING: tracker for " + tracker.getName() + " has outstanding operations:");
+            warning.append("\n\tPending HTTP/1.1 operations: " + tracker.getOutstandingHttpOperations());
+            warning.append("\n\tPending HTTP/2 streams: " + tracker.getOutstandingHttp2Streams());
+            warning.append("\n\tPending WebSocket operations: " + tracker.getOutstandingWebSocketOperations());
+            warning.append("\n\tTotal pending operations: " + tracker.getOutstandingOperations());
+            warning.append("\n\tFacade referenced: " + tracker.isFacadeReferenced());
+            System.out.println(warning.toString().substring(pos));
+            System.err.println(warning.toString().substring(pos));
+        }
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/RequestBodyTest.java b/test/jdk/java/net/httpclient/RequestBodyTest.java
index b3bf1495248..12238b8dd2c 100644
--- a/test/jdk/java/net/httpclient/RequestBodyTest.java
+++ b/test/jdk/java/net/httpclient/RequestBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,31 +24,37 @@
 /*
  * @test
  * @bug 8087112
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary/ /test/lib
  * @compile ../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../com/sun/net/httpserver/EchoHandler.java
  * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @build LightWeightHttpServer
  * @build jdk.test.lib.Platform
  * @build jdk.test.lib.util.FileUtils
- * @build LightWeightHttpServer
- * @build jdk.testlibrary.SimpleSSLContext
  * @run testng/othervm RequestBodyTest
+ * @run testng/othervm/java.security.policy=RequestBodyTest.policy RequestBodyTest
  */
 
 import java.io.*;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpResponse.BodyHandler;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -61,8 +67,6 @@
 import static java.lang.System.out;
 import static java.nio.charset.StandardCharsets.*;
 import static java.nio.file.StandardOpenOption.*;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.*;
-import static jdk.incubator.http.HttpResponse.BodyHandler.*;
 
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -191,28 +195,28 @@ HttpRequest createRequest(URI uri,
 
         switch (requestBodyType) {
             case BYTE_ARRAY:
-                rb.POST(fromByteArray(fileAsBytes));
+                rb.POST(BodyPublishers.ofByteArray(fileAsBytes));
                 break;
             case BYTE_ARRAY_OFFSET:
-                rb.POST(fromByteArray(fileAsBytes,
-                                      DEFAULT_OFFSET,
-                                      fileAsBytes.length * DEFAULT_LENGTH_FACTOR));
+                rb.POST(BodyPublishers.ofByteArray(fileAsBytes,
+                        DEFAULT_OFFSET,
+                        fileAsBytes.length * DEFAULT_LENGTH_FACTOR));
                 break;
             case BYTE_ARRAYS:
                 Iterable<byte[]> iterable = Arrays.asList(fileAsBytes);
-                rb.POST(fromByteArrays(iterable));
+                rb.POST(BodyPublishers.ofByteArrays(iterable));
                 break;
             case FILE:
-                rb.POST(fromFile(file));
+                rb.POST(BodyPublishers.ofFile(file));
                 break;
             case INPUTSTREAM:
-                rb.POST(fromInputStream(fileInputStreamSupplier(file)));
+                rb.POST(BodyPublishers.ofInputStream(fileInputStreamSupplier(file)));
                 break;
             case STRING:
-                rb.POST(fromString(fileAsString));
+                rb.POST(BodyPublishers.ofString(fileAsString));
                 break;
             case STRING_WITH_CHARSET:
-                rb.POST(fromString(new String(fileAsBytes), Charset.defaultCharset()));
+                rb.POST(BodyPublishers.ofString(new String(fileAsBytes), Charset.defaultCharset()));
                 break;
             default:
                 throw new AssertionError("Unknown request body:" + requestBodyType);
@@ -242,8 +246,8 @@ void checkResponse(HttpClient client,
 
         switch (responseBodyType) {
             case BYTE_ARRAY:
-                BodyHandler<byte[]> bh = asByteArray();
-                if (bufferResponseBody) bh = buffering(bh, 50);
+                BodyHandler<byte[]> bh = BodyHandlers.ofByteArray();
+                if (bufferResponseBody) bh = BodyHandlers.buffering(bh, 50);
                 HttpResponse<byte[]> bar = getResponse(client, request, bh, async);
                 assertEquals(bar.statusCode(), 200);
                 assertEquals(bar.body(), fileAsBytes);
@@ -251,8 +255,8 @@ void checkResponse(HttpClient client,
             case BYTE_ARRAY_CONSUMER:
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 Consumer<Optional<byte[]>> consumer = o -> consumerBytes(o, baos);
-                BodyHandler<Void> bh1 = asByteArrayConsumer(consumer);
-                if (bufferResponseBody) bh1 = buffering(bh1, 49);
+                BodyHandler<Void> bh1 = BodyHandlers.ofByteArrayConsumer(consumer);
+                if (bufferResponseBody) bh1 = BodyHandlers.buffering(bh1, 49);
                 HttpResponse<Void> v = getResponse(client, request, bh1, async);
                 byte[] ba = baos.toByteArray();
                 assertEquals(v.statusCode(), 200);
@@ -260,38 +264,38 @@ void checkResponse(HttpClient client,
                 break;
             case DISCARD:
                 Object o = new Object();
-                BodyHandler<Object> bh2 = discard(o);
-                if (bufferResponseBody) bh2 = buffering(bh2, 51);
+                BodyHandler<Object> bh2 = BodyHandlers.replacing(o);
+                if (bufferResponseBody) bh2 = BodyHandlers.buffering(bh2, 51);
                 HttpResponse<Object> or = getResponse(client, request, bh2, async);
                 assertEquals(or.statusCode(), 200);
                 assertSame(or.body(), o);
                 break;
             case FILE:
-                BodyHandler<Path> bh3 = asFile(tempFile);
-                if (bufferResponseBody) bh3 = buffering(bh3, 48);
+                BodyHandler<Path> bh3 = BodyHandlers.ofFile(tempFile);
+                if (bufferResponseBody) bh3 = BodyHandlers.buffering(bh3, 48);
                 HttpResponse<Path> fr = getResponse(client, request, bh3, async);
                 assertEquals(fr.statusCode(), 200);
                 assertEquals(Files.size(tempFile), fileAsString.length());
                 assertEquals(Files.readAllBytes(tempFile), fileAsBytes);
                 break;
             case FILE_WITH_OPTION:
-                BodyHandler<Path> bh4 = asFile(tempFile, CREATE_NEW, WRITE);
-                if (bufferResponseBody) bh4 = buffering(bh4, 52);
+                BodyHandler<Path> bh4 = BodyHandlers.ofFile(tempFile, CREATE_NEW, WRITE);
+                if (bufferResponseBody) bh4 = BodyHandlers.buffering(bh4, 52);
                 fr = getResponse(client, request, bh4, async);
                 assertEquals(fr.statusCode(), 200);
                 assertEquals(Files.size(tempFile), fileAsString.length());
                 assertEquals(Files.readAllBytes(tempFile), fileAsBytes);
                 break;
             case STRING:
-                BodyHandler<String> bh5 = asString();
-                if(bufferResponseBody) bh5 = buffering(bh5, 47);
+                BodyHandler<String> bh5 = BodyHandlers.ofString();
+                if(bufferResponseBody) bh5 = BodyHandlers.buffering(bh5, 47);
                 HttpResponse<String> sr = getResponse(client, request, bh5, async);
                 assertEquals(sr.statusCode(), 200);
                 assertEquals(sr.body(), fileAsString);
                 break;
             case STRING_WITH_CHARSET:
-                BodyHandler<String> bh6 = asString(StandardCharsets.UTF_8);
-                if (bufferResponseBody) bh6 = buffering(bh6, 53);
+                BodyHandler<String> bh6 = BodyHandlers.ofString(StandardCharsets.UTF_8);
+                if (bufferResponseBody) bh6 = BodyHandlers.buffering(bh6, 53);
                 HttpResponse<String> r = getResponse(client, request, bh6, async);
                 assertEquals(r.statusCode(), 200);
                 assertEquals(r.body(), fileAsString);
@@ -328,9 +332,11 @@ static Supplier<FileInputStream> fileInputStreamSupplier(Path f) {
             @Override
             public FileInputStream get() {
                 try {
-                    return new FileInputStream(file.toFile());
-                } catch (FileNotFoundException x) {
-                    throw new UncheckedIOException(x);
+                    PrivilegedExceptionAction<FileInputStream> pa =
+                            () -> new FileInputStream(file.toFile());
+                    return AccessController.doPrivileged(pa);
+                } catch (PrivilegedActionException x) {
+                    throw new UncheckedIOException((IOException)x.getCause());
                 }
             }
         };
diff --git a/test/jdk/java/net/httpclient/RequestBodyTest.policy b/test/jdk/java/net/httpclient/RequestBodyTest.policy
new file mode 100644
index 00000000000..f2f57e6f6d4
--- /dev/null
+++ b/test/jdk/java/net/httpclient/RequestBodyTest.policy
@@ -0,0 +1,52 @@
+//
+// Copyright (c) 2018, 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.
+//
+
+// for JTwork//classes/0/test/lib/jdk/test/lib/util/FileUtils.class
+grant codeBase "file:${test.classes}/../../../../test/lib/-" {
+    permission java.util.PropertyPermission "*", "read";
+    permission java.io.FilePermission "RequestBodyTest.tmp", "read,delete";
+};
+
+// for JTwork/classes/0/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.class
+grant codeBase "file:${test.classes}/../../../../lib/testlibrary/-" {
+    permission java.util.PropertyPermission "test.src.path", "read";
+    permission java.io.FilePermission "${test.src}/../../../lib/testlibrary/jdk/testlibrary/testkeys", "read";
+};
+
+grant codeBase "file:${test.classes}/*" {
+    permission java.io.FilePermission "${test.src}${/}docs${/}files${/}smallfile.txt", "read";
+    permission java.io.FilePermission "${test.src}${/}docs${/}files${/}notsobigfile.txt", "read";
+    permission java.io.FilePermission "RequestBodyTest.tmp", "read,write,delete";
+
+    permission java.net.URLPermission "http://localhost:*/echo/foo",   "POST";
+    permission java.net.URLPermission "https://localhost:*/echo/foo",  "POST";
+
+    // for HTTP/1.1 server logging
+    permission java.util.logging.LoggingPermission "control";
+
+    // needed to grant the HTTP server
+    permission java.net.SocketPermission "localhost:*", "accept,resolve";
+
+    permission java.util.PropertyPermission "*", "read";
+    permission java.lang.RuntimePermission "modifyThread";
+};
diff --git a/test/jdk/java/net/httpclient/RequestBuilderTest.java b/test/jdk/java/net/httpclient/RequestBuilderTest.java
index 49876499222..5da5455b05e 100644
--- a/test/jdk/java/net/httpclient/RequestBuilderTest.java
+++ b/test/jdk/java/net/httpclient/RequestBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -28,18 +28,22 @@
  */
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
-import jdk.incubator.http.HttpRequest;
+import java.util.Map;
+import java.util.Set;
+
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
 import static java.time.Duration.ofNanos;
 import static java.time.Duration.ofMinutes;
 import static java.time.Duration.ofSeconds;
 import static java.time.Duration.ZERO;
-import static jdk.incubator.http.HttpClient.Version.HTTP_1_1;
-import static jdk.incubator.http.HttpClient.Version.HTTP_2;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.noBody;
-import static jdk.incubator.http.HttpRequest.newBuilder;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import static java.net.http.HttpClient.Version.HTTP_2;
+import static java.net.http.HttpRequest.newBuilder;
 import static org.testng.Assert.*;
+
 import org.testng.annotations.Test;
 
 public class RequestBuilderTest {
@@ -54,7 +58,9 @@ public class RequestBuilderTest {
     @Test
     public void testDefaults() {
         List<HttpRequest.Builder> builders = List.of(newBuilder().uri(uri),
-                                                     newBuilder(uri));
+                                                     newBuilder(uri),
+                                                     newBuilder().copy().uri(uri),
+                                                     newBuilder(uri).copy());
         for (HttpRequest.Builder builder : builders) {
             assertFalse(builder.build().expectContinue());
             assertEquals(builder.build().method(), "GET");
@@ -90,7 +96,6 @@ public void testNull() {
         assertThrows(NPE, () -> builder.setHeader("name", null));
         assertThrows(NPE, () -> builder.setHeader(null, "value"));
         assertThrows(NPE, () -> builder.timeout(null));
-        assertThrows(NPE, () -> builder.DELETE(null));
         assertThrows(NPE, () -> builder.POST(null));
         assertThrows(NPE, () -> builder.PUT(null));
     }
@@ -132,51 +137,51 @@ public void testMethod() {
         assertEquals(request.method(), "GET");
         assertTrue(!request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).POST(fromString("")).GET().build();
+        request = newBuilder(uri).POST(BodyPublishers.ofString("")).GET().build();
         assertEquals(request.method(), "GET");
         assertTrue(!request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).PUT(fromString("")).GET().build();
+        request = newBuilder(uri).PUT(BodyPublishers.ofString("")).GET().build();
         assertEquals(request.method(), "GET");
         assertTrue(!request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).DELETE(fromString("")).GET().build();
+        request = newBuilder(uri).DELETE().GET().build();
         assertEquals(request.method(), "GET");
         assertTrue(!request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).POST(fromString("")).build();
+        request = newBuilder(uri).POST(BodyPublishers.ofString("")).build();
         assertEquals(request.method(), "POST");
         assertTrue(request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).PUT(fromString("")).build();
+        request = newBuilder(uri).PUT(BodyPublishers.ofString("")).build();
         assertEquals(request.method(), "PUT");
         assertTrue(request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).DELETE(fromString("")).build();
+        request = newBuilder(uri).DELETE().build();
         assertEquals(request.method(), "DELETE");
-        assertTrue(request.bodyPublisher().isPresent());
+        assertTrue(!request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).GET().POST(fromString("")).build();
+        request = newBuilder(uri).GET().POST(BodyPublishers.ofString("")).build();
         assertEquals(request.method(), "POST");
         assertTrue(request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).GET().PUT(fromString("")).build();
+        request = newBuilder(uri).GET().PUT(BodyPublishers.ofString("")).build();
         assertEquals(request.method(), "PUT");
         assertTrue(request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).GET().DELETE(fromString("")).build();
+        request = newBuilder(uri).GET().DELETE().build();
         assertEquals(request.method(), "DELETE");
-        assertTrue(request.bodyPublisher().isPresent());
+        assertTrue(!request.bodyPublisher().isPresent());
 
         // CONNECT is disallowed in the implementation, since it is used for
         // tunneling, and is handled separately for security checks.
-        assertThrows(IAE, () -> newBuilder(uri).method("CONNECT", noBody()).build());
+        assertThrows(IAE, () -> newBuilder(uri).method("CONNECT", BodyPublishers.noBody()).build());
 
-        request = newBuilder(uri).method("GET", noBody()).build();
+        request = newBuilder(uri).method("GET", BodyPublishers.noBody()).build();
         assertEquals(request.method(), "GET");
         assertTrue(request.bodyPublisher().isPresent());
 
-        request = newBuilder(uri).method("POST", fromString("")).build();
+        request = newBuilder(uri).method("POST", BodyPublishers.ofString("")).build();
         assertEquals(request.method(), "POST");
         assertTrue(request.bodyPublisher().isPresent());
     }
@@ -307,11 +312,55 @@ public void testHeaders() {
         }
     }
 
+    private static final Set<String> RESTRICTED = Set.of("connection", "content-length",
+            "date", "expect", "from", "host", "origin",
+            "referer", "upgrade", "via", "warning",
+            "Connection", "Content-Length",
+            "DATE", "eXpect", "frOm", "hosT", "origIN",
+            "ReFerer", "upgradE", "vIa", "Warning",
+            "CONNection", "CONTENT-LENGTH",
+            "Date", "EXPECT", "From", "Host", "Origin",
+            "Referer", "Upgrade", "Via", "WARNING");
+
+    interface WithHeader {
+        HttpRequest.Builder withHeader(HttpRequest.Builder builder, String name, String value);
+    }
+
+    @Test
+    public void testRestricted()  throws URISyntaxException {
+        URI uri = new URI("http://localhost:80/test/");
+        Map<String, WithHeader> lambdas = Map.of(
+                "Builder::header",    HttpRequest.Builder::header,
+                "Builder::headers",   (b, n, v) -> b.headers(n,v),
+                "Builder::setHeader", HttpRequest.Builder::setHeader
+                );
+        for (Map.Entry<String, WithHeader> e : lambdas.entrySet()) {
+            System.out.println("Testing restricted headers with " + e.getKey());
+            WithHeader f = e.getValue();
+            for (String name : RESTRICTED) {
+                String value = name + "-value";
+                HttpRequest req = f.withHeader(HttpRequest.newBuilder(uri)
+                        .GET(), "x-" + name, value).build();
+                String v = req.headers().firstValue("x-" + name).orElseThrow(
+                        () -> new RuntimeException("header x-" + name + " not set"));
+                assertEquals(v, value);
+                try {
+                    f.withHeader(HttpRequest.newBuilder(uri)
+                            .GET(), name, value).build();
+                    throw new RuntimeException("Expected IAE not thrown for " + name);
+                } catch (IllegalArgumentException x) {
+                    System.out.println("Got expected IAE for " + name + ": " + x);
+                }
+            }
+        }
+    }
+
+
     @Test
     public void testCopy() {
         HttpRequest.Builder builder = newBuilder(uri).expectContinue(true)
                                                      .header("A", "B")
-                                                     .POST(fromString(""))
+                                                     .POST(BodyPublishers.ofString(""))
                                                      .timeout(ofSeconds(30))
                                                      .version(HTTP_1_1);
         HttpRequest.Builder copy = builder.copy();
@@ -329,6 +378,17 @@ public void testCopy() {
         assertEquals(copyRequest.timeout().get(), ofSeconds(30));
         assertTrue(copyRequest.version().isPresent());
         assertEquals(copyRequest.version().get(), HTTP_1_1);
+
+        // lazy set URI ( maybe builder as a template )
+        copyRequest = newBuilder().copy().uri(uri).build();
+        assertEquals(copyRequest.uri(), uri);
+
+        builder = newBuilder().header("C", "D");
+        copy = builder.copy();
+        copy.uri(uri);
+        copyRequest = copy.build();
+        assertEquals(copyRequest.uri(), uri);
+        assertEquals(copyRequest.headers().firstValue("C").get(), "D");
     }
 
     @Test
@@ -361,13 +421,13 @@ public void testEquals() {
         assertEquals(builder.build(), builder.build());
         assertEquals(builder.build(), newBuilder(uri).build());
 
-        builder.POST(noBody());
+        builder.POST(BodyPublishers.noBody());
         assertEquals(builder.build(), builder.build());
-        assertEquals(builder.build(), newBuilder(uri).POST(noBody()).build());
-        assertEquals(builder.build(), newBuilder(uri).POST(fromString("")).build());
+        assertEquals(builder.build(), newBuilder(uri).POST(BodyPublishers.noBody()).build());
+        assertEquals(builder.build(), newBuilder(uri).POST(BodyPublishers.ofString("")).build());
         assertNotEquals(builder.build(), newBuilder(uri).build());
         assertNotEquals(builder.build(), newBuilder(uri).GET().build());
-        assertNotEquals(builder.build(), newBuilder(uri).PUT(noBody()).build());
+        assertNotEquals(builder.build(), newBuilder(uri).PUT(BodyPublishers.noBody()).build());
 
         builder = newBuilder(uri).header("x", "y");
         assertEquals(builder.build(), builder.build());
diff --git a/test/jdk/java/net/httpclient/ResponsePublisher.java b/test/jdk/java/net/httpclient/ResponsePublisher.java
new file mode 100644
index 00000000000..ada47817cb1
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ResponsePublisher.java
@@ -0,0 +1,516 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8201186
+ * @summary Tests an asynchronous BodySubscriber that completes
+ *          immediately with a Publisher<List<ByteBuffer>>
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm ResponsePublisher
+ */
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Publisher;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+public class ResponsePublisher implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;   // HTTPS/1.1
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI_fixed;
+    String httpURI_chunk;
+    String httpsURI_fixed;
+    String httpsURI_chunk;
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    static final int ITERATION_COUNT = 3;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = Executors.newCachedThreadPool();
+
+    interface BHS extends Supplier<BodyHandler<Publisher<List<ByteBuffer>>>> {
+        static BHS of(BHS impl, String name) {
+            return new BHSImpl(impl, name);
+        }
+    }
+
+    static final class BHSImpl implements BHS {
+        final BHS supplier;
+        final String name;
+        BHSImpl(BHS impl, String name) {
+            this.supplier = impl;
+            this.name = name;
+        }
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        @Override
+        public BodyHandler<Publisher<List<ByteBuffer>>> get() {
+            return supplier.get();
+        }
+    }
+
+    static final Supplier<BodyHandler<Publisher<List<ByteBuffer>>>> OF_PUBLISHER_API =
+            BHS.of(BodyHandlers::ofPublisher, "BodyHandlers::ofPublisher");
+    static final Supplier<BodyHandler<Publisher<List<ByteBuffer>>>> OF_PUBLISHER_TEST =
+            BHS.of(PublishingBodyHandler::new, "PublishingBodyHandler::new");
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        return new Object[][]{
+                { httpURI_fixed,    false, OF_PUBLISHER_API },
+                { httpURI_chunk,    false, OF_PUBLISHER_API },
+                { httpsURI_fixed,   false, OF_PUBLISHER_API },
+                { httpsURI_chunk,   false, OF_PUBLISHER_API },
+                { http2URI_fixed,   false, OF_PUBLISHER_API },
+                { http2URI_chunk,   false, OF_PUBLISHER_API },
+                { https2URI_fixed,  false, OF_PUBLISHER_API },
+                { https2URI_chunk,  false, OF_PUBLISHER_API },
+
+                { httpURI_fixed,    true, OF_PUBLISHER_API },
+                { httpURI_chunk,    true, OF_PUBLISHER_API },
+                { httpsURI_fixed,   true, OF_PUBLISHER_API },
+                { httpsURI_chunk,   true, OF_PUBLISHER_API },
+                { http2URI_fixed,   true, OF_PUBLISHER_API },
+                { http2URI_chunk,   true, OF_PUBLISHER_API },
+                { https2URI_fixed,  true, OF_PUBLISHER_API },
+                { https2URI_chunk,  true, OF_PUBLISHER_API },
+
+                { httpURI_fixed,    false, OF_PUBLISHER_TEST },
+                { httpURI_chunk,    false, OF_PUBLISHER_TEST },
+                { httpsURI_fixed,   false, OF_PUBLISHER_TEST },
+                { httpsURI_chunk,   false, OF_PUBLISHER_TEST },
+                { http2URI_fixed,   false, OF_PUBLISHER_TEST },
+                { http2URI_chunk,   false, OF_PUBLISHER_TEST },
+                { https2URI_fixed,  false, OF_PUBLISHER_TEST },
+                { https2URI_chunk,  false, OF_PUBLISHER_TEST },
+
+                { httpURI_fixed,    true, OF_PUBLISHER_TEST },
+                { httpURI_chunk,    true, OF_PUBLISHER_TEST },
+                { httpsURI_fixed,   true, OF_PUBLISHER_TEST },
+                { httpsURI_chunk,   true, OF_PUBLISHER_TEST },
+                { http2URI_fixed,   true, OF_PUBLISHER_TEST },
+                { http2URI_chunk,   true, OF_PUBLISHER_TEST },
+                { https2URI_fixed,  true, OF_PUBLISHER_TEST },
+                { https2URI_chunk,  true, OF_PUBLISHER_TEST },
+        };
+    }
+
+    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    HttpClient newHttpClient() {
+        return TRACKER.track(HttpClient.newBuilder()
+                         .executor(executor)
+                         .sslContext(sslContext)
+                         .build());
+    }
+
+    @Test(dataProvider = "variants")
+    public void testExceptions(String uri, boolean sameClient, BHS handlers) throws Exception {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<Publisher<List<ByteBuffer>>> handler = handlers.get();
+            HttpResponse<Publisher<List<ByteBuffer>>> response = client.send(req, handler);
+            try {
+                response.body().subscribe(null);
+                throw new RuntimeException("Expected NPE not thrown");
+            } catch (NullPointerException x) {
+                System.out.println("Got expected NPE: " + x);
+            }
+            // We can reuse our BodySubscribers implementations to subscribe to the
+            // Publisher<List<ByteBuffer>>
+            BodySubscriber<String> ofString = BodySubscribers.ofString(UTF_8);
+            response.body().subscribe(ofString);
+
+            BodySubscriber<String> ofString2 = BodySubscribers.ofString(UTF_8);
+            response.body().subscribe(ofString2);
+            try {
+                ofString2.getBody().toCompletableFuture().join();
+                throw new RuntimeException("Expected ISE not thrown");
+            } catch (CompletionException x) {
+                Throwable cause = x.getCause();
+                if (cause instanceof  IllegalStateException) {
+                    System.out.println("Got expected ISE: " + cause);
+                } else {
+                    throw x;
+                }
+            }
+            // Get the final result and compare it with the expected body
+            String body = ofString.getBody().toCompletableFuture().get();
+            assertEquals(body, "");
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testNoBody(String uri, boolean sameClient, BHS handlers) throws Exception {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<Publisher<List<ByteBuffer>>> handler = handlers.get();
+            HttpResponse<Publisher<List<ByteBuffer>>> response = client.send(req, handler);
+            // We can reuse our BodySubscribers implementations to subscribe to the
+            // Publisher<List<ByteBuffer>>
+            BodySubscriber<String> ofString = BodySubscribers.ofString(UTF_8);
+            // get the Publisher<List<ByteBuffer>> and
+            // subscribe to it.
+            response.body().subscribe(ofString);
+            // Get the final result and compare it with the expected body
+            String body = ofString.getBody().toCompletableFuture().get();
+            assertEquals(body, "");
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testNoBodyAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<Publisher<List<ByteBuffer>>> handler = handlers.get();
+            // We can reuse our BodySubscribers implementations to subscribe to the
+            // Publisher<List<ByteBuffer>>
+            BodySubscriber<String> ofString = BodySubscribers.ofString(UTF_8);
+            CompletableFuture<String> result =
+                    client.sendAsync(req, handler).thenCompose(
+                            (responsePublisher) -> {
+                                // get the Publisher<List<ByteBuffer>> and
+                                // subscribe to it.
+                                responsePublisher.body().subscribe(ofString);
+                                return ofString.getBody();
+                            });
+            // Get the final result and compare it with the expected body
+            assertEquals(result.get(), "");
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsString(String uri, boolean sameClient, BHS handlers) throws Exception {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri+"/withBody"))
+                    .build();
+            BodyHandler<Publisher<List<ByteBuffer>>> handler = handlers.get();
+            HttpResponse<Publisher<List<ByteBuffer>>> response = client.send(req, handler);
+            // We can reuse our BodySubscribers implementations to subscribe to the
+            // Publisher<List<ByteBuffer>>
+            BodySubscriber<String> ofString = BodySubscribers.ofString(UTF_8);
+            // get the Publisher<List<ByteBuffer>> and
+            // subscribe to it.
+            response.body().subscribe(ofString);
+            // Get the final result and compare it with the expected body
+            String body = ofString.getBody().toCompletableFuture().get();
+            assertEquals(body, WITH_BODY);
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testAsStringAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
+        HttpClient client = null;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient();
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri+"/withBody"))
+                    .build();
+            BodyHandler<Publisher<List<ByteBuffer>>> handler = handlers.get();
+            // We can reuse our BodySubscribers implementations to subscribe to the
+            // Publisher<List<ByteBuffer>>
+            BodySubscriber<String> ofString = BodySubscribers.ofString(UTF_8);
+            CompletableFuture<String> result = client.sendAsync(req, handler)
+                    .thenCompose((responsePublisher) -> {
+                        // get the Publisher<List<ByteBuffer>> and
+                        // subscribe to it.
+                        responsePublisher.body().subscribe(ofString);
+                        return ofString.getBody();
+                    });
+            // Get the final result and compare it with the expected body
+            String body = result.get();
+            assertEquals(body, WITH_BODY);
+        }
+    }
+
+    // A BodyHandler that returns PublishingBodySubscriber instances
+    static class PublishingBodyHandler implements BodyHandler<Publisher<List<ByteBuffer>>> {
+        @Override
+        public BodySubscriber<Publisher<List<ByteBuffer>>> apply(HttpResponse.ResponseInfo rinfo) {
+            assertEquals(rinfo.statusCode(), 200);
+            return new PublishingBodySubscriber();
+        }
+    }
+
+    // A BodySubscriber that returns a Publisher<List<ByteBuffer>>
+    static class PublishingBodySubscriber implements BodySubscriber<Publisher<List<ByteBuffer>>> {
+        private final CompletableFuture<Flow.Subscription> subscriptionCF = new CompletableFuture<>();
+        private final CompletableFuture<Flow.Subscriber<? super List<ByteBuffer>>> subscribedCF = new CompletableFuture<>();
+        private AtomicReference<Flow.Subscriber<? super List<ByteBuffer>>> subscriberRef = new AtomicReference<>();
+        private final CompletionStage<Publisher<List<ByteBuffer>>> body =
+                subscriptionCF.thenCompose((s) -> CompletableFuture.completedStage(this::subscribe));
+                //CompletableFuture.completedStage(this::subscribe);
+
+        private void subscribe(Flow.Subscriber<? super List<ByteBuffer>> subscriber) {
+            Objects.requireNonNull(subscriber, "subscriber must not be null");
+            if (subscriberRef.compareAndSet(null, subscriber)) {
+                subscriptionCF.thenAccept((s) -> {
+                    subscriber.onSubscribe(s);
+                    subscribedCF.complete(subscriber);
+                });
+            } else {
+                subscriber.onSubscribe(new Flow.Subscription() {
+                    @Override public void request(long n) { }
+                    @Override public void cancel() { }
+                });
+                subscriber.onError(
+                        new IllegalStateException("This publisher has already one subscriber"));
+            }
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            subscriptionCF.complete(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            assert subscriptionCF.isDone(); // cannot be called before onSubscribe()
+            Flow.Subscriber<? super List<ByteBuffer>> subscriber = subscriberRef.get();
+            assert subscriber != null; // cannot be called before subscriber calls request(1)
+            subscriber.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            assert subscriptionCF.isDone(); // cannot be called before onSubscribe()
+            // onError can be called before request(1), and therefore can
+            // be called before subscriberRef is set.
+            subscribedCF.thenAccept(s -> s.onError(throwable));
+        }
+
+        @Override
+        public void onComplete() {
+            assert subscriptionCF.isDone(); // cannot be called before onSubscribe()
+            // onComplete can be called before request(1), and therefore can
+            // be called before subscriberRef is set.
+            subscribedCF.thenAccept(s -> s.onComplete());
+        }
+
+        @Override
+        public CompletionStage<Publisher<List<ByteBuffer>>> getBody() {
+            return body;
+        }
+    }
+
+    static String serverAuthority(HttpServer server) {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + server.getAddress().getPort();
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/1.1
+        HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h1_chunkHandler = new HTTP_VariableLengthHandler();
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler( h1_fixedLengthHandler, "/http1/fixed");
+        httpTestServer.addHandler(h1_chunkHandler,"/http1/chunk");
+        httpURI_fixed = "http://" + httpTestServer.serverAuthority() + "/http1/fixed";
+        httpURI_chunk = "http://" + httpTestServer.serverAuthority() + "/http1/chunk";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
+        httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
+        httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed";
+        httpsURI_chunk = "https://" + httpsTestServer.serverAuthority() + "/https1/chunk";
+
+        // HTTP/2
+        HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h2_chunkedHandler = new HTTP_VariableLengthHandler();
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        Thread.sleep(100);
+        AssertionError fail = TRACKER.check(500);
+        try {
+            httpTestServer.stop();
+            httpsTestServer.stop();
+            http2TestServer.stop();
+            https2TestServer.stop();
+        } finally {
+            if (fail != null) {
+                throw fail;
+            }
+        }
+    }
+
+    static final String WITH_BODY = "Lorem ipsum dolor sit amet, consectetur" +
+            " adipiscing elit, sed do eiusmod tempor incididunt ut labore et" +
+            " dolore magna aliqua. Ut enim ad minim veniam, quis nostrud" +
+            " exercitation ullamco laboris nisi ut aliquip ex ea" +
+            " commodo consequat. Duis aute irure dolor in reprehenderit in " +
+            "voluptate velit esse cillum dolore eu fugiat nulla pariatur." +
+            " Excepteur sint occaecat cupidatat non proident, sunt in culpa qui" +
+            " officia deserunt mollit anim id est laborum.";
+
+    static class HTTP_FixedLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            if (t.getRequestURI().getPath().endsWith("/withBody")) {
+                byte[] bytes = WITH_BODY.getBytes(UTF_8);
+                t.sendResponseHeaders(200, bytes.length);  // body
+                try (OutputStream os = t.getResponseBody()) {
+                    os.write(bytes);
+                }
+            } else {
+                t.sendResponseHeaders(200, 0);  //no body
+            }
+        }
+    }
+
+    static class HTTP_VariableLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_VariableLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, -1);  //chunked or variable
+            if (t.getRequestURI().getPath().endsWith("/withBody")) {
+                byte[] bytes = WITH_BODY.getBytes(UTF_8);
+                try (OutputStream os = t.getResponseBody()) {
+                    int chunkLen = bytes.length/10;
+                    if (chunkLen == 0) {
+                        os.write(bytes);
+                    } else {
+                        int count = 0;
+                        for (int i=0; i<10; i++) {
+                            os.write(bytes, count, chunkLen);
+                            os.flush();
+                            count += chunkLen;
+                        }
+                        os.write(bytes, count, bytes.length % chunkLen);
+                        count += bytes.length % chunkLen;
+                        assert count == bytes.length;
+                    }
+                }
+            } else {
+                t.getResponseBody().close();   // no body
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/RetryWithCookie.java b/test/jdk/java/net/httpclient/RetryWithCookie.java
new file mode 100644
index 00000000000..5883cfcfc92
--- /dev/null
+++ b/test/jdk/java/net/httpclient/RetryWithCookie.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8199943
+ * @summary Test for cookie handling when retrying after close
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          jdk.httpserver
+ * @library /lib/testlibrary /test/lib http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext ReferenceTracker
+ * @run testng/othervm
+ *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
+ *       RetryWithCookie
+ */
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.CookieManager;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class RetryWithCookie implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;       // HTTPS/1.1
+    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    String httpURI;
+    String httpsURI;
+    String http2URI;
+    String https2URI;
+
+    static final String MESSAGE = "BasicRedirectTest message body";
+    static final int ITERATIONS = 3;
+
+    @DataProvider(name = "positive")
+    public Object[][] positive() {
+        return new Object[][] {
+                { httpURI,    },
+                { httpsURI,   },
+                { http2URI,   },
+                { https2URI,  },
+        };
+    }
+
+    static final AtomicLong requestCounter = new AtomicLong();
+    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+
+    @Test(dataProvider = "positive")
+    void test(String uriString) throws Exception {
+        out.printf("%n---- starting (%s) ----%n", uriString);
+        CookieManager cookieManager = new CookieManager();
+        HttpClient client = HttpClient.newBuilder()
+                .followRedirects(Redirect.ALWAYS)
+                .cookieHandler(cookieManager)
+                .sslContext(sslContext)
+                .build();
+        TRACKER.track(client);
+        assert client.cookieHandler().isPresent();
+
+        URI uri = URI.create(uriString);
+        List<String> cookies = new ArrayList<>();
+        cookies.add("CUSTOMER=ARTHUR_DENT");
+        Map<String, List<String>> cookieHeaders = new HashMap<>();
+        cookieHeaders.put("Set-Cookie", cookies);
+        cookieManager.put(uri, cookieHeaders);
+
+        HttpRequest request = HttpRequest.newBuilder(uri)
+                .header("X-uuid", "uuid-" + requestCounter.incrementAndGet())
+                .build();
+        out.println("Initial request: " + request.uri());
+
+        for (int i=0; i< ITERATIONS; i++) {
+            out.println("iteration: " + i);
+            HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+
+            out.println("  Got response: " + response);
+            out.println("  Got body Path: " + response.body());
+
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.body(), MESSAGE);
+            assertEquals(response.headers().allValues("X-Request-Cookie"), cookies);
+            request = HttpRequest.newBuilder(uri)
+                    .header("X-uuid", "uuid-" + requestCounter.incrementAndGet())
+                    .build();
+        }
+    }
+
+    // -- Infrastructure
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(new CookieRetryHandler(), "/http1/cookie/");
+        httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/retry";
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(new CookieRetryHandler(),"/https1/cookie/");
+        httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/cookie/retry";
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(new CookieRetryHandler(), "/http2/cookie/");
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/cookie/retry";
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(new CookieRetryHandler(), "/https2/cookie/");
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/cookie/retry";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        Thread.sleep(100);
+        AssertionError fail = TRACKER.check(500);
+        try {
+            httpTestServer.stop();
+            httpsTestServer.stop();
+            http2TestServer.stop();
+            https2TestServer.stop();
+        } finally {
+            if (fail != null) throw fail;
+        }
+    }
+
+    static class CookieRetryHandler implements HttpTestHandler {
+        ConcurrentHashMap<String,String> closedRequests = new ConcurrentHashMap<>();
+
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            System.out.println("CookieRetryHandler for: " + t.getRequestURI());
+
+            List<String> uuids = t.getRequestHeaders().get("X-uuid");
+            if (uuids == null || uuids.size() != 1) {
+                readAllRequestData(t);
+                try (OutputStream os = t.getResponseBody()) {
+                    String msg = "Incorrect uuid header values:[" + uuids + "]";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                }
+                return;
+            }
+
+            String uuid = uuids.get(0);
+            // retrying
+            if (closedRequests.putIfAbsent(uuid, t.getRequestURI().toString()) == null) {
+                if (t.getExchangeVersion() == HttpClient.Version.HTTP_1_1) {
+                    // Throwing an exception here only causes a retry
+                    // with HTTP_1_1 - where it forces the server to close
+                    // the connection.
+                    // For HTTP/2 then throwing an IOE would cause the server
+                    // to close the stream, and throwing anything else would
+                    // cause it to close the connection, but neither would
+                    // cause the client to retry.
+                    // So we simply do not try to retry with HTTP/2 and just verify
+                    // we have received the expected cookie
+                    throw new IOException("Closing on first request");
+                }
+            }
+
+            // not retrying
+            readAllRequestData(t);
+            try (OutputStream os = t.getResponseBody()) {
+                List<String> cookie = t.getRequestHeaders().get("Cookie");
+
+                if (cookie == null || cookie.size() == 0) {
+                    String msg = "No cookie header present";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                } else if (!cookie.get(0).equals("CUSTOMER=ARTHUR_DENT")) {
+                    String msg = "Incorrect cookie header value:[" + cookie.get(0) + "]";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                } else if (cookie.size() > 1) {
+                    String msg = "Incorrect cookie header values:[" + cookie + "]";
+                    (new RuntimeException(msg)).printStackTrace();
+                    t.sendResponseHeaders(500, -1);
+                    os.write(msg.getBytes(UTF_8));
+                } else {
+                    assert cookie.get(0).equals("CUSTOMER=ARTHUR_DENT");
+                    byte[] bytes = MESSAGE.getBytes(UTF_8);
+                    for (String value : cookie) {
+                        t.getResponseHeaders().addHeader("X-Request-Cookie", value);
+                    }
+                    t.sendResponseHeaders(200, bytes.length);
+                    os.write(bytes);
+                }
+            }
+
+            closedRequests.remove(uuid);
+        }
+    }
+
+    static void readAllRequestData(HttpTestExchange t) throws IOException {
+        try (InputStream is = t.getRequestBody()) {
+            is.readAllBytes();
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/ServerCloseTest.java b/test/jdk/java/net/httpclient/ServerCloseTest.java
new file mode 100644
index 00000000000..27f3eda175a
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ServerCloseTest.java
@@ -0,0 +1,410 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Tests that our client deals correctly with servers that
+ *          close the connection right after sending the last byte.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters EncodedCharsInURI
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm ServerCloseTest
+ */
+//*        -Djdk.internal.httpclient.debug=true
+
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublisher;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.util.List;
+import java.util.Locale;
+import java.util.StringTokenizer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+public class ServerCloseTest implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    DummyServer    httpDummyServer;    // HTTP/1.1    [ 2 servers ]
+    DummyServer    httpsDummyServer;   // HTTPS/1.1
+    String httpDummy;
+    String httpsDummy;
+
+    static final int ITERATION_COUNT = 3;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+    static volatile boolean tasksFailed;
+    static final AtomicLong serverCount = new AtomicLong();
+    static final AtomicLong clientCount = new AtomicLong();
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    private volatile HttpClient sharedClient;
+
+    static class TestExecutor implements Executor {
+        final AtomicLong tasks = new AtomicLong();
+        Executor executor;
+        TestExecutor(Executor executor) {
+            this.executor = executor;
+        }
+
+        @Override
+        public void execute(Runnable command) {
+            long id = tasks.incrementAndGet();
+            executor.execute(() -> {
+                try {
+                    command.run();
+                } catch (Throwable t) {
+                    tasksFailed = true;
+                    System.out.printf(now() + "Task %s failed: %s%n", id, t);
+                    System.err.printf(now() + "Task %s failed: %s%n", id, t);
+                    FAILURES.putIfAbsent("Task " + id, t);
+                    throw t;
+                }
+            });
+        }
+    }
+
+    @AfterClass
+    static final void printFailedTests() {
+        out.println("\n=========================");
+        try {
+            out.printf("%n%sCreated %d servers and %d clients%n",
+                    now(), serverCount.get(), clientCount.get());
+            if (FAILURES.isEmpty()) return;
+            out.println("Failed tests: ");
+            FAILURES.entrySet().forEach((e) -> {
+                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+                e.getValue().printStackTrace(out);
+            });
+            if (tasksFailed) {
+                System.out.println("WARNING: Some tasks failed");
+            }
+        } finally {
+            out.println("\n=========================\n");
+        }
+    }
+
+    private String[] uris() {
+        return new String[] {
+                httpDummy,
+                httpsDummy,
+        };
+    }
+
+    @DataProvider(name = "servers")
+    public Object[][] noThrows() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2][];
+        //Object[][] result = new Object[uris.length][];
+        int i = 0;
+        for (boolean sameClient : List.of(false, true)) {
+            //if (!sameClient) continue;
+            for (String uri: uris()) {
+                result[i++] = new Object[] {uri, sameClient};
+            }
+        }
+        assert i == uris.length * 2;
+        // assert i == uris.length ;
+        return result;
+    }
+
+    private HttpClient makeNewClient() {
+        clientCount.incrementAndGet();
+        return HttpClient.newBuilder()
+                .executor(executor)
+                .sslContext(sslContext)
+                .build();
+    }
+
+    HttpClient newHttpClient(boolean share) {
+        if (!share) return makeNewClient();
+        HttpClient shared = sharedClient;
+        if (shared != null) return shared;
+        synchronized (this) {
+            shared = sharedClient;
+            if (shared == null) {
+                shared = sharedClient = makeNewClient();
+            }
+            return shared;
+        }
+    }
+
+    final String ENCODED = "/01%252F03/";
+
+    @Test(dataProvider = "servers")
+    public void testServerClose(String uri, boolean sameClient) {
+        HttpClient client = null;
+        out.printf("%n%s testServerClose(%s, %b)%n", now(), uri, sameClient);
+        uri = uri + ENCODED;
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            BodyPublisher bodyPublisher = BodyPublishers.ofString(uri);
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .POST(bodyPublisher)
+                    .build();
+            BodyHandler<String> handler = BodyHandlers.ofString();
+            HttpClient c = client;
+            CompletableFuture<HttpResponse<String>> responseCF = c.sendAsync(req, handler);
+            // retry POST if needed   #### Replace with exceptionallyCompose
+            responseCF = responseCF.handle((r,t) ->
+                    t == null ? CompletableFuture.completedFuture(r)
+                            : c.sendAsync(req, handler)).thenCompose(x -> x);
+            HttpResponse<String> response = responseCF.join();
+            String body = response.body();
+            if (!uri.contains(body)) {
+                System.err.println("Test failed: " + response);
+                throw new RuntimeException(uri + " doesn't contain '" + body + "'");
+            } else {
+                System.out.println("Found expected " + body + " in " + uri);
+            }
+        }
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+
+        // DummyServer
+        httpDummyServer = DummyServer.create(sa);
+        httpsDummyServer = DummyServer.create(sa, sslContext);
+        httpDummy = "http://" + httpDummyServer.serverAuthority() + "/http1/dummy/x";
+        httpsDummy = "https://" + httpsDummyServer.serverAuthority() + "/https1/dummy/x";
+
+
+        serverCount.addAndGet(2);
+        httpDummyServer.start();
+        httpsDummyServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        sharedClient = null;
+        httpDummyServer.stopServer();
+        httpsDummyServer.stopServer();
+    }
+
+    static class DummyServer extends Thread {
+        final ServerSocket ss;
+        final boolean secure;
+        ConcurrentLinkedQueue<Socket> connections = new ConcurrentLinkedQueue<>();
+        volatile boolean stopped;
+        DummyServer(ServerSocket ss, boolean secure) {
+            super("DummyServer[" + ss.getLocalPort()+"]");
+            this.secure = secure;
+            this.ss = ss;
+        }
+
+        // This is a bit shaky. It doesn't handle continuation
+        // lines, but our client shouldn't send any.
+        // Read a line from the input stream, swallowing the final
+        // \r\n sequence. Stops at the first \n, doesn't complain
+        // if it wasn't preceded by '\r'.
+        //
+        String readLine(InputStream r) throws IOException {
+            StringBuilder b = new StringBuilder();
+            int c;
+            while ((c = r.read()) != -1) {
+                if (c == '\n') break;
+                b.appendCodePoint(c);
+            }
+            if (b.codePointAt(b.length() -1) == '\r') {
+                b.delete(b.length() -1, b.length());
+            }
+            return b.toString();
+        }
+
+        @Override
+        public void run() {
+            try {
+                while(!stopped) {
+                    Socket clientConnection = ss.accept();
+                    connections.add(clientConnection);
+                    System.out.println(now() + getName() + ": Client accepted");
+                    StringBuilder headers = new StringBuilder();
+                    Socket targetConnection = null;
+                    InputStream  ccis = clientConnection.getInputStream();
+                    OutputStream ccos = clientConnection.getOutputStream();
+                    Writer w = new OutputStreamWriter(
+                            clientConnection.getOutputStream(), "UTF-8");
+                    PrintWriter pw = new PrintWriter(w);
+                    System.out.println(now() + getName() + ": Reading request line");
+                    String requestLine = readLine(ccis);
+                    System.out.println(now() + getName() + ": Request line: " + requestLine);
+
+                    StringTokenizer tokenizer = new StringTokenizer(requestLine);
+                    String method = tokenizer.nextToken();
+                    assert method.equalsIgnoreCase("POST")
+                            || method.equalsIgnoreCase("GET");
+                    String path = tokenizer.nextToken();
+                    URI uri;
+                    try {
+                        String hostport = serverAuthority();
+                        uri = new URI((secure ? "https" : "http") +"://" + hostport + path);
+                    } catch (Throwable x) {
+                        System.err.printf("Bad target address: \"%s\" in \"%s\"%n",
+                                path, requestLine);
+                        clientConnection.close();
+                        continue;
+                    }
+
+                    // Read all headers until we find the empty line that
+                    // signals the end of all headers.
+                    String line = requestLine;
+                    while (!line.equals("")) {
+                        System.out.println(now() + getName() + ": Reading header: "
+                                + (line = readLine(ccis)));
+                        headers.append(line).append("\r\n");
+                    }
+
+                    StringBuilder response = new StringBuilder();
+
+                    int index = headers.toString()
+                            .toLowerCase(Locale.US)
+                            .indexOf("content-length: ");
+                    byte[] b = uri.toString().getBytes(UTF_8);
+                    if (index >= 0) {
+                        index = index + "content-length: ".length();
+                        String cl = headers.toString().substring(index);
+                        StringTokenizer tk = new StringTokenizer(cl);
+                        int len = Integer.parseInt(tk.nextToken());
+                        assert len < b.length * 2;
+                        System.out.println(now() + getName()
+                                + ": received body: "
+                                + new String(ccis.readNBytes(len), UTF_8));
+                    }
+                    System.out.println(now()
+                            + getName() + ": sending back " + uri);
+
+                    response.append("HTTP/1.1 200 OK\r\nContent-Length: ")
+                            .append(b.length)
+                            .append("\r\n\r\n");
+
+                    // Then send the 200 OK response to the client
+                    System.out.println(now() + getName() + ": Sending "
+                            + response);
+                    pw.print(response);
+                    pw.flush();
+                    ccos.write(b);
+                    ccos.flush();
+                    ccos.close();
+                    connections.remove(clientConnection);
+                    clientConnection.close();
+                }
+            } catch (Throwable t) {
+                if (!stopped) {
+                    System.out.println(now() + getName() + ": failed: " + t);
+                    t.printStackTrace();
+                    try {
+                        stopServer();
+                    } catch (Throwable e) {
+
+                    }
+                }
+            } finally {
+                System.out.println(now() + getName() + ": exiting");
+            }
+        }
+
+        void close(Socket s) {
+            try {
+                s.close();
+            } catch(Throwable t) {
+
+            }
+        }
+        public void stopServer() throws IOException {
+            stopped = true;
+            ss.close();
+            connections.forEach(this::close);
+        }
+
+        public String serverAuthority() {
+            return InetAddress.getLoopbackAddress().getHostName() + ":"
+                    + ss.getLocalPort();
+        }
+
+        static DummyServer create(InetSocketAddress sa) throws IOException {
+            ServerSocket ss = ServerSocketFactory.getDefault()
+                    .createServerSocket(sa.getPort(), -1, sa.getAddress());
+            return  new DummyServer(ss, false);
+        }
+
+        static DummyServer create(InetSocketAddress sa, SSLContext sslContext) throws IOException {
+            ServerSocket ss = sslContext.getServerSocketFactory()
+                    .createServerSocket(sa.getPort(), -1, sa.getAddress());
+            return new DummyServer(ss, true);
+        }
+
+
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/ShortRequestBody.java b/test/jdk/java/net/httpclient/ShortRequestBody.java
index 9fd3187e25a..6a73d11200a 100644
--- a/test/jdk/java/net/httpclient/ShortRequestBody.java
+++ b/test/jdk/java/net/httpclient/ShortRequestBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -25,9 +25,17 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpTimeoutException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -40,14 +48,8 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpTimeoutException;
-
 import static java.lang.System.err;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -102,21 +104,21 @@ public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
 
     static class StringRequestBody extends AbstractDelegateRequestBody {
         StringRequestBody(String body, int additionalLength) {
-            super(HttpRequest.BodyPublisher.fromString(body),
+            super(HttpRequest.BodyPublishers.ofString(body),
                   body.getBytes(UTF_8).length + additionalLength);
         }
     }
 
     static class ByteArrayRequestBody extends AbstractDelegateRequestBody {
         ByteArrayRequestBody(byte[] body, int additionalLength) {
-            super(HttpRequest.BodyPublisher.fromByteArray(body),
+            super(BodyPublishers.ofByteArray(body),
                   body.length + additionalLength);
         }
     }
 
     static class FileRequestBody extends AbstractDelegateRequestBody {
         FileRequestBody(Path path, int additionalLength) throws IOException {
-            super(HttpRequest.BodyPublisher.fromFile(path),
+            super(BodyPublishers.ofFile(path),
                   Files.size(path) + additionalLength);
         }
     }
@@ -132,7 +134,7 @@ public static void main(String[] args) throws Exception {
         try (Server server = new Server()) {
             for (Supplier<HttpClient> cs : clientSuppliers) {
                 err.println("\n---- next supplier ----\n");
-                URI uri = new URI("http://127.0.0.1:" + server.getPort() + "/");
+                URI uri = new URI("http://localhost:" + server.getPort() + "/");
 
                 // sanity ( 6 requests to keep client and server offsets easy to workout )
                 success(cs, uri, new StringRequestBody(STRING_BODY, 0));
@@ -164,11 +166,12 @@ static void success(Supplier<HttpClient> clientSupplier,
         HttpRequest request = HttpRequest.newBuilder(uri)
                                          .POST(publisher)
                                          .build();
-        cf = clientSupplier.get().sendAsync(request, discard(null));
+        cf = clientSupplier.get().sendAsync(request, BodyHandlers.discarding());
 
         HttpResponse<Void> resp = cf.get(30, TimeUnit.SECONDS);
         err.println("Response code: " + resp.statusCode());
-        check(resp.statusCode() == 200, "Expected 200, got ", resp.statusCode());
+        check(resp.statusCode() == 200, null,
+                "Expected 200, got ", resp.statusCode());
     }
 
     static void failureNonBlocking(Supplier<HttpClient> clientSupplier,
@@ -180,7 +183,7 @@ static void failureNonBlocking(Supplier<HttpClient> clientSupplier,
         HttpRequest request = HttpRequest.newBuilder(uri)
                                          .POST(publisher)
                                          .build();
-        cf = clientSupplier.get().sendAsync(request, discard(null));
+        cf = clientSupplier.get().sendAsync(request, BodyHandlers.discarding());
 
         try {
             HttpResponse<Void> r = cf.get(30, TimeUnit.SECONDS);
@@ -190,11 +193,11 @@ static void failureNonBlocking(Supplier<HttpClient> clientSupplier,
         } catch (ExecutionException expected) {
             err.println("Caught expected: " + expected);
             Throwable t = expected.getCause();
-            check(t instanceof IOException,
-                  "Expected cause IOException, but got: ", expected.getCause());
+            check(t instanceof IOException, t,
+                  "Expected cause IOException, but got: ", t);
             String msg = t.getMessage();
             check(msg.contains("Too many") || msg.contains("Too few"),
-                    "Expected Too many|Too few, got: ", t);
+                    t, "Expected Too many|Too few, got: ", t);
         }
     }
 
@@ -207,7 +210,8 @@ static void failureBlocking(Supplier<HttpClient> clientSupplier,
                                          .POST(publisher)
                                          .build();
         try {
-            HttpResponse<Void> r = clientSupplier.get().send(request, discard(null));
+            HttpResponse<Void> r = clientSupplier.get()
+                    .send(request, BodyHandlers.discarding());
             throw new RuntimeException("Unexpected response: " + r.statusCode());
         } catch (HttpTimeoutException x) {
             throw new RuntimeException("Unexpected timeout", x);
@@ -215,7 +219,7 @@ static void failureBlocking(Supplier<HttpClient> clientSupplier,
             err.println("Caught expected: " + expected);
             String msg = expected.getMessage();
             check(msg.contains("Too many") || msg.contains("Too few"),
-                    "Expected Too many|Too few, got: ", expected);
+                    expected,"Expected Too many|Too few, got: ", expected);
         }
     }
 
@@ -230,7 +234,10 @@ static class Server extends Thread implements AutoCloseable {
 
         Server() throws IOException {
             super("Test-Server");
-            ss = new ServerSocket(0); this.start();
+            ss = new ServerSocket();
+            ss.setReuseAddress(false);
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+            this.start();
         }
 
         int getPort() { return ss.getLocalPort(); }
@@ -318,13 +325,13 @@ static int fileSize(Path p) {
         catch (IOException x) { throw new UncheckedIOException(x); }
     }
 
-    static boolean check(boolean cond, Object... failedArgs) {
+    static boolean check(boolean cond, Throwable t, Object... failedArgs) {
         if (cond)
             return true;
         // We are going to fail...
         StringBuilder sb = new StringBuilder();
         for (Object o : failedArgs)
                 sb.append(o);
-        throw new RuntimeException(sb.toString());
+        throw new RuntimeException(sb.toString(), t);
     }
 }
diff --git a/test/jdk/java/net/httpclient/SmallTimeout.java b/test/jdk/java/net/httpclient/SmallTimeout.java
index 28e6958d4ff..17729f235ff 100644
--- a/test/jdk/java/net/httpclient/SmallTimeout.java
+++ b/test/jdk/java/net/httpclient/SmallTimeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -21,26 +21,28 @@
  * questions.
  */
 
-import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpTimeoutException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpTimeoutException;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import static java.lang.System.out;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
 
 /**
  * @test
  * @bug 8178147
+ * @modules java.net.http/jdk.internal.net.http.common
  * @summary Ensures that small timeouts do not cause hangs due to race conditions
- * @run main/othervm -Djdk.incubator.http.internal.common.DEBUG=true SmallTimeout
+ * @run main/othervm -Djdk.internal.httpclient.debug=true SmallTimeout
  */
 
 // To enable logging use. Not enabled by default as it changes the dynamics
@@ -76,10 +78,14 @@ static HttpResult of(HttpRequest request, Throwable t) {
 
     public static void main(String[] args) throws Exception {
         HttpClient client = HttpClient.newHttpClient();
+        ReferenceTracker.INSTANCE.track(client);
 
-        try (ServerSocket ss = new ServerSocket(0, 20)) {
+        Throwable failed = null;
+        try (ServerSocket ss = new ServerSocket()) {
+            ss.setReuseAddress(false);
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port = ss.getLocalPort();
-            URI uri = new URI("http://127.0.0.1:" + port + "/");
+            URI uri = new URI("http://localhost:" + port + "/");
 
             HttpRequest[] requests = new HttpRequest[TIMEOUTS.length];
 
@@ -92,7 +98,7 @@ public static void main(String[] args) throws Exception {
 
                 final HttpRequest req = requests[i];
                 CompletableFuture<HttpResponse<Object>> response = client
-                    .sendAsync(req, discard(null))
+                    .sendAsync(req, BodyHandlers.replacing(null))
                     .whenComplete((HttpResponse<Object> r, Throwable t) -> {
                         Throwable cause = null;
                         if (r != null) {
@@ -142,7 +148,7 @@ public static void main(String[] args) throws Exception {
                 executor.execute(() -> {
                     Throwable cause = null;
                     try {
-                        client.send(req, discard(null));
+                        client.send(req, BodyHandlers.replacing(null));
                     } catch (HttpTimeoutException e) {
                         out.println("Caught expected timeout: " + e);
                     } catch (Throwable ee) {
@@ -164,6 +170,24 @@ public static void main(String[] args) throws Exception {
             if (error)
                 throw new RuntimeException("Failed. Check output");
 
+        } catch (Throwable t) {
+            failed = t;
+            throw t;
+        } finally {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException t) {
+                // ignore;
+            }
+            AssertionError trackFailed = ReferenceTracker.INSTANCE.check(500);
+            if (trackFailed != null) {
+                if (failed != null) {
+                    failed.addSuppressed(trackFailed);
+                    if (failed instanceof Exception) throw (Exception) failed;
+                    if (failed instanceof Error) throw (Exception) failed;
+                }
+                throw trackFailed;
+            }
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/SmokeTest.java b/test/jdk/java/net/httpclient/SmokeTest.java
index 55f9d4e1aa7..7bc41bbd656 100644
--- a/test/jdk/java/net/httpclient/SmokeTest.java
+++ b/test/jdk/java/net/httpclient/SmokeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8087112 8178699
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary/ /
@@ -32,7 +32,10 @@
  * @compile ../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../com/sun/net/httpserver/EchoHandler.java
  * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
- * @run main/othervm -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=errors,trace SmokeTest
+ * @run main/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.httpclient.HttpClient.log=errors,ssl,trace
+ *      SmokeTest
  */
 
 import com.sun.net.httpserver.Headers;
@@ -43,17 +46,22 @@
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsParameters;
 import com.sun.net.httpserver.HttpsServer;
+
+import java.net.InetAddress;
 import java.net.Proxy;
 import java.net.SocketAddress;
+import java.util.Collections;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.ProxySelector;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import java.nio.file.StandardOpenOption;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -81,12 +89,9 @@
 import java.util.List;
 import java.util.Random;
 import jdk.testlibrary.SimpleSSLContext;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromFile;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromInputStream;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.*;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asFile;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
+import static java.nio.file.StandardOpenOption.WRITE;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
@@ -250,7 +255,7 @@ static void test1(String target, boolean fixedLen) throws Exception {
 
         HttpRequest request = builder.build();
 
-        HttpResponse<String> response = client.send(request, asString());
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
 
         String body = response.body();
         if (!body.equals("This is foo.txt\r\n")) {
@@ -261,7 +266,7 @@ static void test1(String target, boolean fixedLen) throws Exception {
         }
 
         // repeat async
-        HttpResponse<String> response1 = client.sendAsync(request, asString())
+        HttpResponse<String> response1 = client.sendAsync(request, BodyHandlers.ofString())
                                                .join();
 
         String body1 = response1.body();
@@ -277,10 +282,10 @@ static void test2(String s, String body) throws Exception {
         URI uri = new URI(s);
 
         HttpRequest request = HttpRequest.newBuilder(uri)
-                                         .POST(fromString(body))
+                                         .POST(BodyPublishers.ofString(body))
                                          .build();
 
-        HttpResponse<String> response = client.send(request, asString());
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
 
         if (response.statusCode() != 200) {
             throw new RuntimeException(
@@ -301,16 +306,13 @@ static void test2a(String s) throws Exception {
         Path p = getTempFile(128 * 1024);
 
         HttpRequest request = HttpRequest.newBuilder(uri)
-                                         .POST(fromFile(p))
+                                         .POST(BodyPublishers.ofFile(p))
                                          .build();
 
         Path resp = getTempFile(1); // will be overwritten
 
-        HttpResponse<Path> response =
-                client.send(request,
-                            BodyHandler.asFile(resp,
-                                               StandardOpenOption.TRUNCATE_EXISTING,
-                                               StandardOpenOption.WRITE));
+        HttpResponse<Path> response = client.send(request,
+                BodyHandlers.ofFile(resp, TRUNCATE_EXISTING, WRITE));
 
         if (response.statusCode() != 200) {
             throw new RuntimeException(
@@ -340,7 +342,7 @@ static void test3(String s) throws Exception {
                                          .build();
 
         HttpResponse<Path> response = client.send(request,
-                                                  asFile(Paths.get("redir1.txt")));
+                BodyHandlers.ofFile(Paths.get("redir1.txt")));
 
         if (response.statusCode() != 200) {
             throw new RuntimeException(
@@ -361,7 +363,8 @@ static void test3(String s) throws Exception {
 
         request = HttpRequest.newBuilder(uri).build();
 
-        response = client.sendAsync(request, asFile(Paths.get("redir2.txt"))).join();
+        response = client.sendAsync(request,
+                BodyHandlers.ofFile(Paths.get("redir2.txt"))).join();
 
         if (response.statusCode() != 200) {
             throw new RuntimeException(
@@ -449,7 +452,8 @@ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
     static void test4(String s) throws Exception {
         System.out.print("test4: " + s);
         URI uri = new URI(s);
-        InetSocketAddress proxyAddr = new InetSocketAddress("127.0.0.1", proxyPort);
+        InetSocketAddress proxyAddr = new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                                                            proxyPort);
         String filename = fileroot + uri.getPath();
 
         ExecutorService e = Executors.newCachedThreadPool();
@@ -464,7 +468,7 @@ static void test4(String s) throws Exception {
 
         HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
 
-        CompletableFuture<String> fut = cl.sendAsync(request, asString())
+        CompletableFuture<String> fut = cl.sendAsync(request, BodyHandlers.ofString())
                 .thenApply((response) -> response.body());
 
         String body = fut.get(5, TimeUnit.HOURS);
@@ -490,7 +494,7 @@ static void test5(String target, boolean fixedLen) throws Exception {
 
         HttpRequest.Builder builder = HttpRequest.newBuilder(uri)
                                             .expectContinue(true)
-                                            .POST(fromString(requestBody));
+                                            .POST(BodyPublishers.ofString(requestBody));
 
         if (fixedLen) {
             builder.header("XFixed", "yes");
@@ -498,7 +502,7 @@ static void test5(String target, boolean fixedLen) throws Exception {
 
         HttpRequest request = builder.build();
 
-        HttpResponse<String> response = client.send(request, asString());
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
 
         String body = response.body();
 
@@ -523,7 +527,7 @@ static void test6(String target, boolean fixedLen) throws Exception {
 
         HttpRequest request = builder.build();
 
-        HttpResponse<String> response = client.send(request, asString());
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
 
         if (response.statusCode() != 200) {
             throw new RuntimeException(
@@ -548,7 +552,7 @@ static void test7(String target) throws Exception {
         HttpRequest request = HttpRequest.newBuilder().uri(uri).GET().build();
 
         for (int i=0; i<4; i++) {
-            HttpResponse<String> r = client.send(request, asString());
+            HttpResponse<String> r = client.send(request, BodyHandlers.ofString());
             String body = r.body();
             if (!body.equals("OK")) {
                 throw new RuntimeException("Expected OK, got: " + body);
@@ -556,10 +560,13 @@ static void test7(String target) throws Exception {
         }
 
         // Second test: 4 x parallel
-        request = HttpRequest.newBuilder().uri(uri).POST(fromFile(requestBody)).build();
+        request = HttpRequest.newBuilder()
+                .uri(uri)
+                .POST(BodyPublishers.ofFile(requestBody))
+                .build();
         List<CompletableFuture<String>> futures = new LinkedList<>();
         for (int i=0; i<4; i++) {
-            futures.add(client.sendAsync(request, asString())
+            futures.add(client.sendAsync(request, BodyHandlers.ofString())
                               .thenApply((response) -> {
                                   if (response.statusCode() == 200)
                                       return response.body();
@@ -582,7 +589,7 @@ static void test7(String target) throws Exception {
         request = HttpRequest.newBuilder(uri).GET().build();
         BlockingQueue<String> q = new LinkedBlockingQueue<>();
         for (int i=0; i<4; i++) {
-            client.sendAsync(request, asString())
+            client.sendAsync(request, BodyHandlers.ofString())
                   .thenApply((HttpResponse<String> resp) -> {
                       String body = resp.body();
                       putQ(q, body);
@@ -599,7 +606,7 @@ static void test7(String target) throws Exception {
             if (!body.equals("OK")) {
                 throw new RuntimeException(body);
             }
-            client.sendAsync(request, asString())
+            client.sendAsync(request, BodyHandlers.ofString())
                   .thenApply((resp) -> {
                       if (resp.statusCode() == 200)
                           putQ(q, resp.body());
@@ -645,12 +652,12 @@ static void test11(String target) throws Exception {
         URI uri = new URI(target);
 
         HttpRequest request = HttpRequest.newBuilder(uri)
-                                         .POST(fromInputStream(SmokeTest::newStream))
-                                         .build();
+                .POST(BodyPublishers.ofInputStream(SmokeTest::newStream))
+                .build();
 
         Path download = Paths.get("test11.txt");
 
-        HttpResponse<Path> response = client.send(request, asFile(download));
+        HttpResponse<Path> response = client.send(request, BodyHandlers.ofFile(download));
 
         if (response.statusCode() != 200) {
             throw new RuntimeException("Wrong response code");
@@ -683,7 +690,7 @@ static void test10(String s) throws Exception {
 
         HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
         CompletableFuture<HttpResponse<String>> cf =
-                client.sendAsync(request, asString());
+                client.sendAsync(request, BodyHandlers.ofString());
 
         try {
             HttpResponse<String> response = cf.join();
@@ -722,7 +729,7 @@ static void initServer() throws Exception {
         logger.addHandler(ch);
 
         String root = System.getProperty ("test.src", ".")+ "/docs";
-        InetSocketAddress addr = new InetSocketAddress (0);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         s1 = HttpServer.create (addr, 0);
         if (s1 instanceof HttpsServer) {
             throw new RuntimeException ("should not be httpsserver");
@@ -751,7 +758,8 @@ static void initServer() throws Exception {
         s1.setExecutor(executor);
         s2.setExecutor(executor);
         ctx = new SimpleSSLContext().get();
-        sslparams = ctx.getSupportedSSLParameters();
+        sslparams = ctx.getDefaultSSLParameters();
+        //sslparams.setProtocols(new String[]{"TLSv1.2"});
         s2.setHttpsConfigurator(new Configurator(ctx));
         s1.start();
         s2.start();
@@ -760,8 +768,8 @@ static void initServer() throws Exception {
         System.out.println("HTTP server port = " + port);
         httpsport = s2.getAddress().getPort();
         System.out.println("HTTPS server port = " + httpsport);
-        httproot = "http://127.0.0.1:" + port + "/";
-        httpsroot = "https://127.0.0.1:" + httpsport + "/";
+        httproot = "http://localhost:" + port + "/";
+        httpsroot = "https://localhost:" + httpsport + "/";
 
         proxy = new ProxyServer(0, false);
         proxyPort = proxy.getPort();
@@ -872,12 +880,16 @@ public Configurator(SSLContext ctx) {
         }
 
         public void configure (HttpsParameters params) {
-            params.setSSLParameters (getSSLContext().getSupportedSSLParameters());
+            SSLParameters p = getSSLContext().getDefaultSSLParameters();
+            //p.setProtocols(new String[]{"TLSv1.2"});
+            params.setSSLParameters (p);
         }
     }
 
+    static final Path CWD = Paths.get(".");
+
     static Path getTempFile(int size) throws IOException {
-        File f = File.createTempFile("test", "txt");
+        File f = Files.createTempFile(CWD, "test", "txt").toFile();
         f.deleteOnExit();
         byte[] buf = new byte[2048];
         for (int i = 0; i < buf.length; i++)
@@ -901,12 +913,12 @@ static Path getTempFile(int size) throws IOException {
 // Then send 4 requests in parallel x 100 times (same four addresses used all time)
 
 class KeepAliveHandler implements HttpHandler {
-    AtomicInteger counter = new AtomicInteger(0);
-    AtomicInteger nparallel = new AtomicInteger(0);
+    final AtomicInteger counter = new AtomicInteger(0);
+    final AtomicInteger nparallel = new AtomicInteger(0);
 
-    HashSet<Integer> portSet = new HashSet<>();
+    final Set<Integer> portSet = Collections.synchronizedSet(new HashSet<>());
 
-    int[] ports = new int[8];
+    final int[] ports = new int[8];
 
     void sleep(int n) {
         try {
@@ -929,7 +941,9 @@ synchronized void getPorts(int[] dest, int from) {
         dest[3] = ports[from+3];
     }
 
-    static CountDownLatch latch = new CountDownLatch(4);
+    static final CountDownLatch latch = new CountDownLatch(4);
+    static final CountDownLatch latch7 = new CountDownLatch(4);
+    static final CountDownLatch latch8 = new CountDownLatch(1);
 
     @Override
     public void handle (HttpExchange t)
@@ -962,8 +976,11 @@ public void handle (HttpExchange t)
             setPort(n, remotePort);
             latch.countDown();
             try {latch.await();} catch (InterruptedException e) {}
+            latch7.countDown();
         }
         if (n == 7) {
+            // wait until all n <= 7 have called setPort(...)
+            try {latch7.await();} catch (InterruptedException e) {}
             getPorts(lports, 4);
             // should be all different
             if (lports[0] == lports[1] || lports[2] == lports[3]
@@ -976,15 +993,19 @@ public void handle (HttpExchange t)
                 portSet.add(lports[i]);
             }
             System.out.printf("Ports: %d, %d, %d, %d\n", lports[0], lports[1], lports[2], lports[3]);
+            latch8.countDown();
         }
         // Third test
         if (n > 7) {
+            // wait until all n == 7 has updated portSet
+            try {latch8.await();} catch (InterruptedException e) {}
             if (np > 4) {
                 System.err.println("XXX np = " + np);
             }
             // just check that port is one of the ones in portSet
             if (!portSet.contains(remotePort)) {
-                System.out.println ("UNEXPECTED REMOTE PORT " + remotePort);
+                System.out.println ("UNEXPECTED REMOTE PORT "
+                        + remotePort + " not in " + portSet);
                 result = "Error " + Integer.toString(n);
                 System.out.println(result);
             }
diff --git a/test/jdk/java/net/httpclient/SplitResponse.java b/test/jdk/java/net/httpclient/SplitResponse.java
index c2434f57e61..de357e990ec 100644
--- a/test/jdk/java/net/httpclient/SplitResponse.java
+++ b/test/jdk/java/net/httpclient/SplitResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,19 +22,21 @@
  */
 
 import java.io.IOException;
+import java.net.SocketException;
 import java.net.URI;
 import java.util.concurrent.CompletableFuture;
 import javax.net.ssl.SSLContext;
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLServerSocketFactory;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpClient.Version;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import jdk.testlibrary.SimpleSSLContext;
 import static java.lang.System.out;
 import static java.lang.String.format;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+import static java.net.http.HttpResponse.BodyHandlers.ofString;
 
 /**
  * @test
@@ -60,7 +62,9 @@ static String response(String body, boolean serverKeepalive) {
         if (!serverKeepalive)
             sb.append("Connection: Close\r\n");
 
-        sb.append("Content-length: ").append(body.length()).append("\r\n");
+        sb.append("Content-length: ")
+                .append(body.getBytes(ISO_8859_1).length)
+                .append("\r\n");
         sb.append("\r\n");
         sb.append(body);
         return sb.toString();
@@ -146,7 +150,7 @@ void test(Version version, boolean serverKeepalive, boolean async)
         //                        .newBuilder(uri2).version(version).build();
         //                    while (true) {
         //                        try {
-        //                            client.send(request, HttpResponse.BodyHandler.asString());
+        //                            client.send(request, HttpResponse.BodyHandlers.ofString());
         //                        } catch (IOException ex) {
         //                            System.out.println("Client rejected " + request);
         //                        }
@@ -173,18 +177,20 @@ void test(Version version, boolean serverKeepalive, boolean async)
 
                 if (async) {
                     out.println("send async: " + request);
-                    cf1 = client.sendAsync(request, asString());
+                    cf1 = client.sendAsync(request, ofString());
                     r = cf1.get();
                 } else { // sync
                     out.println("send sync: " + request);
-                    r = client.send(request, asString());
+                    r = client.send(request, ofString());
                 }
 
+                out.println("response " + r);
+                String rxbody = r.body();
+                out.println("response body:[" + rxbody + "]");
+
                 if (r.statusCode() != 200)
-                    throw new RuntimeException("Failed");
+                    throw new RuntimeException("Expected 200, got:" + r.statusCode());
 
-                String rxbody = r.body();
-                out.println("received " + rxbody);
                 if (!rxbody.equals(body))
                     throw new RuntimeException(format("Expected:%s, got:%s", body, rxbody));
 
@@ -203,21 +209,37 @@ void test(Version version, boolean serverKeepalive, boolean async)
     // Sends the response, mostly, one byte at a time with a small delay
     // between bytes, to encourage that each byte is read in a separate read
     Thread sendSplitResponse(String s, MockServer server) {
-        System.out.println("Sending: ");
+        System.out.println("Server: creating new thread to send ... ");
         Thread t = new Thread(() -> {
-            System.out.println("Waiting for server to receive headers");
+            System.out.println("Server: waiting for server to receive headers");
             conn = server.activity();
-            System.out.println("Start sending response");
+            System.out.println("Server: Start sending response");
 
             try {
                 int len = s.length();
-                out.println("sending " + s);
+                out.println("Server: going to send [" + s + "]");
                 for (int i = 0; i < len; i++) {
                     String onechar = s.substring(i, i + 1);
-                    conn.send(onechar);
+                    try {
+                        conn.send(onechar);
+                    } catch(SocketException x) {
+                        if (!useSSL || i != len - 1) throw x;
+                        if (x.getMessage().contains("closed by remote host")) {
+                            String osname = System.getProperty("os.name", "unknown");
+                            // On Solaris we can receive an exception when
+                            // the client closes the connection after receiving
+                            // the last expected char.
+                            if (osname.contains("SunO")) {
+                                System.out.println(osname + " detected");
+                                System.out.println("WARNING: ignoring " + x);
+                                System.err.println(osname + " detected");
+                                System.err.println("WARNING: ignoring " + x);
+                            }
+                        }
+                    }
                     Thread.sleep(10);
                 }
-                out.println("sent " + s);
+                out.println("Server: sent [" + s + "]");
             } catch (IOException | InterruptedException e) {
                 throw new RuntimeException(e);
             }
diff --git a/test/jdk/java/net/httpclient/SplitResponseSSL.java b/test/jdk/java/net/httpclient/SplitResponseSSL.java
index 3b0ebc151f8..b8a1a570266 100644
--- a/test/jdk/java/net/httpclient/SplitResponseSSL.java
+++ b/test/jdk/java/net/httpclient/SplitResponseSSL.java
@@ -27,7 +27,10 @@
  * @library /lib/testlibrary
  * @build jdk.testlibrary.SimpleSSLContext
  * @build MockServer SplitResponse
- * @run main/othervm -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=all SplitResponseSSL SSL
+ * @run main/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.httpclient.HttpClient.log=all
+ *      SplitResponseSSL SSL
  */
 public class SplitResponseSSL {
     public static void main(String[] args) throws Exception {
diff --git a/test/jdk/java/net/httpclient/StreamingBody.java b/test/jdk/java/net/httpclient/StreamingBody.java
new file mode 100644
index 00000000000..29c84303a6e
--- /dev/null
+++ b/test/jdk/java/net/httpclient/StreamingBody.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Exercise a streaming subscriber ( InputStream ) without holding a
+ *          strong (or any ) reference to the client.
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ *          java.logging
+ *          jdk.httpserver
+ * @library /lib/testlibrary /test/lib http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm
+ *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
+ *       StreamingBody
+ */
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import javax.net.ssl.SSLContext;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static org.testng.Assert.assertEquals;
+
+public class StreamingBody implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;       // HTTPS/1.1
+    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    String httpURI;
+    String httpsURI;
+    String http2URI;
+    String https2URI;
+
+    static final String MESSAGE = "StreamingBody message body";
+    static final int ITERATIONS = 100;
+
+    @DataProvider(name = "positive")
+    public Object[][] positive() {
+        return new Object[][] {
+                { httpURI,    },
+                { httpsURI,   },
+                { http2URI,   },
+                { https2URI,  },
+        };
+    }
+
+    @Test(dataProvider = "positive")
+    void test(String uriString) throws Exception {
+        out.printf("%n---- starting (%s) ----%n", uriString);
+        URI uri = URI.create(uriString);
+        HttpRequest request = HttpRequest.newBuilder(uri).build();
+
+        for (int i=0; i< ITERATIONS; i++) {
+            out.println("iteration: " + i);
+            HttpResponse<InputStream> response = HttpClient.newBuilder()
+                    .sslContext(sslContext)
+                    .proxy(NO_PROXY)
+                    .build()
+                    .sendAsync(request, BodyHandlers.ofInputStream())
+                    .join();
+
+            String body = new String(response.body().readAllBytes(), UTF_8);
+            out.println("Got response: " + response);
+            out.println("Got body Path: " + body);
+
+            assertEquals(response.statusCode(), 200);
+            assertEquals(body, MESSAGE);
+        }
+    }
+
+
+    // -- Infrastructure
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(new MessageHandler(), "/http1/streamingbody/");
+        httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/streamingbody/w";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(new MessageHandler(),"/https1/streamingbody/");
+        httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/streamingbody/x";
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(new MessageHandler(), "/http2/streamingbody/");
+        http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/streamingbody/y";
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(new MessageHandler(), "/https2/streamingbody/");
+        https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/streamingbody/z";
+
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        httpTestServer.stop();
+        httpsTestServer.stop();
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    static class MessageHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            System.out.println("MessageHandler for: " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                is.readAllBytes();
+                byte[] bytes = MESSAGE.getBytes(UTF_8);
+                t.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/SubscriberPublisherAPIExceptions.java b/test/jdk/java/net/httpclient/SubscriberPublisherAPIExceptions.java
index 69463ad6ee7..62027095810 100644
--- a/test/jdk/java/net/httpclient/SubscriberPublisherAPIExceptions.java
+++ b/test/jdk/java/net/httpclient/SubscriberPublisherAPIExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -30,15 +30,21 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Flow;
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpRequest.BodyPublisher;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.ResponseInfo;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.util.function.Function;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE;
 import static java.nio.file.StandardOpenOption.WRITE;
+import static java.nio.file.StandardOpenOption.READ;
 import static org.testng.Assert.assertThrows;
 
 /*
@@ -56,20 +62,20 @@ public class SubscriberPublisherAPIExceptions {
 
     @Test
     public void publisherAPIExceptions() {
-        assertThrows(NPE, () -> BodyPublisher.fromByteArray(null));
-        assertThrows(NPE, () -> BodyPublisher.fromByteArray(null, 0, 1));
-        assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100],    0, 101));
-        assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100],    1, 100));
-        assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100],   -1,  10));
-        assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100],   99,   2));
-        assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[1],   -100,   1));
-        assertThrows(NPE, () -> BodyPublisher.fromByteArrays(null));
-        assertThrows(NPE, () -> BodyPublisher.fromFile(null));
-        assertThrows(NPE, () -> BodyPublisher.fromInputStream(null));
-        assertThrows(NPE, () -> BodyPublisher.fromString(null));
-        assertThrows(NPE, () -> BodyPublisher.fromString("A", null));
-        assertThrows(NPE, () -> BodyPublisher.fromString(null, UTF_8));
-        assertThrows(NPE, () -> BodyPublisher.fromString(null, null));
+        assertThrows(NPE, () -> BodyPublishers.ofByteArray(null));
+        assertThrows(NPE, () -> BodyPublishers.ofByteArray(null, 0, 1));
+        assertThrows(IOB, () -> BodyPublishers.ofByteArray(new byte[100],    0, 101));
+        assertThrows(IOB, () -> BodyPublishers.ofByteArray(new byte[100],    1, 100));
+        assertThrows(IOB, () -> BodyPublishers.ofByteArray(new byte[100],   -1,  10));
+        assertThrows(IOB, () -> BodyPublishers.ofByteArray(new byte[100],   99,   2));
+        assertThrows(IOB, () -> BodyPublishers.ofByteArray(new byte[1],   -100,   1));
+        assertThrows(NPE, () -> BodyPublishers.ofByteArray(null));
+        assertThrows(NPE, () -> BodyPublishers.ofFile(null));
+        assertThrows(NPE, () -> BodyPublishers.ofInputStream(null));
+        assertThrows(NPE, () -> BodyPublishers.ofString(null));
+        assertThrows(NPE, () -> BodyPublishers.ofString("A", null));
+        assertThrows(NPE, () -> BodyPublishers.ofString(null, UTF_8));
+        assertThrows(NPE, () -> BodyPublishers.ofString(null, null));
     }
 
     @DataProvider(name = "nonExistentFiles")
@@ -87,53 +93,74 @@ public Object[][] nonExistentFiles() {
 
     @Test(dataProvider = "nonExistentFiles", expectedExceptions = FileNotFoundException.class)
     public void fromFileCheck(Path path) throws Exception {
-        BodyPublisher.fromFile(path);
+        BodyPublishers.ofFile(path);
     }
 
     @Test
-    public void handlerAPIExceptions() {
+    public void handlerAPIExceptions() throws Exception {
         Path path = Paths.get(".").resolve("tt");
-        assertThrows(NPE, () -> BodyHandler.asByteArrayConsumer(null));
-        assertThrows(NPE, () -> BodyHandler.asFile(null));
-        assertThrows(NPE, () -> BodyHandler.asFile(null, CREATE, WRITE));
-        assertThrows(NPE, () -> BodyHandler.asFile(path, (OpenOption[])null));
-        assertThrows(NPE, () -> BodyHandler.asFile(path, new OpenOption[] {null}));
-        assertThrows(NPE, () -> BodyHandler.asFile(path, new OpenOption[] {CREATE, null}));
-        assertThrows(NPE, () -> BodyHandler.asFile(path, new OpenOption[] {null, CREATE}));
-        assertThrows(NPE, () -> BodyHandler.asFile(null, (OpenOption[])null));
-        assertThrows(NPE, () -> BodyHandler.asFileDownload(null, CREATE, WRITE));
-        assertThrows(NPE, () -> BodyHandler.asFileDownload(path, (OpenOption[])null));
-        assertThrows(NPE, () -> BodyHandler.asFileDownload(path, new OpenOption[] {null}));
-        assertThrows(NPE, () -> BodyHandler.asFileDownload(path, new OpenOption[] {CREATE, null}));
-        assertThrows(NPE, () -> BodyHandler.asFileDownload(path, new OpenOption[] {null, CREATE}));
-        assertThrows(NPE, () -> BodyHandler.asFileDownload(null, (OpenOption[])null));
-        assertThrows(NPE, () -> BodyHandler.asString(null));
-        assertThrows(NPE, () -> BodyHandler.buffering(null, 1));
-        assertThrows(IAE, () -> BodyHandler.buffering(new NoOpHandler(), 0));
-        assertThrows(IAE, () -> BodyHandler.buffering(new NoOpHandler(), -1));
-        assertThrows(IAE, () -> BodyHandler.buffering(new NoOpHandler(), Integer.MIN_VALUE));
+        Path file = Files.createFile(Paths.get(".").resolve("aFile"));
+        Path doesNotExist = Paths.get(".").resolve("doneNotExist");
+        if (Files.exists(doesNotExist))
+            throw new AssertionError("Unexpected " + doesNotExist);
+
+        assertThrows(NPE, () -> BodyHandlers.ofByteArrayConsumer(null));
+        assertThrows(NPE, () -> BodyHandlers.ofFile(null));
+        assertThrows(NPE, () -> BodyHandlers.ofFile(null, CREATE, WRITE));
+        assertThrows(NPE, () -> BodyHandlers.ofFile(path, (OpenOption[])null));
+        assertThrows(NPE, () -> BodyHandlers.ofFile(path, new OpenOption[] {null}));
+        assertThrows(NPE, () -> BodyHandlers.ofFile(path, new OpenOption[] {CREATE, null}));
+        assertThrows(NPE, () -> BodyHandlers.ofFile(path, new OpenOption[] {null, CREATE}));
+        assertThrows(NPE, () -> BodyHandlers.ofFile(null, (OpenOption[])null));
+        assertThrows(NPE, () -> BodyHandlers.ofFileDownload(null, CREATE, WRITE));
+        assertThrows(NPE, () -> BodyHandlers.ofFileDownload(path, (OpenOption[])null));
+        assertThrows(NPE, () -> BodyHandlers.ofFileDownload(path, new OpenOption[] {null}));
+        assertThrows(NPE, () -> BodyHandlers.ofFileDownload(path, new OpenOption[] {CREATE, null}));
+        assertThrows(NPE, () -> BodyHandlers.ofFileDownload(path, new OpenOption[] {null, CREATE}));
+        assertThrows(NPE, () -> BodyHandlers.ofFileDownload(null, (OpenOption[])null));
+        assertThrows(IAE, () -> BodyHandlers.ofFileDownload(file, CREATE, WRITE));
+        assertThrows(IAE, () -> BodyHandlers.ofFileDownload(doesNotExist, CREATE, WRITE));
+        assertThrows(NPE, () -> BodyHandlers.ofString(null));
+        assertThrows(NPE, () -> BodyHandlers.buffering(null, 1));
+        assertThrows(IAE, () -> BodyHandlers.buffering(new NoOpHandler(), 0));
+        assertThrows(IAE, () -> BodyHandlers.buffering(new NoOpHandler(), -1));
+        assertThrows(IAE, () -> BodyHandlers.buffering(new NoOpHandler(), Integer.MIN_VALUE));
+
+        // implementation specific exceptions
+        assertThrows(IAE, () -> BodyHandlers.ofFile(path, READ));
+        assertThrows(IAE, () -> BodyHandlers.ofFile(path, DELETE_ON_CLOSE));
+        assertThrows(IAE, () -> BodyHandlers.ofFile(path, READ, DELETE_ON_CLOSE));
+        assertThrows(IAE, () -> BodyHandlers.ofFileDownload(path, DELETE_ON_CLOSE));
     }
 
     @Test
     public void subscriberAPIExceptions() {
         Path path = Paths.get(".").resolve("tt");
-        assertThrows(NPE, () -> BodySubscriber.asByteArrayConsumer(null));
-        assertThrows(NPE, () -> BodySubscriber.asFile(null));
-        assertThrows(NPE, () -> BodySubscriber.asFile(null, CREATE, WRITE));
-        assertThrows(NPE, () -> BodySubscriber.asFile(path, (OpenOption[])null));
-        assertThrows(NPE, () -> BodySubscriber.asFile(path, new OpenOption[] {null}));
-        assertThrows(NPE, () -> BodySubscriber.asFile(path, new OpenOption[] {CREATE, null}));
-        assertThrows(NPE, () -> BodySubscriber.asFile(path, new OpenOption[] {null, CREATE}));
-        assertThrows(NPE, () -> BodySubscriber.asFile(null, (OpenOption[])null));
-        assertThrows(NPE, () -> BodySubscriber.asString(null));
-        assertThrows(NPE, () -> BodySubscriber.buffering(null, 1));
-        assertThrows(IAE, () -> BodySubscriber.buffering(new NoOpSubscriber(), 0));
-        assertThrows(IAE, () -> BodySubscriber.buffering(new NoOpSubscriber(), -1));
-        assertThrows(IAE, () -> BodySubscriber.buffering(new NoOpSubscriber(), Integer.MIN_VALUE));
+        assertThrows(NPE, () -> BodySubscribers.ofByteArrayConsumer(null));
+        assertThrows(NPE, () -> BodySubscribers.ofFile(null));
+        assertThrows(NPE, () -> BodySubscribers.ofFile(null, CREATE, WRITE));
+        assertThrows(NPE, () -> BodySubscribers.ofFile(path, (OpenOption[])null));
+        assertThrows(NPE, () -> BodySubscribers.ofFile(path, new OpenOption[] {null}));
+        assertThrows(NPE, () -> BodySubscribers.ofFile(path, new OpenOption[] {CREATE, null}));
+        assertThrows(NPE, () -> BodySubscribers.ofFile(path, new OpenOption[] {null, CREATE}));
+        assertThrows(NPE, () -> BodySubscribers.ofFile(null, (OpenOption[])null));
+        assertThrows(NPE, () -> BodySubscribers.ofString(null));
+        assertThrows(NPE, () -> BodySubscribers.buffering(null, 1));
+        assertThrows(IAE, () -> BodySubscribers.buffering(new NoOpSubscriber(), 0));
+        assertThrows(IAE, () -> BodySubscribers.buffering(new NoOpSubscriber(), -1));
+        assertThrows(IAE, () -> BodySubscribers.buffering(new NoOpSubscriber(), Integer.MIN_VALUE));
+        assertThrows(NPE, () -> BodySubscribers.mapping(null, Function.identity()));
+        assertThrows(NPE, () -> BodySubscribers.mapping(BodySubscribers.ofByteArray(), null));
+        assertThrows(NPE, () -> BodySubscribers.mapping(null, null));
+
+        // implementation specific exceptions
+        assertThrows(IAE, () -> BodySubscribers.ofFile(path, READ));
+        assertThrows(IAE, () -> BodySubscribers.ofFile(path, DELETE_ON_CLOSE));
+        assertThrows(IAE, () -> BodySubscribers.ofFile(path, READ, DELETE_ON_CLOSE));
     }
 
     static class NoOpHandler implements BodyHandler<Void> {
-        @Override public BodySubscriber<Void> apply(int code, HttpHeaders hrds) { return null; }
+        @Override public BodySubscriber<Void> apply(ResponseInfo rinfo) { return null; }
     }
 
     static class NoOpSubscriber implements BodySubscriber<Void> {
diff --git a/test/jdk/java/net/httpclient/TEST.properties b/test/jdk/java/net/httpclient/TEST.properties
index 5da3b5ef3f3..132f8f4012c 100644
--- a/test/jdk/java/net/httpclient/TEST.properties
+++ b/test/jdk/java/net/httpclient/TEST.properties
@@ -1 +1 @@
-modules = jdk.incubator.httpclient
+modules = java.net.http
diff --git a/test/jdk/java/net/httpclient/TestKit.java b/test/jdk/java/net/httpclient/TestKit.java
index c68d4bcdc36..4d37f1201bd 100644
--- a/test/jdk/java/net/httpclient/TestKit.java
+++ b/test/jdk/java/net/httpclient/TestKit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
diff --git a/test/jdk/java/net/httpclient/TestKitTest.java b/test/jdk/java/net/httpclient/TestKitTest.java
index 2fd084cd3a3..25f39d90305 100644
--- a/test/jdk/java/net/httpclient/TestKitTest.java
+++ b/test/jdk/java/net/httpclient/TestKitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishers.java b/test/jdk/java/net/httpclient/ThrowingPublishers.java
new file mode 100644
index 00000000000..f61611df350
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ThrowingPublishers.java
@@ -0,0 +1,685 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Tests what happens when request publishers
+ *          throw unexpected exceptions.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ *        ReferenceTracker ThrowingPublishers
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ *                     -Djdk.httpclient.enableAllMethodRetry=true
+ *                     ThrowingPublishers
+ */
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublisher;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.SubmissionPublisher;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.BiPredicate;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.String.format;
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class ThrowingPublishers implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;   // HTTPS/1.1
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI_fixed;
+    String httpURI_chunk;
+    String httpsURI_fixed;
+    String httpsURI_chunk;
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    static final int ITERATION_COUNT = 1;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+    static volatile boolean tasksFailed;
+    static final AtomicLong serverCount = new AtomicLong();
+    static final AtomicLong clientCount = new AtomicLong();
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private volatile HttpClient sharedClient;
+
+    static class TestExecutor implements Executor {
+        final AtomicLong tasks = new AtomicLong();
+        Executor executor;
+        TestExecutor(Executor executor) {
+            this.executor = executor;
+        }
+
+        @Override
+        public void execute(Runnable command) {
+            long id = tasks.incrementAndGet();
+            executor.execute(() -> {
+                try {
+                    command.run();
+                } catch (Throwable t) {
+                    tasksFailed = true;
+                    System.out.printf(now() + "Task %s failed: %s%n", id, t);
+                    System.err.printf(now() + "Task %s failed: %s%n", id, t);
+                    FAILURES.putIfAbsent("Task " + id, t);
+                    throw t;
+                }
+            });
+        }
+    }
+
+    @AfterClass
+    static final void printFailedTests() {
+        out.println("\n=========================");
+        try {
+            out.printf("%n%sCreated %d servers and %d clients%n",
+                    now(), serverCount.get(), clientCount.get());
+            if (FAILURES.isEmpty()) return;
+            out.println("Failed tests: ");
+            FAILURES.entrySet().forEach((e) -> {
+                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+                e.getValue().printStackTrace(out);
+            });
+            if (tasksFailed) {
+                System.out.println("WARNING: Some tasks failed");
+            }
+        } finally {
+            out.println("\n=========================\n");
+        }
+    }
+
+    private String[] uris() {
+        return new String[] {
+                httpURI_fixed,
+                httpURI_chunk,
+                httpsURI_fixed,
+                httpsURI_chunk,
+                http2URI_fixed,
+                http2URI_chunk,
+                https2URI_fixed,
+                https2URI_chunk,
+        };
+    }
+
+    @DataProvider(name = "noThrows")
+    public Object[][] noThrows() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2][];
+        //Object[][] result = new Object[uris.length][];
+        int i = 0;
+        for (boolean sameClient : List.of(false, true)) {
+            //if (!sameClient) continue;
+            for (String uri: uris()) {
+                result[i++] = new Object[] {uri + "/noThrows", sameClient};
+            }
+        }
+        assert i == uris.length * 2;
+        // assert i == uris.length ;
+        return result;
+    }
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2 * 2][];
+        //Object[][] result = new Object[(uris.length/2) * 2 * 2][];
+        int i = 0;
+        for (Thrower thrower : List.of(
+                new UncheckedIOExceptionThrower(),
+                new UncheckedCustomExceptionThrower())) {
+            for (boolean sameClient : List.of(false, true)) {
+                for (String uri : uris()) {
+                    // if (uri.contains("http2") || uri.contains("https2")) continue;
+                    // if (!sameClient) continue;
+                    result[i++] = new Object[]{uri, sameClient, thrower};
+                }
+            }
+        }
+        assert i == uris.length * 2 * 2;
+        //assert Stream.of(result).filter(o -> o != null).count() == result.length;
+        return result;
+    }
+
+    private HttpClient makeNewClient() {
+        clientCount.incrementAndGet();
+        return TRACKER.track(HttpClient.newBuilder()
+                .proxy(HttpClient.Builder.NO_PROXY)
+                .executor(executor)
+                .sslContext(sslContext)
+                .build());
+    }
+
+    HttpClient newHttpClient(boolean share) {
+        if (!share) return makeNewClient();
+        HttpClient shared = sharedClient;
+        if (shared != null) return shared;
+        synchronized (this) {
+            shared = sharedClient;
+            if (shared == null) {
+                shared = sharedClient = makeNewClient();
+            }
+            return shared;
+        }
+    }
+
+    final String BODY = "Some string | that ? can | be split ? several | ways.";
+
+    @Test(dataProvider = "noThrows")
+    public void testNoThrows(String uri, boolean sameClient)
+            throws Exception {
+        HttpClient client = null;
+        out.printf("%n%s testNoThrows(%s, %b)%n", now(), uri, sameClient);
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            SubmissionPublisher<ByteBuffer> publisher
+                    = new SubmissionPublisher<>(executor,10);
+            ThrowingBodyPublisher bodyPublisher = new ThrowingBodyPublisher((w) -> {},
+                    BodyPublishers.fromPublisher(publisher));
+            CompletableFuture<Void> subscribedCF = bodyPublisher.subscribedCF();
+            subscribedCF.whenComplete((r,t) -> System.out.println(now() + " subscribe completed " + t))
+                    .thenAcceptAsync((v) -> {
+                                Stream.of(BODY.split("\\|"))
+                                        .forEachOrdered(s -> {
+                                                System.out.println("submitting \"" + s +"\"");
+                                                publisher.submit(ByteBuffer.wrap(s.getBytes(StandardCharsets.UTF_8)));
+                                        });
+                                System.out.println("publishing done");
+                                publisher.close();
+                            },
+                    executor);
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .POST(bodyPublisher)
+                    .build();
+            BodyHandler<String> handler = BodyHandlers.ofString();
+            CompletableFuture<HttpResponse<String>> response = client.sendAsync(req, handler);
+
+            String body = response.join().body();
+            assertEquals(body, Stream.of(BODY.split("\\|")).collect(Collectors.joining()));
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsString(String uri,
+                                     boolean sameClient,
+                                     Thrower thrower)
+            throws Exception
+    {
+        String test = format("testThrowingAsString(%s, %b, %s)",
+                             uri, sameClient, thrower);
+        List<byte[]> bytes = Stream.of(BODY.split("|"))
+                .map(s -> s.getBytes(UTF_8))
+                .collect(Collectors.toList());
+        testThrowing(test, uri, sameClient, () -> BodyPublishers.ofByteArrays(bytes),
+                this::shouldNotThrowInCancel, thrower,false);
+    }
+
+    private <T,U> void testThrowing(String name, String uri, boolean sameClient,
+                                    Supplier<BodyPublisher> publishers,
+                                    Finisher finisher, Thrower thrower, boolean async)
+            throws Exception
+    {
+        out.printf("%n%s%s%n", now(), name);
+        try {
+            testThrowing(uri, sameClient, publishers, finisher, thrower, async);
+        } catch (Error | Exception x) {
+            FAILURES.putIfAbsent(name, x);
+            throw x;
+        }
+    }
+
+    private void testThrowing(String uri, boolean sameClient,
+                                    Supplier<BodyPublisher> publishers,
+                                    Finisher finisher, Thrower thrower,
+                                    boolean async)
+            throws Exception
+    {
+        HttpClient client = null;
+        for (Where where : whereValues()) {
+            //if (where == Where.ON_SUBSCRIBE) continue;
+            //if (where == Where.ON_ERROR) continue;
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            ThrowingBodyPublisher bodyPublisher =
+                    new ThrowingBodyPublisher(where.select(thrower), publishers.get());
+            HttpRequest req = HttpRequest.
+                    newBuilder(URI.create(uri))
+                    .header("X-expect-exception", "true")
+                    .POST(bodyPublisher)
+                    .build();
+            BodyHandler<String> handler = BodyHandlers.ofString();
+            System.out.println("try throwing in " + where);
+            HttpResponse<String> response = null;
+            if (async) {
+                try {
+                    response = client.sendAsync(req, handler).join();
+                } catch (Error | Exception x) {
+                    Throwable cause = findCause(where, x, thrower);
+                    if (cause == null) throw causeNotFound(where, x);
+                    System.out.println(now() + "Got expected exception: " + cause);
+                }
+            } else {
+                try {
+                    response = client.send(req, handler);
+                } catch (Error | Exception t) {
+                    if (thrower.test(where, t)) {
+                        System.out.println(now() + "Got expected exception: " + t);
+                    } else throw causeNotFound(where, t);
+                }
+            }
+            if (response != null) {
+                finisher.finish(where, response, thrower);
+            }
+        }
+    }
+
+    enum Where {
+        BEFORE_SUBSCRIBE, BEFORE_REQUEST, BEFORE_NEXT_REQUEST, BEFORE_CANCEL,
+        AFTER_SUBSCRIBE, AFTER_REQUEST, AFTER_NEXT_REQUEST, AFTER_CANCEL;
+        public Consumer<Where> select(Consumer<Where> consumer) {
+            return new Consumer<Where>() {
+                @Override
+                public void accept(Where where) {
+                    if (Where.this == where) {
+                        consumer.accept(where);
+                    }
+                }
+            };
+        }
+    }
+
+    // can be used to reduce the surface of the test when diagnosing
+    // some failure
+    Set<Where> whereValues() {
+        //return EnumSet.of(Where.BEFORE_CANCEL, Where.AFTER_CANCEL);
+        return EnumSet.allOf(Where.class);
+    }
+
+    interface Thrower extends Consumer<Where>, BiPredicate<Where,Throwable> {
+
+    }
+
+    interface Finisher<T,U> {
+        U finish(Where w, HttpResponse<T> resp, Thrower thrower) throws IOException;
+    }
+
+    final <T,U> U shouldNotThrowInCancel(Where w, HttpResponse<T> resp, Thrower thrower) {
+        switch (w) {
+            case BEFORE_CANCEL: return null;
+            case AFTER_CANCEL: return null;
+            default: break;
+        }
+        return shouldHaveThrown(w, resp, thrower);
+    }
+
+
+    final <T,U> U shouldHaveThrown(Where w, HttpResponse<T> resp, Thrower thrower) {
+        String msg = "Expected exception not thrown in " + w
+                + "\n\tReceived: " + resp
+                + "\n\tWith body: " + resp.body();
+        System.out.println(msg);
+        throw new RuntimeException(msg);
+    }
+
+
+    private static Throwable findCause(Where w,
+                                       Throwable x,
+                                       BiPredicate<Where, Throwable> filter) {
+        while (x != null && !filter.test(w,x)) x = x.getCause();
+        return x;
+    }
+
+    static AssertionError causeNotFound(Where w, Throwable t) {
+        return new AssertionError("Expected exception not found in " + w, t);
+    }
+
+    static boolean isConnectionClosedLocally(Throwable t) {
+        if (t instanceof CompletionException) t = t.getCause();
+        if (t instanceof ExecutionException) t = t.getCause();
+        if (t instanceof IOException) {
+            String msg = t.getMessage();
+            return msg == null ? false
+                    : msg.contains("connection closed locally");
+        }
+        return false;
+    }
+
+    static final class UncheckedCustomExceptionThrower implements Thrower {
+        @Override
+        public void accept(Where where) {
+            out.println(now() + "Throwing in " + where);
+            throw new UncheckedCustomException(where.name());
+        }
+
+        @Override
+        public boolean test(Where w, Throwable throwable) {
+            switch (w) {
+                case AFTER_REQUEST:
+                case BEFORE_NEXT_REQUEST:
+                case AFTER_NEXT_REQUEST:
+                    if (isConnectionClosedLocally(throwable)) return true;
+                    break;
+                default:
+                    break;
+            }
+            return UncheckedCustomException.class.isInstance(throwable);
+        }
+
+        @Override
+        public String toString() {
+            return "UncheckedCustomExceptionThrower";
+        }
+    }
+
+    static final class UncheckedIOExceptionThrower implements Thrower {
+        @Override
+        public void accept(Where where) {
+            out.println(now() + "Throwing in " + where);
+            throw new UncheckedIOException(new CustomIOException(where.name()));
+        }
+
+        @Override
+        public boolean test(Where w, Throwable throwable) {
+            switch (w) {
+                case AFTER_REQUEST:
+                case BEFORE_NEXT_REQUEST:
+                case AFTER_NEXT_REQUEST:
+                    if (isConnectionClosedLocally(throwable)) return true;
+                    break;
+                default:
+                    break;
+            }
+            return UncheckedIOException.class.isInstance(throwable)
+                    && CustomIOException.class.isInstance(throwable.getCause());
+        }
+
+        @Override
+        public String toString() {
+            return "UncheckedIOExceptionThrower";
+        }
+    }
+
+    static final class UncheckedCustomException extends RuntimeException {
+        UncheckedCustomException(String message) {
+            super(message);
+        }
+        UncheckedCustomException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    static final class CustomIOException extends IOException {
+        CustomIOException(String message) {
+            super(message);
+        }
+        CustomIOException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+
+    static final class ThrowingBodyPublisher implements BodyPublisher {
+        private final BodyPublisher publisher;
+        private final CompletableFuture<Void> subscribedCF = new CompletableFuture<>();
+        final Consumer<Where> throwing;
+        ThrowingBodyPublisher(Consumer<Where> throwing, BodyPublisher publisher) {
+            this.throwing = throwing;
+            this.publisher = publisher;
+        }
+
+        @Override
+        public long contentLength() {
+            return publisher.contentLength();
+        }
+
+        @Override
+        public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
+            try {
+                throwing.accept(Where.BEFORE_SUBSCRIBE);
+                publisher.subscribe(new SubscriberWrapper(subscriber));
+                subscribedCF.complete(null);
+                throwing.accept(Where.AFTER_SUBSCRIBE);
+            } catch (Throwable t) {
+                subscribedCF.completeExceptionally(t);
+                throw t;
+            }
+        }
+
+        CompletableFuture<Void> subscribedCF() {
+            return subscribedCF;
+        }
+
+        class SubscriptionWrapper implements Flow.Subscription {
+            final Flow.Subscription subscription;
+            final AtomicLong requestCount = new AtomicLong();
+            SubscriptionWrapper(Flow.Subscription subscription) {
+                this.subscription = subscription;
+            }
+            @Override
+            public void request(long n) {
+                long count = requestCount.incrementAndGet();
+                System.out.printf("%s request-%d(%d)%n", now(), count, n);
+                if (count > 1) throwing.accept(Where.BEFORE_NEXT_REQUEST);
+                throwing.accept(Where.BEFORE_REQUEST);
+                subscription.request(n);
+                throwing.accept(Where.AFTER_REQUEST);
+                if (count > 1) throwing.accept(Where.AFTER_NEXT_REQUEST);
+            }
+
+            @Override
+            public void cancel() {
+                throwing.accept(Where.BEFORE_CANCEL);
+                subscription.cancel();
+                throwing.accept(Where.AFTER_CANCEL);
+            }
+        }
+
+        class SubscriberWrapper implements Flow.Subscriber<ByteBuffer> {
+            final Flow.Subscriber<? super ByteBuffer> subscriber;
+            SubscriberWrapper(Flow.Subscriber<? super ByteBuffer> subscriber) {
+                this.subscriber = subscriber;
+            }
+            @Override
+            public void onSubscribe(Flow.Subscription subscription) {
+                subscriber.onSubscribe(new SubscriptionWrapper(subscription));
+            }
+            @Override
+            public void onNext(ByteBuffer item) {
+                subscriber.onNext(item);
+            }
+            @Override
+            public void onComplete() {
+                subscriber.onComplete();
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                subscriber.onError(throwable);
+            }
+        }
+    }
+
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/1.1
+        HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h1_chunkHandler = new HTTP_ChunkedHandler();
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(h1_fixedLengthHandler, "/http1/fixed");
+        httpTestServer.addHandler(h1_chunkHandler, "/http1/chunk");
+        httpURI_fixed = "http://" + httpTestServer.serverAuthority() + "/http1/fixed/x";
+        httpURI_chunk = "http://" + httpTestServer.serverAuthority() + "/http1/chunk/x";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
+        httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
+        httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed/x";
+        httpsURI_chunk = "https://" + httpsTestServer.serverAuthority() + "/https1/chunk/x";
+
+        // HTTP/2
+        HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed/x";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk/x";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/x";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk/x";
+
+        serverCount.addAndGet(4);
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        String sharedClientName =
+                sharedClient == null ? null : sharedClient.toString();
+        sharedClient = null;
+        Thread.sleep(100);
+        AssertionError fail = TRACKER.check(500);
+        try {
+            httpTestServer.stop();
+            httpsTestServer.stop();
+            http2TestServer.stop();
+            https2TestServer.stop();
+        } finally {
+            if (fail != null) {
+                if (sharedClientName != null) {
+                    System.err.println("Shared client name is: " + sharedClientName);
+                }
+                throw fail;
+            }
+        }
+    }
+
+    static class HTTP_FixedLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+            byte[] resp;
+            try (InputStream is = t.getRequestBody()) {
+                resp = is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, resp.length);  //fixed content length
+            try (OutputStream os = t.getResponseBody()) {
+                os.write(resp);
+            }
+        }
+    }
+
+    static class HTTP_ChunkedHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_ChunkedHandler received request to " + t.getRequestURI());
+            byte[] resp;
+            try (InputStream is = t.getRequestBody()) {
+                resp = is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, -1); // chunked/variable
+            try (OutputStream os = t.getResponseBody()) {
+                os.write(resp);
+            }
+        }
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromises.java b/test/jdk/java/net/httpclient/ThrowingPushPromises.java
new file mode 100644
index 00000000000..903dc16b373
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromises.java
@@ -0,0 +1,757 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Tests what happens when push promise handlers and their
+ *          response body handlers and subscribers throw unexpected exceptions.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+  *       ReferenceTracker ThrowingPushPromises
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingPushPromises
+ */
+
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.System.out;
+import static java.lang.System.err;
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class ThrowingPushPromises implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    static final int ITERATION_COUNT = 1;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+    static volatile boolean tasksFailed;
+    static final AtomicLong serverCount = new AtomicLong();
+    static final AtomicLong clientCount = new AtomicLong();
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private volatile HttpClient sharedClient;
+
+    static class TestExecutor implements Executor {
+        final AtomicLong tasks = new AtomicLong();
+        Executor executor;
+        TestExecutor(Executor executor) {
+            this.executor = executor;
+        }
+
+        @Override
+        public void execute(Runnable command) {
+            long id = tasks.incrementAndGet();
+            executor.execute(() -> {
+                try {
+                    command.run();
+                } catch (Throwable t) {
+                    tasksFailed = true;
+                    out.printf(now() + "Task %s failed: %s%n", id, t);
+                    err.printf(now() + "Task %s failed: %s%n", id, t);
+                    FAILURES.putIfAbsent("Task " + id, t);
+                    throw t;
+                }
+            });
+        }
+    }
+
+    @AfterClass
+    static final void printFailedTests() {
+        out.println("\n=========================");
+        try {
+            out.printf("%n%sCreated %d servers and %d clients%n",
+                    now(), serverCount.get(), clientCount.get());
+            if (FAILURES.isEmpty()) return;
+            out.println("Failed tests: ");
+            FAILURES.entrySet().forEach((e) -> {
+                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+                e.getValue().printStackTrace(out);
+                e.getValue().printStackTrace();
+            });
+            if (tasksFailed) {
+                out.println("WARNING: Some tasks failed");
+            }
+        } finally {
+            out.println("\n=========================\n");
+        }
+    }
+
+    private String[] uris() {
+        return new String[] {
+                http2URI_fixed,
+                http2URI_chunk,
+                https2URI_fixed,
+                https2URI_chunk,
+        };
+    }
+
+    @DataProvider(name = "noThrows")
+    public Object[][] noThrows() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2][];
+
+        int i = 0;
+        for (boolean sameClient : List.of(false, true)) {
+            for (String uri: uris()) {
+                result[i++] = new Object[] {uri, sameClient};
+            }
+        }
+        assert i == uris.length * 2;
+        return result;
+    }
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2 * 2][];
+        int i = 0;
+        for (Thrower thrower : List.of(
+                new UncheckedIOExceptionThrower(),
+                new UncheckedCustomExceptionThrower())) {
+            for (boolean sameClient : List.of(false, true)) {
+                for (String uri : uris()) {
+                    result[i++] = new Object[]{uri, sameClient, thrower};
+                }
+            }
+        }
+        assert i == uris.length * 2 * 2;
+        return result;
+    }
+
+    private HttpClient makeNewClient() {
+        clientCount.incrementAndGet();
+        return TRACKER.track(HttpClient.newBuilder()
+                .proxy(HttpClient.Builder.NO_PROXY)
+                .executor(executor)
+                .sslContext(sslContext)
+                .build());
+    }
+
+    HttpClient newHttpClient(boolean share) {
+        if (!share) return makeNewClient();
+        HttpClient shared = sharedClient;
+        if (shared != null) return shared;
+        synchronized (this) {
+            shared = sharedClient;
+            if (shared == null) {
+                shared = sharedClient = makeNewClient();
+            }
+            return shared;
+        }
+    }
+
+    @Test(dataProvider = "noThrows")
+    public void testNoThrows(String uri, boolean sameClient)
+            throws Exception {
+        HttpClient client = null;
+        out.printf("%ntestNoThrows(%s, %b)%n", uri, sameClient);
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<Stream<String>> handler =
+                    new ThrowingBodyHandler((w) -> {},
+                                            BodyHandlers.ofLines());
+            Map<HttpRequest, CompletableFuture<HttpResponse<Stream<String>>>> pushPromises =
+                    new ConcurrentHashMap<>();
+            PushPromiseHandler<Stream<String>> pushHandler = new PushPromiseHandler<>() {
+                @Override
+                public void applyPushPromise(HttpRequest initiatingRequest,
+                                             HttpRequest pushPromiseRequest,
+                                             Function<BodyHandler<Stream<String>>,
+                                                     CompletableFuture<HttpResponse<Stream<String>>>>
+                                                     acceptor) {
+                    pushPromises.putIfAbsent(pushPromiseRequest, acceptor.apply(handler));
+                }
+            };
+            HttpResponse<Stream<String>> response =
+                    client.sendAsync(req, BodyHandlers.ofLines(), pushHandler).get();
+            String body = response.body().collect(Collectors.joining("|"));
+            assertEquals(URI.create(body).getPath(), URI.create(uri).getPath());
+            for (HttpRequest promised : pushPromises.keySet()) {
+                out.printf("%s Received promise: %s%n\tresponse: %s%n",
+                        now(), promised, pushPromises.get(promised).get());
+                String promisedBody = pushPromises.get(promised).get().body()
+                        .collect(Collectors.joining("|"));
+                assertEquals(promisedBody, promised.uri().toASCIIString());
+            }
+            assertEquals(3, pushPromises.size());
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsString(String uri,
+                                     boolean sameClient,
+                                     Thrower thrower)
+            throws Exception
+    {
+        String test = format("testThrowingAsString(%s, %b, %s)",
+                             uri, sameClient, thrower);
+        testThrowing(test, uri, sameClient, BodyHandlers::ofString,
+                this::checkAsString, thrower);
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsLines(String uri,
+                                    boolean sameClient,
+                                    Thrower thrower)
+            throws Exception
+    {
+        String test =  format("testThrowingAsLines(%s, %b, %s)",
+                uri, sameClient, thrower);
+        testThrowing(test, uri, sameClient, BodyHandlers::ofLines,
+                this::checkAsLines, thrower);
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsInputStream(String uri,
+                                          boolean sameClient,
+                                          Thrower thrower)
+            throws Exception
+    {
+        String test = format("testThrowingAsInputStream(%s, %b, %s)",
+                uri, sameClient, thrower);
+        testThrowing(test, uri, sameClient, BodyHandlers::ofInputStream,
+                this::checkAsInputStream,  thrower);
+    }
+
+    private <T,U> void testThrowing(String name, String uri, boolean sameClient,
+                                    Supplier<BodyHandler<T>> handlers,
+                                    Finisher finisher, Thrower thrower)
+            throws Exception
+    {
+        out.printf("%n%s%s%n", now(), name);
+        try {
+            testThrowing(uri, sameClient, handlers, finisher, thrower);
+        } catch (Error | Exception x) {
+            FAILURES.putIfAbsent(name, x);
+            throw x;
+        }
+    }
+
+    private <T,U> void testThrowing(String uri, boolean sameClient,
+                                    Supplier<BodyHandler<T>> handlers,
+                                    Finisher finisher, Thrower thrower)
+            throws Exception
+    {
+        HttpClient client = null;
+        for (Where where : Where.values()) {
+            if (where == Where.ON_ERROR) continue;
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            HttpRequest req = HttpRequest.
+                    newBuilder(URI.create(uri))
+                    .build();
+            ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<T>>> promiseMap =
+                    new ConcurrentHashMap<>();
+            Supplier<BodyHandler<T>> throwing = () ->
+                    new ThrowingBodyHandler(where.select(thrower), handlers.get());
+            PushPromiseHandler<T> pushHandler = new ThrowingPromiseHandler<>(
+                    where.select(thrower),
+                    PushPromiseHandler.of((r) -> throwing.get(), promiseMap));
+            out.println("try throwing in " + where);
+            HttpResponse<T> response = null;
+            try {
+                response = client.sendAsync(req, handlers.get(), pushHandler).join();
+            } catch (Error | Exception x) {
+                throw x;
+            }
+            if (response != null) {
+                finisher.finish(where, req.uri(), response, thrower, promiseMap);
+            }
+        }
+    }
+
+    enum Where {
+        BODY_HANDLER, ON_SUBSCRIBE, ON_NEXT, ON_COMPLETE, ON_ERROR, GET_BODY, BODY_CF,
+        BEFORE_ACCEPTING, AFTER_ACCEPTING;
+        public Consumer<Where> select(Consumer<Where> consumer) {
+            return new Consumer<Where>() {
+                @Override
+                public void accept(Where where) {
+                    if (Where.this == where) {
+                        consumer.accept(where);
+                    }
+                }
+            };
+        }
+    }
+
+    interface Thrower extends Consumer<Where>, Predicate<Throwable> {
+
+    }
+
+    interface Finisher<T,U> {
+        U finish(Where w, URI requestURI, HttpResponse<T> resp, Thrower thrower,
+                 Map<HttpRequest, CompletableFuture<HttpResponse<T>>> promises);
+    }
+
+    final <T,U> U shouldHaveThrown(Where w, HttpResponse<T> resp, Thrower thrower) {
+        String msg = "Expected exception not thrown in " + w
+                + "\n\tReceived: " + resp
+                + "\n\tWith body: " + resp.body();
+        System.out.println(msg);
+        throw new RuntimeException(msg);
+    }
+
+    final List<String> checkAsString(Where w, URI reqURI,
+                                    HttpResponse<String> resp,
+                                    Thrower thrower,
+                                    Map<HttpRequest, CompletableFuture<HttpResponse<String>>> promises) {
+        Function<HttpResponse<String>, List<String>> extractor =
+                (r) -> List.of(r.body());
+        return check(w, reqURI, resp, thrower, promises, extractor);
+    }
+
+    final List<String> checkAsLines(Where w, URI reqURI,
+                                    HttpResponse<Stream<String>> resp,
+                                    Thrower thrower,
+                                    Map<HttpRequest, CompletableFuture<HttpResponse<Stream<String>>>> promises) {
+        Function<HttpResponse<Stream<String>>, List<String>> extractor =
+                (r) -> r.body().collect(Collectors.toList());
+        return check(w, reqURI, resp, thrower, promises, extractor);
+    }
+
+    final List<String> checkAsInputStream(Where w, URI reqURI,
+                                          HttpResponse<InputStream> resp,
+                                          Thrower thrower,
+                                          Map<HttpRequest, CompletableFuture<HttpResponse<InputStream>>> promises)
+    {
+        Function<HttpResponse<InputStream>, List<String>> extractor = (r) -> {
+            List<String> result;
+            try (InputStream is = r.body()) {
+                result = new BufferedReader(new InputStreamReader(is))
+                        .lines().collect(Collectors.toList());
+            } catch (Throwable t) {
+                throw new CompletionException(t);
+            }
+            return result;
+        };
+        return check(w, reqURI, resp, thrower, promises, extractor);
+    }
+
+    private final <T> List<String> check(Where w, URI reqURI,
+                                 HttpResponse<T> resp,
+                                 Thrower thrower,
+                                 Map<HttpRequest, CompletableFuture<HttpResponse<T>>> promises,
+                                 Function<HttpResponse<T>, List<String>> extractor)
+    {
+        List<String> result = extractor.apply(resp);
+        for (HttpRequest req : promises.keySet()) {
+            switch (w) {
+                case BEFORE_ACCEPTING:
+                    throw new RuntimeException("No push promise should have been received" +
+                            " for " + reqURI + " in " + w + ": got " + promises.keySet());
+                default:
+                    break;
+            }
+            HttpResponse<T> presp;
+            try {
+                presp = promises.get(req).join();
+            } catch (Error | Exception x) {
+                Throwable cause = findCause(x, thrower);
+                if (cause != null) {
+                    out.println(now() + "Got expected exception in "
+                            + w + ": " + cause);
+                    continue;
+                }
+                throw x;
+            }
+            switch (w) {
+                case BEFORE_ACCEPTING:
+                case AFTER_ACCEPTING:
+                case BODY_HANDLER:
+                case GET_BODY:
+                case BODY_CF:
+                    return shouldHaveThrown(w, presp, thrower);
+                default:
+                    break;
+            }
+            List<String> presult = null;
+            try {
+                presult = extractor.apply(presp);
+            } catch (Error | Exception x) {
+                Throwable cause = findCause(x, thrower);
+                if (cause != null) {
+                    out.println(now() + "Got expected exception for "
+                            + req + " in " + w + ": " + cause);
+                    continue;
+                }
+                throw x;
+            }
+            throw new RuntimeException("Expected exception not thrown for "
+                    + req + " in " + w);
+        }
+        final int expectedCount;
+        switch (w) {
+            case BEFORE_ACCEPTING:
+                expectedCount = 0;
+                break;
+            default:
+                expectedCount = 3;
+        }
+        assertEquals(promises.size(), expectedCount,
+                "bad promise count for " + reqURI + " with " + w);
+        assertEquals(result, List.of(reqURI.toASCIIString()));
+        return result;
+    }
+
+    private static Throwable findCause(Throwable x,
+                                       Predicate<Throwable> filter) {
+        while (x != null && !filter.test(x)) x = x.getCause();
+        return x;
+    }
+
+    static final class UncheckedCustomExceptionThrower implements Thrower {
+        @Override
+        public void accept(Where where) {
+            out.println(now() + "Throwing in " + where);
+            throw new UncheckedCustomException(where.name());
+        }
+
+        @Override
+        public boolean test(Throwable throwable) {
+            return UncheckedCustomException.class.isInstance(throwable);
+        }
+
+        @Override
+        public String toString() {
+            return "UncheckedCustomExceptionThrower";
+        }
+    }
+
+    static final class UncheckedIOExceptionThrower implements Thrower {
+        @Override
+        public void accept(Where where) {
+            out.println(now() + "Throwing in " + where);
+            throw new UncheckedIOException(new CustomIOException(where.name()));
+        }
+
+        @Override
+        public boolean test(Throwable throwable) {
+            return UncheckedIOException.class.isInstance(throwable)
+                    && CustomIOException.class.isInstance(throwable.getCause());
+        }
+
+        @Override
+        public String toString() {
+            return "UncheckedIOExceptionThrower";
+        }
+    }
+
+    static final class UncheckedCustomException extends RuntimeException {
+        UncheckedCustomException(String message) {
+            super(message);
+        }
+        UncheckedCustomException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    static final class CustomIOException extends IOException {
+        CustomIOException(String message) {
+            super(message);
+        }
+        CustomIOException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    static final class ThrowingPromiseHandler<T> implements PushPromiseHandler<T> {
+        final Consumer<Where> throwing;
+        final PushPromiseHandler<T> pushHandler;
+        ThrowingPromiseHandler(Consumer<Where> throwing, PushPromiseHandler<T> pushHandler) {
+            this.throwing = throwing;
+            this.pushHandler = pushHandler;
+        }
+
+        @Override
+        public void applyPushPromise(HttpRequest initiatingRequest,
+                                     HttpRequest pushPromiseRequest,
+                                     Function<BodyHandler<T>,
+                                             CompletableFuture<HttpResponse<T>>> acceptor) {
+            throwing.accept(Where.BEFORE_ACCEPTING);
+            pushHandler.applyPushPromise(initiatingRequest, pushPromiseRequest, acceptor);
+            throwing.accept(Where.AFTER_ACCEPTING);
+        }
+    }
+
+    static final class ThrowingBodyHandler<T> implements BodyHandler<T> {
+        final Consumer<Where> throwing;
+        final BodyHandler<T> bodyHandler;
+        ThrowingBodyHandler(Consumer<Where> throwing, BodyHandler<T> bodyHandler) {
+            this.throwing = throwing;
+            this.bodyHandler = bodyHandler;
+        }
+        @Override
+        public BodySubscriber<T> apply(HttpResponse.ResponseInfo rinfo) {
+            throwing.accept(Where.BODY_HANDLER);
+            BodySubscriber<T> subscriber = bodyHandler.apply(rinfo);
+            return new ThrowingBodySubscriber(throwing, subscriber);
+        }
+    }
+
+    static final class ThrowingBodySubscriber<T> implements BodySubscriber<T> {
+        private final BodySubscriber<T> subscriber;
+        volatile boolean onSubscribeCalled;
+        final Consumer<Where> throwing;
+        ThrowingBodySubscriber(Consumer<Where> throwing, BodySubscriber<T> subscriber) {
+            this.throwing = throwing;
+            this.subscriber = subscriber;
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            //out.println("onSubscribe ");
+            onSubscribeCalled = true;
+            throwing.accept(Where.ON_SUBSCRIBE);
+            subscriber.onSubscribe(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+           // out.println("onNext " + item);
+            assertTrue(onSubscribeCalled);
+            throwing.accept(Where.ON_NEXT);
+            subscriber.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            //out.println("onError");
+            assertTrue(onSubscribeCalled);
+            throwing.accept(Where.ON_ERROR);
+            subscriber.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            //out.println("onComplete");
+            assertTrue(onSubscribeCalled, "onComplete called before onSubscribe");
+            throwing.accept(Where.ON_COMPLETE);
+            subscriber.onComplete();
+        }
+
+        @Override
+        public CompletionStage<T> getBody() {
+            throwing.accept(Where.GET_BODY);
+            try {
+                throwing.accept(Where.BODY_CF);
+            } catch (Throwable t) {
+                return CompletableFuture.failedFuture(t);
+            }
+            return subscriber.getBody();
+        }
+    }
+
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/2
+        HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed/x";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk/x";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/x";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk/x";
+
+        serverCount.addAndGet(2);
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        String sharedClientName =
+                sharedClient == null ? null : sharedClient.toString();
+        sharedClient = null;
+        Thread.sleep(100);
+        AssertionError fail = TRACKER.check(500);
+        try {
+            http2TestServer.stop();
+            https2TestServer.stop();
+        } finally {
+            if (fail != null) {
+                if (sharedClientName != null) {
+                    System.err.println("Shared client name is: " + sharedClientName);
+                }
+                throw fail;
+            }
+        }
+    }
+
+    private static void pushPromiseFor(HttpTestExchange t, URI requestURI, String pushPath, boolean fixed)
+            throws IOException
+    {
+        try {
+            URI promise = new URI(requestURI.getScheme(),
+                    requestURI.getAuthority(),
+                    pushPath, null, null);
+            byte[] promiseBytes = promise.toASCIIString().getBytes(UTF_8);
+            out.printf("TestServer: %s Pushing promise: %s%n", now(), promise);
+            err.printf("TestServer: %s Pushing promise: %s%n", now(), promise);
+            HttpTestHeaders headers =  HttpTestHeaders.of(new HttpHeadersImpl());
+            if (fixed) {
+                headers.addHeader("Content-length", String.valueOf(promiseBytes.length));
+            }
+            t.serverPush(promise, headers, promiseBytes);
+        } catch (URISyntaxException x) {
+            throw new IOException(x.getMessage(), x);
+        }
+    }
+
+    static class HTTP_FixedLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            URI requestURI = t.getRequestURI();
+            for (int i = 1; i<2; i++) {
+                String path = requestURI.getPath() + "/before/promise-" + i;
+                pushPromiseFor(t, requestURI, path, true);
+            }
+            byte[] resp = t.getRequestURI().toString().getBytes(StandardCharsets.UTF_8);
+            t.sendResponseHeaders(200, resp.length);  //fixed content length
+            try (OutputStream os = t.getResponseBody()) {
+                int bytes = resp.length/3;
+                for (int i = 0; i<2; i++) {
+                    String path = requestURI.getPath() + "/after/promise-" + (i + 2);
+                    os.write(resp, i * bytes, bytes);
+                    os.flush();
+                    pushPromiseFor(t, requestURI, path, true);
+                }
+                os.write(resp, 2*bytes, resp.length - 2*bytes);
+            }
+        }
+
+    }
+
+    static class HTTP_ChunkedHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_ChunkedHandler received request to " + t.getRequestURI());
+            byte[] resp = t.getRequestURI().toString().getBytes(StandardCharsets.UTF_8);
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            URI requestURI = t.getRequestURI();
+            for (int i = 1; i<2; i++) {
+                String path = requestURI.getPath() + "/before/promise-" + i;
+                pushPromiseFor(t, requestURI, path, false);
+            }
+            t.sendResponseHeaders(200, -1); // chunked/variable
+            try (OutputStream os = t.getResponseBody()) {
+                int bytes = resp.length/3;
+                for (int i = 0; i<2; i++) {
+                    String path = requestURI.getPath() + "/after/promise-" + (i + 2);
+                    os.write(resp, i * bytes, bytes);
+                    os.flush();
+                    pushPromiseFor(t, requestURI, path, false);
+                }
+                os.write(resp, 2*bytes, resp.length - 2*bytes);
+            }
+        }
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribers.java b/test/jdk/java/net/httpclient/ThrowingSubscribers.java
new file mode 100644
index 00000000000..e72d8d905f9
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribers.java
@@ -0,0 +1,734 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Tests what happens when response body handlers and subscribers
+ *          throw unexpected exceptions.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+  *       ReferenceTracker ThrowingSubscribers
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm -Djdk.internal.httpclient.debug=true ThrowingSubscribers
+ */
+
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.System.out;
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class ThrowingSubscribers implements HttpServerAdapters {
+
+    SSLContext sslContext;
+    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    HttpTestServer httpsTestServer;   // HTTPS/1.1
+    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    String httpURI_fixed;
+    String httpURI_chunk;
+    String httpsURI_fixed;
+    String httpsURI_chunk;
+    String http2URI_fixed;
+    String http2URI_chunk;
+    String https2URI_fixed;
+    String https2URI_chunk;
+
+    static final int ITERATION_COUNT = 1;
+    // a shared executor helps reduce the amount of threads created by the test
+    static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+    static volatile boolean tasksFailed;
+    static final AtomicLong serverCount = new AtomicLong();
+    static final AtomicLong clientCount = new AtomicLong();
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private volatile HttpClient sharedClient;
+
+    static class TestExecutor implements Executor {
+        final AtomicLong tasks = new AtomicLong();
+        Executor executor;
+        TestExecutor(Executor executor) {
+            this.executor = executor;
+        }
+
+        @Override
+        public void execute(Runnable command) {
+            long id = tasks.incrementAndGet();
+            executor.execute(() -> {
+                try {
+                    command.run();
+                } catch (Throwable t) {
+                    tasksFailed = true;
+                    System.out.printf(now() + "Task %s failed: %s%n", id, t);
+                    System.err.printf(now() + "Task %s failed: %s%n", id, t);
+                    FAILURES.putIfAbsent("Task " + id, t);
+                    throw t;
+                }
+            });
+        }
+    }
+
+    @AfterClass
+    static final void printFailedTests() {
+        out.println("\n=========================");
+        try {
+            out.printf("%n%sCreated %d servers and %d clients%n",
+                    now(), serverCount.get(), clientCount.get());
+            if (FAILURES.isEmpty()) return;
+            out.println("Failed tests: ");
+            FAILURES.entrySet().forEach((e) -> {
+                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+                e.getValue().printStackTrace(out);
+                e.getValue().printStackTrace();
+            });
+            if (tasksFailed) {
+                System.out.println("WARNING: Some tasks failed");
+            }
+        } finally {
+            out.println("\n=========================\n");
+        }
+    }
+
+    private String[] uris() {
+        return new String[] {
+                httpURI_fixed,
+                httpURI_chunk,
+                httpsURI_fixed,
+                httpsURI_chunk,
+                http2URI_fixed,
+                http2URI_chunk,
+                https2URI_fixed,
+                https2URI_chunk,
+        };
+    }
+
+    @DataProvider(name = "noThrows")
+    public Object[][] noThrows() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2][];
+        int i = 0;
+        for (boolean sameClient : List.of(false, true)) {
+            for (String uri: uris()) {
+                result[i++] = new Object[] {uri, sameClient};
+            }
+        }
+        assert i == uris.length * 2;
+        return result;
+    }
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        String[] uris = uris();
+        Object[][] result = new Object[uris.length * 2 * 2][];
+        int i = 0;
+        for (Thrower thrower : List.of(
+                new UncheckedIOExceptionThrower(),
+                new UncheckedCustomExceptionThrower())) {
+            for (boolean sameClient : List.of(false, true)) {
+                for (String uri : uris()) {
+                    result[i++] = new Object[]{uri, sameClient, thrower};
+                }
+            }
+        }
+        assert i == uris.length * 2 * 2;
+        return result;
+    }
+
+    private HttpClient makeNewClient() {
+        clientCount.incrementAndGet();
+        HttpClient client =  HttpClient.newBuilder()
+                .proxy(HttpClient.Builder.NO_PROXY)
+                .executor(executor)
+                .sslContext(sslContext)
+                .build();
+        return TRACKER.track(client);
+    }
+
+    HttpClient newHttpClient(boolean share) {
+        if (!share) return makeNewClient();
+        HttpClient shared = sharedClient;
+        if (shared != null) return shared;
+        synchronized (this) {
+            shared = sharedClient;
+            if (shared == null) {
+                shared = sharedClient = makeNewClient();
+            }
+            return shared;
+        }
+    }
+
+    enum SubscriberType {
+        INLINE,  // In line subscribers complete their CF on ON_COMPLETE
+                 // e.g. BodySubscribers::ofString
+        OFFLINE; // Off line subscribers complete their CF immediately
+                 // but require the client to pull the data after the
+                 // CF completes (e.g. BodySubscribers::ofInputStream)
+    }
+
+    static EnumSet<Where> excludes(SubscriberType type) {
+        EnumSet<Where> set = EnumSet.noneOf(Where.class);
+
+        if (type == SubscriberType.OFFLINE) {
+            // Throwing on onSubscribe needs some more work
+            // for the case of InputStream, where the body has already
+            // completed by the time the subscriber is subscribed.
+            // The only way we have at that point to relay the exception
+            // is to call onError on the subscriber, but should we if
+            // Subscriber::onSubscribed has thrown an exception and
+            // not completed normally?
+            set.add(Where.ON_SUBSCRIBE);
+        }
+
+        // Don't know how to make the stack reliably cause onError
+        // to be called without closing the connection.
+        // And how do we get the exception if onError throws anyway?
+        set.add(Where.ON_ERROR);
+
+        return set;
+    }
+
+    @Test(dataProvider = "noThrows")
+    public void testNoThrows(String uri, boolean sameClient)
+            throws Exception {
+        HttpClient client = null;
+        out.printf("%ntestNoThrows(%s, %b)%n", uri, sameClient);
+        for (int i=0; i< ITERATION_COUNT; i++) {
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<String> handler =
+                    new ThrowingBodyHandler((w) -> {},
+                                            BodyHandlers.ofString());
+            HttpResponse<String> response = client.send(req, handler);
+            String body = response.body();
+            assertEquals(URI.create(body).getPath(), URI.create(uri).getPath());
+        }
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsString(String uri,
+                                     boolean sameClient,
+                                     Thrower thrower)
+            throws Exception
+    {
+        String test = format("testThrowingAsString(%s, %b, %s)",
+                             uri, sameClient, thrower);
+        testThrowing(test, uri, sameClient, BodyHandlers::ofString,
+                this::shouldHaveThrown, thrower,false,
+                excludes(SubscriberType.INLINE));
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsLines(String uri,
+                                    boolean sameClient,
+                                    Thrower thrower)
+            throws Exception
+    {
+        String test =  format("testThrowingAsLines(%s, %b, %s)",
+                uri, sameClient, thrower);
+        testThrowing(test, uri, sameClient, BodyHandlers::ofLines,
+                this::checkAsLines, thrower,false,
+                excludes(SubscriberType.OFFLINE));
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsInputStream(String uri,
+                                          boolean sameClient,
+                                          Thrower thrower)
+            throws Exception
+    {
+        String test = format("testThrowingAsInputStream(%s, %b, %s)",
+                uri, sameClient, thrower);
+        testThrowing(test, uri, sameClient, BodyHandlers::ofInputStream,
+                this::checkAsInputStream,  thrower,false,
+                excludes(SubscriberType.OFFLINE));
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsStringAsync(String uri,
+                                          boolean sameClient,
+                                          Thrower thrower)
+            throws Exception
+    {
+        String test = format("testThrowingAsStringAsync(%s, %b, %s)",
+                uri, sameClient, thrower);
+        testThrowing(test, uri, sameClient, BodyHandlers::ofString,
+                     this::shouldHaveThrown, thrower, true,
+                excludes(SubscriberType.INLINE));
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsLinesAsync(String uri,
+                                         boolean sameClient,
+                                         Thrower thrower)
+            throws Exception
+    {
+        String test = format("testThrowingAsLinesAsync(%s, %b, %s)",
+                uri, sameClient, thrower);
+        testThrowing(test, uri, sameClient, BodyHandlers::ofLines,
+                this::checkAsLines, thrower,true,
+                excludes(SubscriberType.OFFLINE));
+    }
+
+    @Test(dataProvider = "variants")
+    public void testThrowingAsInputStreamAsync(String uri,
+                                               boolean sameClient,
+                                               Thrower thrower)
+            throws Exception
+    {
+        String test = format("testThrowingAsInputStreamAsync(%s, %b, %s)",
+                uri, sameClient, thrower);
+        testThrowing(test, uri, sameClient, BodyHandlers::ofInputStream,
+                this::checkAsInputStream, thrower,true,
+                excludes(SubscriberType.OFFLINE));
+    }
+
+    private <T,U> void testThrowing(String name, String uri, boolean sameClient,
+                                    Supplier<BodyHandler<T>> handlers,
+                                    Finisher finisher, Thrower thrower,
+                                    boolean async, EnumSet<Where> excludes)
+            throws Exception
+    {
+        out.printf("%n%s%s%n", now(), name);
+        try {
+            testThrowing(uri, sameClient, handlers, finisher, thrower, async, excludes);
+        } catch (Error | Exception x) {
+            FAILURES.putIfAbsent(name, x);
+            throw x;
+        }
+    }
+
+    private <T,U> void testThrowing(String uri, boolean sameClient,
+                                    Supplier<BodyHandler<T>> handlers,
+                                    Finisher finisher, Thrower thrower,
+                                    boolean async,
+                                    EnumSet<Where> excludes)
+            throws Exception
+    {
+        HttpClient client = null;
+        for (Where where : EnumSet.complementOf(excludes)) {
+
+            if (!sameClient || client == null)
+                client = newHttpClient(sameClient);
+
+            HttpRequest req = HttpRequest.
+                    newBuilder(URI.create(uri))
+                    .build();
+            BodyHandler<T> handler =
+                    new ThrowingBodyHandler(where.select(thrower), handlers.get());
+            System.out.println("try throwing in " + where);
+            HttpResponse<T> response = null;
+            if (async) {
+                try {
+                    response = client.sendAsync(req, handler).join();
+                } catch (Error | Exception x) {
+                    Throwable cause = findCause(x, thrower);
+                    if (cause == null) throw causeNotFound(where, x);
+                    System.out.println(now() + "Got expected exception: " + cause);
+                }
+            } else {
+                try {
+                    response = client.send(req, handler);
+                } catch (Error | Exception t) {
+                    if (thrower.test(t)) {
+                        System.out.println(now() + "Got expected exception: " + t);
+                    } else throw causeNotFound(where, t);
+                }
+            }
+            if (response != null) {
+                finisher.finish(where, response, thrower);
+            }
+        }
+    }
+
+    enum Where {
+        BODY_HANDLER, ON_SUBSCRIBE, ON_NEXT, ON_COMPLETE, ON_ERROR, GET_BODY, BODY_CF;
+        public Consumer<Where> select(Consumer<Where> consumer) {
+            return new Consumer<Where>() {
+                @Override
+                public void accept(Where where) {
+                    if (Where.this == where) {
+                        consumer.accept(where);
+                    }
+                }
+            };
+        }
+    }
+
+    static AssertionError causeNotFound(Where w, Throwable t) {
+        return new AssertionError("Expected exception not found in " + w, t);
+    }
+
+    interface Thrower extends Consumer<Where>, Predicate<Throwable> {
+
+    }
+
+    interface Finisher<T,U> {
+        U finish(Where w, HttpResponse<T> resp, Thrower thrower) throws IOException;
+    }
+
+    final <T,U> U shouldHaveThrown(Where w, HttpResponse<T> resp, Thrower thrower) {
+        String msg = "Expected exception not thrown in " + w
+                + "\n\tReceived: " + resp
+                + "\n\tWith body: " + resp.body();
+        System.out.println(msg);
+        throw new RuntimeException(msg);
+    }
+
+    final List<String> checkAsLines(Where w, HttpResponse<Stream<String>> resp, Thrower thrower) {
+        switch(w) {
+            case BODY_HANDLER: return shouldHaveThrown(w, resp, thrower);
+            case GET_BODY: return shouldHaveThrown(w, resp, thrower);
+            case BODY_CF: return shouldHaveThrown(w, resp, thrower);
+            default: break;
+        }
+        List<String> result = null;
+        try {
+            result = resp.body().collect(Collectors.toList());
+        } catch (Error | Exception x) {
+            Throwable cause = findCause(x, thrower);
+            if (cause != null) {
+                out.println(now() + "Got expected exception in " + w + ": " + cause);
+                return result;
+            }
+            throw causeNotFound(w, x);
+        }
+        return shouldHaveThrown(w, resp, thrower);
+    }
+
+    final List<String> checkAsInputStream(Where w, HttpResponse<InputStream> resp,
+                                    Thrower thrower)
+            throws IOException
+    {
+        switch(w) {
+            case BODY_HANDLER: return shouldHaveThrown(w, resp, thrower);
+            case GET_BODY: return shouldHaveThrown(w, resp, thrower);
+            case BODY_CF: return shouldHaveThrown(w, resp, thrower);
+            default: break;
+        }
+        List<String> result = null;
+        try (InputStreamReader r1 = new InputStreamReader(resp.body(), UTF_8);
+             BufferedReader r = new BufferedReader(r1)) {
+            try {
+                result = r.lines().collect(Collectors.toList());
+            } catch (Error | Exception x) {
+                Throwable cause = findCause(x, thrower);
+                if (cause != null) {
+                    out.println(now() + "Got expected exception in " + w + ": " + cause);
+                    return result;
+                }
+                throw causeNotFound(w, x);
+            }
+        }
+        return shouldHaveThrown(w, resp, thrower);
+    }
+
+    private static Throwable findCause(Throwable x,
+                                       Predicate<Throwable> filter) {
+        while (x != null && !filter.test(x)) x = x.getCause();
+        return x;
+    }
+
+    static final class UncheckedCustomExceptionThrower implements Thrower {
+        @Override
+        public void accept(Where where) {
+            out.println(now() + "Throwing in " + where);
+            throw new UncheckedCustomException(where.name());
+        }
+
+        @Override
+        public boolean test(Throwable throwable) {
+            return UncheckedCustomException.class.isInstance(throwable);
+        }
+
+        @Override
+        public String toString() {
+            return "UncheckedCustomExceptionThrower";
+        }
+    }
+
+    static final class UncheckedIOExceptionThrower implements Thrower {
+        @Override
+        public void accept(Where where) {
+            out.println(now() + "Throwing in " + where);
+            throw new UncheckedIOException(new CustomIOException(where.name()));
+        }
+
+        @Override
+        public boolean test(Throwable throwable) {
+            return UncheckedIOException.class.isInstance(throwable)
+                    && CustomIOException.class.isInstance(throwable.getCause());
+        }
+
+        @Override
+        public String toString() {
+            return "UncheckedIOExceptionThrower";
+        }
+    }
+
+    static final class UncheckedCustomException extends RuntimeException {
+        UncheckedCustomException(String message) {
+            super(message);
+        }
+        UncheckedCustomException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    static final class CustomIOException extends IOException {
+        CustomIOException(String message) {
+            super(message);
+        }
+        CustomIOException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    static final class ThrowingBodyHandler<T> implements BodyHandler<T> {
+        final Consumer<Where> throwing;
+        final BodyHandler<T> bodyHandler;
+        ThrowingBodyHandler(Consumer<Where> throwing, BodyHandler<T> bodyHandler) {
+            this.throwing = throwing;
+            this.bodyHandler = bodyHandler;
+        }
+        @Override
+        public BodySubscriber<T> apply(HttpResponse.ResponseInfo rinfo) {
+            throwing.accept(Where.BODY_HANDLER);
+            BodySubscriber<T> subscriber = bodyHandler.apply(rinfo);
+            return new ThrowingBodySubscriber(throwing, subscriber);
+        }
+    }
+
+    static final class ThrowingBodySubscriber<T> implements BodySubscriber<T> {
+        private final BodySubscriber<T> subscriber;
+        volatile boolean onSubscribeCalled;
+        final Consumer<Where> throwing;
+        ThrowingBodySubscriber(Consumer<Where> throwing, BodySubscriber<T> subscriber) {
+            this.throwing = throwing;
+            this.subscriber = subscriber;
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            //out.println("onSubscribe ");
+            onSubscribeCalled = true;
+            throwing.accept(Where.ON_SUBSCRIBE);
+            subscriber.onSubscribe(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+           // out.println("onNext " + item);
+            assertTrue(onSubscribeCalled);
+            throwing.accept(Where.ON_NEXT);
+            subscriber.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            //out.println("onError");
+            assertTrue(onSubscribeCalled);
+            throwing.accept(Where.ON_ERROR);
+            subscriber.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            //out.println("onComplete");
+            assertTrue(onSubscribeCalled, "onComplete called before onSubscribe");
+            throwing.accept(Where.ON_COMPLETE);
+            subscriber.onComplete();
+        }
+
+        @Override
+        public CompletionStage<T> getBody() {
+            throwing.accept(Where.GET_BODY);
+            try {
+                throwing.accept(Where.BODY_CF);
+            } catch (Throwable t) {
+                return CompletableFuture.failedFuture(t);
+            }
+            return subscriber.getBody();
+        }
+    }
+
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        // HTTP/1.1
+        HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h1_chunkHandler = new HTTP_ChunkedHandler();
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+        httpTestServer.addHandler(h1_fixedLengthHandler, "/http1/fixed");
+        httpTestServer.addHandler(h1_chunkHandler, "/http1/chunk");
+        httpURI_fixed = "http://" + httpTestServer.serverAuthority() + "/http1/fixed/x";
+        httpURI_chunk = "http://" + httpTestServer.serverAuthority() + "/http1/chunk/x";
+
+        HttpsServer httpsServer = HttpsServer.create(sa, 0);
+        httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+        httpsTestServer = HttpTestServer.of(httpsServer);
+        httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
+        httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
+        httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed/x";
+        httpsURI_chunk = "https://" + httpsTestServer.serverAuthority() + "/https1/chunk/x";
+
+        // HTTP/2
+        HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+        HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();
+
+        http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+        http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+        http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+        http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed/x";
+        http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk/x";
+
+        https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+        https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+        https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+        https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/x";
+        https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk/x";
+
+        serverCount.addAndGet(4);
+        httpTestServer.start();
+        httpsTestServer.start();
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        String sharedClientName =
+                sharedClient == null ? null : sharedClient.toString();
+        sharedClient = null;
+        Thread.sleep(100);
+        AssertionError fail = TRACKER.check(500);
+        try {
+            httpTestServer.stop();
+            httpsTestServer.stop();
+            http2TestServer.stop();
+            https2TestServer.stop();
+        } finally {
+            if (fail != null) {
+                if (sharedClientName != null) {
+                    System.err.println("Shared client name is: " + sharedClientName);
+                }
+                throw fail;
+            }
+        }
+    }
+
+    static class HTTP_FixedLengthHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            byte[] resp = t.getRequestURI().toString().getBytes(StandardCharsets.UTF_8);
+            t.sendResponseHeaders(200, resp.length);  //fixed content length
+            try (OutputStream os = t.getResponseBody()) {
+                os.write(resp);
+            }
+        }
+    }
+
+    static class HTTP_ChunkedHandler implements HttpTestHandler {
+        @Override
+        public void handle(HttpTestExchange t) throws IOException {
+            out.println("HTTP_ChunkedHandler received request to " + t.getRequestURI());
+            byte[] resp = t.getRequestURI().toString().getBytes(StandardCharsets.UTF_8);
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            t.sendResponseHeaders(200, -1); // chunked/variable
+            try (OutputStream os = t.getResponseBody()) {
+                os.write(resp);
+            }
+        }
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/TimeoutBasic.java b/test/jdk/java/net/httpclient/TimeoutBasic.java
index 85e88b4a009..549980df463 100644
--- a/test/jdk/java/net/httpclient/TimeoutBasic.java
+++ b/test/jdk/java/net/httpclient/TimeoutBasic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,12 +22,15 @@
  */
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpTimeoutException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpTimeoutException;
 import jdk.testlibrary.SimpleSSLContext;
 
 import javax.net.ServerSocketFactory;
@@ -40,7 +43,6 @@
 import java.util.function.Function;
 
 import static java.lang.System.out;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
 
 /**
  * @test
@@ -96,17 +98,16 @@ public static void main(String[] args) throws Exception {
     }
 
     static HttpRequest.Builder DELETE(HttpRequest.Builder builder) {
-        HttpRequest.BodyPublisher noBody = HttpRequest.BodyPublisher.noBody();
-        return builder.DELETE(noBody);
+        return builder.DELETE();
     }
 
     static HttpRequest.Builder PUT(HttpRequest.Builder builder) {
-        HttpRequest.BodyPublisher noBody = HttpRequest.BodyPublisher.noBody();
+        HttpRequest.BodyPublisher noBody = HttpRequest.BodyPublishers.noBody();
         return builder.PUT(noBody);
     }
 
     static HttpRequest.Builder POST(HttpRequest.Builder builder) {
-        HttpRequest.BodyPublisher noBody = HttpRequest.BodyPublisher.noBody();
+        HttpRequest.BodyPublisher noBody = HttpRequest.BodyPublishers.noBody();
         return builder.POST(noBody);
     }
 
@@ -140,9 +141,11 @@ public static void test(HttpClient.Version version,
         if (version != null) builder.version(version);
         HttpClient client = builder.build();
         out.printf("%ntest(version=%s, reqVersion=%s, scheme=%s)%n", version, reqVersion, scheme);
-        try (ServerSocket ss = ssf.createServerSocket(0, 20)) {
+        try (ServerSocket ss = ssf.createServerSocket()) {
+            ss.setReuseAddress(false);
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port = ss.getLocalPort();
-            URI uri = new URI(scheme +"://127.0.0.1:" + port + "/");
+            URI uri = new URI(scheme +"://localhost:" + port + "/");
 
             out.println("--- TESTING Async");
             int count = 0;
@@ -152,7 +155,12 @@ public static void test(HttpClient.Version version,
                 if (request == null) continue;
                 count++;
                 try {
-                    HttpResponse<?> resp = client.sendAsync(request, discard(null)).join();
+                    HttpResponse<?> resp = client.sendAsync(request, BodyHandlers.discarding()).join();
+                    out.println("Unexpected response for: " + request);
+                    out.println("\t from " + ss.getLocalSocketAddress());
+                    out.println("Response is: " + resp);
+                    out.println("Headers: " + resp.headers().map());
+                    out.println("Body (should be null): " + resp.body());
                     throw new RuntimeException("Unexpected response: " + resp.statusCode());
                 } catch (CompletionException e) {
                     if (!(e.getCause() instanceof HttpTimeoutException)) {
@@ -172,7 +180,7 @@ public static void test(HttpClient.Version version,
                 if (request == null) continue;
                 count++;
                 try {
-                    client.send(request, discard(null));
+                    client.send(request, BodyHandlers.discarding());
                 } catch (HttpTimeoutException e) {
                     out.println("Caught expected timeout: " + e);
                 }
diff --git a/test/jdk/java/net/httpclient/TimeoutOrdering.java b/test/jdk/java/net/httpclient/TimeoutOrdering.java
index 7505e27ecd7..4a4cba2b984 100644
--- a/test/jdk/java/net/httpclient/TimeoutOrdering.java
+++ b/test/jdk/java/net/httpclient/TimeoutOrdering.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,19 +22,21 @@
  */
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpTimeoutException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpTimeoutException;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import static java.lang.System.out;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
 
 /**
  * @test
@@ -59,9 +61,11 @@ public class TimeoutOrdering {
     public static void main(String[] args) throws Exception {
         HttpClient client = HttpClient.newHttpClient();
 
-        try (ServerSocket ss = new ServerSocket(0, 20)) {
+        try (ServerSocket ss = new ServerSocket()) {
+            ss.setReuseAddress(false);
+            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port = ss.getLocalPort();
-            URI uri = new URI("http://127.0.0.1:" + port + "/");
+            URI uri = new URI("http://localhost:" + port + "/");
 
             HttpRequest[] requests = new HttpRequest[TIMEOUTS.length];
 
@@ -74,7 +78,7 @@ public static void main(String[] args) throws Exception {
 
                 final HttpRequest req = requests[i];
                 CompletableFuture<HttpResponse<Object>> response = client
-                    .sendAsync(req, discard(null))
+                    .sendAsync(req, BodyHandlers.replacing(null))
                     .whenComplete((HttpResponse<Object> r, Throwable t) -> {
                         if (r != null) {
                             out.println("Unexpected response: " + r);
@@ -115,7 +119,7 @@ public static void main(String[] args) throws Exception {
                 final HttpRequest req = requests[i];
                 executor.execute(() -> {
                     try {
-                        client.send(req, discard(null));
+                        client.send(req, BodyHandlers.replacing(null));
                     } catch (HttpTimeoutException e) {
                         out.println("Caught expected timeout: " + e);
                         queue.offer(req);
diff --git a/test/jdk/java/net/httpclient/VersionTest.java b/test/jdk/java/net/httpclient/VersionTest.java
index 6433281e18a..d09ce0354d2 100644
--- a/test/jdk/java/net/httpclient/VersionTest.java
+++ b/test/jdk/java/net/httpclient/VersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -24,7 +24,9 @@
 /*
  * @test
  * @bug 8175814
- * @modules jdk.incubator.httpclient java.logging jdk.httpserver
+ * @modules java.net.http java.logging jdk.httpserver
+ * @library /lib/testlibrary/ /
+ * @build ProxyServer
  * @run main/othervm -Djdk.httpclient.HttpClient.log=errors,requests,headers,trace VersionTest
  */
 
@@ -35,26 +37,26 @@
 import com.sun.net.httpserver.HttpServer;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.URI;
+import java.net.InetSocketAddress;
+import java.net.ProxySelector;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
-import java.net.InetSocketAddress;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
-import static jdk.incubator.http.HttpClient.Version.HTTP_1_1;
-import static jdk.incubator.http.HttpClient.Version.HTTP_2;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import static java.net.http.HttpClient.Version.HTTP_2;
 
-/**
- */
 public class VersionTest {
     static HttpServer s1 ;
+    static ProxyServer proxy;
     static ExecutorService executor;
     static int port;
-    static HttpClient client;
+    static InetSocketAddress proxyAddr;
+    static HttpClient client, clientWithProxy;
     static URI uri;
     static volatile boolean error = false;
 
@@ -64,13 +66,20 @@ public static void main(String[] args) throws Exception {
         client = HttpClient.newBuilder()
                            .executor(executor)
                            .build();
+
+        clientWithProxy = HttpClient.newBuilder()
+                           .executor(executor)
+                           .proxy(ProxySelector.of(proxyAddr))
+                           .build();
+
         // first check that the version is HTTP/2
         if (client.version() != HttpClient.Version.HTTP_2) {
             throw new RuntimeException("Default version not HTTP_2");
         }
         try {
-            test(HTTP_1_1);
-            test(HTTP_2);
+            test(HTTP_1_1, false);
+            test(HTTP_2, false);
+            test(HTTP_2, true);
         } finally {
             s1.stop(0);
             executor.shutdownNow();
@@ -79,12 +88,13 @@ public static void main(String[] args) throws Exception {
             throw new RuntimeException();
     }
 
-    public static void test(HttpClient.Version version) throws Exception {
+    public static void test(HttpClient.Version version, boolean proxy) throws Exception {
         HttpRequest r = HttpRequest.newBuilder(uri)
                 .version(version)
                 .GET()
                 .build();
-        HttpResponse<Void> resp = client.send(r, discard(null));
+        HttpClient c = proxy ? clientWithProxy : client;
+        HttpResponse<Void> resp = c.send(r, BodyHandlers.discarding());
         System.out.printf("Client: response is %d\n", resp.statusCode());
         if (resp.version() != HTTP_1_1) {
             throw new RuntimeException();
@@ -93,7 +103,7 @@ public static void test(HttpClient.Version version) throws Exception {
     }
 
     static void initServer() throws Exception {
-        InetSocketAddress addr = new InetSocketAddress (0);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         s1 = HttpServer.create (addr, 0);
         HttpHandler h = new Handler();
 
@@ -104,36 +114,40 @@ static void initServer() throws Exception {
         s1.start();
 
         port = s1.getAddress().getPort();
-        uri = new URI("http://127.0.0.1:" + Integer.toString(port) + "/foo");
+        uri = new URI("http://localhost:" + Integer.toString(port) + "/foo");
         System.out.println("HTTP server port = " + port);
+        proxy = new ProxyServer(0, false);
+        int proxyPort = proxy.getPort();
+        proxyAddr = new InetSocketAddress(InetAddress.getLoopbackAddress(), proxyPort);
     }
-}
 
-class Handler implements HttpHandler {
-    int counter = 0;
+    static class Handler implements HttpHandler {
+        int counter;
 
-    void checkHeader(Headers h) {
-        counter++;
-        if (counter == 1 && h.containsKey("Upgrade")) {
-            VersionTest.error = true;
-        }
-        if (counter > 1 && !h.containsKey("Upgrade")) {
-            VersionTest.error = true;
+        void checkHeader(Headers h) {
+            counter++;
+            if (counter == 1 && h.containsKey("Upgrade")) {
+                VersionTest.error = true;
+            }
+            if (counter == 2 && !h.containsKey("Upgrade")) {
+                VersionTest.error = true;
+            }
+            if (counter == 3 && h.containsKey("Upgrade")) {
+                VersionTest.error = true;
+            }
         }
-    }
 
-    @Override
-    public synchronized void handle(HttpExchange t)
-        throws IOException
-    {
-        String reply = "Hello world";
-        int len = reply.length();
-        Headers h = t.getRequestHeaders();
-        checkHeader(h);
-        System.out.printf("Sending response 200\n");
-        t.sendResponseHeaders(200, len);
-        OutputStream o = t.getResponseBody();
-        o.write(reply.getBytes());
-        t.close();
+        @Override
+        public synchronized void handle(HttpExchange t) throws IOException {
+            String reply = "Hello world";
+            int len = reply.length();
+            Headers h = t.getRequestHeaders();
+            checkHeader(h);
+            System.out.printf("Sending response 200\n");
+            t.sendResponseHeaders(200, len);
+            OutputStream o = t.getResponseBody();
+            o.write(reply.getBytes());
+            t.close();
+        }
     }
 }
diff --git a/test/jdk/java/net/httpclient/ZeroRedirects.java b/test/jdk/java/net/httpclient/ZeroRedirects.java
index d8968ce742b..a842ea57930 100644
--- a/test/jdk/java/net/httpclient/ZeroRedirects.java
+++ b/test/jdk/java/net/httpclient/ZeroRedirects.java
@@ -24,32 +24,26 @@
 /*
  * @test
  * @bug 8164941
- * @modules jdk.incubator.httpclient java.logging jdk.httpserver
+ * @modules java.net.http java.logging jdk.httpserver
  * @run main/othervm ZeroRedirects
  */
 
-import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.URI;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.net.InetSocketAddress;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
-import static jdk.incubator.http.HttpClient.Version.HTTP_1_1;
-import static jdk.incubator.http.HttpClient.Version.HTTP_2;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 
-/**
- */
 public class ZeroRedirects {
     static HttpServer s1 ;
     static ExecutorService executor;
@@ -73,19 +67,19 @@ public static void main(String[] args) throws Exception {
     }
 
     public static void test() throws Exception {
-        System.setProperty("java.net.httpclient.redirects.retrylimit", "0");
+        System.setProperty("java.net.http.redirects.retrylimit", "0");
         HttpRequest r = HttpRequest.newBuilder(uri)
                 .GET()
                 .build();
-        HttpResponse<Void> resp = client.send(r, discard(null));
+        HttpResponse<Void> resp = client.send(r, BodyHandlers.discarding());
         System.out.printf("Client: response is %d\n", resp.statusCode());
         if (resp.statusCode() != 200)
             throw new RuntimeException();
     }
 
     static void initServer() throws Exception {
-        InetSocketAddress addr = new InetSocketAddress (0);
-        s1 = HttpServer.create (addr, 0);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        s1 = HttpServer.create(addr, 0);
         HttpHandler h = new Handler();
 
         HttpContext c1 = s1.createContext("/", h);
@@ -95,23 +89,21 @@ static void initServer() throws Exception {
         s1.start();
 
         port = s1.getAddress().getPort();
-        uri = new URI("http://127.0.0.1:" + Integer.toString(port) + "/foo");
+        uri = new URI("http://localhost:" + port + "/foo");
         System.out.println("HTTP server port = " + port);
     }
-}
 
-class Handler implements HttpHandler {
+    static class Handler implements HttpHandler {
 
-    @Override
-    public synchronized void handle(HttpExchange t)
-        throws IOException
-    {
-        String reply = "Hello world";
-        int len = reply.length();
-        System.out.printf("Sending response 200\n");
-        t.sendResponseHeaders(200, len);
-        OutputStream o = t.getResponseBody();
-        o.write(reply.getBytes());
-        t.close();
+        @Override
+        public synchronized void handle(HttpExchange t) throws IOException {
+            String reply = "Hello world";
+            int len = reply.length();
+            System.out.printf("Sending response 200\n");
+            t.sendResponseHeaders(200, len);
+            OutputStream o = t.getResponseBody();
+            o.write(reply.getBytes());
+            t.close();
+        }
     }
 }
diff --git a/test/jdk/java/net/httpclient/dependent.policy b/test/jdk/java/net/httpclient/dependent.policy
new file mode 100644
index 00000000000..6a618eee712
--- /dev/null
+++ b/test/jdk/java/net/httpclient/dependent.policy
@@ -0,0 +1,68 @@
+//
+// Copyright (c) 2018, 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.
+//
+
+// for JTwork/classes/0/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.class
+grant codeBase "file:${test.classes}/../../../../lib/testlibrary/-" {
+    permission java.util.PropertyPermission "test.src.path", "read";
+    permission java.io.FilePermission "${test.src}/../../../lib/testlibrary/jdk/testlibrary/testkeys", "read";
+};
+
+// for JTwork//classes/0/java/net/httpclient/http2/server/*
+grant codeBase "file:${test.classes}/../../../../java/net/httpclient/http2/server/*" {
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
+
+    permission java.net.SocketPermission "localhost:*", "listen,accept,resolve";
+    permission java.lang.RuntimePermission "modifyThread";
+};
+
+grant codeBase "file:${test.classes}/*" {
+    permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir", "read,write";
+    permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir/-", "read,write";
+
+    permission java.net.URLPermission "http://localhost:*/http1/-",   "GET,POST";
+    permission java.net.URLPermission "https://localhost:*/https1/-", "GET,POST";
+    permission java.net.URLPermission "http://localhost:*/http2/-",   "GET,POST";
+    permission java.net.URLPermission "https://localhost:*/https2/-", "GET,POST";
+
+
+    // needed to grant permission to the HTTP/2 server
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
+    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
+
+    // for HTTP/1.1 server logging
+    permission java.util.logging.LoggingPermission "control";
+
+    // needed to grant the HTTP servers
+    permission java.net.SocketPermission "localhost:*", "listen,accept,resolve";
+
+    permission java.util.PropertyPermission "*", "read";
+    permission java.lang.RuntimePermission "modifyThread";
+
+    // Permission for DependentActionsTest
+    permission java.lang.RuntimePermission "getStackWalkerWithClassReference";
+};
diff --git a/test/jdk/java/net/httpclient/docs/files/notsobigfile.txt b/test/jdk/java/net/httpclient/docs/files/notsobigfile.txt
index 584209bb192..668e8a8062e 100644
--- a/test/jdk/java/net/httpclient/docs/files/notsobigfile.txt
+++ b/test/jdk/java/net/httpclient/docs/files/notsobigfile.txt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
diff --git a/test/jdk/java/net/httpclient/examples/JavadocExamples.java b/test/jdk/java/net/httpclient/examples/JavadocExamples.java
new file mode 100644
index 00000000000..3ee5a3ec8a7
--- /dev/null
+++ b/test/jdk/java/net/httpclient/examples/JavadocExamples.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2018, 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.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.Authenticator;
+import java.net.InetSocketAddress;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Flow;
+import java.util.regex.Pattern;
+
+/*
+ * THE CONTENTS OF THIS FILE HAVE TO BE IN SYNC WITH THE EXAMPLES USED IN THE
+ * JAVADOC.
+ *
+ * @test
+ * @compile JavadocExamples.java
+ */
+public class JavadocExamples {
+    HttpRequest request = null;
+    HttpClient client = null;
+    Pattern p = null;
+
+    void fromHttpClientClasslevelDescription() throws Exception {
+        //Synchronous Example
+        HttpClient client = HttpClient.newBuilder()
+                .version(Version.HTTP_1_1)
+                .followRedirects(Redirect.NORMAL)
+                .proxy(ProxySelector.of(new InetSocketAddress("proxy.example.com", 80)))
+                .authenticator(Authenticator.getDefault())
+                .build();
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+        System.out.println(response.statusCode());
+        System.out.println(response.body());
+
+        //Asynchronous Example
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create("https://foo.com/"))
+                .timeout(Duration.ofMinutes(1))
+                .header("Content-Type", "application/json")
+                .POST(BodyPublishers.ofFile(Paths.get("file.json")))
+                .build();
+        client.sendAsync(request, BodyHandlers.ofString())
+                .thenApply(HttpResponse::body)
+                .thenAccept(System.out::println);
+    }
+
+    void fromHttpRequest() throws Exception {
+        // HttpRequest class-level description
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create("http://foo.com/"))
+                .build();
+        client.sendAsync(request, BodyHandlers.ofString())
+                .thenApply(HttpResponse::body)
+                .thenAccept(System.out::println)
+                .join();
+
+        // HttpRequest.BodyPublishers class-level description
+        // Request body from a String
+        HttpRequest request1 = HttpRequest.newBuilder()
+                .uri(URI.create("https://foo.com/"))
+                .header("Content-Type", "text/plain; charset=UTF-8")
+                .POST(BodyPublishers.ofString("some body text"))
+                .build();
+
+        // Request body from a File
+        HttpRequest request2 = HttpRequest.newBuilder()
+                .uri(URI.create("https://foo.com/"))
+                .header("Content-Type", "application/json")
+                .POST(BodyPublishers.ofFile(Paths.get("file.json")))
+                .build();
+
+        // Request body from a byte array
+        HttpRequest request3 = HttpRequest.newBuilder()
+                .uri(URI.create("https://foo.com/"))
+                .POST(BodyPublishers.ofByteArray(new byte[] { /*...*/ }))
+                .build();
+    }
+
+    void fromHttpResponse() throws Exception {
+        // HttpResponse class-level description
+        HttpResponse<String> response = client
+                .send(request, BodyHandlers.ofString());
+
+        // HttpResponse.BodyHandler class-level description
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create("http://www.foo.com/"))
+                .build();
+        client.sendAsync(request, BodyHandlers.ofFile(Paths.get("/tmp/f")))
+                .thenApply(HttpResponse::body)
+                .thenAccept(System.out::println);
+
+        HttpRequest request1 = HttpRequest.newBuilder()
+                .uri(URI.create("http://www.foo.com/"))
+                .build();
+        BodyHandler<Path> bodyHandler = (info) -> info.statusCode() == 200
+                ? BodySubscribers.ofFile(Paths.get("/tmp/f"))
+                : BodySubscribers.replacing(Paths.get("/NULL"));
+        client.sendAsync(request, bodyHandler)
+                .thenApply(HttpResponse::body)
+                .thenAccept(System.out::println);
+
+
+        // HttpResponse.BodyHandlers class-level description
+        // Receives the response body as a String
+        HttpResponse<String> response1 = client
+                .send(request, BodyHandlers.ofString());
+
+        // Receives the response body as a file
+        HttpResponse<Path> response2 = client
+                .send(request, BodyHandlers.ofFile(Paths.get("example.html")));
+
+        // Receives the response body as an InputStream
+        HttpResponse<InputStream> respons3 = client
+                .send(request, BodyHandlers.ofInputStream());
+
+        // Discards the response body
+        HttpResponse<Void> respons4 = client
+                .send(request, BodyHandlers.discarding());
+
+    }
+
+    /**
+     * @apiNote This method can be used as an adapter between a {@code
+     * BodySubscriber} and a text based {@code Flow.Subscriber} that parses
+     * text line by line.
+     *
+     * <p> For example:
+     * <pre> {@code  // A PrintSubscriber that implements Flow.Subscriber<String>
+     *  // and print lines received by onNext() on System.out
+     *  PrintSubscriber subscriber = new PrintSubscriber(System.out);
+     *  client.sendAsync(request, BodyHandlers.fromLineSubscriber(subscriber))
+     *      .thenApply(HttpResponse::statusCode)
+     *      .thenAccept((status) -> {
+     *          if (status != 200) {
+     *              System.err.printf("ERROR: %d status received%n", status);
+     *          }
+     *      }); }</pre>
+     */
+    void fromLineSubscriber1() {
+         // A PrintSubscriber that implements Flow.Subscriber<String>
+         // and print lines received by onNext() on System.out
+         PrintSubscriber subscriber = new PrintSubscriber(System.out);
+         client.sendAsync(request, BodyHandlers.fromLineSubscriber(subscriber))
+                 .thenApply(HttpResponse::statusCode)
+                 .thenAccept((status) -> {
+                     if (status != 200) {
+                         System.err.printf("ERROR: %d status received%n", status);
+                     }
+                 });
+    }
+
+    /**
+     * @apiNote This method can be used as an adapter between a {@code
+     * BodySubscriber} and a text based {@code Flow.Subscriber} that parses
+     * text line by line.
+     *
+     * <p> For example:
+     * <pre> {@code  // A LineParserSubscriber that implements Flow.Subscriber<String>
+     *  // and accumulates lines that match a particular pattern
+     *  Pattern pattern = ...;
+     *  LineParserSubscriber subscriber = new LineParserSubscriber(pattern);
+     *  HttpResponse<List<String>> response = client.send(request,
+     *      BodyHandlers.fromLineSubscriber(subscriber, s -> s.getMatchingLines(), "\n"));
+     *  if (response.statusCode() != 200) {
+     *      System.err.printf("ERROR: %d status received%n", response.statusCode());
+     *  } }</pre>
+     *
+     */
+    void fromLineSubscriber2() throws IOException, InterruptedException {
+        // A LineParserSubscriber that implements Flow.Subscriber<String>
+        // and accumulates lines that match a particular pattern
+        Pattern pattern = p;
+        LineParserSubscriber subscriber = new LineParserSubscriber(pattern);
+        HttpResponse<List<String>> response = client.send(request,
+                BodyHandlers.fromLineSubscriber(subscriber, s -> s.getMatchingLines(), "\n"));
+        if (response.statusCode() != 200) {
+            System.err.printf("ERROR: %d status received%n", response.statusCode());
+        }
+    }
+
+    static final class PrintSubscriber implements Flow.Subscriber<String> {
+        final PrintStream out;
+        PrintSubscriber(PrintStream out) {
+            this.out = out;
+        }
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            subscription.request(Long.MAX_VALUE);
+        }
+        @Override
+        public void onNext(String item) {
+            out.println(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            throwable.printStackTrace();
+        }
+        @Override
+        public void onComplete() {
+        }
+    }
+
+    static final class LineParserSubscriber implements Flow.Subscriber<String> {
+        final Pattern pattern;
+        final CopyOnWriteArrayList<String> matches = new CopyOnWriteArrayList<>();
+        LineParserSubscriber(Pattern pattern) {
+            this.pattern = pattern;
+        }
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            subscription.request(Long.MAX_VALUE);
+        }
+        @Override
+        public void onNext(String item) {
+            if (pattern.matcher(item).matches()) {
+                matches.add(item);
+            }
+        }
+        @Override
+        public void onError(Throwable throwable) {
+            throwable.printStackTrace();
+        }
+        @Override
+        public void onComplete() {
+        }
+
+        public List<String> getMatchingLines() {
+            return Collections.unmodifiableList(matches);
+        }
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/examples/WebSocketExample.java b/test/jdk/java/net/httpclient/examples/WebSocketExample.java
index 2bb5a4f980b..ec7419451d9 100644
--- a/test/jdk/java/net/httpclient/examples/WebSocketExample.java
+++ b/test/jdk/java/net/httpclient/examples/WebSocketExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -26,8 +26,9 @@
 import java.net.URI;
 import java.util.concurrent.CompletableFuture;
 
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.WebSocket;
+import java.net.http.HttpClient;
+import java.net.http.WebSocket;
+import java.util.concurrent.CompletionStage;
 
 /*
  * THE CONTENTS OF THIS FILE HAVE TO BE IN SYNC WITH THE EXAMPLES USED IN THE
@@ -56,4 +57,26 @@ public void newBuilderExample1() {
         CompletableFuture<WebSocket> ws = client.newWebSocketBuilder()
                 .buildAsync(URI.create("ws://websocket.example.com"), listener);
     }
+
+    public void requestExample() {
+        WebSocket.Listener listener = new WebSocket.Listener() {
+
+            StringBuilder text = new StringBuilder();
+
+            @Override
+            public CompletionStage<?> onText(WebSocket webSocket,
+                                             CharSequence message,
+                                             boolean last) {
+                text.append(message);
+                if (last) {
+                    processCompleteTextMessage(text);
+                    text = new StringBuilder();
+                }
+                webSocket.request(1);
+                return null;
+            }
+        };
+    }
+
+    static void processCompleteTextMessage(CharSequence result) { }
 }
diff --git a/test/jdk/java/net/httpclient/http2/BadHeadersTest.java b/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
new file mode 100644
index 00000000000..ba268a494f7
--- /dev/null
+++ b/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2018, 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
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @library /lib/testlibrary server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm -Djdk.internal.httpclient.debug=true BadHeadersTest
+ */
+
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.Pair;
+import jdk.internal.net.http.frame.ContinuationFrame;
+import jdk.internal.net.http.frame.HeaderFrame;
+import jdk.internal.net.http.frame.HeadersFrame;
+import jdk.internal.net.http.frame.Http2Frame;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiFunction;
+
+import static java.util.List.of;
+import static jdk.internal.net.http.common.Pair.pair;
+import static org.testng.Assert.assertThrows;
+
+// Code copied from ContinuationFrameTest
+public class BadHeadersTest {
+
+    private static final List<List<Pair<String, String>>> BAD_HEADERS = of(
+            of(pair(":status", "200"),  pair(":hello", "GET")),                      // Unknown pseudo-header
+            of(pair(":status", "200"),  pair("hell o", "value")),                    // Space in the name
+            of(pair(":status", "200"),  pair("hello", "line1\r\n  line2\r\n")),      // Multiline value
+            of(pair(":status", "200"),  pair("hello", "DE" + ((char) 0x7F) + "L")),  // Bad byte in value
+            of(pair("hello", "world!"), pair(":status", "200"))                      // Pseudo header is not the first one
+    );
+
+    SSLContext sslContext;
+    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    String http2URI;
+    String https2URI;
+
+    /**
+     * A function that returns a list of 1) a HEADERS frame ( with an empty
+     * payload ), and 2) a CONTINUATION frame with the actual headers.
+     */
+    static BiFunction<Integer,List<ByteBuffer>,List<Http2Frame>> oneContinuation =
+            (Integer streamid, List<ByteBuffer> encodedHeaders) -> {
+                List<ByteBuffer> empty =  of(ByteBuffer.wrap(new byte[0]));
+                HeadersFrame hf = new HeadersFrame(streamid, 0, empty);
+                ContinuationFrame cf = new ContinuationFrame(streamid,
+                                                             HeaderFrame.END_HEADERS,
+                                                             encodedHeaders);
+                return of(hf, cf);
+            };
+
+    /**
+     * A function that returns a list of a HEADERS frame followed by a number of
+     * CONTINUATION frames. Each frame contains just a single byte of payload.
+     */
+    static BiFunction<Integer,List<ByteBuffer>,List<Http2Frame>> byteAtATime =
+            (Integer streamid, List<ByteBuffer> encodedHeaders) -> {
+                assert encodedHeaders.get(0).hasRemaining();
+                List<Http2Frame> frames = new ArrayList<>();
+                ByteBuffer hb = ByteBuffer.wrap(new byte[] {encodedHeaders.get(0).get()});
+                HeadersFrame hf = new HeadersFrame(streamid, 0, hb);
+                frames.add(hf);
+                for (ByteBuffer bb : encodedHeaders) {
+                    while (bb.hasRemaining()) {
+                        List<ByteBuffer> data = of(ByteBuffer.wrap(new byte[] {bb.get()}));
+                        ContinuationFrame cf = new ContinuationFrame(streamid, 0, data);
+                        frames.add(cf);
+                    }
+                }
+                frames.get(frames.size() - 1).setFlag(HeaderFrame.END_HEADERS);
+                return frames;
+            };
+
+    @DataProvider(name = "variants")
+    public Object[][] variants() {
+        return new Object[][] {
+                { http2URI,  false, oneContinuation },
+                { https2URI, false, oneContinuation },
+                { http2URI,  true,  oneContinuation },
+                { https2URI, true,  oneContinuation },
+
+                { http2URI,  false, byteAtATime },
+                { https2URI, false, byteAtATime },
+                { http2URI,  true,  byteAtATime },
+                { https2URI, true,  byteAtATime },
+        };
+    }
+
+
+    @Test(dataProvider = "variants")
+    void test(String uri,
+              boolean sameClient,
+              BiFunction<Integer,List<ByteBuffer>,List<Http2Frame>> headerFramesSupplier)
+            throws Exception
+    {
+        CFTHttp2TestExchange.setHeaderFrameSupplier(headerFramesSupplier);
+
+        HttpClient client = null;
+        for (int i=0; i< BAD_HEADERS.size(); i++) {
+            if (!sameClient || client == null)
+                client = HttpClient.newBuilder().sslContext(sslContext).build();
+
+            HttpRequest request = HttpRequest.newBuilder(URI.create(uri))
+                    .POST(BodyPublishers.ofString("Hello there!"))
+                    .build();
+            final HttpClient cc = client;
+            if (i % 2 == 0) {
+                assertThrows(IOException.class, () -> cc.send(request, BodyHandlers.ofString()));
+            } else {
+                Throwable t = null;
+                try {
+                    cc.sendAsync(request, BodyHandlers.ofString()).join();
+                } catch (Throwable t0) {
+                    t = t0;
+                }
+                if (t == null) {
+                    throw new AssertionError("An exception was expected");
+                }
+                if (t instanceof CompletionException) {
+                    Throwable c = t.getCause();
+                    if (!(c instanceof IOException)) {
+                        throw new AssertionError("Unexpected exception", c);
+                    }
+                } else if (!(t instanceof IOException)) {
+                    throw new AssertionError("Unexpected exception", t);
+                }
+            }
+        }
+    }
+
+    @BeforeTest
+    public void setup() throws Exception {
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+
+        http2TestServer = new Http2TestServer("localhost", false, 0) {
+            @Override
+            protected Http2TestServerConnection createConnection(Http2TestServer http2TestServer,
+                                                                 Socket socket,
+                                                                 Http2TestExchangeSupplier exchangeSupplier)
+                    throws IOException {
+                return new Http2TestServerConnection(http2TestServer, socket, exchangeSupplier) {
+                    @Override
+                    protected HttpHeadersImpl createNewResponseHeaders() {
+                        return new OrderedHttpHeaders();
+                    }
+                };
+            }
+        };
+        http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
+        int port = http2TestServer.getAddress().getPort();
+        http2URI = "http://localhost:" + port + "/http2/echo";
+
+        https2TestServer = new Http2TestServer("localhost", true, 0){
+            @Override
+            protected Http2TestServerConnection createConnection(Http2TestServer http2TestServer,
+                                                                 Socket socket,
+                                                                 Http2TestExchangeSupplier exchangeSupplier)
+                    throws IOException {
+                return new Http2TestServerConnection(http2TestServer, socket, exchangeSupplier) {
+                    @Override
+                    protected HttpHeadersImpl createNewResponseHeaders() {
+                        return new OrderedHttpHeaders();
+                    }
+                };
+            }
+        };
+        https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
+        port = https2TestServer.getAddress().getPort();
+        https2URI = "https://localhost:" + port + "/https2/echo";
+
+        // Override the default exchange supplier with a custom one to enable
+        // particular test scenarios
+        http2TestServer.setExchangeSupplier(CFTHttp2TestExchange::new);
+        https2TestServer.setExchangeSupplier(CFTHttp2TestExchange::new);
+
+        http2TestServer.start();
+        https2TestServer.start();
+    }
+
+    @AfterTest
+    public void teardown() throws Exception {
+        http2TestServer.stop();
+        https2TestServer.stop();
+    }
+
+    static class Http2EchoHandler implements Http2Handler {
+
+        private final AtomicInteger requestNo = new AtomicInteger();
+
+        @Override
+        public void handle(Http2TestExchange t) throws IOException {
+            try (InputStream is = t.getRequestBody();
+                 OutputStream os = t.getResponseBody()) {
+                byte[] bytes = is.readAllBytes();
+                int i = requestNo.incrementAndGet();
+                List<Pair<String, String>> p = BAD_HEADERS.get(i % BAD_HEADERS.size());
+                p.forEach(h -> t.getResponseHeaders().addHeader(h.first, h.second));
+                t.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+    }
+
+    // A custom Http2TestExchangeImpl that overrides sendResponseHeaders to
+    // allow headers to be sent with a number of CONTINUATION frames.
+    static class CFTHttp2TestExchange extends Http2TestExchangeImpl {
+        static volatile BiFunction<Integer,List<ByteBuffer>,List<Http2Frame>> headerFrameSupplier;
+
+        static void setHeaderFrameSupplier(BiFunction<Integer,List<ByteBuffer>,List<Http2Frame>> hfs) {
+            headerFrameSupplier = hfs;
+        }
+
+        CFTHttp2TestExchange(int streamid, String method, HttpHeadersImpl reqheaders,
+                             HttpHeadersImpl rspheaders, URI uri, InputStream is,
+                             SSLSession sslSession, BodyOutputStream os,
+                             Http2TestServerConnection conn, boolean pushAllowed) {
+            super(streamid, method, reqheaders, rspheaders, uri, is, sslSession,
+                  os, conn, pushAllowed);
+
+        }
+
+        @Override
+        public void sendResponseHeaders(int rCode, long responseLength) throws IOException {
+            List<ByteBuffer> encodeHeaders = conn.encodeHeaders(rspheaders);
+            List<Http2Frame> headerFrames = headerFrameSupplier.apply(streamid, encodeHeaders);
+            assert headerFrames.size() > 0;  // there must always be at least 1
+
+            if (responseLength < 0) {
+                headerFrames.get(headerFrames.size() -1).setFlag(HeadersFrame.END_STREAM);
+                os.closeInternal();
+            }
+
+            for (Http2Frame f : headerFrames)
+                conn.outputQ.put(f);
+
+            os.goodToGo();
+            System.err.println("Sent response headers " + rCode);
+        }
+    }
+
+    /*
+     * Use carefully. This class might not be suitable outside this test's
+     * context. Pay attention working with multi Map view returned from map().
+     * The reason is that header names must be lower-cased prior to any
+     * operation that depends on whether or not the map contains a specific
+     * element.
+     */
+    private static class OrderedHttpHeaders extends HttpHeadersImpl {
+
+        private final Map<String, List<String>> map = new LinkedHashMap<>();
+
+        @Override
+        public void addHeader(String name, String value) {
+            super.addHeader(name.toLowerCase(Locale.ROOT), value);
+        }
+
+        @Override
+        public void setHeader(String name, String value) {
+            super.setHeader(name.toLowerCase(Locale.ROOT), value);
+        }
+
+        @Override
+        protected Map<String, List<String>> headersMap() {
+            return map;
+        }
+
+        @Override
+        protected HttpHeadersImpl newDeepCopy() {
+            return new OrderedHttpHeaders();
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/http2/BasicTest.java b/test/jdk/java/net/httpclient/http2/BasicTest.java
index 2494a6516ea..63729cc5da1 100644
--- a/test/jdk/java/net/httpclient/http2/BasicTest.java
+++ b/test/jdk/java/net/httpclient/http2/BasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -27,30 +27,29 @@
  * @library /lib/testlibrary server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors BasicTest
  */
 
 import java.io.IOException;
 import java.net.*;
-import jdk.incubator.http.*;
-import static jdk.incubator.http.HttpClient.Version.HTTP_2;
 import javax.net.ssl.*;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.file.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import jdk.testlibrary.SimpleSSLContext;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromFile;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asFile;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
-
 import org.testng.annotations.Test;
+import static java.net.http.HttpClient.Version.HTTP_2;
 
 @Test
 public class BasicTest {
@@ -77,9 +76,9 @@ static void initialize() throws Exception {
             httpsServer.addHandler(new Http2EchoHandler(), "/");
 
             httpsPort = httpsServer.getAddress().getPort();
-            httpURIString = "http://127.0.0.1:" + httpPort + "/foo/";
-            pingURIString = "http://127.0.0.1:" + httpPort + "/ping/";
-            httpsURIString = "https://127.0.0.1:" + httpsPort + "/bar/";
+            httpURIString = "http://localhost:" + httpPort + "/foo/";
+            pingURIString = "http://localhost:" + httpPort + "/ping/";
+            httpsURIString = "https://localhost:" + httpsPort + "/bar/";
 
             httpServer.start();
             httpsServer.start();
@@ -203,12 +202,12 @@ static void streamTest(boolean secure) throws Exception {
         HttpClient client = getClient();
         Path src = TestUtil.getAFile(FILESIZE * 4);
         HttpRequest req = HttpRequest.newBuilder(uri)
-                                     .POST(fromFile(src))
+                                     .POST(BodyPublishers.ofFile(src))
                                      .build();
 
         Path dest = Paths.get("streamtest.txt");
         dest.toFile().delete();
-        CompletableFuture<Path> response = client.sendAsync(req, asFile(dest))
+        CompletableFuture<Path> response = client.sendAsync(req, BodyHandlers.ofFile(dest))
                 .thenApply(resp -> {
                     if (resp.statusCode() != 200)
                         throw new RuntimeException();
@@ -230,10 +229,10 @@ static void paramsTest() throws Exception {
                 t.sendResponseHeaders(500, -1);
             }
         }), "/");
-        URI u = new URI("https://127.0.0.1:"+httpsPort+"/foo");
+        URI u = new URI("https://localhost:"+httpsPort+"/foo");
         HttpClient client = getClient();
         HttpRequest req = HttpRequest.newBuilder(u).build();
-        HttpResponse<String> resp = client.send(req, asString());
+        HttpResponse<String> resp = client.send(req, BodyHandlers.ofString());
         int stat = resp.statusCode();
         if (stat != 200) {
             throw new RuntimeException("paramsTest failed "
@@ -250,9 +249,9 @@ static void warmup(boolean secure) throws Exception {
 
         HttpClient client = getClient();
         HttpRequest req = HttpRequest.newBuilder(uri)
-                                     .POST(fromString(SIMPLE_STRING))
+                                     .POST(BodyPublishers.ofString(SIMPLE_STRING))
                                      .build();
-        HttpResponse<String> response = client.send(req, asString());
+        HttpResponse<String> response = client.send(req, BodyHandlers.ofString());
         checkStatus(200, response.statusCode());
         String responseBody = response.body();
         HttpHeaders h = response.headers();
@@ -270,10 +269,10 @@ static void simpleTest(boolean secure, boolean ping) throws Exception {
         CompletableFuture[] responses = new CompletableFuture[LOOPS];
         final Path source = TestUtil.getAFile(FILESIZE);
         HttpRequest request = HttpRequest.newBuilder(uri)
-                                         .POST(fromFile(source))
+                                         .POST(BodyPublishers.ofFile(source))
                                          .build();
         for (int i = 0; i < LOOPS; i++) {
-            responses[i] = client.sendAsync(request, asFile(tempFile()))
+            responses[i] = client.sendAsync(request, BodyHandlers.ofFile(tempFile()))
                 //.thenApply(resp -> compareFiles(resp.body(), source));
                 .thenApply(resp -> {
                     System.out.printf("Resp status %d body size %d\n",
diff --git a/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java b/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
index 58b353ecfb0..52e53e16c84 100644
--- a/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
+++ b/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -25,9 +25,9 @@
  * @test
  * @summary Test for CONTINUATION frame handling
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  * @library /lib/testlibrary server
  * @build Http2TestServer
  * @build jdk.testlibrary.SimpleSSLContext
@@ -44,23 +44,23 @@
 import java.util.function.BiFunction;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
-import jdk.incubator.http.internal.frame.ContinuationFrame;
-import jdk.incubator.http.internal.frame.HeaderFrame;
-import jdk.incubator.http.internal.frame.HeadersFrame;
-import jdk.incubator.http.internal.frame.Http2Frame;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.frame.ContinuationFrame;
+import jdk.internal.net.http.frame.HeaderFrame;
+import jdk.internal.net.http.frame.HeadersFrame;
+import jdk.internal.net.http.frame.Http2Frame;
 import jdk.testlibrary.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static jdk.incubator.http.HttpClient.Version.HTTP_2;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static java.net.http.HttpClient.Version.HTTP_2;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
@@ -139,13 +139,13 @@ void test(String uri,
                 client = HttpClient.newBuilder().sslContext(sslContext).build();
 
             HttpRequest request = HttpRequest.newBuilder(URI.create(uri))
-                                             .POST(fromString("Hello there!"))
+                                             .POST(BodyPublishers.ofString("Hello there!"))
                                              .build();
             HttpResponse<String> resp;
             if (i % 2 == 0) {
-                resp = client.send(request, asString());
+                resp = client.send(request, BodyHandlers.ofString());
             } else {
-                resp = client.sendAsync(request, asString()).join();
+                resp = client.sendAsync(request, BodyHandlers.ofString()).join();
             }
 
             out.println("Got response: " + resp);
@@ -163,15 +163,15 @@ public void setup() throws Exception {
         if (sslContext == null)
             throw new AssertionError("Unexpected null sslContext");
 
-        http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+        http2TestServer = new Http2TestServer("localhost", false, 0);
         http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
         int port = http2TestServer.getAddress().getPort();
-        http2URI = "http://127.0.0.1:" + port + "/http2/echo";
+        http2URI = "http://localhost:" + port + "/http2/echo";
 
-        https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+        https2TestServer = new Http2TestServer("localhost", true, 0);
         https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
         port = https2TestServer.getAddress().getPort();
-        https2URI = "https://127.0.0.1:" + port + "/https2/echo";
+        https2URI = "https://localhost:" + port + "/https2/echo";
 
         // Override the default exchange supplier with a custom one to enable
         // particular test scenarios
@@ -194,9 +194,9 @@ public void handle(Http2TestExchange t) throws IOException {
             try (InputStream is = t.getRequestBody();
                  OutputStream os = t.getResponseBody()) {
                 byte[] bytes = is.readAllBytes();
-                t.getResponseHeaders().addHeader("just some", "noise");
-                t.getResponseHeaders().addHeader("to add ", "payload in ");
-                t.getResponseHeaders().addHeader("the header", "frames");
+                t.getResponseHeaders().addHeader("justSome", "Noise");
+                t.getResponseHeaders().addHeader("toAdd", "payload in");
+                t.getResponseHeaders().addHeader("theHeader", "Frames");
                 t.sendResponseHeaders(200, bytes.length);
                 os.write(bytes);
             }
diff --git a/test/jdk/java/net/httpclient/http2/ErrorTest.java b/test/jdk/java/net/httpclient/http2/ErrorTest.java
index 921118cf60a..7dfab348f40 100644
--- a/test/jdk/java/net/httpclient/http2/ErrorTest.java
+++ b/test/jdk/java/net/httpclient/http2/ErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -27,9 +27,9 @@
  * @library /lib/testlibrary server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  *          java.security.jgss
  * @run testng/othervm/timeout=60 -Djavax.net.debug=ssl -Djdk.httpclient.HttpClient.log=all ErrorTest
  * @summary check exception thrown when bad TLS parameters selected
@@ -37,17 +37,17 @@
 
 import java.io.IOException;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import jdk.testlibrary.SimpleSSLContext;
-import static jdk.incubator.http.HttpClient.Version.HTTP_2;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
+import static java.net.http.HttpClient.Version.HTTP_2;
 
 import org.testng.annotations.Test;
 
@@ -85,18 +85,18 @@ public void test() throws Exception {
                                               serverContext);
             httpsServer.addHandler(new Http2EchoHandler(), "/");
             int httpsPort = httpsServer.getAddress().getPort();
-            String httpsURIString = "https://127.0.0.1:" + httpsPort + "/bar/";
+            String httpsURIString = "https://localhost:" + httpsPort + "/bar/";
 
             httpsServer.start();
             URI uri = URI.create(httpsURIString);
             System.err.println("Request to " + uri);
 
             HttpRequest req = HttpRequest.newBuilder(uri)
-                                    .POST(fromString(SIMPLE_STRING))
+                                    .POST(BodyPublishers.ofString(SIMPLE_STRING))
                                     .build();
             HttpResponse response;
             try {
-                response = client.send(req, discard(null));
+                response = client.send(req, BodyHandlers.discarding());
                 throw new RuntimeException("Unexpected response: " + response);
             } catch (IOException e) {
                 System.err.println("Caught Expected IOException: " + e);
diff --git a/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java b/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
index 3d72c581628..a977b1d934c 100644
--- a/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
+++ b/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -27,24 +27,21 @@
  * @library /lib/testlibrary server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors FixedThreadPoolTest
  */
 
 import java.net.*;
-import jdk.incubator.http.*;
-import static jdk.incubator.http.HttpClient.Version.HTTP_2;
+import java.net.http.*;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandlers;
 import javax.net.ssl.*;
 import java.nio.file.*;
 import java.util.concurrent.*;
 import jdk.testlibrary.SimpleSSLContext;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromFile;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asFile;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
-
+import static java.net.http.HttpClient.Version.HTTP_2;
 import org.testng.annotations.Test;
 
 @Test
@@ -70,8 +67,8 @@ static void initialize() throws Exception {
             httpsServer.addHandler(new Http2EchoHandler(), "/");
 
             httpsPort = httpsServer.getAddress().getPort();
-            httpURIString = "http://127.0.0.1:" + httpPort + "/foo/";
-            httpsURIString = "https://127.0.0.1:" + httpsPort + "/bar/";
+            httpURIString = "http://localhost:" + httpPort + "/foo/";
+            httpsURIString = "https://localhost:" + httpsPort + "/bar/";
 
             httpServer.start();
             httpsServer.start();
@@ -164,12 +161,12 @@ static void streamTest(boolean secure) throws Exception {
         HttpClient client = getClient();
         Path src = TestUtil.getAFile(FILESIZE * 4);
         HttpRequest req = HttpRequest.newBuilder(uri)
-                                     .POST(fromFile(src))
+                                     .POST(BodyPublishers.ofFile(src))
                                      .build();
 
         Path dest = Paths.get("streamtest.txt");
         dest.toFile().delete();
-        CompletableFuture<Path> response = client.sendAsync(req, asFile(dest))
+        CompletableFuture<Path> response = client.sendAsync(req, BodyHandlers.ofFile(dest))
                 .thenApply(resp -> {
                     if (resp.statusCode() != 200)
                         throw new RuntimeException();
@@ -195,10 +192,10 @@ static void paramsTest() throws Exception {
         }), "/");
         server.start();
         int port = server.getAddress().getPort();
-        URI u = new URI("https://127.0.0.1:"+port+"/foo");
+        URI u = new URI("https://localhost:"+port+"/foo");
         HttpClient client = getClient();
         HttpRequest req = HttpRequest.newBuilder(u).build();
-        HttpResponse<String> resp = client.sendAsync(req, asString()).get();
+        HttpResponse<String> resp = client.sendAsync(req, BodyHandlers.ofString()).get();
         int stat = resp.statusCode();
         if (stat != 200) {
             throw new RuntimeException("paramsTest failed "
@@ -214,9 +211,9 @@ static void simpleTest(boolean secure) throws Exception {
 
         HttpClient client = getClient();
         HttpRequest req = HttpRequest.newBuilder(uri)
-                                     .POST(fromString(SIMPLE_STRING))
+                                     .POST(BodyPublishers.ofString(SIMPLE_STRING))
                                      .build();
-        HttpResponse<String> response = client.sendAsync(req, asString()).get();
+        HttpResponse<String> response = client.sendAsync(req, BodyHandlers.ofString()).get();
         HttpHeaders h = response.headers();
 
         checkStatus(200, response.statusCode());
@@ -232,10 +229,10 @@ static void simpleTest(boolean secure) throws Exception {
         CompletableFuture[] responses = new CompletableFuture[LOOPS];
         final Path source = TestUtil.getAFile(FILESIZE);
         HttpRequest request = HttpRequest.newBuilder(uri)
-                                         .POST(fromFile(source))
+                                         .POST(BodyPublishers.ofFile(source))
                                          .build();
         for (int i = 0; i < LOOPS; i++) {
-            responses[i] = client.sendAsync(request, asFile(tempFile()))
+            responses[i] = client.sendAsync(request, BodyHandlers.ofFile(tempFile()))
                 //.thenApply(resp -> compareFiles(resp.body(), source));
                 .thenApply(resp -> {
                     System.out.printf("Resp status %d body size %d\n",
diff --git a/test/jdk/java/net/httpclient/http2/HpackBinaryTestDriver.java b/test/jdk/java/net/httpclient/http2/HpackBinaryTestDriver.java
index 7f04afe8478..7d5424163ba 100644
--- a/test/jdk/java/net/httpclient/http2/HpackBinaryTestDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackBinaryTestDriver.java
@@ -24,11 +24,11 @@
 /*
  * @test
  * @bug 8153353
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * @modules java.net.http/jdk.internal.net.http.hpack
  * @key randomness
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/SpecHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/TestHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/BuffersTestingKit.java
- * @run testng/othervm jdk.incubator.httpclient/jdk.incubator.http.internal.hpack.BinaryPrimitivesTest
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
+ * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.BinaryPrimitivesTest
  */
 public class HpackBinaryTestDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackCircularBufferDriver.java b/test/jdk/java/net/httpclient/http2/HpackCircularBufferDriver.java
index 7a9f034d437..64ba1a3d22e 100644
--- a/test/jdk/java/net/httpclient/http2/HpackCircularBufferDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackCircularBufferDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,11 +24,11 @@
 /*
  * @test
  * @bug 8153353
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * @modules java.net.http/jdk.internal.net.http.hpack
  * @key randomness
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/SpecHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/TestHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/BuffersTestingKit.java
- * @run testng/othervm jdk.incubator.httpclient/jdk.incubator.http.internal.hpack.CircularBufferTest
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
+ * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.CircularBufferTest
  */
 public class HpackCircularBufferDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackDecoderDriver.java b/test/jdk/java/net/httpclient/http2/HpackDecoderDriver.java
index c05c3113c52..15bd92a1398 100644
--- a/test/jdk/java/net/httpclient/http2/HpackDecoderDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackDecoderDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,11 +24,11 @@
 /*
  * @test
  * @bug 8153353
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * @modules java.net.http/jdk.internal.net.http.hpack
  * @key randomness
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/SpecHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/TestHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/BuffersTestingKit.java
- * @run testng/othervm jdk.incubator.httpclient/jdk.incubator.http.internal.hpack.DecoderTest
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
+ * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.DecoderTest
  */
 public class HpackDecoderDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackEncoderDriver.java b/test/jdk/java/net/httpclient/http2/HpackEncoderDriver.java
index 5d4f169814f..12475ccbca9 100644
--- a/test/jdk/java/net/httpclient/http2/HpackEncoderDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackEncoderDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,11 +24,11 @@
 /*
  * @test
  * @bug 8153353
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * @modules java.net.http/jdk.internal.net.http.hpack
  * @key randomness
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/SpecHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/TestHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/BuffersTestingKit.java
- * @run testng/othervm jdk.incubator.httpclient/jdk.incubator.http.internal.hpack.EncoderTest
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
+ * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.EncoderTest
  */
 public class HpackEncoderDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackHeaderTableDriver.java b/test/jdk/java/net/httpclient/http2/HpackHeaderTableDriver.java
index 6d056bde87b..ceb31da4f36 100644
--- a/test/jdk/java/net/httpclient/http2/HpackHeaderTableDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackHeaderTableDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8153353
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * @modules java.net.http/jdk.internal.net.http.hpack
  *          jdk.localedata
  * @key randomness
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/SpecHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/TestHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/BuffersTestingKit.java
- * @run testng/othervm jdk.incubator.httpclient/jdk.incubator.http.internal.hpack.HeaderTableTest
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
+ * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.HeaderTableTest
  */
 public class HpackHeaderTableDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackHuffmanDriver.java b/test/jdk/java/net/httpclient/http2/HpackHuffmanDriver.java
index 681ccf3ed1e..d2b515c6d63 100644
--- a/test/jdk/java/net/httpclient/http2/HpackHuffmanDriver.java
+++ b/test/jdk/java/net/httpclient/http2/HpackHuffmanDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,11 +24,11 @@
 /*
  * @test
  * @bug 8153353
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * @modules java.net.http/jdk.internal.net.http.hpack
  * @key randomness
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/SpecHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/TestHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/BuffersTestingKit.java
- * @run testng/othervm jdk.incubator.httpclient/jdk.incubator.http.internal.hpack.HuffmanTest
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
+ * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.HuffmanTest
  */
 public class HpackHuffmanDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/HpackTestHelper.java b/test/jdk/java/net/httpclient/http2/HpackTestHelper.java
index bc231b75f5c..3faa669c57b 100644
--- a/test/jdk/java/net/httpclient/http2/HpackTestHelper.java
+++ b/test/jdk/java/net/httpclient/http2/HpackTestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,11 +24,11 @@
 /*
  * @test
  * @bug 8153353
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * @modules java.net.http/jdk.internal.net.http.hpack
  * @key randomness
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/SpecHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/TestHelper.java
- * @compile/module=jdk.incubator.httpclient jdk/incubator/http/internal/hpack/BuffersTestingKit.java
- * @run testng/othervm jdk.incubator.httpclient/jdk.incubator.http.internal.hpack.TestHelper
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
+ * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
+ * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.TestHelper
  */
 public class HpackTestHelperDriver { }
diff --git a/test/jdk/java/net/httpclient/http2/ImplicitPushCancel.java b/test/jdk/java/net/httpclient/http2/ImplicitPushCancel.java
index 562904c1752..737d091891c 100644
--- a/test/jdk/java/net/httpclient/http2/ImplicitPushCancel.java
+++ b/test/jdk/java/net/httpclient/http2/ImplicitPushCancel.java
@@ -26,10 +26,13 @@
  * @library /lib/testlibrary server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
- * @run testng/othervm -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=errors,requests,responses,trace ImplicitPushCancel
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.httpclient.HttpClient.log=errors,requests,responses,trace
+ *      ImplicitPushCancel
  */
 
 import java.io.ByteArrayInputStream;
@@ -39,13 +42,16 @@
 import java.net.URI;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpResponse.BodyHandler;
-import jdk.incubator.http.MultiMapResult;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import jdk.internal.net.http.common.HttpHeadersImpl;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -79,7 +85,7 @@ public void setup() throws Exception {
         server.start();
         int port = server.getAddress().getPort();
         System.err.println("Server listening on port " + port);
-        uri = new URI("http://127.0.0.1:" + port + "/foo/a/b/c");
+        uri = new URI("http://localhost:" + port + "/foo/a/b/c");
     }
 
     @AfterTest
@@ -101,21 +107,26 @@ static final <T> HttpResponse<T> assert200ResponseCode(HttpResponse<T> response)
     public void test() throws Exception {
         HttpClient client = HttpClient.newHttpClient();
 
-        client.sendAsync(HttpRequest.newBuilder(uri).build(), BodyHandler.asString())
+        client.sendAsync(HttpRequest.newBuilder(uri).build(), BodyHandlers.ofString())
                 .thenApply(ImplicitPushCancel::assert200ResponseCode)
                 .thenApply(HttpResponse::body)
                 .thenAccept(body -> body.equals(MAIN_RESPONSE_BODY))
                 .join();
 
-        MultiMapResult<String> map = client.sendAsync(
+        ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<String>>> promises
+                = new ConcurrentHashMap<>();
+        PushPromiseHandler<String> pph = PushPromiseHandler
+                .of((r) -> BodyHandlers.ofString(), promises);
+        HttpResponse<String> main = client.sendAsync(
                 HttpRequest.newBuilder(uri).build(),
-                HttpResponse.MultiSubscriber.asMap(
-                       (req) -> Optional.of(HttpResponse.BodyHandler.asString()))
-                ).join();
+                BodyHandlers.ofString(),
+                pph)
+                .join();
 
-        map.entrySet().stream().forEach(e -> System.out.println(e.getKey() + ":" + e.getValue().join().body()));
+        promises.entrySet().stream().forEach(e -> System.out.println(e.getKey() + ":" + e.getValue().join().body()));
 
-        map.entrySet().stream().forEach(entry -> {
+        promises.putIfAbsent(main.request(), CompletableFuture.completedFuture(main));
+        promises.entrySet().stream().forEach(entry -> {
             HttpRequest request = entry.getKey();
             HttpResponse<String> response = entry.getValue().join();
             assertEquals(response.statusCode(), 200);
diff --git a/test/jdk/java/net/httpclient/http2/ProxyTest2.java b/test/jdk/java/net/httpclient/http2/ProxyTest2.java
index b00e182afb9..1c6a3f03072 100644
--- a/test/jdk/java/net/httpclient/http2/ProxyTest2.java
+++ b/test/jdk/java/net/httpclient/http2/ProxyTest2.java
@@ -49,9 +49,9 @@
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import jdk.testlibrary.SimpleSSLContext;
 import java.util.concurrent.*;
 
@@ -60,12 +60,12 @@
  * @bug 8181422
  * @summary  Verifies that you can access an HTTP/2 server over HTTPS by
  *           tunnelling through an HTTP/1.1 proxy.
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  * @library /lib/testlibrary server
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
  * @build jdk.testlibrary.SimpleSSLContext ProxyTest2
  * @run main/othervm ProxyTest2
  * @author danielfuchs
@@ -146,7 +146,7 @@ public static void test(Http2TestServer server, HttpClient.Version version)
 
             System.out.println("Sending request with HttpClient");
             HttpResponse<String> response
-                = client.send(request, HttpResponse.BodyHandler.asString());
+                = client.send(request, HttpResponse.BodyHandlers.ofString());
             System.out.println("Got response");
             String resp = response.body();
             System.out.println("Received: " + resp);
@@ -165,19 +165,25 @@ static class TunnelingProxy {
         final ServerSocket ss;
         final boolean DEBUG = false;
         final Http2TestServer serverImpl;
+        final CopyOnWriteArrayList<CompletableFuture<Void>> connectionCFs
+                = new CopyOnWriteArrayList<>();
+        private volatile boolean stopped;
         TunnelingProxy(Http2TestServer serverImpl) throws IOException {
             this.serverImpl = serverImpl;
             ss = new ServerSocket();
             accept = new Thread(this::accept);
+            accept.setDaemon(true);
         }
 
         void start() throws IOException {
+            ss.setReuseAddress(false);
             ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             accept.start();
         }
 
         // Pipe the input stream to the output stream.
-        private synchronized Thread pipe(InputStream is, OutputStream os, char tag) {
+        private synchronized Thread pipe(InputStream is, OutputStream os,
+                                         char tag, CompletableFuture<Void> end) {
             return new Thread("TunnelPipe("+tag+")") {
                 @Override
                 public void run() {
@@ -197,13 +203,15 @@ public void run() {
                         }
                     } catch (IOException ex) {
                         if (DEBUG) ex.printStackTrace(System.out);
+                    } finally {
+                        end.complete(null);
                     }
                 }
             };
         }
 
         public InetSocketAddress getAddress() {
-            return new InetSocketAddress(ss.getInetAddress(), ss.getLocalPort());
+            return new InetSocketAddress( InetAddress.getLoopbackAddress(), ss.getLocalPort());
         }
 
         // This is a bit shaky. It doesn't handle continuation
@@ -228,18 +236,14 @@ String readLine(InputStream r) throws IOException {
         public void accept() {
             Socket clientConnection = null;
             try {
-                while (true) {
+                while (!stopped) {
                     System.out.println("Tunnel: Waiting for client");
-                    Socket previous = clientConnection;
+                    Socket toClose;
                     try {
-                        clientConnection = ss.accept();
+                        toClose = clientConnection = ss.accept();
                     } catch (IOException io) {
                         if (DEBUG) io.printStackTrace(System.out);
                         break;
-                    } finally {
-                        // we have only 1 client at a time, so it is safe
-                        // to close the previous connection here
-                        if (previous != null) previous.close();
                     }
                     System.out.println("Tunnel: Client accepted");
                     Socket targetConnection = null;
@@ -259,40 +263,59 @@ public void accept() {
                         // signals the end of all headers.
                         while(!requestLine.equals("")) {
                             System.out.println("Tunnel: Reading header: "
-                                               + (requestLine = readLine(ccis)));
+                                    + (requestLine = readLine(ccis)));
                         }
 
                         // Open target connection
                         targetConnection = new Socket(
-                                serverImpl.getAddress().getAddress(),
+                                InetAddress.getLoopbackAddress(),
                                 serverImpl.getAddress().getPort());
 
                         // Then send the 200 OK response to the client
                         System.out.println("Tunnel: Sending "
-                                           + "HTTP/1.1 200 OK\r\n\r\n");
+                                + "HTTP/1.1 200 OK\r\n\r\n");
                         pw.print("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
                         pw.flush();
                     } else {
-                        // This should not happen.
-                        throw new IOException("Tunnel: Unexpected status line: "
-                                           + requestLine);
+                        // This should not happen. If it does then just print an
+                        // error - both on out and err, and close the accepted
+                        // socket
+                        System.out.println("WARNING: Tunnel: Unexpected status line: "
+                                + requestLine + " received by "
+                                + ss.getLocalSocketAddress()
+                                + " from "
+                                + toClose.getRemoteSocketAddress()
+                                + " - closing accepted socket");
+                        // Print on err
+                        System.err.println("WARNING: Tunnel: Unexpected status line: "
+                                + requestLine + " received by "
+                                + ss.getLocalSocketAddress()
+                                + " from "
+                                + toClose.getRemoteSocketAddress());
+                        // close accepted socket.
+                        toClose.close();
+                        System.err.println("Tunnel: accepted socket closed.");
+                        continue;
                     }
 
                     // Pipe the input stream of the client connection to the
                     // output stream of the target connection and conversely.
                     // Now the client and target will just talk to each other.
                     System.out.println("Tunnel: Starting tunnel pipes");
-                    Thread t1 = pipe(ccis, targetConnection.getOutputStream(), '+');
-                    Thread t2 = pipe(targetConnection.getInputStream(), ccos, '-');
+                    CompletableFuture<Void> end, end1, end2;
+                    Thread t1 = pipe(ccis, targetConnection.getOutputStream(), '+',
+                            end1 = new CompletableFuture<>());
+                    Thread t2 = pipe(targetConnection.getInputStream(), ccos, '-',
+                            end2 = new CompletableFuture<>());
+                    end = CompletableFuture.allOf(end1, end2);
+                    end.whenComplete(
+                            (r,t) -> {
+                                try { toClose.close(); } catch (IOException x) { }
+                                finally {connectionCFs.remove(end);}
+                            });
+                    connectionCFs.add(end);
                     t1.start();
                     t2.start();
-
-                    // We have only 1 client... wait until it has finished before
-                    // accepting a new connection request.
-                    // System.out.println("Tunnel: Waiting for pipes to close");
-                    t1.join();
-                    t2.join();
-                    System.out.println("Tunnel: Done - waiting for next client");
                 }
             } catch (Throwable ex) {
                 try {
@@ -301,10 +324,14 @@ public void accept() {
                     ex.addSuppressed(ex1);
                 }
                 ex.printStackTrace(System.err);
+            } finally {
+                System.out.println("Tunnel: exiting (stopped=" + stopped + ")");
+                connectionCFs.forEach(cf -> cf.complete(null));
             }
         }
 
-        void stop() throws IOException {
+        public void stop() throws IOException {
+            stopped = true;
             ss.close();
         }
 
diff --git a/test/jdk/java/net/httpclient/http2/RedirectTest.java b/test/jdk/java/net/httpclient/http2/RedirectTest.java
index 8a5130bd375..41b08008baf 100644
--- a/test/jdk/java/net/httpclient/http2/RedirectTest.java
+++ b/test/jdk/java/net/httpclient/http2/RedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -27,23 +27,28 @@
  * @library /lib/testlibrary server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=frames,ssl,requests,responses,errors RedirectTest
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm
+ *      -Djdk.httpclient.HttpClient.log=frames,ssl,requests,responses,errors
+ *      -Djdk.internal.httpclient.debug=true
+ *      RedirectTest
  */
 
-import java.net.*;
-import jdk.incubator.http.*;
-import java.util.Optional;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.Arrays;
 import java.util.Iterator;
 import org.testng.annotations.Test;
-import static jdk.incubator.http.HttpClient.Version.HTTP_2;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static java.net.http.HttpClient.Version.HTTP_2;
 
 public class RedirectTest {
     static int httpPort;
@@ -96,11 +101,11 @@ static void initialize() throws Exception {
             // urls are accessed in sequence below. The first two are on
             // different servers. Third on same server as second. So, the
             // client should use the same http connection.
-            httpURIString = "http://127.0.0.1:" + httpPort + "/foo/";
+            httpURIString = "http://localhost:" + httpPort + "/foo/";
             httpURI = URI.create(httpURIString);
-            altURIString1 = "http://127.0.0.1:" + httpPort + "/redir";
+            altURIString1 = "http://localhost:" + httpPort + "/redir";
             altURI1 = URI.create(altURIString1);
-            altURIString2 = "http://127.0.0.1:" + httpPort + "/redir_again";
+            altURIString2 = "http://localhost:" + httpPort + "/redir_again";
             altURI2 = URI.create(altURIString2);
 
             Redirector r = new Redirector(sup(altURIString1, altURIString2));
@@ -182,9 +187,9 @@ static void simpleTest() throws Exception {
 
         HttpClient client = getClient();
         HttpRequest req = HttpRequest.newBuilder(uri)
-                                     .POST(fromString(SIMPLE_STRING))
+                                     .POST(BodyPublishers.ofString(SIMPLE_STRING))
                                      .build();
-        CompletableFuture<HttpResponse<String>> cf = client.sendAsync(req, asString());
+        CompletableFuture<HttpResponse<String>> cf = client.sendAsync(req, BodyHandlers.ofString());
         HttpResponse<String> response = cf.join();
 
         checkStatus(200, response.statusCode());
diff --git a/test/jdk/java/net/httpclient/http2/ServerPush.java b/test/jdk/java/net/httpclient/http2/ServerPush.java
index 63079b12019..072377da1a2 100644
--- a/test/jdk/java/net/httpclient/http2/ServerPush.java
+++ b/test/jdk/java/net/httpclient/http2/ServerPush.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -27,92 +27,280 @@
  * @library /lib/testlibrary server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
- * @run testng/othervm -Djdk.internal.httpclient.hpack.debug=true -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=errors,requests,responses ServerPush
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm
+ *      -Djdk.httpclient.HttpClient.log=errors,requests,responses
+ *      ServerPush
  */
 
 import java.io.*;
 import java.net.*;
+import java.nio.ByteBuffer;
 import java.nio.file.*;
-import java.nio.file.attribute.*;
-import jdk.incubator.http.*;
-import jdk.incubator.http.HttpResponse.MultiSubscriber;
-import jdk.incubator.http.HttpResponse.BodyHandler;
+import java.net.http.*;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.net.http.HttpResponse.PushPromiseHandler;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.function.Consumer;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.*;
 
-public class ServerPush {
 
-    static ExecutorService e = Executors.newCachedThreadPool();
+public class ServerPush {
 
     static final int LOOPS = 13;
     static final int FILE_SIZE = 512 * 1024 + 343;
 
     static Path tempFile;
 
+    Http2TestServer server;
+    URI uri;
+
+    @BeforeTest
+    public void setup() throws Exception {
+        tempFile = TestUtil.getAFile(FILE_SIZE);
+        server = new Http2TestServer(false, 0);
+        server.addHandler(new PushHandler(tempFile, LOOPS), "/");
+        System.out.println("Using temp file:" + tempFile);
+
+        System.err.println("Server listening on port " + server.getAddress().getPort());
+        server.start();
+        int port = server.getAddress().getPort();
+        uri = new URI("http://localhost:" + port + "/foo/a/b/c");
+    }
+
+    @AfterTest
+    public void teardown() {
+        server.stop();
+    }
+
+    // Test 1 - custom written push promise handler, everything as a String
+    @Test
+    public void testTypeString() throws Exception {
+        String tempFileAsString = new String(Files.readAllBytes(tempFile), UTF_8);
+        ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<String>>>
+                resultMap = new ConcurrentHashMap<>();
+
+        PushPromiseHandler<String> pph = (initial, pushRequest, acceptor) -> {
+            BodyHandler<String> s = BodyHandlers.ofString(UTF_8);
+            CompletableFuture<HttpResponse<String>> cf = acceptor.apply(s);
+            resultMap.put(pushRequest, cf);
+        };
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
+        CompletableFuture<HttpResponse<String>> cf =
+                client.sendAsync(request, BodyHandlers.ofString(UTF_8), pph);
+        cf.join();
+        resultMap.put(request, cf);
+        System.err.println("results.size: " + resultMap.size());
+        for (HttpRequest r : resultMap.keySet()) {
+            HttpResponse<String> response = resultMap.get(r).join();
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.body(), tempFileAsString);
+        }
+        assertEquals(resultMap.size(), LOOPS + 1);
+    }
+
+    // Test 2 - of(...) populating the given Map, everything as a String
     @Test
-    public static void test() throws Exception {
-        Http2TestServer server = null;
-        final Path dir = Files.createTempDirectory("serverPush");
+    public void testTypeStringOfMap() throws Exception {
+        String tempFileAsString = new String(Files.readAllBytes(tempFile), UTF_8);
+        ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<String>>>
+                resultMap = new ConcurrentHashMap<>();
+
+        PushPromiseHandler<String> pph =
+                PushPromiseHandler.of(pushPromise -> BodyHandlers.ofString(UTF_8),
+                                      resultMap);
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
+        CompletableFuture<HttpResponse<String>> cf =
+                client.sendAsync(request, BodyHandlers.ofString(UTF_8), pph);
+        cf.join();
+        resultMap.put(request, cf);
+        System.err.println("results.size: " + resultMap.size());
+        for (HttpRequest r : resultMap.keySet()) {
+            HttpResponse<String> response = resultMap.get(r).join();
+            assertEquals(response.statusCode(), 200);
+            assertEquals(response.body(), tempFileAsString);
+        }
+        assertEquals(resultMap.size(), LOOPS + 1);
+    }
+
+    // --- Path ---
+
+    static final Path dir = Paths.get(".", "serverPush");
+    static BodyHandler<Path> requestToPath(HttpRequest req) {
+        URI u = req.uri();
+        Path path = Paths.get(dir.toString(), u.getPath());
         try {
-            server = new Http2TestServer(false, 0);
-            server.addHandler(new PushHandler(FILE_SIZE, LOOPS), "/");
-            tempFile = TestUtil.getAFile(FILE_SIZE);
-
-            System.err.println("Server listening on port " + server.getAddress().getPort());
-            server.start();
-            int port = server.getAddress().getPort();
-
-            // use multi-level path
-            URI uri = new URI("http://127.0.0.1:" + port + "/foo/a/b/c");
-            HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
-
-            CompletableFuture<MultiMapResult<Path>> cf =
-                HttpClient.newBuilder().version(HttpClient.Version.HTTP_2)
-                    .executor(e).build().sendAsync(
-                        request, MultiSubscriber.asMap((req) -> {
-                            URI u = req.uri();
-                            Path path = Paths.get(dir.toString(), u.getPath());
-                            try {
-                                Files.createDirectories(path.getParent());
-                            } catch (IOException ee) {
-                                throw new UncheckedIOException(ee);
-                            }
-                            return Optional.of(BodyHandler.asFile(path));
-                        }
-                    ));
-            MultiMapResult<Path> results = cf.get();
-
-            //HttpResponse resp = request.response();
-            System.err.println(results.size());
-            Set<HttpRequest> requests = results.keySet();
-
-            for (HttpRequest r : requests) {
-                URI u = r.uri();
-                Path result = results.get(r).get().body();
-                System.err.printf("%s -> %s\n", u.toString(), result.toString());
-                TestUtil.compareFiles(result, tempFile);
+            Files.createDirectories(path.getParent());
+        } catch (IOException ee) {
+            throw new UncheckedIOException(ee);
+        }
+        return BodyHandlers.ofFile(path);
+    }
+
+    // Test 3 - custom written push promise handler, everything as a Path
+    @Test
+    public void testTypePath() throws Exception {
+        String tempFileAsString = new String(Files.readAllBytes(tempFile), UTF_8);
+        ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<Path>>> resultsMap
+                = new ConcurrentHashMap<>();
+
+        PushPromiseHandler<Path> pushPromiseHandler = (initial, pushRequest, acceptor) -> {
+            BodyHandler<Path> pp = requestToPath(pushRequest);
+            CompletableFuture<HttpResponse<Path>> cf = acceptor.apply(pp);
+            resultsMap.put(pushRequest, cf);
+        };
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
+        CompletableFuture<HttpResponse<Path>> cf =
+                client.sendAsync(request, requestToPath(request), pushPromiseHandler);
+        cf.join();
+        resultsMap.put(request, cf);
+
+        for (HttpRequest r : resultsMap.keySet()) {
+            HttpResponse<Path> response = resultsMap.get(r).join();
+            assertEquals(response.statusCode(), 200);
+            String fileAsString = new String(Files.readAllBytes(response.body()), UTF_8);
+            assertEquals(fileAsString, tempFileAsString);
+        }
+        assertEquals(resultsMap.size(),  LOOPS + 1);
+    }
+
+    // Test 4 - of(...) populating the given Map, everything as a Path
+    @Test
+    public void testTypePathOfMap() throws Exception {
+        String tempFileAsString = new String(Files.readAllBytes(tempFile), UTF_8);
+        ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<Path>>> resultsMap
+                = new ConcurrentHashMap<>();
+
+        PushPromiseHandler<Path> pushPromiseHandler =
+                PushPromiseHandler.of(pushRequest -> requestToPath(pushRequest),
+                        resultsMap);
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
+        CompletableFuture<HttpResponse<Path>> cf =
+                client.sendAsync(request, requestToPath(request), pushPromiseHandler);
+        cf.join();
+        resultsMap.put(request, cf);
+
+        for (HttpRequest r : resultsMap.keySet()) {
+            HttpResponse<Path> response = resultsMap.get(r).join();
+            assertEquals(response.statusCode(), 200);
+            String fileAsString = new String(Files.readAllBytes(response.body()), UTF_8);
+            assertEquals(fileAsString, tempFileAsString);
+        }
+        assertEquals(resultsMap.size(),  LOOPS + 1);
+    }
+
+    // ---  Consumer<byte[]> ---
+
+    static class ByteArrayConsumer implements Consumer<Optional<byte[]>> {
+        volatile List<byte[]> listByteArrays = new ArrayList<>();
+        volatile byte[] accumulatedBytes;
+
+        public byte[] getAccumulatedBytes() { return accumulatedBytes; }
+
+        @Override
+        public void accept(Optional<byte[]> optionalBytes) {
+            assert accumulatedBytes == null;
+            if (!optionalBytes.isPresent()) {
+                int size = listByteArrays.stream().mapToInt(ba -> ba.length).sum();
+                ByteBuffer bb = ByteBuffer.allocate(size);
+                listByteArrays.stream().forEach(ba -> bb.put(ba));
+                accumulatedBytes = bb.array();
+            } else {
+                listByteArrays.add(optionalBytes.get());
             }
-            if (requests.size() != LOOPS + 1)
-                throw new RuntimeException("some results missing");
-            System.out.println("TEST OK: sleeping for 5 sec");
-            Thread.sleep (5 * 1000);
-        } finally {
-            e.shutdownNow();
-            server.stop();
-            Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
-                public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
-                    dir.toFile().delete();
-                    return FileVisitResult.CONTINUE;
-                }
-                public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) {
-                    path.toFile().delete();
-                    return FileVisitResult.CONTINUE;
-                }
-            });
         }
     }
+
+    // Test 5 - custom written handler, everything as a consumer of optional byte[]
+    @Test
+    public void testTypeByteArrayConsumer() throws Exception {
+        String tempFileAsString = new String(Files.readAllBytes(tempFile), UTF_8);
+        ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<Void>>> resultsMap
+                = new ConcurrentHashMap<>();
+        Map<HttpRequest,ByteArrayConsumer> byteArrayConsumerMap
+                = new ConcurrentHashMap<>();
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
+        ByteArrayConsumer bac = new ByteArrayConsumer();
+        byteArrayConsumerMap.put(request, bac);
+
+        PushPromiseHandler<Void> pushPromiseHandler = (initial, pushRequest, acceptor) -> {
+            CompletableFuture<HttpResponse<Void>> cf = acceptor.apply(
+                    (info) -> {
+                        ByteArrayConsumer bc = new ByteArrayConsumer();
+                        byteArrayConsumerMap.put(pushRequest, bc);
+                        return BodySubscribers.ofByteArrayConsumer(bc); } );
+            resultsMap.put(pushRequest, cf);
+        };
+
+        CompletableFuture<HttpResponse<Void>> cf =
+                client.sendAsync(request, BodyHandlers.ofByteArrayConsumer(bac), pushPromiseHandler);
+        cf.join();
+        resultsMap.put(request, cf);
+
+        for (HttpRequest r : resultsMap.keySet()) {
+            HttpResponse<Void> response = resultsMap.get(r).join();
+            assertEquals(response.statusCode(), 200);
+            byte[] ba = byteArrayConsumerMap.get(r).getAccumulatedBytes();
+            String result = new String(ba, UTF_8);
+            assertEquals(result, tempFileAsString);
+        }
+        assertEquals(resultsMap.size(), LOOPS + 1);
+    }
+
+    // Test 6 - of(...) populating the given Map, everything as a consumer of optional byte[]
+    @Test
+    public void testTypeByteArrayConsumerOfMap() throws Exception {
+        String tempFileAsString = new String(Files.readAllBytes(tempFile), UTF_8);
+        ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<Void>>> resultsMap
+                = new ConcurrentHashMap<>();
+        Map<HttpRequest,ByteArrayConsumer> byteArrayConsumerMap
+                = new ConcurrentHashMap<>();
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
+        ByteArrayConsumer bac = new ByteArrayConsumer();
+        byteArrayConsumerMap.put(request, bac);
+
+        PushPromiseHandler<Void> pushPromiseHandler =
+                PushPromiseHandler.of(
+                        pushRequest -> {
+                            ByteArrayConsumer bc = new ByteArrayConsumer();
+                            byteArrayConsumerMap.put(pushRequest, bc);
+                            return BodyHandlers.ofByteArrayConsumer(bc);
+                        },
+                        resultsMap);
+
+        CompletableFuture<HttpResponse<Void>> cf =
+                client.sendAsync(request, BodyHandlers.ofByteArrayConsumer(bac), pushPromiseHandler);
+        cf.join();
+        resultsMap.put(request, cf);
+
+        for (HttpRequest r : resultsMap.keySet()) {
+            HttpResponse<Void> response = resultsMap.get(r).join();
+            assertEquals(response.statusCode(), 200);
+            byte[] ba = byteArrayConsumerMap.get(r).getAccumulatedBytes();
+            String result = new String(ba, UTF_8);
+            assertEquals(result, tempFileAsString);
+        }
+        assertEquals(resultsMap.size(), LOOPS + 1);
+    }
 }
diff --git a/test/jdk/java/net/httpclient/http2/ServerPushWithDiffTypes.java b/test/jdk/java/net/httpclient/http2/ServerPushWithDiffTypes.java
new file mode 100644
index 00000000000..b973d2ed96f
--- /dev/null
+++ b/test/jdk/java/net/httpclient/http2/ServerPushWithDiffTypes.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright (c) 2018, 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 server
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @modules java.base/sun.net.www.http
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm
+ *       -Djdk.internal.httpclient.debug=true
+ *       -Djdk.httpclient.HttpClient.log=errors,requests,responses
+ *       ServerPushWithDiffTypes
+ */
+
+import java.io.*;
+import java.net.*;
+import java.nio.ByteBuffer;
+import java.nio.file.*;
+import java.net.http.*;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.BodySubscribers;
+import java.util.*;
+import java.util.concurrent.*;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import org.testng.annotations.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+
+public class ServerPushWithDiffTypes {
+
+    static Map<String,String> PUSH_PROMISES = Map.of(
+            "/x/y/z/1", "the first push promise body",
+            "/x/y/z/2", "the second push promise body",
+            "/x/y/z/3", "the third push promise body",
+            "/x/y/z/4", "the fourth push promise body",
+            "/x/y/z/5", "the fifth push promise body",
+            "/x/y/z/6", "the sixth push promise body",
+            "/x/y/z/7", "the seventh push promise body",
+            "/x/y/z/8", "the eighth push promise body",
+            "/x/y/z/9", "the ninth push promise body"
+    );
+
+    @Test
+    public static void test() throws Exception {
+        Http2TestServer server = null;
+        try {
+            server = new Http2TestServer(false, 0);
+            Http2Handler handler =
+                    new ServerPushHandler("the main response body",
+                                          PUSH_PROMISES);
+            server.addHandler(handler, "/");
+            server.start();
+            int port = server.getAddress().getPort();
+            System.err.println("Server listening on port " + port);
+
+            HttpClient client = HttpClient.newHttpClient();
+            // use multi-level path
+            URI uri = new URI("http://localhost:" + port + "/foo/a/b/c");
+            HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
+
+            ConcurrentMap<HttpRequest,CompletableFuture<HttpResponse<BodyAndType<?>>>>
+                    results = new ConcurrentHashMap<>();
+            PushPromiseHandler<BodyAndType<?>> bh = PushPromiseHandler.of(
+                    (pushRequest) -> new BodyAndTypeHandler(pushRequest), results);
+
+            CompletableFuture<HttpResponse<BodyAndType<?>>> cf =
+                    client.sendAsync(request, new BodyAndTypeHandler(request), bh);
+            results.put(request, cf);
+            cf.join();
+
+            assertEquals(results.size(), PUSH_PROMISES.size() + 1);
+
+            for (HttpRequest r : results.keySet()) {
+                URI u = r.uri();
+                BodyAndType<?> body = results.get(r).get().body();
+                String result;
+                // convert all body types to String for easier comparison
+                if (body.type() == String.class) {
+                    result = (String)body.getBody();
+                } else if (body.type() == byte[].class) {
+                    byte[] bytes = (byte[])body.getBody();
+                    result = new String(bytes, UTF_8);
+                } else if (Path.class.isAssignableFrom(body.type())) {
+                    Path path = (Path)body.getBody();
+                    result = new String(Files.readAllBytes(path), UTF_8);
+                } else {
+                    throw new AssertionError("Unknown:" + body.type());
+                }
+
+                System.err.printf("%s -> %s\n", u.toString(), result.toString());
+                String expected = PUSH_PROMISES.get(r.uri().getPath());
+                if (expected == null)
+                    expected = "the main response body";
+                assertEquals(result, expected);
+            }
+        } finally {
+            server.stop();
+        }
+    }
+
+    interface BodyAndType<T> {
+        Class<T> type();
+        T getBody();
+    }
+
+    static final Path WORK_DIR = Paths.get(".");
+
+    static class BodyAndTypeHandler implements BodyHandler<BodyAndType<?>> {
+        int count;
+        final HttpRequest request;
+
+        BodyAndTypeHandler(HttpRequest request) {
+            this.request = request;
+        }
+
+        @Override
+        public HttpResponse.BodySubscriber<BodyAndType<?>> apply(HttpResponse.ResponseInfo info) {
+            int whichType = count++ % 3;  // real world may base this on the request metadata
+            switch (whichType) {
+                case 0: // String
+                    return new BodyAndTypeSubscriber(BodySubscribers.ofString(UTF_8));
+                case 1: // byte[]
+                    return new BodyAndTypeSubscriber(BodySubscribers.ofByteArray());
+                case 2: // Path
+                    URI u = request.uri();
+                    Path path = Paths.get(WORK_DIR.toString(), u.getPath());
+                    try {
+                        Files.createDirectories(path.getParent());
+                    } catch (IOException ee) {
+                        throw new UncheckedIOException(ee);
+                    }
+                    return new BodyAndTypeSubscriber(BodySubscribers.ofFile(path));
+                default:
+                    throw new AssertionError("Unexpected " + whichType);
+            }
+        }
+    }
+
+    static class BodyAndTypeSubscriber<T>
+        implements HttpResponse.BodySubscriber<BodyAndType<T>>
+    {
+        private static class BodyAndTypeImpl<T> implements BodyAndType<T> {
+            private final Class<T> type;
+            private final T body;
+            public BodyAndTypeImpl(Class<T> type, T body) { this.type = type; this.body = body; }
+            @Override public Class<T> type() { return type; }
+            @Override public T getBody() { return body; }
+        }
+
+        private final BodySubscriber<?> bodySubscriber;
+        private final CompletableFuture<BodyAndType<T>> cf;
+
+        BodyAndTypeSubscriber(BodySubscriber bodySubscriber) {
+            this.bodySubscriber = bodySubscriber;
+            cf = new CompletableFuture<>();
+            bodySubscriber.getBody().whenComplete(
+                    (r,t) -> cf.complete(new BodyAndTypeImpl(r.getClass(), r)));
+        }
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            bodySubscriber.onSubscribe(subscription);
+        }
+
+        @Override
+        public void onNext(List<ByteBuffer> item) {
+            bodySubscriber.onNext(item);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            bodySubscriber.onError(throwable);
+            cf.completeExceptionally(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            bodySubscriber.onComplete();
+        }
+
+        @Override
+        public CompletionStage<BodyAndType<T>> getBody() {
+            return cf;
+        }
+    }
+
+    // --- server push handler ---
+    static class ServerPushHandler implements Http2Handler {
+
+        private final String mainResponseBody;
+        private final Map<String,String> promises;
+
+        public ServerPushHandler(String mainResponseBody,
+                                 Map<String,String> promises)
+            throws Exception
+        {
+            Objects.requireNonNull(promises);
+            this.mainResponseBody = mainResponseBody;
+            this.promises = promises;
+        }
+
+        public void handle(Http2TestExchange exchange) throws IOException {
+            System.err.println("Server: handle " + exchange);
+            try (InputStream is = exchange.getRequestBody()) {
+                is.readAllBytes();
+            }
+
+            if (exchange.serverPushAllowed()) {
+                pushPromises(exchange);
+            }
+
+            // response data for the main response
+            try (OutputStream os = exchange.getResponseBody()) {
+                byte[] bytes = mainResponseBody.getBytes(UTF_8);
+                exchange.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+
+        private void pushPromises(Http2TestExchange exchange) throws IOException {
+            URI requestURI = exchange.getRequestURI();
+            for (Map.Entry<String,String> promise : promises.entrySet()) {
+                URI uri = requestURI.resolve(promise.getKey());
+                InputStream is = new ByteArrayInputStream(promise.getValue().getBytes(UTF_8));
+                HttpHeadersImpl headers = new HttpHeadersImpl();
+                // TODO: add some check on headers, maybe
+                headers.addHeader("X-Promise", promise.getKey());
+                exchange.serverPush(uri, headers, is);
+            }
+            System.err.println("Server: All pushes sent");
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/http2/TLSConnection.java b/test/jdk/java/net/httpclient/http2/TLSConnection.java
index 0e816d063b8..6c1cb89ed80 100644
--- a/test/jdk/java/net/httpclient/http2/TLSConnection.java
+++ b/test/jdk/java/net/httpclient/http2/TLSConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -27,13 +27,12 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandlers;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSession;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
 
 /*
  * @test
@@ -41,16 +40,21 @@
  * @library server
  * @summary Checks that SSL parameters can be set for HTTP/2 connection
  * @modules java.base/sun.net.www.http
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.common
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- *          jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
- * @run main/othervm TLSConnection
+ *          java.net.http/jdk.internal.net.http.common
+ *          java.net.http/jdk.internal.net.http.frame
+ *          java.net.http/jdk.internal.net.http.hpack
+ * @run main/othervm
+ *       -Djdk.internal.httpclient.debug=true
+ *       -Djdk.httpclient.HttpClient.log=all
+ *       TLSConnection
  */
 public class TLSConnection {
 
     private static final String KEYSTORE = System.getProperty("test.src")
             + File.separator + "keystore.p12";
-   private static final String PASSWORD = "password";
+    private static final String PASSWORD = "password";
+
+    private static final SSLParameters USE_DEFAULT_SSL_PARAMETERS = new SSLParameters();
 
     public static void main(String[] args) throws Exception {
 
@@ -65,51 +69,52 @@ public static void main(String[] args) throws Exception {
 
         Handler handler = new Handler();
 
-        try (Http2TestServer server = new Http2TestServer("127.0.0.1", true, 0)) {
+        try (Http2TestServer server = new Http2TestServer("localhost", true, 0)) {
             server.addHandler(handler, "/");
             server.start();
 
             int port = server.getAddress().getPort();
-            String uriString = "https://127.0.0.1:" + Integer.toString(port);
+            String uriString = "https://localhost:" + Integer.toString(port);
 
             // run test cases
             boolean success = true;
 
             SSLParameters parameters = null;
             success &= expectFailure(
-                    "Test #1: SSL parameters is null, expect NPE",
+                    "---\nTest #1: SSL parameters is null, expect NPE",
                     () -> connect(uriString, parameters),
                     NullPointerException.class);
 
             success &= expectSuccess(
-                    "Test #2: default SSL parameters, "
+                    "---\nTest #2: default SSL parameters, "
                             + "expect successful connection",
-                    () -> connect(uriString, new SSLParameters()));
+                    () -> connect(uriString, USE_DEFAULT_SSL_PARAMETERS));
             success &= checkProtocol(handler.getSSLSession(), "TLSv1.2");
 
             // set SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA cipher suite
             // which has less priority in default cipher suite list
             success &= expectSuccess(
-                    "Test #3: SSL parameters with "
+                    "---\nTest #3: SSL parameters with "
                             + "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA cipher suite, "
                             + "expect successful connection",
                     () -> connect(uriString, new SSLParameters(
-                            new String[] { "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA" })));
+                            new String[] { "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA" },
+                            new String[] { "TLSv1.2" })));
             success &= checkProtocol(handler.getSSLSession(), "TLSv1.2");
             success &= checkCipherSuite(handler.getSSLSession(),
                     "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA");
 
             // set TLS_RSA_WITH_AES_128_CBC_SHA cipher suite
             // which has less priority in default cipher suite list
-            // also set TLSv11 protocol
+            // also set TLSv1.2 protocol
             success &= expectSuccess(
-                    "Test #4: SSL parameters with "
+                    "---\nTest #4: SSL parameters with "
                             + "TLS_RSA_WITH_AES_128_CBC_SHA cipher suite,"
                             + " expect successful connection",
                     () -> connect(uriString, new SSLParameters(
                             new String[] { "TLS_RSA_WITH_AES_128_CBC_SHA" },
-                            new String[] { "TLSv1.1" })));
-            success &= checkProtocol(handler.getSSLSession(), "TLSv1.1");
+                            new String[] { "TLSv1.2" })));
+            success &= checkProtocol(handler.getSSLSession(), "TLSv1.2");
             success &= checkCipherSuite(handler.getSSLSession(),
                     "TLS_RSA_WITH_AES_128_CBC_SHA");
 
@@ -158,16 +163,18 @@ SSLSession getSSLSession() {
     }
 
     private static void connect(String uriString, SSLParameters sslParameters)
-        throws URISyntaxException, IOException, InterruptedException
+            throws URISyntaxException, IOException, InterruptedException
     {
-        HttpClient client = HttpClient.newBuilder()
-                                      .sslParameters(sslParameters)
-                                      .version(HttpClient.Version.HTTP_2)
-                                      .build();
+        HttpClient.Builder builder = HttpClient.newBuilder()
+                .version(HttpClient.Version.HTTP_2);
+        if (sslParameters != USE_DEFAULT_SSL_PARAMETERS)
+            builder.sslParameters(sslParameters);
+        HttpClient client = builder.build();
+
         HttpRequest request = HttpRequest.newBuilder(new URI(uriString))
-                                         .POST(fromString("body"))
-                                         .build();
-        String body = client.send(request, asString()).body();
+                .POST(BodyPublishers.ofString("body"))
+                .build();
+        String body = client.send(request, BodyHandlers.ofString()).body();
 
         System.out.println("Response: " + body);
     }
@@ -222,7 +229,7 @@ private static boolean expectSuccess(String message, Test test) {
     }
 
     private static boolean expectFailure(String message, Test test,
-            Class<? extends Throwable> expectedException) {
+                                         Class<? extends Throwable> expectedException) {
 
         System.out.println(message);
         try {
@@ -243,5 +250,4 @@ private static boolean expectFailure(String message, Test test,
             return true;
         }
     }
-
 }
diff --git a/test/jdk/java/net/httpclient/http2/Timeout.java b/test/jdk/java/net/httpclient/http2/Timeout.java
index 178e80f6363..42a51f56fab 100644
--- a/test/jdk/java/net/httpclient/http2/Timeout.java
+++ b/test/jdk/java/net/httpclient/http2/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,19 +23,21 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
-import jdk.incubator.http.HttpTimeoutException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpTimeoutException;
 import java.time.Duration;
 import java.util.concurrent.CompletionException;
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocket;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
 
 /*
  * @test
@@ -69,7 +71,9 @@ public static void test(boolean async) throws Exception {
                 (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
 
         try (SSLServerSocket ssocket =
-                (SSLServerSocket) factory.createServerSocket(RANDOM_PORT)) {
+                (SSLServerSocket) factory.createServerSocket()) {
+            ssocket.setReuseAddress(false);
+            ssocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), RANDOM_PORT));
 
             // start server
             Thread server = new Thread(() -> {
@@ -118,9 +122,9 @@ private static void connect(String server) throws Exception {
                                           .build();
             HttpRequest request = HttpRequest.newBuilder(new URI(server))
                                              .timeout(Duration.ofMillis(TIMEOUT))
-                                             .POST(fromString("body"))
+                                             .POST(BodyPublishers.ofString("body"))
                                              .build();
-            HttpResponse<String> response = client.send(request, asString());
+            HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
             System.out.println("Received unexpected reply: " + response.statusCode());
             throw new RuntimeException("unexpected successful connection");
         } catch (HttpTimeoutException e) {
@@ -135,9 +139,9 @@ private static void connectAsync(String server) throws Exception {
                     .build();
             HttpRequest request = HttpRequest.newBuilder(new URI(server))
                     .timeout(Duration.ofMillis(TIMEOUT))
-                    .POST(fromString("body"))
+                    .POST(BodyPublishers.ofString("body"))
                     .build();
-            HttpResponse<String> response = client.sendAsync(request, asString()).join();
+            HttpResponse<String> response = client.sendAsync(request, BodyHandlers.ofString()).join();
             System.out.println("Received unexpected reply: " + response.statusCode());
             throw new RuntimeException("unexpected successful connection");
         } catch (CompletionException e) {
diff --git a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BinaryPrimitivesTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BinaryPrimitivesTest.java
similarity index 92%
rename from test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BinaryPrimitivesTest.java
rename to test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BinaryPrimitivesTest.java
index ee8c99c0887..d3cf1a59483 100644
--- a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BinaryPrimitivesTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BinaryPrimitivesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import org.testng.annotations.Test;
 
@@ -35,8 +35,8 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
-import static jdk.incubator.http.internal.hpack.BuffersTestingKit.*;
-import static jdk.incubator.http.internal.hpack.TestHelper.newRandom;
+import static jdk.internal.net.http.hpack.BuffersTestingKit.*;
+import static jdk.internal.net.http.hpack.TestHelper.newRandom;
 
 //
 // Some of the tests below overlap in what they test. This allows to diagnose
@@ -44,7 +44,7 @@
 //
 public final class BinaryPrimitivesTest {
 
-    private final Random rnd = newRandom();
+    private final Random random = newRandom();
 
     @Test
     public void integerRead1() {
@@ -100,8 +100,8 @@ public void integerIdentity() throws IOException {
                 buf.clear();
             }
         }
-        System.out.printf("totalCases: %,d, maxFilling: %,d, maxValue: %,d%n",
-                totalCases, maxFilling, MAX_VALUE);
+//        System.out.printf("totalCases: %,d, maxFilling: %,d, maxValue: %,d%n",
+//                totalCases, maxFilling, MAX_VALUE);
     }
 
     @Test
@@ -111,9 +111,9 @@ public void integerReadChunked() {
         ByteBuffer bb = ByteBuffer.allocate(8);
         IntegerWriter w = new IntegerWriter();
         for (int i = 0; i < NUM_TESTS; i++) {
-            final int N = 1 + rnd.nextInt(8);
-            final int expected = rnd.nextInt(Integer.MAX_VALUE) + 1;
-            w.reset().configure(expected, N, rnd.nextInt()).write(bb);
+            final int N = 1 + random.nextInt(8);
+            final int expected = random.nextInt(Integer.MAX_VALUE) + 1;
+            w.reset().configure(expected, N, random.nextInt()).write(bb);
             bb.flip();
 
             forEachSplit(bb,
@@ -143,9 +143,9 @@ public void integerWriteChunked() {
         IntegerWriter w = new IntegerWriter();
         IntegerReader r = new IntegerReader();
         for (int i = 0; i < 1024; i++) { // number of tests
-            final int N = 1 + rnd.nextInt(8);
-            final int payload = rnd.nextInt(255);
-            final int expected = rnd.nextInt(Integer.MAX_VALUE) + 1;
+            final int N = 1 + random.nextInt(8);
+            final int payload = random.nextInt(255);
+            final int expected = random.nextInt(Integer.MAX_VALUE) + 1;
 
             forEachSplit(bb,
                     (buffers) -> {
@@ -195,7 +195,7 @@ public void stringIdentity() throws IOException {
                 chars.clear();
 
                 byte[] b = new byte[len];
-                rnd.nextBytes(b);
+                random.nextBytes(b);
 
                 String expected = new String(b, StandardCharsets.ISO_8859_1); // reference string
 
@@ -236,7 +236,7 @@ public void stringWriteChunked() {
         for (int len = 0; len <= MAX_STRING_LENGTH; len++) {
 
             byte[] b = new byte[len];
-            rnd.nextBytes(b);
+            random.nextBytes(b);
 
             String expected = new String(b, StandardCharsets.ISO_8859_1); // reference string
 
@@ -276,7 +276,7 @@ public void stringReadChunked() {
         for (int len = 0; len <= MAX_STRING_LENGTH; len++) {
 
             byte[] b = new byte[len];
-            rnd.nextBytes(b);
+            random.nextBytes(b);
 
             String expected = new String(b, StandardCharsets.ISO_8859_1); // reference string
 
@@ -325,7 +325,7 @@ public void stringReadChunked() {
 //                binary.clear();
 //
 //                byte[] bytes = new byte[len];
-//                rnd.nextBytes(bytes);
+//                random.nextBytes(bytes);
 //
 //                String s = new String(bytes, StandardCharsets.ISO_8859_1);
 //
@@ -356,7 +356,7 @@ private static void verifyRead(byte[] data, int expected, int N) {
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
-        assertEquals(expected, reader.get());
+        assertEquals(reader.get(), expected);
     }
 
     private void verifyWrite(byte[] expected, int data, int N) {
@@ -364,6 +364,6 @@ private void verifyWrite(byte[] expected, int data, int N) {
         ByteBuffer buf = ByteBuffer.allocate(2 * expected.length);
         w.configure(data, N, 1).write(buf);
         buf.flip();
-        assertEquals(ByteBuffer.wrap(expected), buf);
+        assertEquals(buf, ByteBuffer.wrap(expected));
     }
 }
diff --git a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BuffersTestingKit.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BuffersTestingKit.java
similarity index 98%
rename from test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BuffersTestingKit.java
rename to test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BuffersTestingKit.java
index 0b4165eb11a..3bc8406d68d 100644
--- a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/BuffersTestingKit.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BuffersTestingKit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 import java.util.*;
diff --git a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/CircularBufferTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/CircularBufferTest.java
similarity index 72%
rename from test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/CircularBufferTest.java
rename to test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/CircularBufferTest.java
index 6cbfc0b7a3d..20d06198d8d 100644
--- a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/CircularBufferTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/CircularBufferTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,27 +20,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import jdk.incubator.http.internal.hpack.HeaderTable.CircularBuffer;
+import jdk.internal.net.http.hpack.SimpleHeaderTable.CircularBuffer;
 
 import java.util.Queue;
 import java.util.Random;
 import java.util.concurrent.ArrayBlockingQueue;
 
 import static org.testng.Assert.assertEquals;
-import static jdk.incubator.http.internal.hpack.TestHelper.newRandom;
+import static jdk.internal.net.http.hpack.TestHelper.assertVoidThrows;
+import static jdk.internal.net.http.hpack.TestHelper.newRandom;
 
 public final class CircularBufferTest {
 
-    private final Random r = newRandom();
-
-    @BeforeClass
-    public void setUp() {
-        r.setSeed(System.currentTimeMillis());
-    }
+    private final Random random = newRandom();
 
     @Test
     public void queue() {
@@ -62,6 +57,27 @@ public void downSizeEmptyBuffer() {
         buffer.resize(15);
     }
 
+    @Test
+    public void newCapacityLessThanCurrentSize1() {
+        CircularBuffer<Integer> buffer = new CircularBuffer<>(0);
+        buffer.resize(5);
+        buffer.add(1);
+        buffer.add(1);
+        buffer.add(1);
+        assertVoidThrows(IllegalStateException.class, () -> buffer.resize(2));
+        assertVoidThrows(IllegalStateException.class, () -> buffer.resize(1));
+    }
+
+    @Test
+    public void newCapacityLessThanCurrentSize2() {
+        CircularBuffer<Integer> buffer = new CircularBuffer<>(5);
+        buffer.add(1);
+        buffer.add(1);
+        buffer.add(1);
+        assertVoidThrows(IllegalStateException.class, () -> buffer.resize(2));
+        assertVoidThrows(IllegalStateException.class, () -> buffer.resize(1));
+    }
+
     private void resizeOnce(int capacity) {
 
         int nextNumberToPut = 0;
@@ -74,12 +90,12 @@ private void resizeOnce(int capacity) {
             buffer.add(nextNumberToPut);
             referenceQueue.add(nextNumberToPut);
         }
-        int gets = r.nextInt(capacity); // [0, capacity)
+        int gets = random.nextInt(capacity); // [0, capacity)
         for (int i = 0; i < gets; i++) {
             referenceQueue.poll();
             buffer.remove();
         }
-        int puts = r.nextInt(gets + 1); // [0, gets]
+        int puts = random.nextInt(gets + 1); // [0, gets]
         for (int i = 0; i < puts; i++, nextNumberToPut++) {
             buffer.add(nextNumberToPut);
             referenceQueue.add(nextNumberToPut);
@@ -104,7 +120,7 @@ private void queueOnce(int capacity, int numWraps) {
 
         while (totalPuts < putsLimit) {
             assert remainingCapacity + size == capacity;
-            int puts = r.nextInt(remainingCapacity + 1); // [0, remainingCapacity]
+            int puts = random.nextInt(remainingCapacity + 1); // [0, remainingCapacity]
             remainingCapacity -= puts;
             size += puts;
             for (int i = 0; i < puts; i++, nextNumberToPut++) {
@@ -112,7 +128,7 @@ private void queueOnce(int capacity, int numWraps) {
                 buffer.add(nextNumberToPut);
             }
             totalPuts += puts;
-            int gets = r.nextInt(size + 1); // [0, size]
+            int gets = random.nextInt(size + 1); // [0, size]
             size -= gets;
             remainingCapacity += gets;
             for (int i = 0; i < gets; i++) {
diff --git a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/DecoderTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java
similarity index 99%
rename from test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/DecoderTest.java
rename to test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java
index 155603f241a..cf302dab135 100644
--- a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/DecoderTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import org.testng.annotations.Test;
 
@@ -35,7 +35,7 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
-import static jdk.incubator.http.internal.hpack.TestHelper.*;
+import static jdk.internal.net.http.hpack.TestHelper.*;
 
 //
 // Tests whose names start with "testX" are the ones captured from real HPACK
diff --git a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/EncoderTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java
similarity index 98%
rename from test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/EncoderTest.java
rename to test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java
index fa2ce93e32f..e96ab298bea 100644
--- a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/EncoderTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/EncoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import org.testng.annotations.Test;
 
@@ -35,10 +35,10 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import static jdk.incubator.http.internal.hpack.BuffersTestingKit.concat;
-import static jdk.incubator.http.internal.hpack.BuffersTestingKit.forEachSplit;
-import static jdk.incubator.http.internal.hpack.SpecHelper.toHexdump;
-import static jdk.incubator.http.internal.hpack.TestHelper.assertVoidThrows;
+import static jdk.internal.net.http.hpack.BuffersTestingKit.concat;
+import static jdk.internal.net.http.hpack.BuffersTestingKit.forEachSplit;
+import static jdk.internal.net.http.hpack.SpecHelper.toHexdump;
+import static jdk.internal.net.http.hpack.TestHelper.assertVoidThrows;
 import static java.util.Arrays.asList;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
diff --git a/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HeaderTableTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HeaderTableTest.java
new file mode 100644
index 00000000000..c4a19a9d849
--- /dev/null
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HeaderTableTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2014, 2018, 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.
+ */
+package jdk.internal.net.http.hpack;
+
+import jdk.internal.net.http.hpack.SimpleHeaderTable.HeaderField;
+import org.testng.annotations.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.testng.Assert.assertEquals;
+
+public class HeaderTableTest extends SimpleHeaderTableTest {
+
+    @Override
+    protected HeaderTable createHeaderTable(int maxSize) {
+        return new HeaderTable(maxSize, HPACK.getLogger());
+    }
+
+    @Test
+    public void staticData() {
+        HeaderTable table = createHeaderTable(0);
+        Map<Integer, HeaderField> staticHeaderFields = createStaticEntries();
+
+        Map<String, Integer> minimalIndexes = new HashMap<>();
+
+        for (Map.Entry<Integer, HeaderField> e : staticHeaderFields.entrySet()) {
+            Integer idx = e.getKey();
+            String hName = e.getValue().name;
+            Integer midx = minimalIndexes.get(hName);
+            if (midx == null) {
+                minimalIndexes.put(hName, idx);
+            } else {
+                minimalIndexes.put(hName, Math.min(idx, midx));
+            }
+        }
+
+        staticHeaderFields.entrySet().forEach(
+                e -> {
+                    // lookup
+                    HeaderField actualHeaderField = table.get(e.getKey());
+                    HeaderField expectedHeaderField = e.getValue();
+                    assertEquals(actualHeaderField, expectedHeaderField);
+
+                    // reverse lookup (name, value)
+                    String hName = expectedHeaderField.name;
+                    String hValue = expectedHeaderField.value;
+                    int expectedIndex = e.getKey();
+                    int actualIndex = table.indexOf(hName, hValue);
+
+                    assertEquals(actualIndex, expectedIndex);
+
+                    // reverse lookup (name)
+                    int expectedMinimalIndex = minimalIndexes.get(hName);
+                    int actualMinimalIndex = table.indexOf(hName, "blah-blah");
+
+                    assertEquals(-actualMinimalIndex, expectedMinimalIndex);
+                }
+        );
+    }
+
+    @Test
+    public void lowerIndexPriority() {
+        HeaderTable table = createHeaderTable(256);
+        int oldLength = table.length();
+        table.put("bender", "rodriguez");
+        table.put("bender", "rodriguez");
+        table.put("bender", "rodriguez");
+
+        assertEquals(table.length(), oldLength + 3); // more like an assumption
+        int i = table.indexOf("bender", "rodriguez");
+        assertEquals(i, oldLength + 1);
+    }
+
+    @Test
+    public void indexesAreNotLost2() {
+        HeaderTable table = createHeaderTable(256);
+        int oldLength = table.length();
+        table.put("bender", "rodriguez");
+        assertEquals(table.indexOf("bender", "rodriguez"), oldLength + 1);
+        table.put("bender", "rodriguez");
+        assertEquals(table.indexOf("bender", "rodriguez"), oldLength + 1);
+        table.evictEntry();
+        assertEquals(table.indexOf("bender", "rodriguez"), oldLength + 1);
+        table.evictEntry();
+        assertEquals(table.indexOf("bender", "rodriguez"), 0);
+    }
+
+    @Test
+    public void lowerIndexPriority2() {
+        HeaderTable table = createHeaderTable(256);
+        int oldLength = table.length();
+        int idx = rnd.nextInt(oldLength) + 1;
+        HeaderField f = table.get(idx);
+        table.put(f.name, f.value);
+        assertEquals(table.length(), oldLength + 1);
+        int i = table.indexOf(f.name, f.value);
+        assertEquals(i, idx);
+    }
+
+    @Test
+    public void indexOf() {
+        // Let's put a series of header fields
+        int NUM_HEADERS = 32;
+        HeaderTable table =
+                createHeaderTable((32 + 4) * NUM_HEADERS);
+        //                          ^   ^
+        //             entry overhead   symbols per entry (max 2x2 digits)
+        for (int i = 1; i <= NUM_HEADERS; i++) {
+            String s = String.valueOf(i);
+            table.put(s, s);
+        }
+        // and verify indexOf (reverse lookup) returns correct indexes for
+        // full lookup
+        for (int j = 1; j <= NUM_HEADERS; j++) {
+            String s = String.valueOf(j);
+            int actualIndex = table.indexOf(s, s);
+            int expectedIndex = STATIC_TABLE_LENGTH + NUM_HEADERS - j + 1;
+            assertEquals(actualIndex, expectedIndex);
+        }
+        // as well as for just a name lookup
+        for (int j = 1; j <= NUM_HEADERS; j++) {
+            String s = String.valueOf(j);
+            int actualIndex = table.indexOf(s, "blah");
+            int expectedIndex = -(STATIC_TABLE_LENGTH + NUM_HEADERS - j + 1);
+            assertEquals(actualIndex, expectedIndex);
+        }
+        // lookup for non-existent name returns 0
+        assertEquals(table.indexOf("chupacabra", "1"), 0);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HuffmanTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HuffmanTest.java
similarity index 99%
rename from test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HuffmanTest.java
rename to test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HuffmanTest.java
index d8b8b9397b9..2a0e5c6bc72 100644
--- a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HuffmanTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/HuffmanTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import org.testng.annotations.Test;
 
diff --git a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SimpleHeaderTableTest.java
similarity index 64%
rename from test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java
rename to test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SimpleHeaderTableTest.java
index 6018e5859c8..eae27b47e5f 100644
--- a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SimpleHeaderTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,10 +20,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
+import jdk.internal.net.http.hpack.SimpleHeaderTable.HeaderField;
 import org.testng.annotations.Test;
-import jdk.incubator.http.internal.hpack.HeaderTable.HeaderField;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
@@ -34,14 +34,14 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static jdk.internal.net.http.hpack.TestHelper.assertExceptionMessageContains;
+import static jdk.internal.net.http.hpack.TestHelper.assertThrows;
+import static jdk.internal.net.http.hpack.TestHelper.assertVoidThrows;
+import static jdk.internal.net.http.hpack.TestHelper.newRandom;
 import static java.lang.String.format;
 import static org.testng.Assert.assertEquals;
-import static jdk.incubator.http.internal.hpack.TestHelper.assertExceptionMessageContains;
-import static jdk.incubator.http.internal.hpack.TestHelper.assertThrows;
-import static jdk.incubator.http.internal.hpack.TestHelper.assertVoidThrows;
-import static jdk.incubator.http.internal.hpack.TestHelper.newRandom;
 
-public class HeaderTableTest {
+public class SimpleHeaderTableTest {
 
     //
     // https://tools.ietf.org/html/rfc7541#appendix-A
@@ -111,71 +111,45 @@ public class HeaderTableTest {
        "          | 61    | www-authenticate            |               |\n";
     // @formatter:on
 
-    private static final int STATIC_TABLE_LENGTH = createStaticEntries().size();
-    private final Random rnd = newRandom();
+    static final int STATIC_TABLE_LENGTH = createStaticEntries().size();
+    final Random rnd = newRandom();
+
+    /** Creates a header table under test. Override in subclass. */
+    protected SimpleHeaderTable createHeaderTable(int maxSize) {
+        return new SimpleHeaderTable(maxSize, HPACK.getLogger());
+    }
 
     @Test
-    public void staticData() {
-        HeaderTable table = new HeaderTable(0, HPACK.getLogger());
+    public void staticData0() {
+        SimpleHeaderTable table = createHeaderTable(0);
         Map<Integer, HeaderField> staticHeaderFields = createStaticEntries();
-
-        Map<String, Integer> minimalIndexes = new HashMap<>();
-
-        for (Map.Entry<Integer, HeaderField> e : staticHeaderFields.entrySet()) {
-            Integer idx = e.getKey();
-            String hName = e.getValue().name;
-            Integer midx = minimalIndexes.get(hName);
-            if (midx == null) {
-                minimalIndexes.put(hName, idx);
-            } else {
-                minimalIndexes.put(hName, Math.min(idx, midx));
-            }
-        }
-
-        staticHeaderFields.entrySet().forEach(
-                e -> {
-                    // lookup
-                    HeaderField actualHeaderField = table.get(e.getKey());
-                    HeaderField expectedHeaderField = e.getValue();
-                    assertEquals(actualHeaderField, expectedHeaderField);
-
-                    // reverse lookup (name, value)
-                    String hName = expectedHeaderField.name;
-                    String hValue = expectedHeaderField.value;
-                    int expectedIndex = e.getKey();
-                    int actualIndex = table.indexOf(hName, hValue);
-
-                    assertEquals(actualIndex, expectedIndex);
-
-                    // reverse lookup (name)
-                    int expectedMinimalIndex = minimalIndexes.get(hName);
-                    int actualMinimalIndex = table.indexOf(hName, "blah-blah");
-
-                    assertEquals(-actualMinimalIndex, expectedMinimalIndex);
-                }
-        );
+        staticHeaderFields.forEach((index, expectedHeaderField) -> {
+            SimpleHeaderTable.HeaderField actualHeaderField = table.get(index);
+            assertEquals(actualHeaderField, expectedHeaderField);
+        });
     }
 
     @Test
     public void constructorSetsMaxSize() {
         int size = rnd.nextInt(64);
-        HeaderTable t = new HeaderTable(size, HPACK.getLogger());
-        assertEquals(t.size(), 0);
-        assertEquals(t.maxSize(), size);
+        SimpleHeaderTable table = createHeaderTable(size);
+        assertEquals(table.size(), 0);
+        assertEquals(table.maxSize(), size);
     }
 
     @Test
     public void negativeMaximumSize() {
         int maxSize = -(rnd.nextInt(100) + 1); // [-100, -1]
+        SimpleHeaderTable table = createHeaderTable(0);
         IllegalArgumentException e =
                 assertVoidThrows(IllegalArgumentException.class,
-                        () -> new HeaderTable(0, HPACK.getLogger()).setMaxSize(maxSize));
+                                 () -> table.setMaxSize(maxSize));
         assertExceptionMessageContains(e, "maxSize");
     }
 
     @Test
     public void zeroMaximumSize() {
-        HeaderTable table = new HeaderTable(0, HPACK.getLogger());
+        SimpleHeaderTable table = createHeaderTable(0);
         table.setMaxSize(0);
         assertEquals(table.maxSize(), 0);
     }
@@ -183,39 +157,41 @@ public void zeroMaximumSize() {
     @Test
     public void negativeIndex() {
         int idx = -(rnd.nextInt(256) + 1); // [-256, -1]
+        SimpleHeaderTable table = createHeaderTable(0);
         IndexOutOfBoundsException e =
                 assertVoidThrows(IndexOutOfBoundsException.class,
-                        () -> new HeaderTable(0, HPACK.getLogger()).get(idx));
+                                 () -> table.get(idx));
         assertExceptionMessageContains(e, "index");
     }
 
     @Test
     public void zeroIndex() {
+        SimpleHeaderTable table = createHeaderTable(0);
         IndexOutOfBoundsException e =
                 assertThrows(IndexOutOfBoundsException.class,
-                        () -> new HeaderTable(0, HPACK.getLogger()).get(0));
+                             () -> table.get(0));
         assertExceptionMessageContains(e, "index");
     }
 
     @Test
     public void length() {
-        HeaderTable table = new HeaderTable(0, HPACK.getLogger());
+        SimpleHeaderTable table = createHeaderTable(0);
         assertEquals(table.length(), STATIC_TABLE_LENGTH);
     }
 
     @Test
     public void indexOutsideStaticRange() {
-        HeaderTable table = new HeaderTable(0, HPACK.getLogger());
+        SimpleHeaderTable table = createHeaderTable(0);
         int idx = table.length() + (rnd.nextInt(256) + 1);
         IndexOutOfBoundsException e =
                 assertThrows(IndexOutOfBoundsException.class,
-                        () -> table.get(idx));
+                             () -> table.get(idx));
         assertExceptionMessageContains(e, "index");
     }
 
     @Test
     public void entryPutAfterStaticArea() {
-        HeaderTable table = new HeaderTable(256, HPACK.getLogger());
+        SimpleHeaderTable table = createHeaderTable(256);
         int idx = table.length() + 1;
         assertThrows(IndexOutOfBoundsException.class, () -> table.get(idx));
 
@@ -225,40 +201,15 @@ public void entryPutAfterStaticArea() {
         String value = "custom-value";
 
         table.put(name, value);
-        HeaderField f = table.get(idx);
-        assertEquals(name, f.name);
-        assertEquals(value, f.value);
+        SimpleHeaderTable.HeaderField f = table.get(idx);
+        assertEquals(f.name, name);
+        assertEquals(f.value, value);
     }
 
     @Test
     public void staticTableHasZeroSize() {
-        HeaderTable table = new HeaderTable(0, HPACK.getLogger());
-        assertEquals(0, table.size());
-    }
-
-    @Test
-    public void lowerIndexPriority() {
-        HeaderTable table = new HeaderTable(256, HPACK.getLogger());
-        int oldLength = table.length();
-        table.put("bender", "rodriguez");
-        table.put("bender", "rodriguez");
-        table.put("bender", "rodriguez");
-
-        assertEquals(table.length(), oldLength + 3); // more like an assumption
-        int i = table.indexOf("bender", "rodriguez");
-        assertEquals(oldLength + 1, i);
-    }
-
-    @Test
-    public void lowerIndexPriority2() {
-        HeaderTable table = new HeaderTable(256, HPACK.getLogger());
-        int oldLength = table.length();
-        int idx = rnd.nextInt(oldLength) + 1;
-        HeaderField f = table.get(idx);
-        table.put(f.name, f.value);
-        assertEquals(table.length(), oldLength + 1);
-        int i = table.indexOf(f.name, f.value);
-        assertEquals(idx, i);
+        SimpleHeaderTable table = createHeaderTable(0);
+        assertEquals(table.size(), 0);
     }
 
     // TODO: negative indexes check
@@ -269,58 +220,29 @@ public void lowerIndexPriority2() {
     public void fifo() {
         // Let's add a series of header fields
         int NUM_HEADERS = 32;
-        HeaderTable t = new HeaderTable((32 + 4) * NUM_HEADERS, HPACK.getLogger());
-        //                                ^   ^
-        //                   entry overhead   symbols per entry (max 2x2 digits)
+        SimpleHeaderTable table =
+                createHeaderTable((32 + 4) * NUM_HEADERS);
+        //                          ^   ^
+        //             entry overhead   symbols per entry (max 2x2 digits)
         for (int i = 1; i <= NUM_HEADERS; i++) {
             String s = String.valueOf(i);
-            t.put(s, s);
+            table.put(s, s);
         }
         // They MUST appear in a FIFO order:
         //   newer entries are at lower indexes
         //   older entries are at higher indexes
         for (int j = 1; j <= NUM_HEADERS; j++) {
-            HeaderField f = t.get(STATIC_TABLE_LENGTH + j);
+            SimpleHeaderTable.HeaderField f = table.get(STATIC_TABLE_LENGTH + j);
             int actualName = Integer.parseInt(f.name);
             int expectedName = NUM_HEADERS - j + 1;
-            assertEquals(expectedName, actualName);
+            assertEquals(actualName, expectedName);
         }
         // Entries MUST be evicted in the order they were added:
         //   the newer the entry the later it is evicted
         for (int k = 1; k <= NUM_HEADERS; k++) {
-            HeaderField f = t.evictEntry();
-            assertEquals(String.valueOf(k), f.name);
-        }
-    }
-
-    @Test
-    public void indexOf() {
-        // Let's put a series of header fields
-        int NUM_HEADERS = 32;
-        HeaderTable t = new HeaderTable((32 + 4) * NUM_HEADERS, HPACK.getLogger());
-        //                                ^   ^
-        //                   entry overhead   symbols per entry (max 2x2 digits)
-        for (int i = 1; i <= NUM_HEADERS; i++) {
-            String s = String.valueOf(i);
-            t.put(s, s);
-        }
-        // and verify indexOf (reverse lookup) returns correct indexes for
-        // full lookup
-        for (int j = 1; j <= NUM_HEADERS; j++) {
-            String s = String.valueOf(j);
-            int actualIndex = t.indexOf(s, s);
-            int expectedIndex = STATIC_TABLE_LENGTH + NUM_HEADERS - j + 1;
-            assertEquals(expectedIndex, actualIndex);
-        }
-        // as well as for just a name lookup
-        for (int j = 1; j <= NUM_HEADERS; j++) {
-            String s = String.valueOf(j);
-            int actualIndex = t.indexOf(s, "blah");
-            int expectedIndex = -(STATIC_TABLE_LENGTH + NUM_HEADERS - j + 1);
-            assertEquals(expectedIndex, actualIndex);
+            SimpleHeaderTable.HeaderField f = table.evictEntry();
+            assertEquals(f.name, String.valueOf(k));
         }
-        // lookup for non-existent name returns 0
-        assertEquals(0, t.indexOf("chupacabra", "1"));
     }
 
     @Test
@@ -334,7 +256,7 @@ public void testToStringDifferentLocale() {
         Locale.setDefault(Locale.FRENCH);
         try {
             String s = format("%.1f", 3.1);
-            assertEquals("3,1", s); // assumption of the test, otherwise the test is useless
+            assertEquals(s, "3,1"); // assumption of the test, otherwise the test is useless
             testToString0();
         } finally {
             Locale.setDefault(locale);
@@ -342,14 +264,14 @@ public void testToStringDifferentLocale() {
     }
 
     private void testToString0() {
-        HeaderTable table = new HeaderTable(0, HPACK.getLogger());
+        SimpleHeaderTable table = createHeaderTable(0);
         {
             int maxSize = 2048;
             table.setMaxSize(maxSize);
             String expected = format(
                     "dynamic length: %s, full length: %s, used space: %s/%s (%.1f%%)",
                     0, STATIC_TABLE_LENGTH, 0, maxSize, 0.0);
-            assertEquals(expected, table.toString());
+            assertEquals(table.toString(), expected);
         }
 
         {
@@ -367,7 +289,7 @@ private void testToString0() {
             String expected = format(
                     "dynamic length: %s, full length: %s, used space: %s/%s (%.1f%%)",
                     1, STATIC_TABLE_LENGTH + 1, used, size, ratio);
-            assertEquals(expected, s);
+            assertEquals(s, expected);
         }
 
         {
@@ -378,21 +300,22 @@ private void testToString0() {
             String expected =
                     format("dynamic length: %s, full length: %s, used space: %s/%s (%.1f%%)",
                            2, STATIC_TABLE_LENGTH + 2, 78, 78, 100.0);
-            assertEquals(expected, s);
+            assertEquals(s, expected);
         }
     }
 
     @Test
     public void stateString() {
-        HeaderTable table = new HeaderTable(256, HPACK.getLogger());
+        SimpleHeaderTable table = createHeaderTable(256);
         table.put("custom-key", "custom-header");
         // @formatter:off
-        assertEquals("[  1] (s =  55) custom-key: custom-header\n" +
-                     "      Table size:  55", table.getStateString());
+        assertEquals(table.getStateString(),
+                     "[  1] (s =  55) custom-key: custom-header\n" +
+                     "      Table size:  55");
         // @formatter:on
     }
 
-    private static Map<Integer, HeaderField> createStaticEntries() {
+    static Map<Integer, HeaderField> createStaticEntries() {
         Pattern line = Pattern.compile(
                 "\\|\\s*(?<index>\\d+?)\\s*\\|\\s*(?<name>.+?)\\s*\\|\\s*(?<value>.*?)\\s*\\|");
         Matcher m = line.matcher(SPEC);
diff --git a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/SpecHelper.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SpecHelper.java
similarity index 95%
rename from test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/SpecHelper.java
rename to test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SpecHelper.java
index e0c01d18405..e5d32666c45 100644
--- a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/SpecHelper.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/SpecHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/TestHelper.java b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/TestHelper.java
similarity index 98%
rename from test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/TestHelper.java
rename to test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/TestHelper.java
index b8ebd5644bf..89982a46a1f 100644
--- a/test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/TestHelper.java
+++ b/test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/TestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.hpack;
+package jdk.internal.net.http.hpack;
 
 import org.testng.annotations.Test;
 
diff --git a/test/jdk/java/net/httpclient/http2/keystore.p12 b/test/jdk/java/net/httpclient/http2/keystore.p12
index a635533d086f0dd97cb3c24ac34cf35680af3774..d84d7f664113012d303955adbf6f7646820d6039 100644
GIT binary patch
delta 2574
zcmY+Ec{J1uAI4|TGPbb|p|QnCW{{n1lVr)hjcg&y8`;&x{V|sbg-CYB8nR@`63U>g
z>B>&_#&vB8HFjR_Iq!S!dH?vH=bX=Tp6{QZRL&+Y08e6)hk&7Y65|GfQHrcj-eUn@
z0Oyk!XJI79sdGGrC&3^6Uj_Guk>K~v@!j)tL@@t%g=7Ll@=35GJPEdk$0C^ihtHp1
zgmFzf-qJV$qvwcXGj^JS*ImPBX!jvd5YS}`Bf)yx#B1_-=Xx4whKq|MC}ftu^0hcZ
z3uY}TwrbmjlFh7$srvCzDtH2jn%L$XB7qWk5M;4<zltwMJKIHbBIM&jv`}H0y{tBI
zM(*OpsN;bR<u@Jbp00)64{N}HOrfW_kN2QsUuC@nrNdI9B-7&a5SMI?k9QGZo6E(4
z*m~D)8ctF0TM(p<uy>S?YHsek|H8d6**M(9M?fJ32$?3F|C*eI!?1G8UvhwTN%NX^
z=VU~s5#Q**zTnRo4|18;rugwYp_O;oQ&!l~{&%Se|NDBkU@S=H-YZL&aGxG{W9bBr
z;0Vi>*(KlPdwz!TTTL>Qg|7fN;ZQOu`;{p*(C5w#k*-@E0-c@DuQJ?Lt}+&U=2cuA
zm$4;xWW>z7?XZ#z{a_KEG%fL`S{uwt{cN(fCpp`LTf(P)(8xtkzCNA*)eT82V(<DW
z@mN@K^sS)3d<^O^#J(d_I47ld1YDAS*}E+*_gWl9L98Q!Mm?C3*TMiUH5qoOM>+a6
z&%TuNg}Kn}UenL?9)?lp11_wvTAiS(l}R><PS~`=t5Ximj#;{!HWm7FxCYmmgfplw
zYS-ZPE{rT_DyzyMBB|aRjS~<$2|l$7R#gAAOpw6n6L3y19%k0-(L9^Yw;!;TU+ya<
z4pO53jH5M!&#2EjU;q|yb|=`K8eMYqc=mqdM1Jc>{%0BfA;VG5p|6T_fpDdDI}4nZ
zAl(~tcxF7%$94jz=~ZX+%UK1DYh1pG)Ttlk$bx74NY;2&M0|a}(f-y;FwApXQpPoL
z9xXXSn76Fr4pg;76{YrS(g9-Aa9l+vL{&?ZRVzU$?#V(E09o>~Ef$izi5O<HcdlzV
z4KiUGV}CJNmYWz+cgFBy^ryI?OGBw<qDZb<Cn`B_Cu5w9tRL=EVKCz3x((LQhV!;s
zKeL9L9dwCP@1>bN4Np<cer3Ll#{%*D_J-}nj|gVB(t?B)3mF%rqUP8;v*SNMF>QlL
zNrnwGm$8HZNCdgfs_l=4Y)uM{k5Rs9ceg*!!M<rAt`I1BqZEK<_H~wkXExaitn>Uv
zG4$71HLc@CCYcAtqq#p7PxvG2Pa9jtV!z*J^$gz<-bJ^t8`$wOW4E+=Dlqg(y{wvP
zz`4`|^IZPk68JlfDyTNQUN|WRue<b#vpaqNfC8wI*@rHq-@5;)oH!5^Rn+ROGj5=Z
z`H78oRX6_T!mHA#cEpz<@`p)MG<0E2)dS8A8q8i%MCvGAN2J+JMPD^8>Z%~BJG*QS
z3Yi)As;xC_uxP9Vp|L6^{VZzHt;dOhGdr;P_Ot!7qt1z?l=jAMzcRaeUV}0gs6p5%
z8aO}(N(8g#_=o*zVzZ2z^Iq+6C=G#S8t^|o#MF8v|44F&+im?E)NRHJevx`p-<U7V
zt`joEd=yI1vCf5MFpbOE)wTW@_d<@>&Qv-21Sx$n!9inq-A$L@Nn1BOs`GWYnPLQF
zq7BhNk~{Q8g#s`iu41lNl(O|XR?h@&Lj?_ok}iZk6-n?-7^!_bq{PPQ@mja`j-PY=
zzO~jA*lUZm(sR1(NdVh6TrY-yrF&61AT)+*!A}k}nqCVv&@s)GKF;$Ib{p4zST|C#
zhW}+L4PKsmZUol@6l9eZ6y;S^uHofW&aG(qk3|vZqP%gAv>{;7d8q!=fd5aOi2tb5
z1)aNG88U!#y#kKXu@bx~{`ZjoxjMT{BS|pOGhu<LQF@fqv!{DFPY&5N?z=AgIl9!2
z63YU>Lsz0R#B)_Dehfc>z!Y3U{ZX*=wHlXNG-&K}p9gm+`Y!L~SFT{n_1+L$j;cfs
z)Q0xeOndPg2O#aQe1J$oDQ>}?XueYtAgUt+3m!`mLQ_x8*flEb8spO92Q0wWl}C}^
z!s@EcF0nzfdI+}0uJe;03pG7k?O$e7?~DKo)czd-8;x<k&apSH6m|7bff1#$-=?0R
zj(Z6A2aPVG;Qp5*I46t8d?DWgY!)Q>|K%GAj~O-5e){^A``hu{ZF6TnV(<eLljh=>
zOshLuxsNM-o3we-RN%0~$(aI<O`}NRn8d=j+17+u{Sa~H?-RbAneZH7C5JQD0~mpw
z%*7Cg4xS$ga+iaNtcjOsLpxRXuIjb4rOiG{-rO_l<q}orH~1^UYOnpIQYc7ew$0#u
ziNMl|{^{5TMfwF(LvN7a-xxPg!8o=!ZcTh@u3ylw!7o<GB^T2@k`$+w;5;usjf~o1
zRN2v<uZYsOU$lhAhC5jJ{w`F)zV8Mse|Xv`ww6+unzWn;-A(A;X!W{7C*N8E>piY~
zG$AcA&brE}kldCLpJ=5sztHyc1&prHfu<)L>^}dneX^-!n~<)>J}IbXo(ic>C!g4J
zbOkMzAB-O6V4<08>od33#D(K>Bz7daMymU!r`}}R4niG0nL%wG&*dLG)z<=kJp48I
zocKU`a~qS>`p(Cr{L6p2?*wB*CiZ<{q7V3xP1*;LEJlb4gBi!}g6<9B$O#@5$63d;
zKrB&Ibh&8aW#9^vWP2KvTTJK88YNF@2xQ&aGliCTgp|!vb<m58Z=<Nu41UF>-ss~C
zetqyjMgUZsyW$x-r+%I6J`POc!$F~2K40?4g9QDHXU(%NL`eT*7SW~Qd!##8rZLot
zi^H?oLR+Epo4TlBAC}`H|Gi*_)(@U9>D`}g3_IBfZU?uWIPECR*8+<U3*Uz|JS0@)
zmtyesZj4{58#m3_E;!vZT40(A6VdvZ4m*k@5Q}KtGp4D>q6u!vRN!vUZwQ`V+3$lb
zNlC^f-^4*rc?+8ebcWUP-><ZbS}z)+-v07;Y<9+fIEi}Phm8*2yJM`&u-WN41z!H(
z{c2W{BdfQm0I?}H_4cFz6Zva)HcPje)>)>J$IyI1#o9UM;hsW9pOC`o5jTX*47N`B
zTZ=P*!H@I0J`GriRt6fwJySzyUfW<eqgXkmTWmJfi@7A__f=Z|c&w_4MYKP!4(G04
z$tIbU2=^)0PV;s9<xiNae;qg>ZEYN7z6v5P@7|Ywg4goRbG^$JDLg@B9W<>N!8A-E
zMSZDG8N#&;Wd(k+rO7qBrTFW3VLT%OeuWhZ;fI4@Ts`!w#(B6S{scN?a`bcX-Mn?)
hofH_CYoUzGpsCF}3ww<1^Z5wQkQ1&@2oy}t|2N?gweSD{

delta 2410
zcmV-w36=J@6qFNxFoFq?0s#Xsf(c3n2`Yw2hW8Bt2LYgh2|EOW2{$l;2{SN)1$YJt
zDuzgg_YDCD0ic2fX#|1=WiWyTVK9OPT?Pv(hDe6@4FL=a0Ro_c1o|+71oki}1_~;M
zNQU<f0So~HFd76DP)I=}NH>sr(-+R@Vv<GxW@Mqo0s;ho00e>r$lyuA&848p4zbcG
z06`OwJd>^k*Sf<^z$JK=hoE>!TFusE*2e)mmJDk*w)z<u+6U+2L7;wJ2vQW}YarkH
zsMYny+8H=bGMcdk%6Y5%6p>Mc1;jR{f6|s!1*MhNh#oNhXTv6iC0ofxo;HwgAatSZ
z6xcz81T|uRY&=pT4(9c@UiG2~2X%KIkx6WJ0(ifRNIdCz2lcWr#hf&(FJS2ex$g*3
zLDxa(Yf@K$MJ~Vi{O_ExGI(eIi3d6LCSnK(R?jxpE8I7J`=*xbPCx)1C0S63EqkLo
zpiXd3Joyr<(Uc$KF$?hZk)(0KCy8WRmh#4bDh0QHQmG7~Z%@d(-_`|_4Ap(6+$r~f
zbep(&7*53voDSTLD#7P}epLTCE6kDa#$SgdshsdTV>7j0k$>rF2)yAzEm1o$2Z|%}
zLadYqP&iZaCXjSro}LtGLOAf>RbuFULAGx6eg~DdKDL#ZMj_)%W$hL~(F#j#Pk78o
zG*Oy=gCJug!C{P@pACN-f3j>vmQwwRD$xAC?!~LZe>d+87!}1P9utog$XO+KSk+NV
zO|-n#59G^84P>yMMOQivYrD4dwF#GBY8RzBqz|__oCFUrVPK8kn+5P4_5A3kC@9h7
zHjcXs%3i^5j$ZQrO^@k#`qBv17>J7m=88IhXXlaH<w34ZzaqjPC-*KRo2LL4P!yQJ
z{nE#nAn-EydXn_1QJd!S&S3V*?E213^8(BRWbp~Si$c;g0ZkY90?KLJ3gmdu5%Udx
zq&w~td8}-Ytj=YT1=gS8IRQT$gwB$(;At9f1n(9{-CXp-Vz({~g2AhT%kaq%s)q-E
zmg#zlmQ1ex7SOq=Io~R5!;>Y{suXXYP5fR;a0jtS>UVCIKalP06=d0gqcvZEj&D>D
z@O9yPdf#G(I+Wc-=hfD$&Sc&p9{R-9{PXKDc$`v6H?6<6D^%=x|D26@?2tpwj6r7=
zxKW(J4x)tTVvIQInSOrbcvX1UM<o+~ej*`;O({?uyvnm9lGFYF&hd$4-9#S@9pK{u
z?(4&y#e`1%ReDFl?XSZ3uINSKzh{1CWmL;S%A)ok`3(#R_l5Blc5R#L${rAK2bO29
z!`4?=Pm-uVQFJ^{fZ~Zvk#!r0w<HI)e#kjxVUvzeP{f2p7W^ojZAba=p&Mv_*F);A
zuk*C2?hOwtrIhBI>?Nf+wNn`mXn<Wafvv$?!rhcu*}Xh4*a?bYnp(5$P)BkkQ4DZ7
ztzpa0fC21Rj@ACwVz^0W051LiZ;)8-Ti}PavW*rccwT6d16NH^MafhLu_TUmaSyc@
z64-@flBwO$i8ZkftxmFW6-KCkQN)5wP`#t2DHkCx9acs%&!kdT{(9W2XS(%v;c}6-
zgi$nR8}E1prgBT+l&d1#gB-2kr)d+1<;lYZ1M{<a6piZ+X+K*)dA<^AY}i~E1H*Kw
zu=78mg9yCAk||-(HOyBQwXM>m%;X0naQ$~x`tVCqXYIz!MA@pe+XlT>4_+=I>gZa)
zvAjWGsszZYZ(4LvOaxPQS1GmhP9A=RAQEkvw>c@))6fo7HULSBGGL8$LCyxdGwtd1
z?6p#U4KNWJY|b@s^H1DaL97Hn%%W~#FI1CF1x9}~HZw3dH#RdlH8(Xdf&;S#2`Yw2
zhW8Bt2L_;m1Ees51E2x{05F0BnFa|ehDe6@4FLxMFenBJDuzgg_YDCI0R}J{1QY=B
zj!O|_sLZ{W+{Ek`Q9Ferlw<+|1OR}717JzG7zegZ$m4xcHjAXS62ILIm(bI+UvE=H
zu+M+;VZZQR7*btwA~p>5k2xx;e`n-fKe7b5OVuM6pmP@u{8!2v(O6od_QcmUO+MIS
zJQwm~xC_z1k6StMz<l`GK8@5b0zSu_Nnb1DR9`|ano21R0W{06GUnnZChdFE4rt$B
z*p~J`#7ORVYO=^WS!66d+eiKywyBHW5WauChWuCM3I<jqdez#Dc5EX76nGds*x+y*
zc^H@lb{&vVA}TjHv5ipUGpt?ri_5#7Q>{gkkGLpVG^#H3z+uz^bH!-vGI-Lj(K}lM
zZhQp$LDxsT#jp&{qWHXVq%|A<{#eL9ZWeak?ZSTjm<BB~pz|5*0}o^s_p<Lm&c=Ve
z_o(3WW0u<Ov^)03qy)p_I$hE6FySjGH=$8e%jfhR+gag_l}app;pNJtm*yoxZYB0l
zC?v&zd-qvG?e6di3ZTQBVLnMXfi471B;U1>ID)bHBV3V2wNj!PxJDoBKlN}Z<`1*L
zwP^kiTSa3+J2q5itjZVJ*j9=KBolu-0CmJ$OmQ9)&1t={$tkTD*{L($BdhcYL`XEF
z{Bz+I)Hr6tj0nOQY;!8@P^+%7kOxqQq~};-jyBAi8d}$Ay-v(45S+}IBEs7B)|eU7
zhpoQiP>VTKLFBV;kz;msJjS@}^m8|J6tcgswT9=4uga)H={$A@4QYXb`J{h(t4#qv
z7VwH^-EOq+D^q$%eADND94kg|w3=!aa$L)=GW?o%@7I~BCqCm7|E1=qV%d5>iqe+?
zkwR`yV>_I;5Vs`gs4-UcP2(*MBQ%CR|9^IE__;i0+wz|p9hdJwy;_whn1^mME<}{i
za<U}>z{e-ZjAXT}1Mj1#<A;Ce;;&YrEUYhd3X8bs9``HD055*l7>{GNQH5EiO_EcP
zDyLMUmW36<gxrGA^(35f5Xst*k#W{l^jmj6Rrun|_lDWsimSE8Yt0BUVNREXdVPW>
z(tH*bNCocx-I-|uG;mk$1E`zYQG;JH*GKT*L;UIVVVI^HWd_Lh!7zVv6!u~1GIgVE
zGC%t@KC7qQKUvDyX?azT8>HHjf!cu<4>t$J!JdK8KMa`hu}b6m?qc^{46iX~jt>s%
z722F;Y@t`SZSB{N4=_D2AutIB1uG5%0vZJX1QhG+OW@d`Ff9~(qzII4nv2@5F7X5u
c;H~s@V>=jvyXpqm#s&%(oR*h(y8;3P04INQw*UYD

diff --git a/test/jdk/java/net/httpclient/http2/server/BodyInputStream.java b/test/jdk/java/net/httpclient/http2/server/BodyInputStream.java
index dbfefe58e78..4ffca293ded 100644
--- a/test/jdk/java/net/httpclient/http2/server/BodyInputStream.java
+++ b/test/jdk/java/net/httpclient/http2/server/BodyInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -25,10 +25,10 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import jdk.incubator.http.internal.common.Utils;
-import jdk.incubator.http.internal.frame.DataFrame;
-import jdk.incubator.http.internal.frame.Http2Frame;
-import jdk.incubator.http.internal.frame.ResetFrame;
+import jdk.internal.net.http.common.Utils;
+import jdk.internal.net.http.frame.DataFrame;
+import jdk.internal.net.http.frame.Http2Frame;
+import jdk.internal.net.http.frame.ResetFrame;
 
 /**
  * InputStream reads frames off stream q and supplies read demand from any
@@ -62,6 +62,7 @@ private DataFrame getData() throws IOException {
         Http2Frame frame;
         do {
             frame = q.take();
+            if (frame == null) return null; // closed/eof before receiving data.
             // ignoring others for now Wupdates handled elsewhere
             if (frame.type() != DataFrame.TYPE) {
                 System.out.println("Ignoring " + frame.toString() + " CHECK THIS");
@@ -122,7 +123,7 @@ public int read() throws IOException {
         if (c == -1) {
             return -1;
         }
-        return one[0];
+        return one[0] & 0xFF;
     }
 
     @Override
diff --git a/test/jdk/java/net/httpclient/http2/server/BodyOutputStream.java b/test/jdk/java/net/httpclient/http2/server/BodyOutputStream.java
index 95a18007461..008d9bdffc1 100644
--- a/test/jdk/java/net/httpclient/http2/server/BodyOutputStream.java
+++ b/test/jdk/java/net/httpclient/http2/server/BodyOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,7 +24,7 @@
 import java.io.*;
 import java.nio.ByteBuffer;
 
-import jdk.incubator.http.internal.frame.DataFrame;
+import jdk.internal.net.http.frame.DataFrame;
 
 /**
  * OutputStream. Incoming window updates handled by the main connection
@@ -86,8 +86,14 @@ public void write(byte[] buf, int offset, int len) throws IOException {
             throw new IllegalStateException("sendResponseHeaders must be called first");
         }
         try {
-            waitForWindow(len);
-            send(buf, offset, len, 0);
+            int max = conn.getMaxFrameSize();
+            while (len > 0) {
+                int n = len > max ? max : len;
+                waitForWindow(n);
+                send(buf, offset, n, 0);
+                offset += n;
+                len -= n;
+            }
         } catch (InterruptedException ex) {
             throw new IOException(ex);
         }
diff --git a/test/jdk/java/net/httpclient/http2/server/EchoHandler.java b/test/jdk/java/net/httpclient/http2/server/EchoHandler.java
index c36410317ee..58cc22943d6 100644
--- a/test/jdk/java/net/httpclient/http2/server/EchoHandler.java
+++ b/test/jdk/java/net/httpclient/http2/server/EchoHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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,9 +22,15 @@
  */
 
 import java.io.*;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.internal.net.http.common.HttpHeadersImpl;
 
 public class EchoHandler implements Http2Handler {
+    static final Path CWD = Paths.get(".");
+
     public EchoHandler() {}
 
     @Override
@@ -38,7 +44,7 @@ public void handle(Http2TestExchange t)
             map1.addHeader("X-Hello", "world");
             map1.addHeader("X-Bye", "universe");
             String fixedrequest = map.firstValue("XFixed").orElse(null);
-            File outfile = File.createTempFile("foo", "bar");
+            File outfile = Files.createTempFile(CWD, "foo", "bar").toFile();
             //System.err.println ("QQQ = " + outfile.toString());
             FileOutputStream fos = new FileOutputStream(outfile);
             int count = (int) is.transferTo(fos);
diff --git a/test/jdk/java/net/httpclient/http2/server/ExceptionallyCloseable.java b/test/jdk/java/net/httpclient/http2/server/ExceptionallyCloseable.java
index b27117602f2..338af80c59e 100644
--- a/test/jdk/java/net/httpclient/http2/server/ExceptionallyCloseable.java
+++ b/test/jdk/java/net/httpclient/http2/server/ExceptionallyCloseable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
diff --git a/test/jdk/java/net/httpclient/http2/server/Http2EchoHandler.java b/test/jdk/java/net/httpclient/http2/server/Http2EchoHandler.java
index b6872e54227..5e66b615857 100644
--- a/test/jdk/java/net/httpclient/http2/server/Http2EchoHandler.java
+++ b/test/jdk/java/net/httpclient/http2/server/Http2EchoHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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,23 +22,30 @@
  */
 
 import java.io.*;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.internal.net.http.common.HttpHeadersImpl;
 
 public class Http2EchoHandler implements Http2Handler {
+    static final Path CWD = Paths.get(".");
+
     public Http2EchoHandler() {}
 
     @Override
     public void handle(Http2TestExchange t)
             throws IOException {
         try {
-            System.err.printf("EchoHandler received request to %s from %s\n", t.getRequestURI(), t.getRemoteAddress());
+            System.err.printf("EchoHandler received request to %s from %s\n",
+                              t.getRequestURI(), t.getRemoteAddress());
             InputStream is = t.getRequestBody();
             HttpHeadersImpl map = t.getRequestHeaders();
             HttpHeadersImpl map1 = t.getResponseHeaders();
             map1.addHeader("X-Hello", "world");
             map1.addHeader("X-Bye", "universe");
             String fixedrequest = map.firstValue("XFixed").orElse(null);
-            File outfile = File.createTempFile("foo", "bar");
+            File outfile = Files.createTempFile(CWD, "foo", "bar").toFile();
             //System.err.println ("QQQ = " + outfile.toString());
             FileOutputStream fos = new FileOutputStream(outfile);
             int count = (int) is.transferTo(fos);
diff --git a/test/jdk/java/net/httpclient/http2/server/Http2Handler.java b/test/jdk/java/net/httpclient/http2/server/Http2Handler.java
index 1addb8bffdd..03af49e8b07 100644
--- a/test/jdk/java/net/httpclient/http2/server/Http2Handler.java
+++ b/test/jdk/java/net/httpclient/http2/server/Http2Handler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
diff --git a/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java b/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java
index 5b7fcb79748..ebef70dcef1 100644
--- a/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java
+++ b/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -25,7 +25,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.function.Supplier;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.HttpHeadersImpl;
 
 public class Http2RedirectHandler implements Http2Handler {
 
diff --git a/test/jdk/java/net/httpclient/http2/server/Http2TestExchange.java b/test/jdk/java/net/httpclient/http2/server/Http2TestExchange.java
index 6e55021af9e..3d5b2574cbe 100644
--- a/test/jdk/java/net/httpclient/http2/server/Http2TestExchange.java
+++ b/test/jdk/java/net/httpclient/http2/server/Http2TestExchange.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import javax.net.ssl.SSLSession;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.HttpHeadersImpl;
 
 public interface Http2TestExchange {
 
diff --git a/test/jdk/java/net/httpclient/http2/server/Http2TestExchangeImpl.java b/test/jdk/java/net/httpclient/http2/server/Http2TestExchangeImpl.java
index 4d0b83f2763..53cc3d43aa0 100644
--- a/test/jdk/java/net/httpclient/http2/server/Http2TestExchangeImpl.java
+++ b/test/jdk/java/net/httpclient/http2/server/Http2TestExchangeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -29,9 +29,9 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import javax.net.ssl.SSLSession;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
-import jdk.incubator.http.internal.frame.HeaderFrame;
-import jdk.incubator.http.internal.frame.HeadersFrame;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.frame.HeaderFrame;
+import jdk.internal.net.http.frame.HeadersFrame;
 
 public class Http2TestExchangeImpl implements Http2TestExchange {
 
diff --git a/test/jdk/java/net/httpclient/http2/server/Http2TestExchangeSupplier.java b/test/jdk/java/net/httpclient/http2/server/Http2TestExchangeSupplier.java
index d0c3ea127f0..73e7ae575b2 100644
--- a/test/jdk/java/net/httpclient/http2/server/Http2TestExchangeSupplier.java
+++ b/test/jdk/java/net/httpclient/http2/server/Http2TestExchangeSupplier.java
@@ -24,7 +24,7 @@
 import javax.net.ssl.SSLSession;
 import java.io.InputStream;
 import java.net.URI;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.HttpHeadersImpl;
 
 /**
  * A supplier of Http2TestExchanges. If the default Http2TestExchange impl is
diff --git a/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java b/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java
index 019db437720..f96c6635c82 100644
--- a/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java
+++ b/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -35,7 +35,7 @@
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SNIServerName;
-import jdk.incubator.http.internal.frame.ErrorFrame;
+import jdk.internal.net.http.frame.ErrorFrame;
 
 /**
  * Waits for incoming TCP connections from a client and establishes
@@ -78,6 +78,11 @@ public InetSocketAddress getAddress() {
         return (InetSocketAddress)server.getLocalSocketAddress();
     }
 
+    public String serverAuthority() {
+        return InetAddress.getLoopbackAddress().getHostName() + ":"
+                + getAddress().getPort();
+    }
+
     public Http2TestServer(boolean secure,
                            SSLContext context) throws Exception {
         this(null, secure, 0, null, context);
@@ -167,7 +172,10 @@ Http2Handler getHandlerFor(String path) {
     }
 
     final ServerSocket initPlaintext(int port) throws Exception {
-        return new ServerSocket(port);
+        ServerSocket ss = new ServerSocket();
+        ss.setReuseAddress(false);
+        ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+        return ss;
     }
 
     public synchronized void stop() {
@@ -191,9 +199,12 @@ final ServerSocket initSecure(int port) throws Exception {
         } else {
             fac = SSLServerSocketFactory.getDefault();
         }
-        SSLServerSocket se = (SSLServerSocket) fac.createServerSocket(port);
+        SSLServerSocket se = (SSLServerSocket) fac.createServerSocket();
+        se.setReuseAddress(false);
+        se.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
         SSLParameters sslp = se.getSSLParameters();
         sslp.setApplicationProtocols(new String[]{"h2"});
+        sslp.setEndpointIdentificationAlgorithm("HTTPS");
         se.setSSLParameters(sslp);
         se.setEnabledCipherSuites(se.getSupportedCipherSuites());
         se.setEnabledProtocols(se.getSupportedProtocols());
@@ -222,23 +233,33 @@ public void start() {
             try {
                 while (!stopping) {
                     Socket socket = server.accept();
-                    InetSocketAddress addr = (InetSocketAddress) socket.getRemoteSocketAddress();
-                    Http2TestServerConnection c =
-                            new Http2TestServerConnection(this, socket, exchangeSupplier);
-                    putConnection(addr, c);
+                    Http2TestServerConnection c = null;
+                    InetSocketAddress addr = null;
                     try {
+                        addr = (InetSocketAddress) socket.getRemoteSocketAddress();
+                        c = createConnection(this, socket, exchangeSupplier);
+                        putConnection(addr, c);
                         c.run();
                     } catch (Throwable e) {
                         // we should not reach here, but if we do
                         // the connection might not have been closed
                         // and if so then the client might wait
                         // forever.
-                        removeConnection(addr, c);
-                        c.close(ErrorFrame.PROTOCOL_ERROR);
+                        if (c != null) {
+                            removeConnection(addr, c);
+                            c.close(ErrorFrame.PROTOCOL_ERROR);
+                        } else {
+                            socket.close();
+                        }
                         System.err.println("TestServer: start exception: " + e);
                         //throw e;
                     }
                 }
+            } catch (SecurityException se) {
+                System.err.println("TestServer: terminating, caught " + se);
+                se.printStackTrace();
+                stopping = true;
+                try { server.close(); } catch (IOException ioe) { /* ignore */}
             } catch (Throwable e) {
                 if (!stopping) {
                     System.err.println("TestServer: terminating, caught " + e);
@@ -248,6 +269,13 @@ public void start() {
         });
     }
 
+    protected Http2TestServerConnection createConnection(Http2TestServer http2TestServer,
+                                                         Socket socket,
+                                                         Http2TestExchangeSupplier exchangeSupplier)
+            throws IOException {
+        return new Http2TestServerConnection(http2TestServer, socket, exchangeSupplier);
+    }
+
     @Override
     public void close() throws Exception {
         stop();
diff --git a/test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java b/test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java
index 4246713879c..a27ddd09dff 100644
--- a/test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java
+++ b/test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java
@@ -40,14 +40,14 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.function.Consumer;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
-import jdk.incubator.http.internal.frame.*;
-import jdk.incubator.http.internal.hpack.Decoder;
-import jdk.incubator.http.internal.hpack.DecodingCallback;
-import jdk.incubator.http.internal.hpack.Encoder;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.frame.*;
+import jdk.internal.net.http.hpack.Decoder;
+import jdk.internal.net.http.hpack.DecodingCallback;
+import jdk.internal.net.http.hpack.Encoder;
 import sun.net.www.http.ChunkedInputStream;
 import sun.net.www.http.HttpClient;
-import static jdk.incubator.http.internal.frame.SettingsFrame.HEADER_TABLE_SIZE;
+import static jdk.internal.net.http.frame.SettingsFrame.HEADER_TABLE_SIZE;
 
 /**
  * Represents one HTTP2 connection, either plaintext upgraded from HTTP/1.1
@@ -215,7 +215,7 @@ private static void handshake(String name, SSLSocket sock) throws IOException {
         if (name == null) {
             // no name set. No need to check
             return;
-        } else if (name.equals("127.0.0.1")) {
+        } else if (name.equals("localhost")) {
             name = "localhost";
         }
         final String fname = name;
@@ -224,7 +224,7 @@ private static void handshake(String name, SSLSocket sock) throws IOException {
         SNIMatcher matcher = new SNIMatcher(StandardConstants.SNI_HOST_NAME) {
             public boolean matches (SNIServerName n) {
                 String host = ((SNIHostName)n).getAsciiName();
-                if (host.equals("127.0.0.1"))
+                if (host.equals("localhost"))
                     host = "localhost";
                 boolean cmp = host.equalsIgnoreCase(fname);
                 if (cmp)
@@ -269,9 +269,9 @@ private void readPreface() throws IOException {
         }
     }
 
-    String doUpgrade() throws IOException {
-        String upgrade = readHttp1Request();
-        String h2c = getHeader(upgrade, "Upgrade");
+    Http1InitialRequest doUpgrade() throws IOException {
+        Http1InitialRequest upgrade = readHttp1Request();
+        String h2c = getHeader(upgrade.headers, "Upgrade");
         if (h2c == null || !h2c.equals("h2c")) {
             System.err.println("Server:HEADERS: " + upgrade);
             throw new IOException("Bad upgrade 1 " + h2c);
@@ -283,7 +283,7 @@ String doUpgrade() throws IOException {
         sendSettingsFrame();
         readPreface();
 
-        String clientSettingsString = getHeader(upgrade, "HTTP2-Settings");
+        String clientSettingsString = getHeader(upgrade.headers, "HTTP2-Settings");
         clientSettings = getSettingsFromString(clientSettingsString);
 
         return upgrade;
@@ -312,8 +312,12 @@ private SettingsFrame getSettingsFromString(String s) throws IOException {
         return (SettingsFrame)frame;
     }
 
+    public int getMaxFrameSize() {
+        return clientSettings.getParameter(SettingsFrame.MAX_FRAME_SIZE);
+    }
+
     void run() throws Exception {
-        String upgrade = null;
+        Http1InitialRequest upgrade = null;
         if (!secure) {
             upgrade = doUpgrade();
         } else {
@@ -327,8 +331,9 @@ void run() throws Exception {
             nextstream = 1;
         }
 
-        System.out.println("ServerSettings: " + serverSettings);
-        System.out.println("ClientSettings: " + clientSettings);
+        // Uncomment if needed, but very noisy
+        //System.out.println("ServerSettings: " + serverSettings);
+        //System.out.println("ClientSettings: " + clientSettings);
 
         hpackOut = new Encoder(serverSettings.getParameter(HEADER_TABLE_SIZE));
         hpackIn = new Decoder(clientSettings.getParameter(HEADER_TABLE_SIZE));
@@ -416,7 +421,7 @@ void sendWindowUpdates(int len, int streamid) throws IOException {
     }
 
     HttpHeadersImpl decodeHeaders(List<HeaderFrame> frames) throws IOException {
-        HttpHeadersImpl headers = new HttpHeadersImpl();
+        HttpHeadersImpl headers = createNewResponseHeaders();
 
         DecodingCallback cb = (name, value) -> {
             headers.addHeader(name.toString(), value.toString());
@@ -462,20 +467,20 @@ void addHeaders(String headers, HttpHeadersImpl hdrs) {
 
     // First stream (1) comes from a plaintext HTTP/1.1 request
     @SuppressWarnings({"rawtypes","unchecked"})
-    void createPrimordialStream(String request) throws IOException {
-        HttpHeadersImpl headers = new HttpHeadersImpl();
-        String requestLine = getRequestLine(request);
+    void createPrimordialStream(Http1InitialRequest request) throws IOException {
+        HttpHeadersImpl headers = createNewResponseHeaders();
+        String requestLine = getRequestLine(request.headers);
         String[] tokens = requestLine.split(" ");
         if (!tokens[2].equals("HTTP/1.1")) {
             throw new IOException("bad request line");
         }
-        URI uri = null;
+        URI uri;
         try {
             uri = new URI(tokens[1]);
         } catch (URISyntaxException e) {
             throw new IOException(e);
         }
-        String host = getHeader(request, "Host");
+        String host = getHeader(request.headers, "Host");
         if (host == null) {
             throw new IOException("missing Host");
         }
@@ -483,11 +488,15 @@ void createPrimordialStream(String request) throws IOException {
         headers.setHeader(":method", tokens[0]);
         headers.setHeader(":scheme", "http"); // always in this case
         headers.setHeader(":authority", host);
-        headers.setHeader(":path", uri.getPath());
+        String path = uri.getRawPath();
+        if (uri.getRawQuery() != null)
+            path = path + "?" + uri.getRawQuery();
+        headers.setHeader(":path", path);
+
         Queue q = new Queue(sentinel);
-        String body = getRequestBody(request);
-        addHeaders(getHeaders(request), headers);
-        headers.setHeader("Content-length", Integer.toString(body.length()));
+        byte[] body = getRequestBody(request);
+        addHeaders(getHeaders(request.headers), headers);
+        headers.setHeader("Content-length", Integer.toString(body.length));
 
         addRequestBodyToQueue(body, q);
         streams.put(1, q);
@@ -526,6 +535,18 @@ void createStream(HeaderFrame frame) throws IOException {
         }
         boolean endStreamReceived = endStream;
         HttpHeadersImpl headers = decodeHeaders(frames);
+
+        // Strict to assert Client correctness. Not all servers are as strict,
+        // but some are known to be.
+        Optional<?> disallowedHeader = headers.firstValue("Upgrade");
+        if (disallowedHeader.isPresent()) {
+            throw new IOException("Unexpected Upgrade in headers:" + headers);
+        }
+        disallowedHeader = headers.firstValue("HTTP2-Settings");
+        if (disallowedHeader.isPresent())
+            throw new IOException("Unexpected HTTP2-Settings in headers:" + headers);
+
+
         Queue q = new Queue(sentinel);
         streams.put(streamid, q);
         exec.submit(() -> {
@@ -551,7 +572,7 @@ void handleRequest(HttpHeadersImpl headers,
         String authority = headers.firstValue(":authority").orElse("");
         //System.out.println("authority = " + authority);
         System.err.printf("TestServer: %s %s\n", method, path);
-        HttpHeadersImpl rspheaders = new HttpHeadersImpl();
+        HttpHeadersImpl rspheaders = createNewResponseHeaders();
         int winsize = clientSettings.getParameter(
                 SettingsFrame.INITIAL_WINDOW_SIZE);
         //System.err.println ("Stream window size = " + winsize);
@@ -577,16 +598,32 @@ headers, rspheaders, uri, bis, getSSLSession(),
 
             // give to user
             Http2Handler handler = server.getHandlerFor(uri.getPath());
-            handler.handle(exchange);
+            try {
+                handler.handle(exchange);
+            } catch (IOException closed) {
+                if (bos.closed) {
+                    Queue q = streams.get(streamid);
+                    if (q != null && (q.isClosed() || q.isClosing())) {
+                        System.err.println("TestServer: Stream " + streamid + " closed: " + closed);
+                        return;
+                    }
+                }
+                throw closed;
+            }
 
             // everything happens in the exchange from here. Hopefully will
             // return though.
         } catch (Throwable e) {
             System.err.println("TestServer: handleRequest exception: " + e);
             e.printStackTrace();
+            close(-1);
         }
     }
 
+    protected HttpHeadersImpl createNewResponseHeaders() {
+        return new HttpHeadersImpl();
+    }
+
     private SSLSession getSSLSession() {
         if (! (socket instanceof SSLSocket))
             return null;
@@ -775,7 +812,7 @@ private void handlePush(OutgoingPushPromise op) throws IOException {
     // returns a minimal response with status 200
     // that is the response to the push promise just sent
     private ResponseHeaders getPushResponse(int streamid) {
-        HttpHeadersImpl h = new HttpHeadersImpl();
+        HttpHeadersImpl h = createNewResponseHeaders();
         h.addHeader(":status", "200");
         ResponseHeaders oh = new ResponseHeaders(h);
         oh.streamid(streamid);
@@ -895,7 +932,16 @@ private String getHeader(String headers, String name) {
     final static String CRLF = "\r\n";
     final static String CRLFCRLF = "\r\n\r\n";
 
-    String readHttp1Request() throws IOException {
+    static class Http1InitialRequest {
+        final String headers;
+        final byte[] body;
+        Http1InitialRequest(String headers, byte[] body) {
+            this.headers = headers;
+            this.body = body.clone();
+        }
+    }
+
+    Http1InitialRequest readHttp1Request() throws IOException {
         String headers = readUntil(CRLF + CRLF);
         int clen = getContentLength(headers);
         String te = getHeader(headers, "Transfer-encoding");
@@ -909,8 +955,7 @@ String readHttp1Request() throws IOException {
                 //  HTTP/1.1 chunked data, read it
                 buf = readChunkedInputStream(is);
             }
-            String body = new String(buf, StandardCharsets.US_ASCII);
-            return headers + body;
+            return new Http1InitialRequest(headers, buf);
         } catch (IOException e) {
             System.err.println("TestServer: headers read: [ " + headers + " ]");
             throw e;
@@ -953,19 +998,13 @@ private void unexpectedFrame(Http2Frame frame) {
     // wrapper around a BlockingQueue that throws an exception when it's closed
     // Each stream has one of these
 
-    String getRequestBody(String request) {
-        int bodystart = request.indexOf(CRLF+CRLF);
-        String body;
-        if (bodystart == -1)
-            body = "";
-        else
-            body = request.substring(bodystart+4);
-        return body;
+    byte[] getRequestBody(Http1InitialRequest request) {
+        return request.body;
     }
 
     @SuppressWarnings({"rawtypes","unchecked"})
-    void addRequestBodyToQueue(String body, Queue q) throws IOException {
-        ByteBuffer buf = ByteBuffer.wrap(body.getBytes(StandardCharsets.US_ASCII));
+    void addRequestBodyToQueue(byte[] body, Queue q) throws IOException {
+        ByteBuffer buf = ByteBuffer.wrap(body);
         DataFrame df = new DataFrame(1, DataFrame.END_STREAM, buf);
         // only used for primordial stream
         q.put(df);
diff --git a/test/jdk/java/net/httpclient/http2/server/NoBodyHandler.java b/test/jdk/java/net/httpclient/http2/server/NoBodyHandler.java
index 6cf7ea3d4ed..7a28ed5d9e8 100644
--- a/test/jdk/java/net/httpclient/http2/server/NoBodyHandler.java
+++ b/test/jdk/java/net/httpclient/http2/server/NoBodyHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
diff --git a/test/jdk/java/net/httpclient/http2/server/OutgoingPushPromise.java b/test/jdk/java/net/httpclient/http2/server/OutgoingPushPromise.java
index 7ef4684e591..68a9a802a63 100644
--- a/test/jdk/java/net/httpclient/http2/server/OutgoingPushPromise.java
+++ b/test/jdk/java/net/httpclient/http2/server/OutgoingPushPromise.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,8 +23,8 @@
 
 import java.io.*;
 import java.net.*;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
-import jdk.incubator.http.internal.frame.Http2Frame;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.internal.net.http.frame.Http2Frame;
 
 // will be converted to a PushPromiseFrame in the writeLoop
 // a thread is then created to produce the DataFrames from the InputStream
diff --git a/test/jdk/java/net/httpclient/http2/server/PushHandler.java b/test/jdk/java/net/httpclient/http2/server/PushHandler.java
index fcfb4ce7fcd..f8f43efa95a 100644
--- a/test/jdk/java/net/httpclient/http2/server/PushHandler.java
+++ b/test/jdk/java/net/httpclient/http2/server/PushHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,18 +24,18 @@
 import java.io.*;
 import java.net.*;
 import java.nio.file.*;
-import jdk.incubator.http.internal.common.HttpHeadersImpl;
+import jdk.internal.net.http.common.HttpHeadersImpl;
 
 public class PushHandler implements Http2Handler {
 
     final Path tempFile;
     final int loops;
-    final int file_size;
+    final long file_size;
 
-    public PushHandler(int file_size, int loops) throws Exception {
-        tempFile = TestUtil.getAFile(file_size);
+    public PushHandler(Path file, int loops) throws Exception {
+        tempFile = file;
         this.loops = loops;
-        this.file_size = file_size;
+        this.file_size = Files.size(file);
     }
 
     int invocation = 0;
@@ -46,9 +46,10 @@ public void handle(Http2TestExchange ee) {
             invocation++;
 
             if (ee.serverPushAllowed()) {
+                URI requestURI = ee.getRequestURI();
                 for (int i=0; i<loops; i++) {
                     InputStream is = new FileInputStream(tempFile.toFile());
-                    URI u = new URI ("http://www.foo.com/x/y/z/" + Integer.toString(i));
+                    URI u = requestURI.resolve("/x/y/z/" + Integer.toString(i));
                     HttpHeadersImpl h = new HttpHeadersImpl();
                     h.addHeader("X-foo", "bar");
                     ee.serverPush(u, h, is);
diff --git a/test/jdk/java/net/httpclient/http2/server/Queue.java b/test/jdk/java/net/httpclient/http2/server/Queue.java
index cc789272317..b663643f08a 100644
--- a/test/jdk/java/net/httpclient/http2/server/Queue.java
+++ b/test/jdk/java/net/httpclient/http2/server/Queue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -48,6 +48,14 @@ public synchronized int size() {
         return q.size();
     }
 
+    public synchronized boolean isClosed() {
+        return closed;
+    }
+
+    public synchronized boolean isClosing() {
+        return closing;
+    }
+
     public synchronized void put(T obj) throws IOException {
         Objects.requireNonNull(obj);
         if (closed || closing) {
diff --git a/test/jdk/java/net/httpclient/http2/server/TestUtil.java b/test/jdk/java/net/httpclient/http2/server/TestUtil.java
index a439f0a2596..db03c218bc2 100644
--- a/test/jdk/java/net/httpclient/http2/server/TestUtil.java
+++ b/test/jdk/java/net/httpclient/http2/server/TestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -27,6 +27,7 @@
 
 public class TestUtil {
 
+    static final Path CWD = Paths.get(".");
     final static String fileContent = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; // repeated
 
     public static Path getAFile(int size) throws IOException {
@@ -44,8 +45,7 @@ public static Path getAFile(int size) throws IOException {
 
     public static Path tempFile() {
         try {
-            Path p = Files.createTempFile("foo", "test");
-            p.toFile().deleteOnExit();
+            Path p = Files.createTempFile(CWD, "TestUtil_tmp_", "_HTTPClient");
             return p;
         } catch (IOException e) {
             throw new UncheckedIOException(e);
diff --git a/test/jdk/java/net/httpclient/offline/DelegatingHttpClient.java b/test/jdk/java/net/httpclient/offline/DelegatingHttpClient.java
new file mode 100644
index 00000000000..b70645c7e07
--- /dev/null
+++ b/test/jdk/java/net/httpclient/offline/DelegatingHttpClient.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2018, 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 javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLParameters;
+import java.io.IOException;
+import java.net.Authenticator;
+import java.net.CookieHandler;
+import java.net.ProxySelector;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+/**
+ * An HttpClient that delegates all its operations to the given client.
+ */
+public class DelegatingHttpClient extends HttpClient {
+
+    private final HttpClient client;
+
+    public DelegatingHttpClient(HttpClient client) {
+        this.client = client;
+    }
+
+    @Override
+    public Optional<CookieHandler> cookieHandler() {
+        return client.cookieHandler();
+    }
+
+    @Override
+    public Redirect followRedirects() {
+        return client.followRedirects();
+    }
+
+    @Override
+    public Optional<ProxySelector> proxy() {
+        return client.proxy();
+    }
+
+    @Override
+    public SSLContext sslContext() {
+        return client.sslContext();
+    }
+
+    @Override
+    public SSLParameters sslParameters() {
+        return client.sslParameters();
+    }
+
+    @Override
+    public Optional<Authenticator> authenticator() {
+        return client.authenticator();
+    }
+
+    @Override
+    public Version version() {
+        return client.version();
+    }
+
+    @Override
+    public Optional<Executor> executor() {
+        return client.executor();
+    }
+
+    @Override
+    public <T> HttpResponse<T> send(HttpRequest request,
+                                    HttpResponse.BodyHandler<T> responseBodyHandler)
+            throws IOException, InterruptedException {
+        return client.send(request, responseBodyHandler);
+    }
+
+    @Override
+    public <T> CompletableFuture<HttpResponse<T>>
+    sendAsync(HttpRequest request,
+              HttpResponse.BodyHandler<T> responseBodyHandler) {
+        return client.sendAsync(request, responseBodyHandler);
+    }
+
+    @Override
+    public <T> CompletableFuture<HttpResponse<T>>
+    sendAsync(HttpRequest request,
+              HttpResponse.BodyHandler<T> responseBodyHandler,
+              HttpResponse.PushPromiseHandler<T> pushPromiseHandler) {
+        return client.sendAsync(request, responseBodyHandler, pushPromiseHandler);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/offline/FixedHttpHeaders.java b/test/jdk/java/net/httpclient/offline/FixedHttpHeaders.java
new file mode 100644
index 00000000000..ac5817bae45
--- /dev/null
+++ b/test/jdk/java/net/httpclient/offline/FixedHttpHeaders.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2018, 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.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.net.http.HttpHeaders;
+
+/**
+ * An HttpHeaders consisting of the given name value pairs.
+ */
+public class FixedHttpHeaders extends HttpHeaders {
+
+    private final Map<String, List<String>> map =
+            new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+
+    @Override
+    public Map<String, List<String>> map() {
+        return map;
+    }
+
+    /**
+     * Creates an HttpHeaders of the given name value pairs.
+     */
+    public static HttpHeaders of(String... params) {
+        Objects.requireNonNull(params);
+        if ((params.length & 0x1) != 0)
+            throw new IllegalArgumentException("odd number of params");
+        FixedHttpHeaders headers = new FixedHttpHeaders();
+        for (int i = 0; i < params.length; i += 2) {
+            String name = params[i];
+            String value = params[i + 1];
+            headers.map.computeIfAbsent(name, k -> new ArrayList<>(1))
+                       .add(value);
+        }
+        return headers;
+    }
+}
diff --git a/test/jdk/java/net/httpclient/offline/FixedHttpResponse.java b/test/jdk/java/net/httpclient/offline/FixedHttpResponse.java
new file mode 100644
index 00000000000..3b41e0bc175
--- /dev/null
+++ b/test/jdk/java/net/httpclient/offline/FixedHttpResponse.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2018, 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 javax.net.ssl.SSLSession;
+import java.net.URI;
+import java.util.Optional;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+/**
+ * An HttpResponse consisting of the given state.
+ */
+public class FixedHttpResponse<T> implements HttpResponse<T> {
+
+    private final int statusCode;
+    private final HttpRequest request;
+    private final HttpHeaders headers;
+    private final T body;
+    private final SSLSession sslSession;
+    private final URI uri;
+    private final HttpClient.Version version;
+
+    public FixedHttpResponse(int statusCode,
+                             HttpRequest request,
+                             HttpHeaders headers,
+                             T body,
+                             SSLSession sslSession,
+                             URI uri,
+                             HttpClient.Version version) {
+        this.statusCode = statusCode;
+        this.request = request;
+        this.headers = headers;
+        this.body = body;
+        this.sslSession = sslSession;
+        this.uri = uri;
+        this.version = version;
+    }
+
+    @Override
+    public int statusCode() {
+        return statusCode;
+    }
+
+    @Override
+    public HttpRequest request() {
+        return request;
+    }
+
+    @Override
+    public Optional<HttpResponse<T>> previousResponse() {
+        return Optional.empty();
+    }
+
+    @Override
+    public HttpHeaders headers() {
+        return headers;
+    }
+
+    @Override
+    public T body() {
+        return body;
+    }
+
+    @Override
+    public Optional<SSLSession> sslSession() {
+        return Optional.ofNullable(sslSession);
+    }
+
+    @Override
+    public URI uri() {
+        return uri;
+    }
+
+    @Override
+    public HttpClient.Version version() {
+        return version;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        return sb.append(super.toString()).append(" [ ")
+                .append("status code: ").append(statusCode)
+                .append(", request: ").append(request)
+                .append(", headers: ").append(headers)
+                .append(" ]")
+                .toString();
+    }
+}
diff --git a/test/jdk/java/net/httpclient/offline/FixedResponseHttpClient.java b/test/jdk/java/net/httpclient/offline/FixedResponseHttpClient.java
new file mode 100644
index 00000000000..13f7f4f6d83
--- /dev/null
+++ b/test/jdk/java/net/httpclient/offline/FixedResponseHttpClient.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2018, 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.IOException;
+import java.io.UncheckedIOException;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Flow;
+import java.util.concurrent.SubmissionPublisher;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.ByteBuffer.wrap;
+
+/**
+ * An HttpClient that returns a given fixed response.
+ * Suitable for testing where network connections are to be avoided.
+ */
+public class FixedResponseHttpClient extends DelegatingHttpClient {
+    private final ByteBuffer responseBodyBytes;
+    private final int responseStatusCode;
+    private final HttpHeaders responseHeaders;
+    private final HttpClient.Version responseVersion;
+    private final HttpResponse.ResponseInfo responseInfo;
+
+    private FixedResponseHttpClient(HttpClient.Builder builder,
+                                    int responseStatusCode,
+                                    HttpHeaders responseHeaders,
+                                    ByteBuffer responseBodyBytes) {
+        super(builder.build());
+        this.responseStatusCode = responseStatusCode;
+        this.responseHeaders = responseHeaders;
+        this.responseBodyBytes = responseBodyBytes;
+        this.responseVersion = HttpClient.Version.HTTP_1_1; // should be added to constructor
+        this.responseInfo = new FixedResponseInfo();
+    }
+
+    /**
+     * Creates a new HttpClient that returns a fixed response,
+     * constructed from the given values, for every request sent.
+     */
+    public static HttpClient createClientFrom(HttpClient.Builder builder,
+                                              int responseStatusCode,
+                                              HttpHeaders responseHeaders,
+                                              String responseBody) {
+        return new FixedResponseHttpClient(builder,
+                                           responseStatusCode,
+                                           responseHeaders,
+                                           wrap(responseBody.getBytes(UTF_8)));
+    }
+
+    /**
+     * Creates a new HttpClient that returns a fixed response,
+     * constructed from the given values, for every request sent.
+     */
+    public static HttpClient createClientFrom(HttpClient.Builder builder,
+                                              int responseStatusCode,
+                                              HttpHeaders responseHeaders,
+                                              Path path) {
+        try {
+            return new FixedResponseHttpClient(builder,
+                                               responseStatusCode,
+                                               responseHeaders,
+                                               wrap(Files.readAllBytes(path)));
+        } catch (IOException ioe) {
+            throw new UncheckedIOException(ioe);
+        }
+    }
+
+    /**
+     * Creates a new HttpClient that returns a fixed response,
+     * constructed from the given values, for every request sent.
+     */
+    public static HttpClient createClientFrom(HttpClient.Builder builder,
+                                              int responseStatusCode,
+                                              HttpHeaders responseHeaders,
+                                              byte[] responseBody) {
+        return new FixedResponseHttpClient(builder,
+                responseStatusCode,
+                responseHeaders,
+                wrap(responseBody));
+    }
+
+    private static final ByteBuffer ECHO_SENTINAL = ByteBuffer.wrap(new byte[] {});
+
+    /**
+     * Creates a new HttpClient that returns a fixed response,
+     * constructed from the given values, for every request sent.
+     */
+    public static HttpClient createEchoClient(HttpClient.Builder builder,
+                                              int responseStatusCode,
+                                              HttpHeaders responseHeaders) {
+        return new FixedResponseHttpClient(builder,
+                                           responseStatusCode,
+                                           responseHeaders,
+                                           ECHO_SENTINAL);
+    }
+
+    @Override
+    public <T> CompletableFuture<HttpResponse<T>>
+    sendAsync(HttpRequest request, BodyHandler<T> responseBodyHandler) {
+        return sendAsync(request, responseBodyHandler, null);
+    }
+
+    @Override
+    public <T> HttpResponse<T> send(HttpRequest request,
+                                    BodyHandler<T> responseBodyHandler)
+            throws IOException, InterruptedException {
+        return sendAsync(request, responseBodyHandler).join();  // unwrap exceptions if needed
+    }
+
+    class FixedResponseInfo implements HttpResponse.ResponseInfo {
+        private final int statusCode;
+        private final HttpHeaders headers;
+        private final HttpClient.Version version;
+
+        FixedResponseInfo() {
+            this.statusCode = responseStatusCode;
+            this.headers = responseHeaders;
+            this.version = HttpClient.Version.HTTP_1_1;
+        }
+
+        /**
+         * Provides the response status code
+         * @return the response status code
+         */
+        public int statusCode() {
+            return statusCode;
+        }
+
+        /**
+         * Provides the response headers
+         * @return the response headers
+         */
+        public HttpHeaders headers() {
+            return headers;
+        }
+
+        /**
+         * provides the response protocol version
+         * @return the response protocol version
+         */
+        public HttpClient.Version version() {
+            return version;
+        }
+    }
+
+    @Override
+    public <T> CompletableFuture<HttpResponse<T>>
+    sendAsync(HttpRequest request,
+              BodyHandler<T> responseBodyHandler,
+              PushPromiseHandler<T> pushPromiseHandler) {
+        List<ByteBuffer> responseBody = List.of(responseBodyBytes.duplicate());
+
+        // Push promises can be mocked too, if needed
+
+        Optional<HttpRequest.BodyPublisher> obp = request.bodyPublisher();
+        if (obp.isPresent()) {
+            ConsumingSubscriber subscriber = new ConsumingSubscriber();
+            obp.get().subscribe(subscriber);
+            if (responseBodyBytes == ECHO_SENTINAL) {
+                responseBody = subscriber.buffers;
+            }
+        }
+
+        BodySubscriber<T> bodySubscriber =
+                responseBodyHandler.apply(responseInfo);
+        SubmissionPublisher<List<ByteBuffer>> publisher = new SubmissionPublisher<>();
+        publisher.subscribe(bodySubscriber);
+        publisher.submit(responseBody);
+        publisher.close();
+
+        CompletableFuture<HttpResponse<T>> cf = new CompletableFuture<>();
+        bodySubscriber.getBody().whenComplete((body, throwable) -> {
+                    if (body != null)
+                        cf.complete(new FixedHttpResponse<>(
+                                responseStatusCode,
+                                request,
+                                responseHeaders,
+                                body,
+                                null,
+                                request.uri(),
+                                request.version().orElse(Version.HTTP_2)));
+                    else
+                        cf.completeExceptionally(throwable);
+                }
+        );
+
+        return cf;
+    }
+
+    /**
+     * A Subscriber that demands and consumes all the Publishers data,
+     * after which makes it directly available.
+     */
+    private static class ConsumingSubscriber implements Flow.Subscriber<ByteBuffer> {
+        final List<ByteBuffer> buffers = Collections.synchronizedList(new ArrayList<>());
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            subscription.request(Long.MAX_VALUE);
+        }
+
+        @Override public void onNext(ByteBuffer item) {
+            buffers.add(item.duplicate());
+        }
+
+        @Override public void onError(Throwable throwable) { assert false : "Unexpected"; }
+
+        @Override public void onComplete() { /* do nothing */ }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/offline/OfflineTesting.java b/test/jdk/java/net/httpclient/offline/OfflineTesting.java
new file mode 100644
index 00000000000..d2df4907154
--- /dev/null
+++ b/test/jdk/java/net/httpclient/offline/OfflineTesting.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Demonstrates how to achieve testing without network connections
+ * @build FixedHttpHeaders DelegatingHttpClient FixedHttpResponse FixedResponseHttpClient
+ * @run testng/othervm OfflineTesting
+ */
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import org.testng.annotations.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+public class OfflineTesting {
+
+    private static HttpClient getClient() {
+        // be sure to return the appropriate client when testing
+        //return HttpClient.newHttpClient();
+        return FixedResponseHttpClient.createClientFrom(
+                HttpClient.newBuilder(),
+                200,
+                FixedHttpHeaders.of("Server",  "nginx",
+                                    "Content-Type", "text/html"),
+                "A response message");
+    }
+
+    @Test
+    public void testResponseAsString() {
+        HttpClient client = getClient();
+
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create("http://openjdk.java.net/"))
+                .build();
+
+        client.sendAsync(request, BodyHandlers.ofString())
+                .thenAccept(response -> {
+                    System.out.println("response: " + response);
+                    assertEquals(response.statusCode(), 200);
+                    assertTrue(response.headers().firstValue("Server").isPresent());
+                    assertEquals(response.body(), "A response message"); } )
+                .join();
+    }
+
+    @Test
+    public void testResponseAsByteArray() {
+        HttpClient client = getClient();
+
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create("http://openjdk.java.net/"))
+                .build();
+
+        client.sendAsync(request, BodyHandlers.ofByteArray())
+                .thenAccept(response -> {
+                    System.out.println("response: " + response);
+                    assertEquals(response.statusCode(), 200);
+                    assertTrue(response.headers().firstValue("Content-Type").isPresent());
+                    assertEquals(response.body(), "A response message".getBytes(UTF_8)); } )
+                .join();
+    }
+
+    @Test
+    public void testFileNotFound() {
+        //HttpClient client = HttpClient.newHttpClient();
+        HttpClient client = FixedResponseHttpClient.createClientFrom(
+                HttpClient.newBuilder(),
+                404,
+                FixedHttpHeaders.of("Connection",  "keep-alive",
+                                    "Content-Length", "162",
+                                    "Content-Type", "text/html",
+                                    "Date", "Mon, 15 Jan 2018 15:01:16 GMT",
+                                    "Server", "nginx"),
+                "<html>\n" +
+                "<head><title>404 Not Found</title></head>\n" +
+                "<body bgcolor=\"white\">\n" +
+                "<center><h1>404 Not Found</h1></center>\n" +
+                "<hr><center>nginx</center>\n" +
+                "</body>\n" +
+                "</html>");
+
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create("http://openjdk.java.net/notFound"))
+                .build();
+
+        client.sendAsync(request, BodyHandlers.ofString())
+                .thenAccept(response -> {
+                    assertEquals(response.statusCode(), 404);
+                    response.headers().firstValue("Content-Type")
+                            .ifPresentOrElse(type -> assertEquals(type, "text/html"),
+                                             () -> fail("Content-Type not present"));
+                    assertTrue(response.body().contains("404 Not Found")); } )
+                .join();
+    }
+
+    @Test
+    public void testEcho() {
+        HttpClient client = FixedResponseHttpClient.createEchoClient(
+                HttpClient.newBuilder(),
+                200,
+                FixedHttpHeaders.of("Connection",  "keep-alive"));
+
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create("http://openjdk.java.net/echo"))
+                .POST(BodyPublishers.ofString("Hello World"))
+                .build();
+
+        client.sendAsync(request, BodyHandlers.ofString())
+                .thenAccept(response -> {
+                    System.out.println("response: " + response);
+                    assertEquals(response.statusCode(), 200);
+                    assertEquals(response.body(), "Hello World"); } )
+                .join();
+    }
+
+    @Test
+    public void testEchoBlocking() throws IOException, InterruptedException {
+        HttpClient client = FixedResponseHttpClient.createEchoClient(
+                HttpClient.newBuilder(),
+                200,
+                FixedHttpHeaders.of("Connection",  "keep-alive"));
+
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create("http://openjdk.java.net/echo"))
+                .POST(BodyPublishers.ofString("Hello chegar!!"))
+                .build();
+
+        HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+        System.out.println("response: " + response);
+        assertEquals(response.statusCode(), 200);
+        assertEquals(response.body(), "Hello chegar!!");
+    }
+}
diff --git a/test/jdk/java/net/httpclient/security/0.policy b/test/jdk/java/net/httpclient/security/0.policy
index d9b7a757bdc..42c1cb202c5 100644
--- a/test/jdk/java/net/httpclient/security/0.policy
+++ b/test/jdk/java/net/httpclient/security/0.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -40,28 +40,7 @@ grant {
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
 
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
 
diff --git a/test/jdk/java/net/httpclient/security/1.policy b/test/jdk/java/net/httpclient/security/1.policy
index 964e8b643dc..729ebbe06ad 100644
--- a/test/jdk/java/net/httpclient/security/1.policy
+++ b/test/jdk/java/net/httpclient/security/1.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,35 +34,11 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET";
+    permission java.net.URLPermission "http://localhost:${port.number}/files/foo.txt", "GET";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
-
diff --git a/test/jdk/java/net/httpclient/security/10.policy b/test/jdk/java/net/httpclient/security/10.policy
index 32a985c33f8..f8e2699e89b 100644
--- a/test/jdk/java/net/httpclient/security/10.policy
+++ b/test/jdk/java/net/httpclient/security/10.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -33,34 +33,11 @@ grant {
     permission java.lang.RuntimePermission "createClassLoader";
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET:*";
+    permission java.net.URLPermission "http://localhost:${port.number}/files/foo.txt", "GET:*";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/11.policy b/test/jdk/java/net/httpclient/security/11.policy
index 4db4cfe6e80..42b96c6bffe 100644
--- a/test/jdk/java/net/httpclient/security/11.policy
+++ b/test/jdk/java/net/httpclient/security/11.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -33,36 +33,13 @@ grant {
     permission java.lang.RuntimePermission "createClassLoader";
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET:*";
-    permission java.net.URLPermission "socket://127.0.0.1:${port.number1}", "CONNECT";
+    permission java.net.URLPermission "http://localhost:${port.number}/files/foo.txt", "GET:*";
+    permission java.net.URLPermission "socket://localhost:${port.number1}", "CONNECT";
 };
 
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/12.policy b/test/jdk/java/net/httpclient/security/12.policy
index 4db4cfe6e80..42b96c6bffe 100644
--- a/test/jdk/java/net/httpclient/security/12.policy
+++ b/test/jdk/java/net/httpclient/security/12.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -33,36 +33,13 @@ grant {
     permission java.lang.RuntimePermission "createClassLoader";
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:${port.number}/files/foo.txt", "GET:*";
-    permission java.net.URLPermission "socket://127.0.0.1:${port.number1}", "CONNECT";
+    permission java.net.URLPermission "http://localhost:${port.number}/files/foo.txt", "GET:*";
+    permission java.net.URLPermission "socket://localhost:${port.number1}", "CONNECT";
 };
 
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/14.policy b/test/jdk/java/net/httpclient/security/14.policy
index 5cd778beb87..0cd95b13b06 100644
--- a/test/jdk/java/net/httpclient/security/14.policy
+++ b/test/jdk/java/net/httpclient/security/14.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,34 +34,11 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET";
+    permission java.net.URLPermission "http://localhost:*/files/foo.txt", "GET";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/15.policy b/test/jdk/java/net/httpclient/security/15.policy
index 5418bbea054..269b3a92fbb 100644
--- a/test/jdk/java/net/httpclient/security/15.policy
+++ b/test/jdk/java/net/httpclient/security/15.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -33,7 +33,7 @@ grant {
     permission java.lang.RuntimePermission "createClassLoader";
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET:*";
+    permission java.net.URLPermission "http://localhost:*/files/foo.txt", "GET:*";
 
     // Test checks for this explicitly
     permission java.lang.RuntimePermission "foobar";
@@ -43,28 +43,5 @@ grant {
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/2.policy b/test/jdk/java/net/httpclient/security/2.policy
index 2b3e1b9f7ed..d36b6f298b6 100644
--- a/test/jdk/java/net/httpclient/security/2.policy
+++ b/test/jdk/java/net/httpclient/security/2.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,34 +34,11 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/*", "GET";
+    permission java.net.URLPermission "http://localhost:*/files/*", "GET";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/3.policy b/test/jdk/java/net/httpclient/security/3.policy
index b876accab84..fe8c76e3e33 100644
--- a/test/jdk/java/net/httpclient/security/3.policy
+++ b/test/jdk/java/net/httpclient/security/3.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,34 +34,11 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/redirect/foo.txt", "GET";
+    permission java.net.URLPermission "http://localhost:*/redirect/foo.txt", "GET";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/4.policy b/test/jdk/java/net/httpclient/security/4.policy
index f06f38433bc..855f5f717a8 100644
--- a/test/jdk/java/net/httpclient/security/4.policy
+++ b/test/jdk/java/net/httpclient/security/4.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,35 +34,12 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/redirect/foo.txt", "GET";
-    permission java.net.URLPermission "http://127.0.0.1:*/redirect/bar.txt", "GET";
+    permission java.net.URLPermission "http://localhost:*/redirect/foo.txt", "GET";
+    permission java.net.URLPermission "http://localhost:*/redirect/bar.txt", "GET";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/5.policy b/test/jdk/java/net/httpclient/security/5.policy
index 3afcb50c676..9f804769343 100644
--- a/test/jdk/java/net/httpclient/security/5.policy
+++ b/test/jdk/java/net/httpclient/security/5.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,34 +34,11 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/redirect/bar.txt", "GET";
+    permission java.net.URLPermission "http://localhost:*/redirect/bar.txt", "GET";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/6.policy b/test/jdk/java/net/httpclient/security/6.policy
index b2dffc008c8..64910ae9ff0 100644
--- a/test/jdk/java/net/httpclient/security/6.policy
+++ b/test/jdk/java/net/httpclient/security/6.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,34 +34,11 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "POST";
+    permission java.net.URLPermission "http://localhost:*/files/foo.txt", "POST";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/7.policy b/test/jdk/java/net/httpclient/security/7.policy
index b0f6bc49308..1ca82a8c5e6 100644
--- a/test/jdk/java/net/httpclient/security/7.policy
+++ b/test/jdk/java/net/httpclient/security/7.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,34 +34,11 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET:X-Bar";
+    permission java.net.URLPermission "http://localhost:*/files/foo.txt", "GET:X-Bar";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/8.policy b/test/jdk/java/net/httpclient/security/8.policy
index b5dbcf2366a..a158b2b74b2 100644
--- a/test/jdk/java/net/httpclient/security/8.policy
+++ b/test/jdk/java/net/httpclient/security/8.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,34 +34,11 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET:X-Foo1,X-Foo,X-Bar";
+    permission java.net.URLPermission "http://localhost:*/files/foo.txt", "GET:X-Foo1,X-Foo,X-Bar";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/9.policy b/test/jdk/java/net/httpclient/security/9.policy
index 2aa216552b4..85d392bc5c1 100644
--- a/test/jdk/java/net/httpclient/security/9.policy
+++ b/test/jdk/java/net/httpclient/security/9.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2016, 2018, 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
@@ -34,34 +34,11 @@ grant {
 
 
     // permissions specific to this test
-    permission java.net.URLPermission "http://127.0.0.1:*/files/foo.txt", "GET:*";
+    permission java.net.URLPermission "http://localhost:*/files/foo.txt", "GET:*";
 };
 
 // For proxy only. Not being tested
 grant codebase "file:${test.classes}/proxydir/-" {
     permission java.net.SocketPermission "localhost:1024-", "accept,listen,connect";
-    permission java.net.SocketPermission "127.0.0.1:1024-", "connect,resolve";
+    permission java.net.SocketPermission "localhost:1024-", "connect,resolve";
 };
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write";  // delete???
-
-    permission java.util.PropertyPermission "jdk.httpclient.*","read";
-
-    permission java.net.NetPermission "getProxySelector";
-};
-
diff --git a/test/jdk/java/net/httpclient/security/Driver.java b/test/jdk/java/net/httpclient/security/Driver.java
index 3ccec62fdb5..04e4d3774a8 100644
--- a/test/jdk/java/net/httpclient/security/Driver.java
+++ b/test/jdk/java/net/httpclient/security/Driver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -25,7 +25,7 @@
  * @test
  * @bug 8087112
  * @library /lib/testlibrary/
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
  * @build jdk.testlibrary.SimpleSSLContext jdk.testlibrary.Utils
@@ -49,6 +49,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -59,7 +62,7 @@
  */
 public class Driver {
     // change the default value to "true" to get the subprocess traces.
-    final static boolean DEBUG = Boolean.parseBoolean(System.getProperty("test.debug", "false"));
+    final static boolean DEBUG = Boolean.parseBoolean(System.getProperty("test.debug", "true"));
 
     public static void main(String[] args) throws Throwable {
         System.out.println("Starting Driver");
@@ -70,16 +73,18 @@ public static void main(String[] args) throws Throwable {
         System.out.println("DONE");
     }
 
+    static final Path CWD = Paths.get(".");
+
     static class Logger extends Thread {
         private final OutputStream ps;
         private final InputStream stdout;
 
-        Logger(String cmdLine, Process p, String dir) throws IOException {
+        Logger(String cmdLine, Process p) throws IOException {
             super();
             setDaemon(true);
             cmdLine = "Command line = [" + cmdLine + "]\n";
             stdout = p.getInputStream();
-            File f = File.createTempFile("debug", ".txt", new File(dir));
+            File f = Files.createTempFile(CWD, "debug", ".txt").toFile();
             ps = new FileOutputStream(f);
             ps.write(cmdLine.getBytes());
             ps.flush();
@@ -127,7 +132,6 @@ public static void runtest(String policy, String testnum) throws Throwable {
             cmd.add("-Dtest.src=" + testSrc);
             cmd.add("-Dtest.classes=" + testClasses);
             cmd.add("-Djava.security.manager");
-            cmd.add("--add-modules=jdk.incubator.httpclient");
             cmd.add("-Djava.security.policy=" + testSrc + sep + policy);
             cmd.add("-Dport.number=" + Integer.toString(Utils.getFreePort()));
             cmd.add("-Dport.number1=" + Integer.toString(Utils.getFreePort()));
@@ -144,7 +148,7 @@ public static void runtest(String policy, String testnum) throws Throwable {
             String cmdLine = cmd.stream().collect(Collectors.joining(" "));
             long start = System.currentTimeMillis();
             Process child = processBuilder.start();
-            Logger log = new Logger(cmdLine, child, testClasses);
+            Logger log = new Logger(cmdLine, child);
             log.start();
             retval = child.waitFor();
             long elapsed = System.currentTimeMillis() - start;
diff --git a/test/jdk/java/net/httpclient/security/Security.java b/test/jdk/java/net/httpclient/security/Security.java
index d6b1c623efd..be23f10bc86 100644
--- a/test/jdk/java/net/httpclient/security/Security.java
+++ b/test/jdk/java/net/httpclient/security/Security.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8087112
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
  * @library /lib/testlibrary/
@@ -50,7 +50,6 @@
 // Tests 1, 10, 11 and 12 executed from Driver
 
 import com.sun.net.httpserver.Headers;
-import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
@@ -61,15 +60,16 @@
 import java.io.OutputStream;
 import java.lang.reflect.Constructor;
 import java.net.BindException;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.ProxySelector;
 import java.net.URI;
 import java.net.URLClassLoader;
 import java.net.URL;
-import jdk.incubator.http.HttpHeaders;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -89,40 +89,62 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.lang.reflect.InvocationTargetException;
-import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static java.net.http.HttpResponse.BodyHandlers.ofString;
 
 /**
  * Security checks test
  */
 public class Security {
 
-    static HttpServer s1 = null;
-    static ExecutorService executor=null;
+    static HttpServer s1;
+    static ExecutorService executor;
     static int port, proxyPort;
     static HttpClient client;
     static String httproot, fileuri, fileroot, redirectroot;
     static List<HttpClient> clients = new LinkedList<>();
     static URI uri;
 
-    interface Test {
-        void execute() throws IOException, InterruptedException;
-    }
+    interface ThrowingRunnable { void run() throws Throwable; }
 
     static class TestAndResult {
-        Test test;
-        boolean result;
+        private final ThrowingRunnable runnable;
+        private final boolean expectSecurityException;
 
-        TestAndResult (Test t, boolean result) {
-            this.test = t;
-            this.result = result;
+        TestAndResult(boolean expectSecurityException, ThrowingRunnable runnable) {
+            this.expectSecurityException = expectSecurityException;
+            this.runnable = runnable;
+        }
+
+        static TestAndResult of(boolean expectSecurityException,
+                                ThrowingRunnable runnable) {
+            return new TestAndResult(expectSecurityException, runnable);
         }
-    }
 
-    static TestAndResult test(boolean result, Test t) {
-        return new TestAndResult(t, result);
+        void runWithPolicy(String policy) {
+            System.out.println("Using policy file: " + policy);
+            try {
+                runnable.run();
+                if (expectSecurityException) {
+                    String msg = "FAILED: expected security exception not thrown";
+                    System.out.println(msg);
+                    throw new RuntimeException(msg);
+                }
+                System.out.println (policy + " succeeded as expected");
+            } catch (BindException e) {
+                System.exit(10);
+            } catch (SecurityException e) {
+                if (!expectSecurityException) {
+                    System.out.println("UNEXPECTED security Exception: " + e);
+                    throw new RuntimeException("UNEXPECTED security Exception", e);
+                }
+                System.out.println(policy + " threw SecurityException as expected: " + e);
+            } catch (Throwable t) {
+                throw new AssertionError(t);
+            }
+        }
     }
 
-    static TestAndResult[] tests;
+    static TestAndResult[] tests = createTests();
     static String testclasses;
     static File subdir;
 
@@ -143,7 +165,7 @@ static void setupProxy() throws IOException, ClassNotFoundException, NoSuchMetho
         movefile("ProxyServer$Connection.class");
         movefile("ProxyServer$1.class");
 
-        URL url = subdir.toURL();
+        URL url = subdir.toURI().toURL();
         System.out.println("URL for class loader = " + url);
         URLClassLoader urlc = new URLClassLoader(new URL[] {url});
         proxyClass = Class.forName("ProxyServer", true, urlc);
@@ -164,7 +186,7 @@ static void movefile(String f) throws IOException {
         }
     }
 
-    static Object getProxy(int port, boolean b) throws Throwable {
+    static Object createProxy(int port, boolean b) throws Throwable {
         try {
             return proxyConstructor.newInstance(port, b);
         } catch (InvocationTargetException e) {
@@ -175,95 +197,106 @@ static Object getProxy(int port, boolean b) throws Throwable {
     static Class<?> proxyClass;
     static Constructor<?> proxyConstructor;
 
-    static void setupTests() {
-        tests = new TestAndResult[]{
+    static TestAndResult[] createTests() {
+        return new TestAndResult[] {
             // (0) policy does not have permission for file. Should fail
-            test(false, () -> { // Policy 0
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(true, () -> { // Policy 0
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (1) policy has permission for file URL
-            test(true, () -> { //Policy 1
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(false, () -> { //Policy 1
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (2) policy has permission for all file URLs under /files
-            test(true, () -> { // Policy 2
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(false, () -> { // Policy 2
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (3) policy has permission for first URL but not redirected URL
-            test(false, () -> { // Policy 3
-                URI u = URI.create("http://127.0.0.1:" + port + "/redirect/foo.txt");
+            TestAndResult.of(true, () -> { // Policy 3
+                URI u = URI.create("http://localhost:" + port + "/redirect/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (4) policy has permission for both first URL and redirected URL
-            test(true, () -> { // Policy 4
-                URI u = URI.create("http://127.0.0.1:" + port + "/redirect/foo.txt");
+            TestAndResult.of(false, () -> { // Policy 4
+                URI u = URI.create("http://localhost:" + port + "/redirect/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (5) policy has permission for redirected but not first URL
-            test(false, () -> { // Policy 5
-                URI u = URI.create("http://127.0.0.1:" + port + "/redirect/foo.txt");
+            TestAndResult.of(true, () -> { // Policy 5
+                URI u = URI.create("http://localhost:" + port + "/redirect/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (6) policy has permission for file URL, but not method
-            test(false, () -> { //Policy 6
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(true, () -> { //Policy 6
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (7) policy has permission for file URL, method, but not header
-            test(false, () -> { //Policy 7
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(true, () -> { //Policy 7
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u)
                                                  .header("X-Foo", "bar")
                                                  .GET()
                                                  .build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (8) policy has permission for file URL, method and header
-            test(true, () -> { //Policy 8
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(false, () -> { //Policy 8
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u)
                                                  .header("X-Foo", "bar")
                                                  .GET()
                                                  .build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (9) policy has permission for file URL, method and header
-            test(true, () -> { //Policy 9
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(false, () -> { //Policy 9
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u)
                                                  .headers("X-Foo", "bar", "X-Bar", "foo")
                                                  .GET()
                                                  .build();
-                HttpResponse<?> response = client.send(request, asString());
+                HttpResponse<?> response = client.send(request, ofString());
+                System.out.println("Received response:" + response);
             }),
             // (10) policy has permission for destination URL but not for proxy
-            test(false, () -> { //Policy 10
+            TestAndResult.of(true, () -> { //Policy 10
                 directProxyTest(proxyPort, true);
             }),
             // (11) policy has permission for both destination URL and proxy
-            test(true, () -> { //Policy 11
+            TestAndResult.of(false, () -> { //Policy 11
                 directProxyTest(proxyPort, true);
             }),
             // (12) policy has permission for both destination URL and proxy
-            test(false, () -> { //Policy 11
+            TestAndResult.of(true, () -> { //Policy 12 ( 11 & 12 are the same )
                 directProxyTest(proxyPort, false);
             }),
             // (13) async version of test 0
-            test(false, () -> { // Policy 0
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(true, () -> { // Policy 0
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
                 try {
-                    HttpResponse<?> response = client.sendAsync(request, asString()).get();
+                    HttpResponse<?> response = client.sendAsync(request, ofString()).get();
+                    System.out.println("Received response:" + response);
                 } catch (ExecutionException e) {
                     if (e.getCause() instanceof SecurityException) {
                         throw (SecurityException)e.getCause();
@@ -273,11 +306,12 @@ static void setupTests() {
                 }
             }),
             // (14) async version of test 1
-            test(true, () -> { //Policy 1
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(false, () -> { //Policy 1
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
                 try {
-                    HttpResponse<?> response = client.sendAsync(request, asString()).get();
+                    HttpResponse<?> response = client.sendAsync(request, ofString()).get();
+                    System.out.println("Received response:" + response);
                 } catch (ExecutionException e) {
                     if (e.getCause() instanceof SecurityException) {
                         throw (SecurityException)e.getCause();
@@ -288,16 +322,16 @@ static void setupTests() {
             }),
             // (15) check that user provided unprivileged code running on a worker
             //      thread does not gain ungranted privileges.
-            test(false, () -> { //Policy 12
-                URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+            TestAndResult.of(true, () -> { //Policy 12
+                URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
                 HttpRequest request = HttpRequest.newBuilder(u).GET().build();
-                HttpResponse.BodyHandler<String> sth = asString();
+                HttpResponse.BodyHandler<String> sth = ofString();
 
                 CompletableFuture<HttpResponse<String>> cf =
                     client.sendAsync(request, new HttpResponse.BodyHandler<String>() {
                         @Override
-                        public HttpResponse.BodySubscriber<String> apply(int status, HttpHeaders responseHeaders)  {
-                            final HttpResponse.BodySubscriber<String> stproc = sth.apply(status, responseHeaders);
+                        public HttpResponse.BodySubscriber<String> apply(HttpResponse.ResponseInfo rinfo) {
+                            final HttpResponse.BodySubscriber<String> stproc = sth.apply(rinfo);
                             return new HttpResponse.BodySubscriber<String>() {
                                 @Override
                                 public CompletionStage<String> getBody() {
@@ -331,7 +365,8 @@ public void onComplete() {
                     }
                 );
                 try {
-                    cf.join();
+                    HttpResponse<String> response = cf.join();
+                    System.out.println("Received response:" + response);
                 } catch (CompletionException e) {
                     Throwable t = e.getCause();
                     if (t instanceof SecurityException)
@@ -349,52 +384,43 @@ else if ((t instanceof IOException)
     private static void directProxyTest(int proxyPort, boolean samePort)
         throws IOException, InterruptedException
     {
-        Object proxy = null;
-        try {
-            proxy = getProxy(proxyPort, true);
-        } catch (BindException e) {
-            System.out.println("Bind failed");
-            throw e;
-        } catch (Throwable ee) {
-            throw new RuntimeException(ee);
+        System.out.println("proxyPort:" + proxyPort + ", samePort:" + samePort);
+
+        int p = proxyPort;
+        if (samePort) {
+            Object proxy;
+            try {
+                proxy = createProxy(p, true);
+            } catch (BindException e) {
+                System.out.println("Bind failed");
+                throw e;
+            } catch (Throwable ee) {
+                throw new RuntimeException(ee);
+            }
+        } else {
+            while (p == proxyPort || p == port) {
+                // avoid ports that may be granted permission
+                p++;
+                if (p > 65535) {
+                    p = 32000; // overflow
+                }
+            }
         }
-        System.out.println("Proxy port = " + proxyPort);
-        if (!samePort)
-            proxyPort++;
+        System.out.println("Proxy port, p:" + p);
 
-        InetSocketAddress addr = new InetSocketAddress("127.0.0.1", proxyPort);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                                                       p);
         HttpClient cl = HttpClient.newBuilder()
                                     .proxy(ProxySelector.of(addr))
                                     .build();
         clients.add(cl);
 
-        URI u = URI.create("http://127.0.0.1:" + port + "/files/foo.txt");
+        URI u = URI.create("http://localhost:" + port + "/files/foo.txt");
         HttpRequest request = HttpRequest.newBuilder(u)
                                          .headers("X-Foo", "bar", "X-Bar", "foo")
                                          .build();
-        HttpResponse<?> response = cl.send(request, asString());
-    }
-
-    static void runtest(Test r, String policy, boolean succeeds) {
-        System.out.println("Using policy file: " + policy);
-        try {
-            r.execute();
-            if (!succeeds) {
-                System.out.println("FAILED: expected security exception");
-                throw new RuntimeException("FAILED: expected security exception\"");
-            }
-            System.out.println (policy + " succeeded as expected");
-        } catch (BindException e) {
-            System.exit(10);
-        } catch (SecurityException e) {
-            if (succeeds) {
-                System.out.println("FAILED");
-                throw new RuntimeException(e);
-            }
-            System.out.println (policy + " threw exception as expected");
-        } catch (IOException | InterruptedException ee) {
-            throw new RuntimeException(ee);
-        }
+        HttpResponse<?> response = cl.send(request, ofString());
+        System.out.println("Received response:" + response);
     }
 
     public static void main(String[] args) throws Exception {
@@ -404,7 +430,7 @@ public static void main(String[] args) throws Exception {
         } catch (BindException e) {
             System.exit(10);
         }
-        fileroot = System.getProperty ("test.src")+ "/docs";
+        fileroot = System.getProperty("test.src")+ "/docs";
         int testnum = Integer.parseInt(args[0]);
         String policy = args[0];
 
@@ -415,9 +441,8 @@ public static void main(String[] args) throws Exception {
         clients.add(client);
 
         try {
-            setupTests();
             TestAndResult tr = tests[testnum];
-            runtest(tr.test, policy, tr.result);
+            tr.runWithPolicy(policy);
         } finally {
             s1.stop(0);
             executor.shutdownNow();
@@ -435,20 +460,17 @@ public static void initServer() throws Exception {
         logger.setLevel(Level.ALL);
         ch.setLevel(Level.ALL);
         logger.addHandler(ch);
-        String root = System.getProperty ("test.src")+ "/docs";
-        InetSocketAddress addr = new InetSocketAddress (port);
+        String root = System.getProperty("test.src")+ "/docs";
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), port);
         s1 = HttpServer.create (addr, 0);
         if (s1 instanceof HttpsServer) {
-            throw new RuntimeException ("should not be httpsserver");
+            throw new RuntimeException("should not be httpsserver");
         }
-        HttpHandler h = new FileServerHandler (root);
-        HttpContext c = s1.createContext ("/files", h);
-
-        HttpHandler h1 = new RedirectHandler ("/redirect");
-        HttpContext c1 = s1.createContext ("/redirect", h1);
+        s1.createContext("/files", new FileServerHandler(root));
+        s1.createContext("/redirect", new RedirectHandler("/redirect"));
 
         executor = Executors.newCachedThreadPool();
-        s1.setExecutor (executor);
+        s1.setExecutor(executor);
         s1.start();
 
         if (port == 0)
@@ -459,8 +481,8 @@ public static void initServer() throws Exception {
             System.out.println("Port was assigned by Driver");
         }
         System.out.println("HTTP server port = " + port);
-        httproot = "http://127.0.0.1:" + port + "/files/";
-        redirectroot = "http://127.0.0.1:" + port + "/redirect/";
+        httproot = "http://localhost:" + port + "/files/";
+        redirectroot = "http://localhost:" + port + "/redirect/";
         uri = new URI(httproot);
         fileuri = httproot + "foo.txt";
     }
@@ -483,12 +505,10 @@ synchronized void increment() {
         }
 
         @Override
-        public synchronized void handle(HttpExchange t)
-                throws IOException {
-            byte[] buf = new byte[2048];
+        public synchronized void handle(HttpExchange t) throws IOException {
             System.out.println("Server: " + t.getRequestURI());
             try (InputStream is = t.getRequestBody()) {
-                while (is.read(buf) != -1) ;
+               is.readAllBytes();
             }
             increment();
             if (count() == 1) {
diff --git a/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java b/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java
index d8bf837adbc..351a676cc43 100644
--- a/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java
+++ b/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -24,9 +24,10 @@
 /*
  * @test
  * @summary Basic checks for SecurityException from body processors APIs
- * @run testng/othervm/java.security.policy=httpclient.policy FileProcessorPermissionTest
+ * @run testng/othervm/java.security.policy=allpermissions.policy FileProcessorPermissionTest
  */
 
+import java.io.File;
 import java.io.FilePermission;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -38,8 +39,10 @@
 import java.security.PrivilegedExceptionAction;
 import java.security.ProtectionDomain;
 import java.util.List;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import org.testng.annotations.Test;
 import static java.nio.file.StandardOpenOption.*;
 import static org.testng.Assert.*;
@@ -68,26 +71,18 @@ static AccessControlContext noPermissions() {
     @Test
     public void test() throws Exception {
         List<PrivilegedExceptionAction<?>> list = List.of(
-                () -> HttpRequest.BodyPublisher.fromFile(fromFilePath),
+                () -> HttpRequest.BodyPublishers.ofFile(fromFilePath),
 
-                () -> HttpResponse.BodyHandler.asFile(asFilePath),
-                () -> HttpResponse.BodyHandler.asFile(asFilePath, CREATE),
-                () -> HttpResponse.BodyHandler.asFile(asFilePath, CREATE, WRITE),
-                () -> HttpResponse.BodyHandler.asFile(asFilePath, CREATE, WRITE, READ),
-                () -> HttpResponse.BodyHandler.asFile(asFilePath, CREATE, WRITE, READ, DELETE_ON_CLOSE),
+                () -> BodyHandlers.ofFile(asFilePath),
+                () -> BodyHandlers.ofFile(asFilePath, CREATE),
+                () -> BodyHandlers.ofFile(asFilePath, CREATE, WRITE),
 
-                () -> HttpResponse.BodyHandler.asFileDownload(CWD),
-                () -> HttpResponse.BodyHandler.asFileDownload(CWD, CREATE),
-                () -> HttpResponse.BodyHandler.asFileDownload(CWD, CREATE, WRITE),
-                () -> HttpResponse.BodyHandler.asFileDownload(CWD, CREATE, WRITE, READ),
-                () -> HttpResponse.BodyHandler.asFileDownload(CWD, CREATE, WRITE, READ, DELETE_ON_CLOSE),
-
-                // TODO: what do these even mean by themselves, maybe ok means nothing?
-                () -> HttpResponse.BodyHandler.asFile(asFilePath, DELETE_ON_CLOSE),
-                () -> HttpResponse.BodyHandler.asFile(asFilePath, READ)
+                () -> BodyHandlers.ofFileDownload(CWD),
+                () -> BodyHandlers.ofFileDownload(CWD, CREATE),
+                () -> BodyHandlers.ofFileDownload(CWD, CREATE, WRITE)
         );
 
-        // sanity, just run http ( no security manager )
+        // TEST 1 - sanity, just run ( no security manager )
         System.setSecurityManager(null);
         try {
             for (PrivilegedExceptionAction pa : list) {
@@ -108,11 +103,27 @@ public void test() throws Exception {
             }
         }
 
-        // Run with limited permissions, i.e. just what is required
+        // TEST 2 - with all file permissions
+        AccessControlContext allFilesACC = withPermissions(
+                new FilePermission("<<ALL FILES>>" , "read,write")
+        );
+        for (PrivilegedExceptionAction pa : list) {
+            try {
+                assert System.getSecurityManager() != null;
+                AccessController.doPrivileged(pa, allFilesACC);
+            } catch (PrivilegedActionException pae) {
+                fail("UNEXPECTED Exception:" + pae);
+                pae.printStackTrace();
+            }
+        }
+
+        // TEST 3 - with limited permissions, i.e. just what is required
         AccessControlContext minimalACC = withPermissions(
                 new FilePermission(fromFilePath.toString() , "read"),
-                new FilePermission(asFilePath.toString(), "read,write,delete"),
-                new FilePermission(CWD.toString(), "read,write,delete")
+                new FilePermission(asFilePath.toString(), "write"),
+                // ofFileDownload requires read and write to the dir
+                new FilePermission(CWD.toString(), "read,write"),
+                new FilePermission(CWD.toString() + File.separator + "*", "read,write")
         );
         for (PrivilegedExceptionAction pa : list) {
             try {
@@ -124,7 +135,7 @@ public void test() throws Exception {
             }
         }
 
-        // Run with NO permissions, i.e. expect SecurityException
+        // TEST 4 - with NO permissions, i.e. expect SecurityException
         for (PrivilegedExceptionAction pa : list) {
             try {
                 assert System.getSecurityManager() != null;
diff --git a/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java b/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java
new file mode 100644
index 00000000000..0b88961b155
--- /dev/null
+++ b/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2018, 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
+ * @summary Verifies security checks are performed before existence checks
+ *          in pre-defined body processors APIs
+ * @run testng/othervm SecurityBeforeFile
+ * @run testng/othervm/java.security.policy=nopermissions.policy SecurityBeforeFile
+ */
+
+import java.io.FileNotFoundException;
+import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandlers;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static java.nio.file.StandardOpenOption.*;
+import static org.testng.Assert.*;
+
+public class SecurityBeforeFile {
+
+    static final boolean hasSecurityManager = System.getSecurityManager() != null;
+    static final boolean hasNoSecurityManager = !hasSecurityManager;
+
+    @Test
+    public void BodyPublishersOfFile() {
+        Path p = Paths.get("doesNotExist.txt");
+        if (hasNoSecurityManager && Files.exists(p))
+            throw new AssertionError("Unexpected " + p);
+
+        try {
+            BodyPublishers.ofFile(p);
+            fail("UNEXPECTED, file " + p.toString() + " exists?");
+        } catch (SecurityException se) {
+            assertTrue(hasSecurityManager);
+            out.println("caught expected security exception: " + se);
+        } catch (FileNotFoundException fnfe) {
+            assertTrue(hasNoSecurityManager);
+            out.println("caught expected file not found exception: " + fnfe);
+        }
+    }
+
+    @DataProvider(name = "handlerOpenOptions")
+    public Object[][] handlerOpenOptions() {
+        return new Object[][] {
+                { new OpenOption[] {               } },
+                { new OpenOption[] { CREATE        } },
+                { new OpenOption[] { CREATE, WRITE } },
+        };
+    }
+
+    @Test(dataProvider = "handlerOpenOptions")
+    public void BodyHandlersOfFileDownload(OpenOption[] openOptions) {
+        Path p = Paths.get("doesNotExistDir");
+        if (hasNoSecurityManager && Files.exists(p))
+            throw new AssertionError("Unexpected " + p);
+
+        try {
+            BodyHandlers.ofFileDownload(p, openOptions);
+            fail("UNEXPECTED, file " + p.toString() + " exists?");
+        } catch (SecurityException se) {
+            assertTrue(hasSecurityManager);
+            out.println("caught expected security exception: " + se);
+        } catch (IllegalArgumentException iae) {
+            assertTrue(hasNoSecurityManager);
+            out.println("caught expected illegal argument exception: " + iae);
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/security/filePerms/allpermissions.policy b/test/jdk/java/net/httpclient/security/filePerms/allpermissions.policy
new file mode 100644
index 00000000000..789a7dd878c
--- /dev/null
+++ b/test/jdk/java/net/httpclient/security/filePerms/allpermissions.policy
@@ -0,0 +1,28 @@
+//
+// Copyright (c) 2017, 2018, 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.
+//
+
+// bootstrap to get the test going, it will do its own restrictions
+grant codeBase "file:${test.classes}/*" {
+    permission java.security.AllPermission;
+};
+
diff --git a/test/jdk/java/net/httpclient/security/filePerms/httpclient.policy b/test/jdk/java/net/httpclient/security/filePerms/httpclient.policy
deleted file mode 100644
index e63c2acd92a..00000000000
--- a/test/jdk/java/net/httpclient/security/filePerms/httpclient.policy
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright (c) 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.
-//
-
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
-
-    // ## look at the different property names!
-    permission java.util.PropertyPermission "jdk.httpclient.HttpClient.log","read";  // name!
-    permission java.util.PropertyPermission "jdk.httpclient.auth.retrylimit","read";
-    permission java.util.PropertyPermission "jdk.httpclient.connectionWindowSize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.enablepush","read";
-    permission java.util.PropertyPermission "jdk.httpclient.hpack.maxheadertablesize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.keepalive.timeout","read";
-    permission java.util.PropertyPermission "jdk.httpclient.maxframesize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.maxstreams","read";
-    permission java.util.PropertyPermission "jdk.httpclient.redirects.retrylimit","read";
-    permission java.util.PropertyPermission "jdk.httpclient.windowsize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.receiveBufferSize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.bufsize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.internal.selector.timeout","read";
-    permission java.util.PropertyPermission "jdk.internal.httpclient.debug","read";
-    permission java.util.PropertyPermission "jdk.internal.httpclient.hpack.debug","read";
-    permission java.util.PropertyPermission "jdk.internal.httpclient.hpack.log.level","read";
-    permission java.util.PropertyPermission "test.src","read";
-
-    permission java.net.NetPermission "getProxySelector";
-
-    permission java.security.SecurityPermission "createAccessControlContext";
-};
-
-// bootstrap to get the test going, it will do its own restrictions
-grant codeBase "file:${test.classes}/*" {
-    permission java.security.AllPermission;
-};
-
diff --git a/test/jdk/java/net/httpclient/security/filePerms/nopermissions.policy b/test/jdk/java/net/httpclient/security/filePerms/nopermissions.policy
new file mode 100644
index 00000000000..062fefd0773
--- /dev/null
+++ b/test/jdk/java/net/httpclient/security/filePerms/nopermissions.policy
@@ -0,0 +1,26 @@
+//
+// Copyright (c) 2018, 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.
+//
+
+grant codeBase "file:${test.classes}/*" {
+};
+
diff --git a/test/jdk/java/net/httpclient/ssltest/CertificateTest.java b/test/jdk/java/net/httpclient/ssltest/CertificateTest.java
new file mode 100644
index 00000000000..c1f176d461d
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ssltest/CertificateTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2018, 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.File;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLParameters;
+
+/*
+ * @test
+ * @build Server CertificateTest
+ * @run main/othervm CertificateTest good.keystore expectSuccess
+ * @run main/othervm CertificateTest bad.keystore expectFailure
+ * @run main/othervm
+ *      -Djdk.internal.httpclient.disableHostnameVerification
+ *       CertificateTest bad.keystore expectSuccess
+ * @run main/othervm
+ *      -Djdk.internal.httpclient.disableHostnameVerification=true
+ *       CertificateTest bad.keystore expectSuccess
+ * @run main/othervm
+ *      -Djdk.internal.httpclient.disableHostnameVerification=false
+ *       CertificateTest bad.keystore expectFailure
+ * @run main/othervm
+ *      -Djdk.internal.httpclient.disableHostnameVerification=xxyyzz
+ *       CertificateTest bad.keystore expectFailure
+ * @run main/othervm CertificateTest loopback.keystore expectSuccess
+ */
+
+/**
+ * The test runs a number of times. In all cases it uses a valid self-signed certificate
+ * that is installed in the trust store (so is trusted) and the same cert is supplied
+ * by the server for its own identity. Two servers on two different ports are used
+ * on the remote end.
+ *
+ * For the "good" run the cert contains the correct hostname of the target server
+ * and therefore should be accepted by the cert checking code in the client.
+ * For the "bad" run, the cert contains an invalid hostname, and should be rejected.
+ */
+public class CertificateTest {
+    static SSLContext ctx;
+    static SSLParameters params;
+    static boolean expectSuccess;
+    static String trustStoreProp;
+    static Server server;
+    static int port;
+
+    static String TESTSRC = System.getProperty("test.src");
+    public static void main(String[] args) throws Exception
+    {
+        try {
+            String keystore = args[0];
+            trustStoreProp = TESTSRC + File.separatorChar + keystore;
+
+            String passOrFail = args[1];
+
+            if (passOrFail.equals("expectSuccess")) {
+                expectSuccess = true;
+            } else {
+                expectSuccess = false;
+            }
+            server = new Server(trustStoreProp);
+            port = server.getPort();
+            System.setProperty("javax.net.ssl.trustStore", trustStoreProp);
+            System.setProperty("javax.net.ssl.trustStorePassword", "passphrase");
+            init();
+            test(args);
+        } finally {
+            server.stop();
+        }
+    }
+
+    static void init() throws Exception
+    {
+        ctx = SSLContext.getDefault();
+        params = ctx.getDefaultSSLParameters();
+        //params.setProtocols(new String[] { "TLSv1.2" });
+    }
+
+    static void test(String[] args) throws Exception
+    {
+        String uri_s;
+        if (args[0].equals("loopback.keystore"))
+            uri_s = "https://127.0.0.1:" + Integer.toString(port) + "/foo";
+        else
+            uri_s = "https://localhost:" + Integer.toString(port) + "/foo";
+        String error = null;
+        Exception exception = null;
+        System.out.println("Making request to " + uri_s);
+        HttpClient client = HttpClient.newBuilder()
+                .sslContext(ctx)
+                .sslParameters(params)
+                .build();
+
+        HttpRequest request = HttpRequest.newBuilder(new URI(uri_s))
+                .version(HttpClient.Version.HTTP_1_1)
+                .GET()
+                .build();
+
+        try {
+            HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+            System.out.printf("Status code %d received\n", response.statusCode());
+            if (expectSuccess && response.statusCode() != 200)
+                error = "Test failed: good: status should be 200";
+            else if (!expectSuccess)
+                error = "Test failed: bad: status should not be 200";
+        } catch (SSLException e) {
+            System.err.println("Caught Exception " + e + ". expectSuccess = " + expectSuccess);
+            exception = e;
+            if (expectSuccess)
+                error = "Test failed: expectSuccess:true, but got unexpected exception";
+        }
+        if (error != null)
+            throw new RuntimeException(error, exception);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/ssltest/Server.java b/test/jdk/java/net/httpclient/ssltest/Server.java
new file mode 100644
index 00000000000..6d841be9015
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ssltest/Server.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2018, 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 com.sun.net.httpserver.*;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.security.*;
+import java.util.*;
+import java.util.logging.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import javax.net.ssl.*;
+
+public class Server {
+
+    HttpsServer server;
+    final ExecutorService exec;
+    final int port;
+
+    // certfile: needs to be good or bad, ie. bad contains an otherwise valid
+    // cert but whose CN contains a different host. good must be correct
+
+    // assuming the TLS handshake succeeds, the server returns a 200 OK
+    // response with a short text string.
+    public Server(String certfile) throws Exception {
+        initLogger();
+        SSLContext ctx = getContext("TLSv1.2", certfile);
+        Configurator cfg = new Configurator(ctx);
+        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(),0);
+        server = HttpsServer.create(addr, 10);
+        server.setHttpsConfigurator(cfg);
+        server.createContext("/", new MyHandler());
+        server.setExecutor((exec=Executors.newCachedThreadPool()));
+        port = server.getAddress().getPort();
+        System.out.println ("Listening on port " + port);
+        server.start();
+    }
+
+    int getPort() {
+        return port;
+    }
+
+    void stop() {
+        server.stop(1);
+        exec.shutdownNow();
+    }
+
+    SSLContext getContext(String protocol, String certfile) throws Exception {
+        char[] passphrase = "passphrase".toCharArray();
+        KeyStore ks = KeyStore.getInstance("JKS");
+        ks.load(new FileInputStream(certfile), passphrase);
+
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+        kmf.init(ks, passphrase);
+
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+        tmf.init(ks);
+
+        SSLContext ssl = SSLContext.getInstance(protocol);
+        ssl.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+        return ssl;
+    }
+
+    Logger logger;
+
+    void initLogger() {
+        logger = Logger.getLogger("com.sun.net.httpserver");
+        Handler h = new ConsoleHandler();
+        logger.setLevel(Level.ALL);
+        h.setLevel(Level.ALL);
+        logger.addHandler(h);
+    }
+
+    String responseBody = "Greetings from localhost";
+
+    class MyHandler implements HttpHandler {
+
+        @Override
+        public void handle(HttpExchange e) throws IOException {
+            System.out.println("Server: received " + e.getRequestURI());
+            InputStream is = e.getRequestBody();
+            byte[] buf = new byte[128];
+            while (is.read(buf) != -1);
+            is.close();
+            e.sendResponseHeaders(200, responseBody.length());
+            OutputStream os = e.getResponseBody();
+            os.write(responseBody.getBytes("ISO8859_1"));
+            os.close();
+        }
+    }
+
+    class Configurator extends HttpsConfigurator {
+        public Configurator(SSLContext ctx) throws Exception {
+            super(ctx);
+        }
+
+        public void configure(HttpsParameters params) {
+            SSLParameters p = getSSLContext().getDefaultSSLParameters();
+            for (String cipher : p.getCipherSuites())
+                System.out.println("Cipher: " + cipher);
+            System.err.println("PArams = " + p);
+            params.setSSLParameters(p);
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/ssltest/bad.keystore b/test/jdk/java/net/httpclient/ssltest/bad.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..acbb7517ec93dcd3239a032b23cc1497e9295917
GIT binary patch
literal 2329
zcmY+Gc{CIX8^&kG%$Tu^C8Nw#w&XIF8B1hKmh8%sAxqY5Q6ywZGhMO^VX}^8B-tV~
zmI!5^Y@;w#2qV{}G>XCXedqh`J@=3IyyyI$_kI3)pL1R;5sm}_Ij}?+4GNcyGmhKl
z1#$w(L|6xy2x~pW%~&D__rD|%8%zZK#1cVUhqVFa{@)f47Z5}yg7OYw4ps)r^?!V5
zjs^=os$Z{UM50yr>5jId^1m%!ibNTJH~`(34!wM2QLeJ7uRph95*w}92V0QUz444@
z;WNBg{_Cid{c;qIjxhzpbN&H03Ue8I^J*tWX(A|ctA)#>&lp2g)W;OzqWRfi8~)=n
zA3!JWjGY=>Qw+H^_H$lUah1SjV7W0T*JooPWz?z>P*IVp`j}a(z>pL8a}p9*dCKA7
zEH^EsX$sa7GIO3~C{<Xq^bEGe=vd1wuYT!?S!@YCaP!dHNWIWGm@}?p;CTgN#&>^h
zbA2M!o(}TFS0@W<QSFY-q<G+kcp5Xd!3PO<*DzbOLZ_EVE2A?MZbX`@c?kh3Uaa6n
zHoIv1a+H@NGxhZ~j~S@9v|q=@wepYhBA~84E3GT0$Fx&+<6Krv$#`gj32h&=Fo`Bz
zj0&Qj3g9L<L({%<?r#aZ?$3Q_2GjROe3KFGF-x@V>6;i=SY9~w;_FO3X^xm`wnh0n
zi4ne*KI5RzcI^dj0t~l({Q$-jjk6?~`gy}?OJT<#X=a{)!msK3N{~|0{(OaV;e(~h
z%}=9xPa`!H7jE8U<|dS53v(&OO0Cb_+d{PzG5jqLFDx)HAH@BKd~XhC=LwAW24k2<
zM@G}=Rd|ZUCp7W7Uz>-?+aD{2PsQ~YWNSw&86|7B8!)Vl1lk>(-)WcP5Eh^9>iRRd
z*T!P?<rHGo;HWOw;GZWt!9x}$Uih;z!E;&bPxwlZ5d+upwxuMrP*f5-yP@~n_5oaF
zR;%mC98`jJ<Wc9PL8-u|@{#rCSGz{HQ~btpr+*@TlzYV9c{@|JyJ?<)gd0e8Wiv~i
z$V`Z<Yw~ghB}?51XlUlv&tXlt<cHJ4p7{He;X*k6lL$Z<z!%^N@CJARLIAh0;{V7<
zoDf*h);GXQ45x}yS3RSmtcFukR>cw_Wq%KGLdir()*(s<0Re|C@gD{FuM9x{lYwJ%
zB6ME(A7yFwb#XM42T{X8{$c;kz&#@5l9TO%2jl8_>9CCKy(T@wA{$Zhx%ZsX%x;zG
z%eA~-lAG>7S>`TR+B?tijhOo3*D`8_x@p-OCQL7MyOy|g&m$Kq;f2xBl80TO6jc5&
z2ql}EJYgx;`GH6;S)OR<!^h1GXjWQRk`q->CyKvmX=fyVPtM}fY;-G2S+mu-5rTBB
z3dO#KJk8mi2~bl{O@EP+K4Eb+r86;NWk%UKX12@#gj=SWA(PJfQCst$+uLmRqjF}n
zRvr{_DVcLtP+7}WU|dfFA&d)G-Z<W0v6=Hb>1U>6el6aGRD*E{j22E7u^0Q=Iaw5s
zHony4KhCT$3yCf5j^okxta>&`Wu&ukphRD2?vah2$?IMgkDBLBS9ps`j720)FD@d|
zhL~!aixTnj21j1Bq;Y&<O6J<JB=v9CkOV)P9Xw7_72nt0=(M{=QdYMzH5}T`F5DjI
zdmCN;Tw3E^)i;@D_wESOrpr9nip<*7ruKiI*r9CMKX<YzhI=b4X1&u$r;m2aApJo(
z6KcnsNy%d@o=Ci4cLPQZA`<!))opQ1Zl_F&OE6|WPx`7CqZ^cus{4W(3O|1;3{qnp
zz^Q*HqJgjeSTc4(;T3q^Qxf5?3x-f*<lo&y?+}8d>e8DCQNYj#(}wx2Q5HH%&*t8*
z{Md;<9;o0*>4I!pqsXjCt^T_Z>voMBh?P8Zr5v@LgqIiPQb*$ToHsMQ-RE!tnncHq
zSJWs|H0!8SCAYI5*M2mxx1D-fm&;J{*eitLmm+0O7Qom<Ha63BykPD8Fh)uV?p;Cu
zLhV`s0^#?(r>z7|gS?k%^XFnHJ?d<XYk>79<)I7GWH9c?Da8*L*;diq%2QplF|rZ)
z{WZ57d!U)-^*-8lJ9qoMhADC$APP(WSH=+;x`PV)jlA#KLLhr3mq#q&YTZ?*7+LU>
z>0fxk?1XRO=X<oagkNh~>j%1x1()~b_o$fySc4H4zCTln-XC#8Xw-~N)#l5*mvKqm
z;3~$(FYc--Q(%ZYPnxd4XZOz5xE@yp*#02E+qUV6ZZZps!AOjUN^Md}NTx5}e5sM#
z@cpB3ezR@oIbiVRt&=C|w-ZWXQoKGaQA;)1jIM|4O=Y$^q|_FX=e4P;p`7Ti*@}CM
zu<DM1n0-j3$hJ$D<^x?L2{B#NEd{yHe6dNsk=2$AX2xPpM!~r;%5Q*~Um;b`YO#%d
z8}Yr|>BaK8qf=9<-;;E<cRSHe=gPpl;;O48Pi-a#ONGk5w&@Wa@Ma-)wOWfdz=lBk
z)15!w<&=3)T(ByL;x!2uj4(F&qmP&@AgRo%osO8Q*CA95$MkOA>u(gjy=U+)y!fW}
z>+;0OSj$P|>@w;r_Mim6Lc8ye_Hn<l@8Y>HChRj1VTB)i(@go;Ug`@ZbHbQa+EY3W
zf*0bDjlKv=oijZ?uAbFGKMHeyH~|XQ-%F;!`XwA=Gl{%JPBvk6;vGo1=2Pun#mriJ
zpuN5O5+g6pW#p>rjlk#iz$Z7{T^vrd=^qnNKX{K}jKsokOJWkgQr{b`Agx4qyR^L=
zSXtH%BSCfI&aqr<)hT`ZUzejAAv+r2Dah-_Gy^YI;`q$+xn57`y^h>T1wu^Pl>AF(
z{-B1p9-)zkZa3OBw8Rp%s?e$PX$&tdu-4CHcS`fk@otO0F||u?l6qBEeJ#o`bjf{Q
zY?Bd<2qM86Lg**_<l)9-*_3Vy3Hhm7NAt5)-E8zAkI9>??@cmyIRxE6V-vSU)Xvx}
zc1+XmOAi2*r@h)F7PTXslyj`b*Co@^oo{7RusT?AEF22KAUHrM2;lGoSxWy@^p<CC
r{GN8-=Z3cW$FPhMu+X3_oZ(|^6gP}n?P^h18TzB!MHa*Xj3fUAip)WF

literal 0
HcmV?d00001

diff --git a/test/jdk/java/net/httpclient/ssltest/good.keystore b/test/jdk/java/net/httpclient/ssltest/good.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..02988c752af315257b78ee4d6adacfc796f26eef
GIT binary patch
literal 2321
zcmY+Dc{CIX8^&jkWH88*CE1x6j6t$y8Of3@6|xK?jWpI!%2->FB_m4)Gu9MFL)K);
zEf?A5UMeNgF!p`FzVCeBz32Y%p7)&J^S;kt&x0aya)W?i6p5n?#;FvKjo;t~9syEF
z9CZ*92mKJgLXp5+|B^tv5E5t;MFOoJ&LWKKe_zLr0zniKDCZE8QHrpm|Hp^sCm;gy
zm9997Ml-F-n{+vz9-~`K!+r#T0qwSjUcQA4zJ0?-SLTOq(}{1?Gwd!jZuYlDCkN(W
z`}%n^6`zHI=mrFUYz;Rf-l^;Eo){i(PWUXhD2bT+ZK=^ER7|I6oHza&`^`aFPL0qo
zDdAEpJtezSB4+pG5Xsgm;%#8OEp$8E11~1OxRmP49l0vo%-2Up_hgJN7ug>rLU|_|
ze)*L9Q@zy1Sxmm-_3ZINL(y<1fA_|BvbS~ej9ezM<jd~Q_f+5gDzQ^{GDSE!TRdrI
zQK+S!A>4T$WD9mF#yG0}dXvu@b28hxy0bK}R!}$kM)-iF@vv{)bgGXV!&TuJmW|Zl
zcH51+w^Af+CoA4J;JhoQplmKbHJ0Mod#Z0Un0@?y$mKlK+f^vI`A+nQR}SzOc8eiB
zse$KZg!E27Bp>t0nnoC0VBFo<gboI&DzxX!BlOzyr(7wu$X6<AOc*J?HxQO|a8n=d
zT@f27T&^Br&Bzju$SFC%5!Ur?=c$;q2M6X#e~+JHSO~=?ZbfK$34p&2iw)iReSC%^
z*S?>ZoHiP*hK!-<UHoK2(i%S4KE}{1s1X^VRE|Wkw_3UU?ZU=)$+k7@(W{#~V?r)C
zLyNl#0bBWd<XBDQ^vwzm2hnV7&<#+c7UWlz;QFT~!Go<yw{P-aRhoR6RBsQv67vPH
z@C!z(v4t}0I5o|6zupMcTS^_lohNcLD~+p%$0sdg+BMC%8yn##&iK8QDq6DP6C$ZH
zhg=e#X0z18n`w6s6yH%Ik&zp|Wa}eq4Z0U@$j^Qc#<~WncBR37Klx%8Q46gCb1HXu
zOyxkW!nJfidN91}w6c@cj8Wo$N10PVjaLE=2m@RP-~f1lHy{`ggp&G47E}{}ARMmy
zd!JO(RMXbPpf%7aEp0T41kL^X=m?BLf+iiJ2OuEeaFPB|fdA?M>^~hKFK&bGjZmM5
z)-qdlWq?My2XV>&?ZAB!6k8u$IkhO*{xUeL6iWQDIknS!vr&>N<M)AHlRqI56^mCt
zH{oQ194oNp8Gb1D#v$b*N_1iFCg1Ri;$?%1LaipGR*0|S#JEW25zl1&Y_n+w8G`A*
zxmQtX;jQ4i9yicX?@^O1f^NQw5b0_gKl9W`ox3Fi?WOe5&tbvLXt<LPJz(?pz&@4T
zD)Ch^30d*uw7U!I1kqL5xe%wcpgLBJHE^>>rbX@r5V7BYnwz;-3ngVzOK%%eTT5-u
zMo`7pVNVh{1TgXvygptB@}oQ&UxX(1C0+t0)1G#|Owrt!D>o;4H8R)@D1I;8PFM{_
zm*w%jaZPd`#(4Se6}1fB80&MprK=z=f#1x1tS7LCdpnKAerhGM>veK;1^AR)yy0?}
ztMKaHSi4Gjof2d&-F#?9>gJa+vKH}CRcH{l&BTpd*^-xs$E6PaDr3~gO4pj4V<gGt
zrzzPFiwbil=rhb_Zp}laET=#JDr!A=a>r1PcHKz+oPQecQC0?-<aG;X88^7&W)A%D
z@ZHyZ&vR%ClS>T;(}Xwqjxc&x@yqnyia$XeN&&X@&hW=OENMz@Q_2su=X`rDpb2~6
zGbA11SbLd8M}h}WD9LSJ{xHPBiip;+dRs-QvP&YVI{9=GdqX_KaaqO20iPswrU(yz
zjx4a6ic{2HPa+~}s@9D27l4Y))Q{jL(5Zs)2SIzC7y`d<bp?x8-E=9IC%4;VJP!BP
zZy+*>X)@ay^Z6WE1oUf)pzJ6f+h92%<WViCQ&Z_;QOAualQG}SnN48L;Cb^RPes-k
z!QG>{@fTI>c{;w86TrM}vek9hk}vB{V&Bi_6KO)U2BP)V)p%n^uu+D=^Y&80Ju@7R
z@qSpN)6#ifaMLw$xsPK|sv!OTqmkc4)I9o*9H)=e?-pk0{M4LY7JQ$2-Sf3J6){{m
z+s~DzjW3P?cUVU0RL9_RrZYKO)I)dzsMkt$E8SGljxy{9l6;?lxQ(cOvb&4bwdfGl
zNU1^;%~q}Koq}M3@BW?Q_SK!Sh_iM|Q%p}-)vSVe@W7(AbvCnm#dF*6VxmM`E3Qt6
z?%_oKF+h`<bT(y1c0;?(JG%5AnAy`!`+RksGJPZ~=?Xe`;97}`vxxUL>B8&)*HALU
z)Cqz~Zzpfd>3R(gIHYJ4+OGNu7j+412)gR|Q!H<}dtW`@v^~0|qatFr+ig&YoGkeg
zeg6I}JtQ&1id$TIHO((iA8*&~v@5k^9jo#gV5!l=%TJu!LR4cGn2hp{mDI2Ci@EqB
zQ&o|7&6taW^sM97VF(06X{$F&&-(F$UHB-?h>%qTc&<5y)Kfi&y>epcTC#x^qKV69
zAdI=@Y$TzRU@MyFeBZPQ6J^|z9oLWkqd&%+ovz_mhaipCgz?`^Yw|_DM(a&+eQKSl
zNavx*x?(=f7faM^5>B@oM7lkiVM@Igl=b-j*nP+64oL_>m~_YkA}`@CL3_wQn^Fea
zG_wD|lK7X-YF?S1dnfPm4PO8ZJEL4;L?_g*v&6#Taw+J!O)0%6YiCOy@B3R&!WJ+t
zEgVX)5-ysHeZqXM`*J>pwGwH}Q(ID&f4+Ak@=vdB?+g0+?{yzt2v67>@h@o)w|v&E
z%z`wHau9@bWoFh!Lyvhu5ziV;8miFr#A~aaOEiCrYRm5!-0FZ7)FGmX4JnTZuyp=n
zpiuCnt@*9AY)UWUSrYw)82_?%4+l<LU;F~az9&a|IPN3w@|jT4QfiQbQJ1Nn&SGkI
z_KS|+6x#eRO&r+Pqx4ZyC{7qu84d=CLIDtgLAK`TjUU=aQr(P93!_!ke)^g9LIh6T
cBc%G-k8A}`9)B$`B4So<o#_t(1LG-w0kw}kng9R*

literal 0
HcmV?d00001

diff --git a/test/jdk/java/net/httpclient/ssltest/loopback.keystore b/test/jdk/java/net/httpclient/ssltest/loopback.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..a5833bd496738ab1497f16d41f8da2fd2d1461d7
GIT binary patch
literal 2343
zcmY+Dc{CJ`7RSw)nXF?cLzb~+s~MU>NhJH4P^1(yV~t2ejb;3(nXygTB8+`cMzSP4
z5|JfYB1U6LLzwxYta;u$@BMz~cka38p7Z(M`~B;F5d>}pAb=A=;F^MPtHqng|KbN6
z0Z<8C{U8F@`$OD?AaHX3LjvxA2*95R0`SknUWM@f?~0EH0HhLt*@rL#p$g&oKRz^<
z0*S_kfV(odAahuv(OJ=dy%r{!2GjsKIXdkRy}XU8oO>AQZ^6C%l5rj=Jg*=t@hb4m
z&A2TlD<!NR@7j8yg3DEiWHc%@cKd8yt6m4(EX=adzAvQ1Ony>GEh}i@Kss}&KHl&7
z@p$j6u`Yqe-xur1Mb=sS#vfz5f1}g?XyHq&(N*5O*Eo1<zf8vH;&-Bo&YUmiX>6s8
z-?skcjXcLS^<umJz8p#{zMJNcR#|bh+n(d#rqqn~y}BB@_2eqXO15a--iv*zy?)E^
z6_kDQx_r8tVmYuM9Hb-KN%GPW@^BpsgF1#CA8CSk6Z?fD?)cu>nnPPzm?dSpTBI3v
z?>DB^=1W#nh>2u?^jp%>e69IrnNe8{sDV8rNS_O~YwNYYE`t2L$LO8mmENdfKm7To
z@KgF-vVrc`&w||2z(F%#>aKWu;0tlv`Y`?p>os#eB~;rdc238)@urP;=Sk>pn>+q<
zDMjR3INs!w?c~wEUrC7SP5#<g5d2<+^0#@;*H>p5m0u3zW!-+xo+^hzM;U9LGf)w7
zvJL5v#|7TD!78O%5ffA*kD1lT*N1O~yKl>CT#DK5J@L`4Ju$Vz2zF9>>CFxO#<)cV
zhC#APbE2EFu_G~d7TZ`&li?EUX;oh|1HWT8-qAm@mMtH24~JRC2eL(HT!uzrBdbSt
zBimBLXAE4fq<rX5$9U1^K2MNn;-?&i#gDu0<&-wB(pO;AV>&0s?3x|Qb4{eVqHmz6
z3gsEQuez3;+ABmrsn<k4<386KIWZG5c_NvycGwpK%yiR~77Sz9yI7|$qhh37e0V_*
zd0OYO%+2zC;T=Uobjg&&$}%eIeFoAHA@$cQbBiLOGJG63j=;n6;JC>VjFA6Z6hn%F
zgdKfuVdao0EiG+rErhnN78;EpfM5Q#bOb^rfQt`NJ`lihII{j$0RKn;<Ua{uw`&+q
z7Bwdhm}@m*cosb#3@TmwZvvtT;2YujuNuz}aL_~X-wKvi)}t;uWqj#>p~u|8P%HsI
z0Tn*2!roshlW|p!iaLcR-M%>1#2c)4p1?4xc_lSnuu{L_<z7YURQ1?K$XxF|KdGo+
z_H@tHJkQQ({7S?={O<9~byE@iZ+_FQNAEAsjNg}y5Xtc)_?Lsd2D7Irdczx15yUW>
z*iZ1FjhR}pg+%U2?OCB|MXAi<{H=7W>>J~r{rZ;hT3rW{IQK|&6cJjMhybq3$;CW}
zpV70r4ZfStSF{lKeHLOD(yx2|ieMz?&AqI-oMSo8FoDAJ?Ix5o)OOi)^Ofy4J8>fY
z;jFc?5WY}JKI}g0<ukf}fH!^1f-JHOQVPFYNL%sq)N1Wwz`o6Hb@TPJJV+9i+zLsu
z4W2E}KV;o=)No0Y6w@*Ik&7-d)jb|#Qw-?){VR)WQ@>vEN~aw$prX-5G|uTM+cL)0
z^y%YV(=o549Z#lK-}BJZU*2t}n%cI>F7Qse4$6M8QD8+kHQyH>aQH2vX_NHME6`Rf
zeA`J(9%U#W4FxO$UWckRv~od`U5#^n`${0j5?xelZ+pM0PeY7FO(beO4K;4JaeX$_
z*q<)<=snbH?{-HfbS4bVUy5x<$yuqBU;)Rll}M(>%TviT-S<%^xX#cgVW$d^xvle(
z$~_%I<f^xUO{WbT6kUdbh>xi=_4B0`w^nQXPyDV)viMU`<wAK9^vl+swz9-cY3zZj
zLVmK`*@%G1AC~Q!ogj);P`8~9E{sqqY9J5SwQluv9`|*C&!ofZodn!l2PZbdCMz#Y
z4)w{!_^jq5Tq|s<IfDz*&f<|3C+C(jO&gG%Rp-`mP*`?Ro&{V*v2^dbD%>yirv&l`
zHtYw#@6MX@Oj!xz4!BINJSt(gWc^1+rZ<D;evRgn>#>9jin6}w|BNh6eB~G*)s-~A
z&l_Mnk%y^!V8#>sRa#Z=M`y63-KuDZMH3D7A{G&=ad~fv?6|NStkE>sgD1zdadRwZ
zmA0v1{DV+t?lZ}n_EzU8r)eVk6Xp0QviYOo(M5%xthEh8jLkAHc$}Y#YhHy1*;5P?
ze5kAsiFv*FhN@_?jJKSC|Fii_^%lCe{v;`FASqJZ@+$XRMh-T=c?l1{E=)j1__&0M
zDLvpl+o<cq>>PHW*xzqdYnKA_O>Lk0XwMYOvGdVPePBwN_8stt2-j&i?>E+~>G&X1
z<HL7fMP2ILG1sm^sYoYm`L*3Bd_?n{2q+cjn+Vy%XFI3xetp=ck_+tgtb3+v_2u2c
z6}@+AwU_9^Fi2fiLZO%d^Wm(f8>`cyB2K2B=frnXkKi?pl>Vq|2Yq)$E^0n&;<<?3
zI>w6mYI&x>BOw#x=DhoK-$(Y=1vTo2m!Nq<%c8RW_yhMRQk)@0sx@+Ts%s|--9((g
zAKTEB1ykd`l<O^8i`dG`m!oZ#)Ta3>P2St1=(;P%B$cMll5v54T4Rv&%JnWdRa^)2
z(&p*OA-!(%%J2XI^_8ArANM8k2^A*$+$vX`h()F1P=IQeW{J@fmt>}J$v8iDBh=4k
zA+nmp?mxNM(Q*3;=Fy&5c`;Avni4tvGUH5_=SPF`xGVzyPWEemBa~rj65Tynxy)su
zY|wx(WtU&Z#EuY|%d|0;wGd*zt3>SJ;JfUm`sC@m(2#M8_@jy^iK*NA=yl-z@mrV+
zyS4@phKId!v4*=2OUSK>U1OlI)`=@yg`FAW+01I+n9e~j55gNbrJySrM`gx%ArYnq
z_0&<pY(fNjop=O??;VdYl<xlQ?G&f69<Xc388k*{SC=(ShaP1B*$4xKJc1hnR)=x|
zVPFoB=s=2_A3?X^1*}(MBtbr<VAQ{*79=VFimX*I-cX)q-EtTy-7>ljG|&Wc0^+Iv
E1^`7*)&Kwi

literal 0
HcmV?d00001

diff --git a/test/jdk/java/net/httpclient/websocket/Abort.java b/test/jdk/java/net/httpclient/websocket/Abort.java
new file mode 100644
index 00000000000..90203ac2cc2
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/Abort.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       Abort
+ */
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.ProtocolException;
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+import static java.net.http.WebSocket.NORMAL_CLOSURE;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+public class Abort {
+
+    private static final Class<NullPointerException> NPE = NullPointerException.class;
+    private static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
+    private static final Class<IOException> IOE = IOException.class;
+
+    private DummyWebSocketServer server;
+    private WebSocket webSocket;
+
+    @AfterTest
+    public void cleanup() {
+        server.close();
+        webSocket.abort();
+    }
+
+    @Test
+    public void onOpenThenAbort() throws Exception {
+        int[] bytes = new int[]{
+                0x88, 0x00, // opcode=close
+        };
+        server = Support.serverWithCannedData(bytes);
+        server.open();
+        // messages are available
+        MockListener listener = new MockListener() {
+            @Override
+            protected void onOpen0(WebSocket webSocket) {
+                // unbounded request
+                webSocket.request(Long.MAX_VALUE);
+                webSocket.abort();
+            }
+        };
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+        TimeUnit.SECONDS.sleep(5);
+        List<MockListener.Invocation> inv = listener.invocationsSoFar();
+        // no more invocations after onOpen as WebSocket was aborted
+        assertEquals(inv, List.of(MockListener.Invocation.onOpen(webSocket)));
+    }
+
+    @Test
+    public void onOpenThenOnTextThenAbort() throws Exception {
+        int[] bytes = new int[]{
+                0x81, 0x00, // opcode=text, fin=true
+                0x88, 0x00, // opcode=close
+        };
+        server = Support.serverWithCannedData(bytes);
+        server.open();
+        MockListener listener = new MockListener() {
+            @Override
+            protected void onOpen0(WebSocket webSocket) {
+                // unbounded request
+                webSocket.request(Long.MAX_VALUE);
+            }
+
+            @Override
+            protected CompletionStage<?> onText0(WebSocket webSocket,
+                                                 CharSequence message,
+                                                 boolean last) {
+                webSocket.abort();
+                return super.onText0(webSocket, message, last);
+            }
+        };
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+        TimeUnit.SECONDS.sleep(5);
+        List<MockListener.Invocation> inv = listener.invocationsSoFar();
+        // no more invocations after onOpen, onBinary as WebSocket was aborted
+        List<MockListener.Invocation> expected = List.of(
+                MockListener.Invocation.onOpen(webSocket),
+                MockListener.Invocation.onText(webSocket, "", true));
+        assertEquals(inv, expected);
+    }
+
+    @Test
+    public void onOpenThenOnBinaryThenAbort() throws Exception {
+        int[] bytes = new int[]{
+                0x82, 0x00, // opcode=binary, fin=true
+                0x88, 0x00, // opcode=close
+        };
+        server = Support.serverWithCannedData(bytes);
+        server.open();
+        MockListener listener = new MockListener() {
+            @Override
+            protected void onOpen0(WebSocket webSocket) {
+                // unbounded request
+                webSocket.request(Long.MAX_VALUE);
+            }
+
+            @Override
+            protected CompletionStage<?> onBinary0(WebSocket webSocket,
+                                                   ByteBuffer message,
+                                                   boolean last) {
+                webSocket.abort();
+                return super.onBinary0(webSocket, message, last);
+            }
+        };
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+        TimeUnit.SECONDS.sleep(5);
+        List<MockListener.Invocation> inv = listener.invocationsSoFar();
+        // no more invocations after onOpen, onBinary as WebSocket was aborted
+        List<MockListener.Invocation> expected = List.of(
+                MockListener.Invocation.onOpen(webSocket),
+                MockListener.Invocation.onBinary(webSocket, ByteBuffer.allocate(0), true));
+        assertEquals(inv, expected);
+    }
+
+    @Test
+    public void onOpenThenOnPingThenAbort() throws Exception {
+        int[] bytes = {
+                0x89, 0x00, // opcode=ping
+                0x88, 0x00, // opcode=close
+        };
+        server = Support.serverWithCannedData(bytes);
+        server.open();
+        MockListener listener = new MockListener() {
+            @Override
+            protected void onOpen0(WebSocket webSocket) {
+                // unbounded request
+                webSocket.request(Long.MAX_VALUE);
+            }
+
+            @Override
+            protected CompletionStage<?> onPing0(WebSocket webSocket,
+                                                 ByteBuffer message) {
+                webSocket.abort();
+                return super.onPing0(webSocket, message);
+            }
+        };
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+        TimeUnit.SECONDS.sleep(5);
+        List<MockListener.Invocation> inv = listener.invocationsSoFar();
+        // no more invocations after onOpen, onPing as WebSocket was aborted
+        List<MockListener.Invocation> expected = List.of(
+                MockListener.Invocation.onOpen(webSocket),
+                MockListener.Invocation.onPing(webSocket, ByteBuffer.allocate(0)));
+        assertEquals(inv, expected);
+    }
+
+    @Test
+    public void onOpenThenOnPongThenAbort() throws Exception {
+        int[] bytes = {
+                0x8a, 0x00, // opcode=pong
+                0x88, 0x00, // opcode=close
+        };
+        server = Support.serverWithCannedData(bytes);
+        server.open();
+        MockListener listener = new MockListener() {
+            @Override
+            protected void onOpen0(WebSocket webSocket) {
+                // unbounded request
+                webSocket.request(Long.MAX_VALUE);
+            }
+
+            @Override
+            protected CompletionStage<?> onPong0(WebSocket webSocket,
+                                                 ByteBuffer message) {
+                webSocket.abort();
+                return super.onPong0(webSocket, message);
+            }
+        };
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+        TimeUnit.SECONDS.sleep(5);
+        List<MockListener.Invocation> inv = listener.invocationsSoFar();
+        // no more invocations after onOpen, onPong as WebSocket was aborted
+        List<MockListener.Invocation> expected = List.of(
+                MockListener.Invocation.onOpen(webSocket),
+                MockListener.Invocation.onPong(webSocket, ByteBuffer.allocate(0)));
+        assertEquals(inv, expected);
+    }
+
+    @Test
+    public void onOpenThenOnCloseThenAbort() throws Exception {
+        int[] bytes = {
+                0x88, 0x00, // opcode=close
+                0x8a, 0x00, // opcode=pong
+        };
+        server = Support.serverWithCannedData(bytes);
+        server.open();
+        MockListener listener = new MockListener() {
+            @Override
+            protected void onOpen0(WebSocket webSocket) {
+                // unbounded request
+                webSocket.request(Long.MAX_VALUE);
+            }
+
+            @Override
+            protected CompletionStage<?> onClose0(WebSocket webSocket,
+                                                  int statusCode,
+                                                  String reason) {
+                webSocket.abort();
+                return super.onClose0(webSocket, statusCode, reason);
+            }
+        };
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+        TimeUnit.SECONDS.sleep(5);
+        List<MockListener.Invocation> inv = listener.invocationsSoFar();
+        // no more invocations after onOpen, onClose
+        List<MockListener.Invocation> expected = List.of(
+                MockListener.Invocation.onOpen(webSocket),
+                MockListener.Invocation.onClose(webSocket, 1005, ""));
+        assertEquals(inv, expected);
+    }
+
+    @Test
+    public void onOpenThenOnErrorThenAbort() throws Exception {
+        // A header of 128 bytes long Ping (which is a protocol error)
+        int[] badPingHeader = new int[]{0x89, 0x7e, 0x00, 0x80};
+        int[] closeMessage = new int[]{0x88, 0x00};
+        int[] bytes = new int[badPingHeader.length + 128 + closeMessage.length];
+        System.arraycopy(badPingHeader, 0, bytes, 0, badPingHeader.length);
+        System.arraycopy(closeMessage, 0, bytes, badPingHeader.length + 128, closeMessage.length);
+        server = Support.serverWithCannedData(bytes);
+        server.open();
+        MockListener listener = new MockListener() {
+            @Override
+            protected void onOpen0(WebSocket webSocket) {
+                // unbounded request
+                webSocket.request(Long.MAX_VALUE);
+            }
+
+            @Override
+            protected void onError0(WebSocket webSocket, Throwable error) {
+                webSocket.abort();
+                super.onError0(webSocket, error);
+            }
+        };
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+        TimeUnit.SECONDS.sleep(5);
+        List<MockListener.Invocation> inv = listener.invocationsSoFar();
+        // no more invocations after onOpen, onError
+        List<MockListener.Invocation> expected = List.of(
+                MockListener.Invocation.onOpen(webSocket),
+                MockListener.Invocation.onError(webSocket, ProtocolException.class));
+        System.out.println("actual invocations:" + Arrays.toString(inv.toArray()));
+        assertEquals(inv, expected);
+    }
+
+    @Test
+    public void immediateAbort() throws Exception {
+        CompletableFuture<Void> messageReceived = new CompletableFuture<>();
+        WebSocket.Listener listener = new WebSocket.Listener() {
+
+            @Override
+            public void onOpen(WebSocket webSocket) {
+                /* no initial request */
+            }
+
+            @Override
+            public CompletionStage<?> onText(WebSocket webSocket,
+                                             CharSequence message,
+                                             boolean last) {
+                messageReceived.complete(null);
+                return null;
+            }
+
+            @Override
+            public CompletionStage<?> onBinary(WebSocket webSocket,
+                                               ByteBuffer message,
+                                               boolean last) {
+                messageReceived.complete(null);
+                return null;
+            }
+
+            @Override
+            public CompletionStage<?> onPing(WebSocket webSocket,
+                                             ByteBuffer message) {
+                messageReceived.complete(null);
+                return null;
+            }
+
+            @Override
+            public CompletionStage<?> onPong(WebSocket webSocket,
+                                             ByteBuffer message) {
+                messageReceived.complete(null);
+                return null;
+            }
+
+            @Override
+            public CompletionStage<?> onClose(WebSocket webSocket,
+                                              int statusCode,
+                                              String reason) {
+                messageReceived.complete(null);
+                return null;
+            }
+        };
+
+        int[] bytes = new int[]{
+                0x82, 0x00, // opcode=binary, fin=true
+                0x88, 0x00, // opcode=close
+        };
+        server = Support.serverWithCannedData(bytes);
+        server.open();
+
+        WebSocket ws = newHttpClient()
+                .newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+        for (int i = 0; i < 3; i++) {
+            System.out.printf("iteration #%s%n", i);
+            // after the first abort() each consecutive one must be a no-op,
+            // moreover, query methods should continue to return consistent
+            // values
+            for (int j = 0; j < 3; j++) {
+                System.out.printf("abort #%s%n", j);
+                ws.abort();
+                assertTrue(ws.isInputClosed());
+                assertTrue(ws.isOutputClosed());
+                assertEquals(ws.getSubprotocol(), "");
+            }
+            // at this point valid requests MUST be a no-op:
+            for (int j = 0; j < 3; j++) {
+                System.out.printf("request #%s%n", j);
+                ws.request(1);
+                ws.request(2);
+                ws.request(8);
+                ws.request(Integer.MAX_VALUE);
+                ws.request(Long.MAX_VALUE);
+                // invalid requests MUST throw IAE:
+                assertThrows(IAE, () -> ws.request(Integer.MIN_VALUE));
+                assertThrows(IAE, () -> ws.request(Long.MIN_VALUE));
+                assertThrows(IAE, () -> ws.request(-1));
+                assertThrows(IAE, () -> ws.request(0));
+            }
+        }
+        // even though there is a bunch of messages readily available on the
+        // wire we shouldn't have received any of them as we aborted before
+        // the first request
+        try {
+            messageReceived.get(5, TimeUnit.SECONDS);
+            fail();
+        } catch (TimeoutException expected) {
+            System.out.println("Finished waiting");
+        }
+        for (int i = 0; i < 3; i++) {
+            System.out.printf("send #%s%n", i);
+            Support.assertFails(IOE, ws.sendText("text!", false));
+            Support.assertFails(IOE, ws.sendText("text!", true));
+            Support.assertFails(IOE, ws.sendBinary(ByteBuffer.allocate(16), false));
+            Support.assertFails(IOE, ws.sendBinary(ByteBuffer.allocate(16), true));
+            Support.assertFails(IOE, ws.sendPing(ByteBuffer.allocate(16)));
+            Support.assertFails(IOE, ws.sendPong(ByteBuffer.allocate(16)));
+            Support.assertFails(IOE, ws.sendClose(NORMAL_CLOSURE, "a reason"));
+            assertThrows(NPE, () -> ws.sendText(null, false));
+            assertThrows(NPE, () -> ws.sendText(null, true));
+            assertThrows(NPE, () -> ws.sendBinary(null, false));
+            assertThrows(NPE, () -> ws.sendBinary(null, true));
+            assertThrows(NPE, () -> ws.sendPing(null));
+            assertThrows(NPE, () -> ws.sendPong(null));
+            assertThrows(NPE, () -> ws.sendClose(NORMAL_CLOSURE, null));
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/AutomaticPong.java b/test/jdk/java/net/httpclient/websocket/AutomaticPong.java
new file mode 100644
index 00000000000..cfb9dd95ce4
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/AutomaticPong.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       AutomaticPong
+ */
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import static java.net.http.HttpClient.newHttpClient;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+public class AutomaticPong {
+
+    private DummyWebSocketServer server;
+    private WebSocket webSocket;
+
+    @AfterTest
+    public void cleanup() {
+        server.close();
+        webSocket.abort();
+    }
+
+    /*
+     * The sendClose method has been invoked and a Ping comes from the server.
+     * Naturally, the client cannot reply with a Pong (the output has been
+     * closed). However, this MUST not be treated as an error.
+     * At this stage the server either has received or pretty soon will receive
+     * the Close message sent by the sendClose. Thus, the server will know the
+     * client cannot send further messages and it's up to the server to decide
+     * how to react on the corresponding Pong not being received.
+     */
+    @Test
+    public void sendCloseThenAutomaticPong() throws IOException {
+        int[] bytes = {
+                0x89, 0x00,                                     // ping
+                0x89, 0x06, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x3f, // ping hello?
+                0x88, 0x00,                                     // close
+        };
+        server = Support.serverWithCannedData(bytes);
+        server.open();
+        MockListener listener = new MockListener() {
+            @Override
+            protected void onOpen0(WebSocket webSocket) {
+                /* request nothing */
+            }
+        };
+        webSocket = newHttpClient()
+                .newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+
+        webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok").join();
+        // now request all messages available
+        webSocket.request(Long.MAX_VALUE);
+        List<MockListener.Invocation> actual = listener.invocations();
+        ByteBuffer hello = ByteBuffer.wrap("hello?".getBytes(StandardCharsets.UTF_8));
+        ByteBuffer empty = ByteBuffer.allocate(0);
+        List<MockListener.Invocation> expected = List.of(
+                MockListener.Invocation.onOpen(webSocket),
+                MockListener.Invocation.onPing(webSocket, empty),
+                MockListener.Invocation.onPing(webSocket, hello),
+                MockListener.Invocation.onClose(webSocket, 1005, "")
+        );
+        assertEquals(actual, expected);
+    }
+
+    /*
+     * The server sends a number of contiguous Ping messages. The client replies
+     * to these messages automatically. According to RFC 6455 a WebSocket client
+     * is free to reply only to the most recent Pings.
+     *
+     * What is checked here is that:
+     *
+     *     a) the order of Pong replies corresponds to the Pings received,
+     *     b) the last Pong corresponds to the last Ping
+     *     c) there are no unrelated Pongs
+     */
+    @Test(dataProvider = "nPings")
+    public void automaticPongs(int nPings) throws Exception {
+        // big enough to not bother with resize
+        ByteBuffer buffer = ByteBuffer.allocate(65536);
+        Frame.HeaderWriter w = new Frame.HeaderWriter();
+        for (int i = 0; i < nPings; i++) {
+            w.fin(true)
+             .opcode(Frame.Opcode.PING)
+             .noMask()
+             .payloadLen(4)    // the length of the number of the Ping (int)
+             .write(buffer);
+            buffer.putInt(i);  // the number of the Ping (int)
+        }
+        w.fin(true)
+         .opcode(Frame.Opcode.CLOSE)
+         .noMask()
+         .payloadLen(2)
+        .write(buffer);
+        buffer.putChar((char) 1000);
+        buffer.flip();
+        server = Support.serverWithCannedData(buffer.array());
+        server.open();
+        MockListener listener = new MockListener();
+        webSocket = newHttpClient()
+                .newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+        List<MockListener.Invocation> inv = listener.invocations();
+        assertEquals(inv.size(), nPings + 2); // n * onPing + onOpen + onClose
+
+        ByteBuffer data = server.read();
+        Frame.Reader reader = new Frame.Reader();
+
+        Frame.Consumer consumer = new Frame.Consumer() {
+
+            ByteBuffer number = ByteBuffer.allocate(4);
+            Frame.Masker masker = new Frame.Masker();
+            int i = -1;
+            boolean closed;
+
+            @Override
+            public void fin(boolean value) { assertTrue(value); }
+
+            @Override
+            public void rsv1(boolean value) { assertFalse(value); }
+
+            @Override
+            public void rsv2(boolean value) { assertFalse(value); }
+
+            @Override
+            public void rsv3(boolean value) { assertFalse(value); }
+
+            @Override
+            public void opcode(Frame.Opcode value) {
+                if (value == Frame.Opcode.CLOSE) {
+                    closed = true;
+                    return;
+                }
+                assertEquals(value, Frame.Opcode.PONG);
+            }
+
+            @Override
+            public void mask(boolean value) { assertTrue(value); }
+
+            @Override
+            public void payloadLen(long value) {
+                if (!closed)
+                    assertEquals(value, 4);
+            }
+
+            @Override
+            public void maskingKey(int value) {
+                masker.mask(value);
+            }
+
+            @Override
+            public void payloadData(ByteBuffer src) {
+                masker.transferMasking(src, number);
+                if (closed) {
+                    return;
+                }
+                number.flip();
+                int n = number.getInt();
+                System.out.printf("pong number=%s%n", n);
+                number.clear();
+                // a Pong with the number less than the maximum of Pongs already
+                // received MUST never be received
+                if (i >= n) {
+                    fail(String.format("i=%s, n=%s", i, n));
+                }
+                i = n;
+            }
+
+            @Override
+            public void endFrame() { }
+        };
+        while (data.hasRemaining()) {
+            reader.readFrame(data, consumer);
+        }
+    }
+
+
+    @DataProvider(name = "nPings")
+    public Object[][] nPings() {
+        return new Object[][]{{1}, {2}, {4}, {8}, {9}, {256}};
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/BlowupOutputQueue.java b/test/jdk/java/net/httpclient/websocket/BlowupOutputQueue.java
new file mode 100644
index 00000000000..c597dc995b8
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/BlowupOutputQueue.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       BlowupOutputQueue
+ */
+
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+import static org.testng.Assert.assertFalse;
+
+public class BlowupOutputQueue extends PendingOperations {
+
+    CompletableFuture<WebSocket> cfText;
+    CompletableFuture<WebSocket> cfPing;
+    CompletableFuture<WebSocket> cfClose;
+    MockListener listener;
+
+    /*
+     * The idea is to arrange things such that the internal queue will be fully
+     * utilized and then make sure there won't be any errors caused by that.
+     *
+     * First, fill the queue with Text messages. Once done, send a Ping message.
+     * At this stage, there are at least 2 messages are in queue. Now, start
+     * receiving. Received Ping messages will cause automatic Pong replies. When
+     * all done, there will be at least 3 messages in the queue. (As at least
+     * the a single Ping has to be replied). Then send a Close message. Now
+     * there are at least 4 messages in the queue. Finally, receive the last
+     * message which is a Close message. This will cause an automatic reply with
+     * a Close message from the client side. All in all there should be at least
+     * 5 messages in the queue.
+     */
+    @Test
+    public void full() throws Exception {
+        int N = 32;
+        int[] incoming = new int[2 * (N + 1)]; // 2 bytes per message
+        for (int i = 0; i < incoming.length - 2; i += 2) {
+            // <PING>
+            incoming[i + 0] = 0x89;
+            incoming[i + 1] = 0x00;
+        }
+        // <CLOSE>
+        incoming[incoming.length - 2] = 0x88;
+        incoming[incoming.length - 1] = 0x00;
+
+        repeatable(() -> {
+            CountDownLatch allButCloseReceived = new CountDownLatch(N);
+            server = Support.writingServer(incoming);
+            server.open();
+            listener = new MockListener() {
+
+                @Override
+                protected void replenish(WebSocket webSocket) {
+                    /* do nothing */
+                }
+
+                @Override
+                protected CompletionStage<?> onPing0(WebSocket webSocket,
+                                                     ByteBuffer message) {
+                    allButCloseReceived.countDown();
+                    return null;
+                }
+            };
+            webSocket = newHttpClient().newWebSocketBuilder()
+                    .buildAsync(server.getURI(), listener)
+                    .join();
+            CharBuffer data = CharBuffer.allocate(65536);
+            for (int i = 0; ; i++) {  // fill up the send buffer
+                long start = System.currentTimeMillis();
+                System.out.printf("begin cycle #%s at %s%n", i, start);
+                cfText = webSocket.sendText(data, true);
+                try {
+                    cfText.get(MAX_WAIT_SEC, TimeUnit.SECONDS);
+                    data.clear();
+                } catch (TimeoutException e) {
+                    break;
+                } finally {
+                    long stop = System.currentTimeMillis();
+                    System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+                }
+            }
+            cfPing = webSocket.sendPing(ByteBuffer.allocate(125));
+            webSocket.request(N);
+            allButCloseReceived.await();
+            webSocket.request(1); // Receive the last message: Close
+            return null;
+        }, () -> cfText.isDone());
+        List<MockListener.Invocation> invocations = listener.invocations();
+        cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+
+        assertFalse(invocations.contains(new MockListener.OnError(webSocket, IOException.class)));
+        assertFalse(cfText.isDone());
+        assertFalse(cfPing.isDone());
+        assertFalse(cfClose.isDone());
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/ConnectionHandover.java b/test/jdk/java/net/httpclient/websocket/ConnectionHandoverTest.java
similarity index 95%
rename from test/jdk/java/net/httpclient/websocket/ConnectionHandover.java
rename to test/jdk/java/net/httpclient/websocket/ConnectionHandoverTest.java
index b62527f4e99..30569fa80d7 100644
--- a/test/jdk/java/net/httpclient/websocket/ConnectionHandover.java
+++ b/test/jdk/java/net/httpclient/websocket/ConnectionHandoverTest.java
@@ -21,20 +21,20 @@
  * questions.
  */
 
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.WebSocket;
-
-import java.io.IOException;
-import java.net.URI;
-
 /*
  * @test
  * @bug 8164625
  * @summary Verifies HttpClient yields the connection to the WebSocket
  * @build DummyWebSocketServer
- * @run main/othervm -Djdk.httpclient.HttpClient.log=trace ConnectionHandover
+ * @run main/othervm -Djdk.httpclient.HttpClient.log=trace ConnectionHandoverTest
  */
-public class ConnectionHandover {
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.WebSocket;
+
+public class ConnectionHandoverTest {
     /*
      * An I/O channel associated with the connection is closed by WebSocket.abort().
      * If this connection is returned to the connection pool, then the second
diff --git a/test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java b/test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java
index 7e72d52e7f4..2b933c1a3f1 100644
--- a/test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java
+++ b/test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,7 +24,9 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.StandardSocketOptions;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -42,6 +44,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.regex.Pattern;
@@ -80,12 +83,14 @@
  *     Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
  *     Sec-WebSocket-Protocol: chat
  */
-public final class DummyWebSocketServer implements Closeable {
+public class DummyWebSocketServer implements Closeable {
 
     private final AtomicBoolean started = new AtomicBoolean();
     private final Thread thread;
     private volatile ServerSocketChannel ssc;
     private volatile InetSocketAddress address;
+    private ByteBuffer read = ByteBuffer.allocate(16384);
+    private final CountDownLatch readReady = new CountDownLatch(1);
 
     public DummyWebSocketServer() {
         this(defaultMapping());
@@ -100,6 +105,7 @@ public DummyWebSocketServer(Function<List<String>, List<String>> mapping) {
                     SocketChannel channel = ssc.accept();
                     err.println("Accepted: " + channel);
                     try {
+                        channel.setOption(StandardSocketOptions.TCP_NODELAY, true);
                         channel.configureBlocking(true);
                         StringBuilder request = new StringBuilder();
                         if (!readRequest(channel, request)) {
@@ -108,21 +114,17 @@ public DummyWebSocketServer(Function<List<String>, List<String>> mapping) {
                         List<String> strings = asList(request.toString().split("\r\n"));
                         List<String> response = mapping.apply(strings);
                         writeResponse(channel, response);
-                        // Read until the thread is interrupted or an error occurred
-                        // or the input is shutdown
-                        ByteBuffer b = ByteBuffer.allocate(1024);
-                        while (channel.read(b) != -1) {
-                            b.clear();
-                        }
+                        serve(channel);
                     } catch (IOException e) {
                         err.println("Error in connection: " + channel + ", " + e);
                     } finally {
                         err.println("Closed: " + channel);
                         close(channel);
+                        readReady.countDown();
                     }
                 }
             } catch (ClosedByInterruptException ignored) {
-            } catch (IOException e) {
+            } catch (Exception e) {
                 err.println(e);
             } finally {
                 close(ssc);
@@ -133,6 +135,58 @@ public DummyWebSocketServer(Function<List<String>, List<String>> mapping) {
         thread.setDaemon(false);
     }
 
+    protected void read(SocketChannel ch) throws IOException {
+        // Read until the thread is interrupted or an error occurred
+        // or the input is shutdown
+        ByteBuffer b = ByteBuffer.allocate(65536);
+        while (ch.read(b) != -1) {
+            b.flip();
+            if (read.remaining() < b.remaining()) {
+                int required = read.capacity() - read.remaining() + b.remaining();
+                int log2required = 32 - Integer.numberOfLeadingZeros(required - 1);
+                ByteBuffer newBuffer = ByteBuffer.allocate(1 << log2required);
+                newBuffer.put(read.flip());
+                read = newBuffer;
+            }
+            read.put(b);
+            b.clear();
+        }
+    }
+
+    protected void write(SocketChannel ch) throws IOException { }
+
+    protected final void serve(SocketChannel channel)
+            throws InterruptedException
+    {
+        Thread reader = new Thread(() -> {
+            try {
+                read(channel);
+            } catch (IOException ignored) { }
+        });
+        Thread writer = new Thread(() -> {
+            try {
+                write(channel);
+            } catch (IOException ignored) { }
+        });
+        reader.start();
+        writer.start();
+        try {
+            reader.join();
+        } finally {
+            reader.interrupt();
+            try {
+                writer.join();
+            } finally {
+                writer.interrupt();
+            }
+        }
+    }
+
+    public ByteBuffer read() throws InterruptedException {
+        readReady.await();
+        return read.duplicate().asReadOnlyBuffer().flip();
+    }
+
     public void open() throws IOException {
         err.println("Starting");
         if (!started.compareAndSet(false, true)) {
@@ -141,7 +195,7 @@ public void open() throws IOException {
         ssc = ServerSocketChannel.open();
         try {
             ssc.configureBlocking(true);
-            ssc.bind(new InetSocketAddress("localhost", 0));
+            ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             address = (InetSocketAddress) ssc.getLocalAddress();
             thread.start();
         } catch (IOException e) {
@@ -161,7 +215,7 @@ URI getURI() {
         if (!started.get()) {
             throw new IllegalStateException("Not yet started");
         }
-        return URI.create("ws://" + address.getHostName() + ":" + address.getPort());
+        return URI.create("ws://localhost:" + address.getPort());
     }
 
     private boolean readRequest(SocketChannel channel, StringBuilder request)
diff --git a/test/jdk/java/net/httpclient/websocket/Frame.java b/test/jdk/java/net/httpclient/websocket/Frame.java
new file mode 100644
index 00000000000..99c7f4ac65c
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/Frame.java
@@ -0,0 +1,497 @@
+/*
+ * Copyright (c) 2016, 2018, 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.nio.ByteBuffer;
+
+/* Copied from jdk.internal.net.http.websocket.Frame */
+final class Frame {
+
+    final Opcode opcode;
+    final ByteBuffer data;
+    final boolean last;
+
+    public Frame(Opcode opcode, ByteBuffer data, boolean last) {
+        this.opcode = opcode;
+        /* copy */
+        this.data = ByteBuffer.allocate(data.remaining()).put(data.slice()).flip();
+        this.last = last;
+    }
+
+    static final int MAX_HEADER_SIZE_BYTES = 2 + 8 + 4;
+    static final int MAX_CONTROL_FRAME_PAYLOAD_SIZE = 125;
+
+    enum Opcode {
+
+        CONTINUATION   (0x0),
+        TEXT           (0x1),
+        BINARY         (0x2),
+        NON_CONTROL_0x3(0x3),
+        NON_CONTROL_0x4(0x4),
+        NON_CONTROL_0x5(0x5),
+        NON_CONTROL_0x6(0x6),
+        NON_CONTROL_0x7(0x7),
+        CLOSE          (0x8),
+        PING           (0x9),
+        PONG           (0xA),
+        CONTROL_0xB    (0xB),
+        CONTROL_0xC    (0xC),
+        CONTROL_0xD    (0xD),
+        CONTROL_0xE    (0xE),
+        CONTROL_0xF    (0xF);
+
+        private static final Opcode[] opcodes;
+
+        static {
+            Opcode[] values = values();
+            opcodes = new Opcode[values.length];
+            for (Opcode c : values) {
+                opcodes[c.code] = c;
+            }
+        }
+
+        private final byte code;
+
+        Opcode(int code) {
+            this.code = (byte) code;
+        }
+
+        boolean isControl() {
+            return (code & 0x8) != 0;
+        }
+
+        static Opcode ofCode(int code) {
+            return opcodes[code & 0xF];
+        }
+    }
+
+    /*
+     * A utility for masking frame payload data.
+     */
+    static final class Masker {
+
+        // Exploiting ByteBuffer's ability to read/write multi-byte integers
+        private final ByteBuffer acc = ByteBuffer.allocate(8);
+        private final int[] maskBytes = new int[4];
+        private int offset;
+        private long maskLong;
+
+        /*
+         * Reads all remaining bytes from the given input buffer, masks them
+         * with the supplied mask and writes the resulting bytes to the given
+         * output buffer.
+         *
+         * The source and the destination buffers may be the same instance.
+         */
+        static void transferMasking(ByteBuffer src, ByteBuffer dst, int mask) {
+            if (src.remaining() > dst.remaining()) {
+                throw new IllegalArgumentException();
+            }
+            new Masker().mask(mask).transferMasking(src, dst);
+        }
+
+        /*
+         * Clears this instance's state and sets the mask.
+         *
+         * The behaviour is as if the mask was set on a newly created instance.
+         */
+        Masker mask(int value) {
+            acc.clear().putInt(value).putInt(value).flip();
+            for (int i = 0; i < maskBytes.length; i++) {
+                maskBytes[i] = acc.get(i);
+            }
+            offset = 0;
+            maskLong = acc.getLong(0);
+            return this;
+        }
+
+        /*
+         * Reads as many remaining bytes as possible from the given input
+         * buffer, masks them with the previously set mask and writes the
+         * resulting bytes to the given output buffer.
+         *
+         * The source and the destination buffers may be the same instance. If
+         * the mask hasn't been previously set it is assumed to be 0.
+         */
+        Masker transferMasking(ByteBuffer src, ByteBuffer dst) {
+            begin(src, dst);
+            loop(src, dst);
+            end(src, dst);
+            return this;
+        }
+
+        /*
+         * Applies up to 3 remaining from the previous pass bytes of the mask.
+         */
+        private void begin(ByteBuffer src, ByteBuffer dst) {
+            if (offset == 0) { // No partially applied mask from the previous invocation
+                return;
+            }
+            int i = src.position(), j = dst.position();
+            final int srcLim = src.limit(), dstLim = dst.limit();
+            for (; offset < 4 && i < srcLim && j < dstLim; i++, j++, offset++)
+            {
+                dst.put(j, (byte) (src.get(i) ^ maskBytes[offset]));
+            }
+            offset &= 3; // Will become 0 if the mask has been fully applied
+            src.position(i);
+            dst.position(j);
+        }
+
+        /*
+         * Gallops one long (mask + mask) at a time.
+         */
+        private void loop(ByteBuffer src, ByteBuffer dst) {
+            int i = src.position();
+            int j = dst.position();
+            final int srcLongLim = src.limit() - 7, dstLongLim = dst.limit() - 7;
+            for (; i < srcLongLim && j < dstLongLim; i += 8, j += 8) {
+                dst.putLong(j, src.getLong(i) ^ maskLong);
+            }
+            if (i > src.limit()) {
+                src.position(i - 8);
+            } else {
+                src.position(i);
+            }
+            if (j > dst.limit()) {
+                dst.position(j - 8);
+            } else {
+                dst.position(j);
+            }
+        }
+
+        /*
+         * Applies up to 7 remaining from the "galloping" phase bytes of the
+         * mask.
+         */
+        private void end(ByteBuffer src, ByteBuffer dst) {
+            assert Math.min(src.remaining(), dst.remaining()) < 8;
+            final int srcLim = src.limit(), dstLim = dst.limit();
+            int i = src.position(), j = dst.position();
+            for (; i < srcLim && j < dstLim;
+                 i++, j++, offset = (offset + 1) & 3) // offset cycles through 0..3
+            {
+                dst.put(j, (byte) (src.get(i) ^ maskBytes[offset]));
+            }
+            src.position(i);
+            dst.position(j);
+        }
+    }
+
+    /*
+     * A builder-style writer of frame headers.
+     *
+     * The writer does not enforce any protocol-level rules, it simply writes a
+     * header structure to the given buffer. The order of calls to intermediate
+     * methods is NOT significant.
+     */
+    static final class HeaderWriter {
+
+        private char firstChar;
+        private long payloadLen;
+        private int maskingKey;
+        private boolean mask;
+
+        HeaderWriter fin(boolean value) {
+            if (value) {
+                firstChar |=  0b10000000_00000000;
+            } else {
+                firstChar &= ~0b10000000_00000000;
+            }
+            return this;
+        }
+
+        HeaderWriter rsv1(boolean value) {
+            if (value) {
+                firstChar |=  0b01000000_00000000;
+            } else {
+                firstChar &= ~0b01000000_00000000;
+            }
+            return this;
+        }
+
+        HeaderWriter rsv2(boolean value) {
+            if (value) {
+                firstChar |=  0b00100000_00000000;
+            } else {
+                firstChar &= ~0b00100000_00000000;
+            }
+            return this;
+        }
+
+        HeaderWriter rsv3(boolean value) {
+            if (value) {
+                firstChar |=  0b00010000_00000000;
+            } else {
+                firstChar &= ~0b00010000_00000000;
+            }
+            return this;
+        }
+
+        HeaderWriter opcode(Opcode value) {
+            firstChar = (char) ((firstChar & 0xF0FF) | (value.code << 8));
+            return this;
+        }
+
+        HeaderWriter payloadLen(long value) {
+            if (value < 0) {
+                throw new IllegalArgumentException("Negative: " + value);
+            }
+            payloadLen = value;
+            firstChar &= 0b11111111_10000000; // Clear previous payload length leftovers
+            if (payloadLen < 126) {
+                firstChar |= payloadLen;
+            } else if (payloadLen < 65536) {
+                firstChar |= 126;
+            } else {
+                firstChar |= 127;
+            }
+            return this;
+        }
+
+        HeaderWriter mask(int value) {
+            firstChar |= 0b00000000_10000000;
+            maskingKey = value;
+            mask = true;
+            return this;
+        }
+
+        HeaderWriter noMask() {
+            firstChar &= ~0b00000000_10000000;
+            mask = false;
+            return this;
+        }
+
+        /*
+         * Writes the header to the given buffer.
+         *
+         * The buffer must have at least MAX_HEADER_SIZE_BYTES remaining. The
+         * buffer's position is incremented by the number of bytes written.
+         */
+        void write(ByteBuffer buffer) {
+            buffer.putChar(firstChar);
+            if (payloadLen >= 126) {
+                if (payloadLen < 65536) {
+                    buffer.putChar((char) payloadLen);
+                } else {
+                    buffer.putLong(payloadLen);
+                }
+            }
+            if (mask) {
+                buffer.putInt(maskingKey);
+            }
+        }
+    }
+
+    /*
+     * A consumer of frame parts.
+     *
+     * Frame.Reader invokes the consumer's methods in the following order:
+     *
+     *     fin rsv1 rsv2 rsv3 opcode mask payloadLength maskingKey? payloadData+ endFrame
+     */
+    interface Consumer {
+
+        void fin(boolean value);
+
+        void rsv1(boolean value);
+
+        void rsv2(boolean value);
+
+        void rsv3(boolean value);
+
+        void opcode(Opcode value);
+
+        void mask(boolean value);
+
+        void payloadLen(long value);
+
+        void maskingKey(int value);
+
+        /*
+         * Called by the Frame.Reader when a part of the (or a complete) payload
+         * is ready to be consumed.
+         *
+         * The sum of numbers of bytes consumed in each invocation of this
+         * method corresponding to the given frame WILL be equal to
+         * 'payloadLen', reported to `void payloadLen(long value)` before that.
+         *
+         * In particular, if `payloadLen` is 0, then there WILL be a single
+         * invocation to this method.
+         *
+         * No unmasking is done.
+         */
+        void payloadData(ByteBuffer data);
+
+        void endFrame();
+    }
+
+    /*
+     * A Reader of frames.
+     *
+     * No protocol-level rules are checked.
+     */
+    static final class Reader {
+
+        private static final int AWAITING_FIRST_BYTE  =  1;
+        private static final int AWAITING_SECOND_BYTE =  2;
+        private static final int READING_16_LENGTH    =  4;
+        private static final int READING_64_LENGTH    =  8;
+        private static final int READING_MASK         = 16;
+        private static final int READING_PAYLOAD      = 32;
+
+        // Exploiting ByteBuffer's ability to read multi-byte integers
+        private final ByteBuffer accumulator = ByteBuffer.allocate(8);
+        private int state = AWAITING_FIRST_BYTE;
+        private boolean mask;
+        private long remainingPayloadLength;
+
+        /*
+         * Reads at most one frame from the given buffer invoking the consumer's
+         * methods corresponding to the frame parts found.
+         *
+         * As much of the frame's payload, if any, is read. The buffer's
+         * position is updated to reflect the number of bytes read.
+         *
+         * Throws FailWebSocketException if detects the frame is malformed.
+         */
+        void readFrame(ByteBuffer input, Consumer consumer) {
+            loop:
+            while (true) {
+                byte b;
+                switch (state) {
+                    case AWAITING_FIRST_BYTE:
+                        if (!input.hasRemaining()) {
+                            break loop;
+                        }
+                        b = input.get();
+                        consumer.fin( (b & 0b10000000) != 0);
+                        consumer.rsv1((b & 0b01000000) != 0);
+                        consumer.rsv2((b & 0b00100000) != 0);
+                        consumer.rsv3((b & 0b00010000) != 0);
+                        consumer.opcode(Opcode.ofCode(b));
+                        state = AWAITING_SECOND_BYTE;
+                        continue loop;
+                    case AWAITING_SECOND_BYTE:
+                        if (!input.hasRemaining()) {
+                            break loop;
+                        }
+                        b = input.get();
+                        consumer.mask(mask = (b & 0b10000000) != 0);
+                        byte p1 = (byte) (b & 0b01111111);
+                        if (p1 < 126) {
+                            assert p1 >= 0 : p1;
+                            consumer.payloadLen(remainingPayloadLength = p1);
+                            state = mask ? READING_MASK : READING_PAYLOAD;
+                        } else if (p1 < 127) {
+                            state = READING_16_LENGTH;
+                        } else {
+                            state = READING_64_LENGTH;
+                        }
+                        continue loop;
+                    case READING_16_LENGTH:
+                        if (!input.hasRemaining()) {
+                            break loop;
+                        }
+                        b = input.get();
+                        if (accumulator.put(b).position() < 2) {
+                            continue loop;
+                        }
+                        remainingPayloadLength = accumulator.flip().getChar();
+                        if (remainingPayloadLength < 126) {
+                            throw notMinimalEncoding(remainingPayloadLength);
+                        }
+                        consumer.payloadLen(remainingPayloadLength);
+                        accumulator.clear();
+                        state = mask ? READING_MASK : READING_PAYLOAD;
+                        continue loop;
+                    case READING_64_LENGTH:
+                        if (!input.hasRemaining()) {
+                            break loop;
+                        }
+                        b = input.get();
+                        if (accumulator.put(b).position() < 8) {
+                            continue loop;
+                        }
+                        remainingPayloadLength = accumulator.flip().getLong();
+                        if (remainingPayloadLength < 0) {
+                            throw negativePayload(remainingPayloadLength);
+                        } else if (remainingPayloadLength < 65536) {
+                            throw notMinimalEncoding(remainingPayloadLength);
+                        }
+                        consumer.payloadLen(remainingPayloadLength);
+                        accumulator.clear();
+                        state = mask ? READING_MASK : READING_PAYLOAD;
+                        continue loop;
+                    case READING_MASK:
+                        if (!input.hasRemaining()) {
+                            break loop;
+                        }
+                        b = input.get();
+                        if (accumulator.put(b).position() != 4) {
+                            continue loop;
+                        }
+                        consumer.maskingKey(accumulator.flip().getInt());
+                        accumulator.clear();
+                        state = READING_PAYLOAD;
+                        continue loop;
+                    case READING_PAYLOAD:
+                        // This state does not require any bytes to be available
+                        // in the input buffer in order to proceed
+                        int deliverable = (int) Math.min(remainingPayloadLength,
+                                                         input.remaining());
+                        int oldLimit = input.limit();
+                        input.limit(input.position() + deliverable);
+                        if (deliverable != 0 || remainingPayloadLength == 0) {
+                            consumer.payloadData(input);
+                        }
+                        int consumed = deliverable - input.remaining();
+                        if (consumed < 0) {
+                            // Consumer cannot consume more than there was available
+                            throw new InternalError();
+                        }
+                        input.limit(oldLimit);
+                        remainingPayloadLength -= consumed;
+                        if (remainingPayloadLength == 0) {
+                            consumer.endFrame();
+                            state = AWAITING_FIRST_BYTE;
+                        }
+                        break loop;
+                    default:
+                        throw new InternalError(String.valueOf(state));
+                }
+            }
+        }
+
+        private static IllegalArgumentException negativePayload(long payloadLength)
+        {
+            return new IllegalArgumentException("Negative payload length: "
+                                                        + payloadLength);
+        }
+
+        private static IllegalArgumentException notMinimalEncoding(long payloadLength)
+        {
+            return new IllegalArgumentException("Not minimally-encoded payload length:"
+                                                      + payloadLength);
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/HeaderWriterDriver.java b/test/jdk/java/net/httpclient/websocket/HeaderWriterDriver.java
index f806bd402c1..6293b1b6c71 100644
--- a/test/jdk/java/net/httpclient/websocket/HeaderWriterDriver.java
+++ b/test/jdk/java/net/httpclient/websocket/HeaderWriterDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,7 +24,9 @@
 /*
  * @test
  * @bug 8159053
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.websocket:open
- * @run testng/othervm --add-reads jdk.incubator.httpclient=ALL-UNNAMED jdk.incubator.httpclient/jdk.incubator.http.internal.websocket.HeaderWriterTest
+ * @modules java.net.http/jdk.internal.net.http.websocket:open
+ * @run testng/othervm
+ *      --add-reads java.net.http=ALL-UNNAMED
+ *      java.net.http/jdk.internal.net.http.websocket.HeaderWriterTest
  */
 public final class HeaderWriterDriver { }
diff --git a/test/jdk/java/net/httpclient/websocket/MaskerDriver.java b/test/jdk/java/net/httpclient/websocket/MaskerDriver.java
index facf0a812d5..b84ea1fff5c 100644
--- a/test/jdk/java/net/httpclient/websocket/MaskerDriver.java
+++ b/test/jdk/java/net/httpclient/websocket/MaskerDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,7 +24,9 @@
 /*
  * @test
  * @bug 8159053
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.websocket:open
- * @run testng/othervm --add-reads jdk.incubator.httpclient=ALL-UNNAMED jdk.incubator.httpclient/jdk.incubator.http.internal.websocket.MaskerTest
+ * @modules java.net.http/jdk.internal.net.http.websocket:open
+ * @run testng/othervm
+ *      --add-reads java.net.http=ALL-UNNAMED
+ *      java.net.http/jdk.internal.net.http.websocket.MaskerTest
  */
 public final class MaskerDriver { }
diff --git a/test/jdk/java/net/httpclient/websocket/SendingTestDriver.java b/test/jdk/java/net/httpclient/websocket/MessageQueueDriver.java
similarity index 75%
rename from test/jdk/java/net/httpclient/websocket/SendingTestDriver.java
rename to test/jdk/java/net/httpclient/websocket/MessageQueueDriver.java
index 85a061a2126..9831bb59297 100644
--- a/test/jdk/java/net/httpclient/websocket/SendingTestDriver.java
+++ b/test/jdk/java/net/httpclient/websocket/MessageQueueDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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,7 +23,10 @@
 
 /*
  * @test
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.websocket:open
- * @run testng/othervm --add-reads jdk.incubator.httpclient=ALL-UNNAMED jdk.incubator.httpclient/jdk.incubator.http.internal.websocket.SendingTest
+ * @bug 8159053
+ * @modules java.net.http/jdk.internal.net.http.websocket:open
+ * @run testng/othervm
+ *      --add-reads java.net.http=ALL-UNNAMED
+ *      java.net.http/jdk.internal.net.http.websocket.MessageQueueTest
  */
-public class SendingTestDriver { }
+public final class MessageQueueDriver { }
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListener.java b/test/jdk/java/net/httpclient/websocket/MockListener.java
similarity index 65%
rename from test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListener.java
rename to test/jdk/java/net/httpclient/websocket/MockListener.java
index 9147304573b..0602f422afa 100644
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListener.java
+++ b/test/jdk/java/net/httpclient/websocket/MockListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -21,41 +21,54 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
-
-import jdk.incubator.http.WebSocket;
-import jdk.incubator.http.WebSocket.MessagePart;
-
+import java.net.http.WebSocket;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
-
-import static jdk.incubator.http.internal.websocket.TestSupport.fullCopy;
+import java.util.function.Predicate;
 
 public class MockListener implements WebSocket.Listener {
 
     private final long bufferSize;
     private long count;
-    private final List<ListenerInvocation> invocations = new ArrayList<>();
+    private final List<Invocation> invocations = new ArrayList<>();
     private final CompletableFuture<?> lastCall = new CompletableFuture<>();
+    private final Predicate<? super Invocation> collectUntil;
+
+    public MockListener() {
+        this(i -> i instanceof OnClose || i instanceof OnError);
+    }
+
+    public MockListener(Predicate<? super Invocation> collectUntil) {
+        this(2, collectUntil);
+    }
 
     /*
      * Typical buffer sizes: 1, n, Long.MAX_VALUE
      */
-    public MockListener(long bufferSize) {
+    public MockListener(long bufferSize,
+                        Predicate<? super Invocation> collectUntil) {
         if (bufferSize < 1) {
             throw new IllegalArgumentException();
         }
+        Objects.requireNonNull(collectUntil);
         this.bufferSize = bufferSize;
+        this.collectUntil = collectUntil;
     }
 
     @Override
     public void onOpen(WebSocket webSocket) {
         System.out.printf("onOpen(%s)%n", webSocket);
-        invocations.add(new OnOpen(webSocket));
+        OnOpen inv = new OnOpen(webSocket);
+        synchronized (invocations) {
+            invocations.add(inv);
+        }
+        if (collectUntil.test(inv)) {
+            lastCall.complete(null);
+        }
         onOpen0(webSocket);
     }
 
@@ -66,15 +79,21 @@ protected void onOpen0(WebSocket webSocket) {
     @Override
     public CompletionStage<?> onText(WebSocket webSocket,
                                      CharSequence message,
-                                     MessagePart part) {
-        System.out.printf("onText(%s, %s, %s)%n", webSocket, message, part);
-        invocations.add(new OnText(webSocket, message.toString(), part));
-        return onText0(webSocket, message, part);
+                                     boolean last) {
+        System.out.printf("onText(%s, message.length=%s, %s)%n", webSocket, message.length(), last);
+        OnText inv = new OnText(webSocket, message.toString(), last);
+        synchronized (invocations) {
+            invocations.add(inv);
+        }
+        if (collectUntil.test(inv)) {
+            lastCall.complete(null);
+        }
+        return onText0(webSocket, message, last);
     }
 
     protected CompletionStage<?> onText0(WebSocket webSocket,
                                          CharSequence message,
-                                         MessagePart part) {
+                                         boolean last) {
         replenish(webSocket);
         return null;
     }
@@ -82,15 +101,21 @@ protected CompletionStage<?> onText0(WebSocket webSocket,
     @Override
     public CompletionStage<?> onBinary(WebSocket webSocket,
                                        ByteBuffer message,
-                                       MessagePart part) {
-        System.out.printf("onBinary(%s, %s, %s)%n", webSocket, message, part);
-        invocations.add(new OnBinary(webSocket, fullCopy(message), part));
-        return onBinary0(webSocket, message, part);
+                                       boolean last) {
+        System.out.printf("onBinary(%s, %s, %s)%n", webSocket, message, last);
+        OnBinary inv = new OnBinary(webSocket, fullCopy(message), last);
+        synchronized (invocations) {
+            invocations.add(inv);
+        }
+        if (collectUntil.test(inv)) {
+            lastCall.complete(null);
+        }
+        return onBinary0(webSocket, message, last);
     }
 
     protected CompletionStage<?> onBinary0(WebSocket webSocket,
                                            ByteBuffer message,
-                                           MessagePart part) {
+                                           boolean last) {
         replenish(webSocket);
         return null;
     }
@@ -98,7 +123,13 @@ protected CompletionStage<?> onBinary0(WebSocket webSocket,
     @Override
     public CompletionStage<?> onPing(WebSocket webSocket, ByteBuffer message) {
         System.out.printf("onPing(%s, %s)%n", webSocket, message);
-        invocations.add(new OnPing(webSocket, fullCopy(message)));
+        OnPing inv = new OnPing(webSocket, fullCopy(message));
+        synchronized (invocations) {
+            invocations.add(inv);
+        }
+        if (collectUntil.test(inv)) {
+            lastCall.complete(null);
+        }
         return onPing0(webSocket, message);
     }
 
@@ -110,7 +141,13 @@ protected CompletionStage<?> onPing0(WebSocket webSocket, ByteBuffer message) {
     @Override
     public CompletionStage<?> onPong(WebSocket webSocket, ByteBuffer message) {
         System.out.printf("onPong(%s, %s)%n", webSocket, message);
-        invocations.add(new OnPong(webSocket, fullCopy(message)));
+        OnPong inv = new OnPong(webSocket, fullCopy(message));
+        synchronized (invocations) {
+            invocations.add(inv);
+        }
+        if (collectUntil.test(inv)) {
+            lastCall.complete(null);
+        }
         return onPong0(webSocket, message);
     }
 
@@ -124,20 +161,49 @@ public CompletionStage<?> onClose(WebSocket webSocket,
                                       int statusCode,
                                       String reason) {
         System.out.printf("onClose(%s, %s, %s)%n", webSocket, statusCode, reason);
-        invocations.add(new OnClose(webSocket, statusCode, reason));
-        lastCall.complete(null);
+        OnClose inv = new OnClose(webSocket, statusCode, reason);
+        synchronized (invocations) {
+            invocations.add(inv);
+        }
+        if (collectUntil.test(inv)) {
+            lastCall.complete(null);
+        }
+        return onClose0(webSocket, statusCode, reason);
+    }
+
+    protected CompletionStage<?> onClose0(WebSocket webSocket,
+                                          int statusCode,
+                                          String reason) {
         return null;
     }
 
     @Override
     public void onError(WebSocket webSocket, Throwable error) {
         System.out.printf("onError(%s, %s)%n", webSocket, error);
-        invocations.add(new OnError(webSocket, error == null ? null : error.getClass()));
-        lastCall.complete(null);
+        error.printStackTrace(System.out);
+        OnError inv = new OnError(webSocket, error == null ? null : error.getClass());
+        synchronized (invocations) {
+            invocations.add(inv);
+        }
+        if (collectUntil.test(inv)) {
+            lastCall.complete(null);
+        }
+        onError0(webSocket, error);
+    }
+
+    protected void onError0(WebSocket webSocket, Throwable error) { }
+
+    public List<Invocation> invocationsSoFar() {
+        synchronized (invocations) {
+            return new ArrayList<>(invocations);
+        }
     }
 
-    public CompletableFuture<?> onCloseOrOnErrorCalled() {
-        return lastCall.copy();
+    public List<Invocation> invocations() {
+        lastCall.join();
+        synchronized (invocations) {
+            return new ArrayList<>(invocations);
+        }
     }
 
     protected void replenish(WebSocket webSocket) {
@@ -147,11 +213,7 @@ protected void replenish(WebSocket webSocket) {
         webSocket.request(count);
     }
 
-    public List<ListenerInvocation> invocations() {
-        return new ArrayList<>(invocations);
-    }
-
-    public abstract static class ListenerInvocation {
+    public abstract static class Invocation {
 
         public static OnOpen onOpen(WebSocket webSocket) {
             return new OnOpen(webSocket);
@@ -159,14 +221,14 @@ public static OnOpen onOpen(WebSocket webSocket) {
 
         public static OnText onText(WebSocket webSocket,
                                     String text,
-                                    MessagePart part) {
-            return new OnText(webSocket, text, part);
+                                    boolean last) {
+            return new OnText(webSocket, text, last);
         }
 
         public static OnBinary onBinary(WebSocket webSocket,
                                         ByteBuffer data,
-                                        MessagePart part) {
-            return new OnBinary(webSocket, data, part);
+                                        boolean last) {
+            return new OnBinary(webSocket, data, last);
         }
 
         public static OnPing onPing(WebSocket webSocket,
@@ -192,12 +254,12 @@ public static OnError onError(WebSocket webSocket,
 
         final WebSocket webSocket;
 
-        private ListenerInvocation(WebSocket webSocket) {
+        private Invocation(WebSocket webSocket) {
             this.webSocket = webSocket;
         }
     }
 
-    public static final class OnOpen extends ListenerInvocation {
+    public static final class OnOpen extends Invocation {
 
         public OnOpen(WebSocket webSocket) {
             super(webSocket);
@@ -207,7 +269,7 @@ public OnOpen(WebSocket webSocket) {
         public boolean equals(Object o) {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
-            ListenerInvocation that = (ListenerInvocation) o;
+            Invocation that = (Invocation) o;
             return Objects.equals(webSocket, that.webSocket);
         }
 
@@ -215,17 +277,22 @@ public boolean equals(Object o) {
         public int hashCode() {
             return Objects.hashCode(webSocket);
         }
+
+        @Override
+        public String toString() {
+            return String.format("onOpen(%s)", webSocket);
+        }
     }
 
-    public static final class OnText extends ListenerInvocation {
+    public static final class OnText extends Invocation {
 
         final String text;
-        final MessagePart part;
+        final boolean last;
 
-        public OnText(WebSocket webSocket, String text, MessagePart part) {
+        public OnText(WebSocket webSocket, String text, boolean last) {
             super(webSocket);
             this.text = text;
-            this.part = part;
+            this.last = last;
         }
 
         @Override
@@ -234,30 +301,30 @@ public boolean equals(Object o) {
             if (o == null || getClass() != o.getClass()) return false;
             OnText onText = (OnText) o;
             return Objects.equals(text, onText.text) &&
-                    part == onText.part &&
+                    last == onText.last &&
                     Objects.equals(webSocket, onText.webSocket);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(text, part, webSocket);
+            return Objects.hash(text, last, webSocket);
         }
 
         @Override
         public String toString() {
-            return String.format("onText(%s, %s, %s)", webSocket, text, part);
+            return String.format("onText(%s, message.length=%s, %s)", webSocket, text.length(), last);
         }
     }
 
-    public static final class OnBinary extends ListenerInvocation {
+    public static final class OnBinary extends Invocation {
 
         final ByteBuffer data;
-        final MessagePart part;
+        final boolean last;
 
-        public OnBinary(WebSocket webSocket, ByteBuffer data, MessagePart part) {
+        public OnBinary(WebSocket webSocket, ByteBuffer data, boolean last) {
             super(webSocket);
             this.data = data;
-            this.part = part;
+            this.last = last;
         }
 
         @Override
@@ -266,22 +333,22 @@ public boolean equals(Object o) {
             if (o == null || getClass() != o.getClass()) return false;
             OnBinary onBinary = (OnBinary) o;
             return Objects.equals(data, onBinary.data) &&
-                    part == onBinary.part &&
+                    last == onBinary.last &&
                     Objects.equals(webSocket, onBinary.webSocket);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(data, part, webSocket);
+            return Objects.hash(data, last, webSocket);
         }
 
         @Override
         public String toString() {
-            return String.format("onBinary(%s, %s, %s)", webSocket, data, part);
+            return String.format("onBinary(%s, %s, %s)", webSocket, data, last);
         }
     }
 
-    public static final class OnPing extends ListenerInvocation {
+    public static final class OnPing extends Invocation {
 
         final ByteBuffer data;
 
@@ -310,7 +377,7 @@ public String toString() {
         }
     }
 
-    public static final class OnPong extends ListenerInvocation {
+    public static final class OnPong extends Invocation {
 
         final ByteBuffer data;
 
@@ -339,7 +406,7 @@ public String toString() {
         }
     }
 
-    public static final class OnClose extends ListenerInvocation {
+    public static final class OnClose extends Invocation {
 
         final int statusCode;
         final String reason;
@@ -371,7 +438,7 @@ public String toString() {
         }
     }
 
-    public static final class OnError extends ListenerInvocation {
+    public static final class OnError extends Invocation {
 
         final Class<? extends Throwable> clazz;
 
@@ -399,4 +466,14 @@ public String toString() {
             return String.format("onError(%s, %s)", webSocket, clazz);
         }
     }
+
+    private static ByteBuffer fullCopy(ByteBuffer src) {
+        ByteBuffer copy = ByteBuffer.allocate(src.capacity());
+        int p = src.position();
+        int l = src.limit();
+        src.clear();
+        copy.put(src).position(p).limit(l);
+        src.position(p).limit(l);
+        return copy;
+    }
 }
diff --git a/test/jdk/java/net/httpclient/websocket/PendingBinaryPingClose.java b/test/jdk/java/net/httpclient/websocket/PendingBinaryPingClose.java
new file mode 100644
index 00000000000..d91002c9d86
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/PendingBinaryPingClose.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       PendingBinaryPingClose
+ */
+
+import org.testng.annotations.Test;
+
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+
+public class PendingBinaryPingClose extends PendingOperations {
+
+    CompletableFuture<WebSocket> cfBinary;
+    CompletableFuture<WebSocket> cfPing;
+    CompletableFuture<WebSocket> cfClose;
+
+    @Test(dataProvider = "booleans")
+    public void pendingBinaryPingClose(boolean last) throws Exception {
+        repeatable(() -> {
+            server = Support.notReadingServer();
+            server.open();
+            webSocket = newHttpClient().newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ByteBuffer data = ByteBuffer.allocate(65536);
+            for (int i = 0; ; i++) {  // fill up the send buffer
+                long start = System.currentTimeMillis();
+                System.out.printf("begin cycle #%s at %s%n", i, start);
+                cfBinary = webSocket.sendBinary(data, last);
+                try {
+                    cfBinary.get(MAX_WAIT_SEC, TimeUnit.SECONDS);
+                    data.clear();
+                } catch (TimeoutException e) {
+                    break;
+                } finally {
+                    long stop = System.currentTimeMillis();
+                    System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+                }
+            }
+            assertFails(ISE, webSocket.sendText("", true));
+            assertFails(ISE, webSocket.sendText("", false));
+            assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(0), true));
+            assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(0), false));
+            cfPing = webSocket.sendPing(ByteBuffer.allocate(125));
+            assertHangs(cfPing);
+            assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125)));
+            assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125)));
+            cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+            assertHangs(cfClose);
+            return null;
+        }, () -> cfBinary.isDone() ? true : false);
+        webSocket.abort();
+        assertFails(IOE, cfBinary);
+        assertFails(IOE, cfPing);
+        assertFails(IOE, cfClose);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/PendingBinaryPongClose.java b/test/jdk/java/net/httpclient/websocket/PendingBinaryPongClose.java
new file mode 100644
index 00000000000..289eba86270
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/PendingBinaryPongClose.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       PendingBinaryPongClose
+ */
+
+import org.testng.annotations.Test;
+
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+
+public class PendingBinaryPongClose extends PendingOperations {
+
+    CompletableFuture<WebSocket> cfBinary;
+    CompletableFuture<WebSocket> cfPong;
+    CompletableFuture<WebSocket> cfClose;
+
+    @Test(dataProvider = "booleans")
+    public void pendingBinaryPongClose(boolean last) throws Exception {
+        repeatable(() -> {
+            server = Support.notReadingServer();
+            server.open();
+            webSocket = newHttpClient().newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ByteBuffer data = ByteBuffer.allocate(65536);
+            for (int i = 0; ; i++) {  // fill up the send buffer
+                long start = System.currentTimeMillis();
+                System.out.printf("begin cycle #%s at %s%n", i, start);
+                cfBinary = webSocket.sendBinary(data, last);
+                try {
+                    cfBinary.get(MAX_WAIT_SEC, TimeUnit.SECONDS);
+                    data.clear();
+                } catch (TimeoutException e) {
+                    break;
+                } finally {
+                    long stop = System.currentTimeMillis();
+                    System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+                }
+            }
+            assertFails(ISE, webSocket.sendText("", true));
+            assertFails(ISE, webSocket.sendText("", false));
+            assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(0), true));
+            assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(0), false));
+            cfPong = webSocket.sendPong(ByteBuffer.allocate(125));
+            assertHangs(cfPong);
+            assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125)));
+            assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125)));
+            cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+            assertHangs(cfClose);
+            return null;
+        }, () -> cfBinary.isDone() ? true : false);
+        webSocket.abort();
+        assertFails(IOE, cfBinary);
+        assertFails(IOE, cfPong);
+        assertFails(IOE, cfClose);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/PendingOperations.java b/test/jdk/java/net/httpclient/websocket/PendingOperations.java
new file mode 100644
index 00000000000..d0a7e21db67
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/PendingOperations.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2018, 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 org.testng.annotations.AfterTest;
+import org.testng.annotations.DataProvider;
+
+import java.io.IOException;
+import java.net.http.WebSocket;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionStage;
+import java.util.function.BooleanSupplier;
+
+/* Common infrastructure for tests that check pending operations */
+public class PendingOperations {
+
+    static final Class<IllegalStateException> ISE = IllegalStateException.class;
+    static final Class<IOException> IOE = IOException.class;
+    // Time after which we deem that the local send buffer and remote
+    // receive buffer must be full. This has been heuristically determined.
+    // At the time of writing, using anything <= 5s on Mac will make the
+    // tests fail intermittently.
+    static final long MAX_WAIT_SEC = 10; // seconds.
+
+    DummyWebSocketServer server;
+    WebSocket webSocket;
+
+    @AfterTest
+    public void cleanup() {
+        server.close();
+        webSocket.abort();
+    }
+
+    /* shortcut */
+    static void assertHangs(CompletionStage<?> stage) {
+        Support.assertHangs(stage);
+    }
+
+    /* shortcut */
+    static void assertFails(Class<? extends Throwable> clazz,
+                            CompletionStage<?> stage) {
+        Support.assertCompletesExceptionally(clazz, stage);
+    }
+
+    @DataProvider(name = "booleans")
+    public Object[][] booleans() {
+        return new Object[][]{{Boolean.TRUE}, {Boolean.FALSE}};
+    }
+
+    static boolean isMacOS() {
+        return System.getProperty("os.name").contains("OS X");
+    }
+
+    private static final int ITERATIONS = 3;
+
+    static void repeatable(Callable<Void> callable,
+                           BooleanSupplier repeatCondition)
+        throws Exception
+    {
+        int iterations = 0;
+        do {
+            iterations++;
+            System.out.println("--- iteration " + iterations + " ---");
+            try {
+                callable.call();
+                break;
+            } catch (AssertionError e) {
+                if (isMacOS() && repeatCondition.getAsBoolean()) {
+                    // ## This is loathsome, but necessary because of observed
+                    // ## automagic socket buffer resizing on recent macOS platforms
+                    continue;
+                } else {
+                    throw e;
+                }
+            }
+        } while (iterations <= ITERATIONS);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/PendingPingBinaryClose.java b/test/jdk/java/net/httpclient/websocket/PendingPingBinaryClose.java
new file mode 100644
index 00000000000..af1f9daea1d
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/PendingPingBinaryClose.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *       PendingPingBinaryClose
+ */
+
+// This test produce huge logs (14Mb+) so disable logging by default
+// *      -Djdk.internal.httpclient.debug=true
+// *      -Djdk.internal.httpclient.websocket.debug=true
+
+import org.testng.annotations.Test;
+
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+
+public class PendingPingBinaryClose extends PendingOperations {
+
+    CompletableFuture<WebSocket> cfBinary;
+    CompletableFuture<WebSocket> cfPing;
+    CompletableFuture<WebSocket> cfClose;
+
+    @Test(dataProvider = "booleans")
+    public void pendingPingBinaryClose(boolean last) throws Exception {
+        repeatable( () -> {
+            server = Support.notReadingServer();
+            server.open();
+            webSocket = newHttpClient().newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ByteBuffer data = ByteBuffer.allocate(125);
+            for (int i = 0; ; i++) {  // fill up the send buffer
+                long start = System.currentTimeMillis();
+                System.out.printf("begin cycle #%s at %s%n", i, start);
+                cfPing = webSocket.sendPing(data);
+                try {
+                    cfPing.get(MAX_WAIT_SEC, TimeUnit.SECONDS);
+                    data.clear();
+                } catch (TimeoutException e) {
+                    break;
+                } finally {
+                    long stop = System.currentTimeMillis();
+                    System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+                }
+            }
+            assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125)));
+            assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125)));
+            cfBinary = webSocket.sendBinary(ByteBuffer.allocate(4), last);
+            assertHangs(cfBinary);
+            cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+            assertHangs(cfClose);
+            return null;
+        }, () -> cfPing.isDone() ? true : false);
+        webSocket.abort();
+        assertFails(IOE, cfPing);
+        assertFails(IOE, cfBinary);
+        assertFails(IOE, cfClose);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/PendingPingTextClose.java b/test/jdk/java/net/httpclient/websocket/PendingPingTextClose.java
new file mode 100644
index 00000000000..5cec4288c95
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/PendingPingTextClose.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *       PendingPingTextClose
+ */
+
+// This test produce huge logs (14Mb+) so disable logging by default
+// *      -Djdk.internal.httpclient.debug=true
+// *      -Djdk.internal.httpclient.websocket.debug=true
+
+import org.testng.annotations.Test;
+
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+
+public class PendingPingTextClose extends PendingOperations {
+
+    CompletableFuture<WebSocket> cfText;
+    CompletableFuture<WebSocket> cfPing;
+    CompletableFuture<WebSocket> cfClose;
+
+    @Test(dataProvider = "booleans")
+    public void pendingPingTextClose(boolean last) throws Exception {
+        repeatable( () -> {
+            server = Support.notReadingServer();
+            server.open();
+            webSocket = newHttpClient().newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ByteBuffer data = ByteBuffer.allocate(125);
+            for (int i = 0; ; i++) {  // fill up the send buffer
+                long start = System.currentTimeMillis();
+                System.out.printf("begin cycle #%s at %s%n", i, start);
+                cfPing = webSocket.sendPing(data);
+                try {
+                    cfPing.get(MAX_WAIT_SEC, TimeUnit.SECONDS);
+                    data.clear();
+                } catch (TimeoutException e) {
+                    break;
+                } finally {
+                    long stop = System.currentTimeMillis();
+                    System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+                }
+            }
+            assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125)));
+            assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125)));
+            cfText = webSocket.sendText("hello", last);
+            assertHangs(cfText);
+            cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+            assertHangs(cfClose);
+            return null;
+        }, () -> cfPing.isDone() ? true : false);
+        webSocket.abort();
+        assertFails(IOE, cfPing);
+        assertFails(IOE, cfText);
+        assertFails(IOE, cfClose);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/PendingPongBinaryClose.java b/test/jdk/java/net/httpclient/websocket/PendingPongBinaryClose.java
new file mode 100644
index 00000000000..f57b33cfa66
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/PendingPongBinaryClose.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *       PendingPongBinaryClose
+ */
+
+// This test produce huge logs (14Mb+) so disable logging by default
+// *      -Djdk.internal.httpclient.debug=true
+// *      -Djdk.internal.httpclient.websocket.debug=true
+
+import org.testng.annotations.Test;
+
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+
+public class PendingPongBinaryClose extends PendingOperations {
+
+    CompletableFuture<WebSocket> cfBinary;
+    CompletableFuture<WebSocket> cfPong;
+    CompletableFuture<WebSocket> cfClose;
+
+    @Test(dataProvider = "booleans")
+    public void pendingPongBinaryClose(boolean last) throws Exception {
+        repeatable( () -> {
+            server = Support.notReadingServer();
+            server.open();
+            webSocket = newHttpClient().newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ByteBuffer data = ByteBuffer.allocate(125);
+            for (int i = 0; ; i++) {  // fill up the send buffer
+                long start = System.currentTimeMillis();
+                System.out.printf("begin cycle #%s at %s%n", i, start);
+                cfPong = webSocket.sendPong(data);
+                try {
+                    cfPong.get(MAX_WAIT_SEC, TimeUnit.SECONDS);
+                    data.clear();
+                } catch (TimeoutException e) {
+                    break;
+                } finally {
+                    long stop = System.currentTimeMillis();
+                    System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+                }
+            }
+            assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125)));
+            assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125)));
+            cfBinary = webSocket.sendBinary(ByteBuffer.allocate(4), last);
+            assertHangs(cfBinary);
+            cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+            assertHangs(cfClose);
+            return null;
+        }, () -> cfPong.isDone() ? true : false);
+        webSocket.abort();
+        assertFails(IOE, cfPong);
+        assertFails(IOE, cfBinary);
+        assertFails(IOE, cfClose);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/PendingPongTextClose.java b/test/jdk/java/net/httpclient/websocket/PendingPongTextClose.java
new file mode 100644
index 00000000000..50e4552a5e8
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/PendingPongTextClose.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *       PendingPongTextClose
+ */
+
+// This test produce huge logs (14Mb+) so disable logging by default
+// *      -Djdk.internal.httpclient.debug=true
+// *      -Djdk.internal.httpclient.websocket.debug=true
+
+import org.testng.annotations.Test;
+
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+
+public class PendingPongTextClose extends PendingOperations {
+
+    CompletableFuture<WebSocket> cfText;
+    CompletableFuture<WebSocket> cfPong;
+    CompletableFuture<WebSocket> cfClose;
+
+    @Test(dataProvider = "booleans")
+    public void pendingPongTextClose(boolean last) throws Exception {
+        repeatable( () -> {
+            server = Support.notReadingServer();
+            server.open();
+            webSocket = newHttpClient().newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ByteBuffer data = ByteBuffer.allocate(125);
+            for (int i = 0; ; i++) {  // fill up the send buffer
+                long start = System.currentTimeMillis();
+                System.out.printf("begin cycle #%s at %s%n", i, start);
+                cfPong = webSocket.sendPong(data);
+                try {
+                    cfPong.get(MAX_WAIT_SEC, TimeUnit.SECONDS);
+                    data.clear();
+                } catch (TimeoutException e) {
+                    break;
+                } finally {
+                    long stop = System.currentTimeMillis();
+                    System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+                }
+            }
+            assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125)));
+            assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125)));
+            cfText = webSocket.sendText("hello", last);
+            assertHangs(cfText);
+            cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+            assertHangs(cfClose);
+            return  null;
+        }, () -> cfPong.isDone() ? true : false);
+        webSocket.abort();
+        assertFails(IOE, cfPong);
+        assertFails(IOE, cfText);
+        assertFails(IOE, cfClose);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/PendingTextPingClose.java b/test/jdk/java/net/httpclient/websocket/PendingTextPingClose.java
new file mode 100644
index 00000000000..439ad31f169
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/PendingTextPingClose.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       PendingTextPingClose
+ */
+
+import org.testng.annotations.Test;
+
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+
+public class PendingTextPingClose extends PendingOperations {
+
+    CompletableFuture<WebSocket> cfText;
+    CompletableFuture<WebSocket> cfPing;
+    CompletableFuture<WebSocket> cfClose;
+
+    @Test(dataProvider = "booleans")
+    public void pendingTextPingClose(boolean last) throws Exception {
+        repeatable(() -> {
+            server = Support.notReadingServer();
+            server.open();
+            webSocket = newHttpClient().newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            CharBuffer data = CharBuffer.allocate(65536);
+            for (int i = 0; ; i++) {  // fill up the send buffer
+                long start = System.currentTimeMillis();
+                System.out.printf("begin cycle #%s at %s%n", i, start);
+                cfText = webSocket.sendText(data, last);
+                try {
+                    cfText.get(MAX_WAIT_SEC, TimeUnit.SECONDS);
+                    data.clear();
+                } catch (TimeoutException e) {
+                    break;
+                } finally {
+                    long stop = System.currentTimeMillis();
+                    System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+                }
+            }
+            assertFails(ISE, webSocket.sendText("", true));
+            assertFails(ISE, webSocket.sendText("", false));
+            assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(0), true));
+            assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(0), false));
+            cfPing = webSocket.sendPing(ByteBuffer.allocate(125));
+            assertHangs(cfPing);
+            assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125)));
+            assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125)));
+            cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+            assertHangs(cfClose);
+            return null;
+        }, () -> cfText.isDone() ? true : false);
+        webSocket.abort();
+        assertFails(IOE, cfText);
+        assertFails(IOE, cfPing);
+        assertFails(IOE, cfClose);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/PendingTextPongClose.java b/test/jdk/java/net/httpclient/websocket/PendingTextPongClose.java
new file mode 100644
index 00000000000..6d13d81dfb2
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/PendingTextPongClose.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       PendingTextPongClose
+ */
+
+import org.testng.annotations.Test;
+
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static java.net.http.HttpClient.newHttpClient;
+
+public class PendingTextPongClose extends PendingOperations {
+
+    CompletableFuture<WebSocket> cfText;
+    CompletableFuture<WebSocket> cfPong;
+    CompletableFuture<WebSocket> cfClose;
+
+    @Test(dataProvider = "booleans")
+    public void pendingTextPongClose(boolean last) throws Exception {
+        repeatable(() -> {
+            server = Support.notReadingServer();
+            server.open();
+            webSocket = newHttpClient().newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            CharBuffer data = CharBuffer.allocate(65536);
+            for (int i = 0; ; i++) {  // fill up the send buffer
+                long start = System.currentTimeMillis();
+                System.out.printf("begin cycle #%s at %s%n", i, start);
+                cfText = webSocket.sendText(data, last);
+                try {
+                    cfText.get(MAX_WAIT_SEC, TimeUnit.SECONDS);
+                    data.clear();
+                } catch (TimeoutException e) {
+                    break;
+                } finally {
+                    long stop = System.currentTimeMillis();
+                    System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start);
+                }
+            }
+            assertFails(ISE, webSocket.sendText("", true));
+            assertFails(ISE, webSocket.sendText("", false));
+            assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(0), true));
+            assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(0), false));
+            cfPong = webSocket.sendPong(ByteBuffer.allocate(125));
+            assertHangs(cfPong);
+            assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125)));
+            assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125)));
+            cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
+            assertHangs(cfClose);
+            return null;
+        }, () -> cfText.isDone() ? true : false);
+        webSocket.abort();
+        assertFails(IOE, cfText);
+        assertFails(IOE, cfPong);
+        assertFails(IOE, cfClose);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/ReaderDriver.java b/test/jdk/java/net/httpclient/websocket/ReaderDriver.java
index d43e48eb088..61829a5a010 100644
--- a/test/jdk/java/net/httpclient/websocket/ReaderDriver.java
+++ b/test/jdk/java/net/httpclient/websocket/ReaderDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8159053
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.websocket:open
- * @run testng/othervm --add-reads jdk.incubator.httpclient=ALL-UNNAMED jdk.incubator.httpclient/jdk.incubator.http.internal.websocket.ReaderTest
+ * @modules java.net.http/jdk.internal.net.http.websocket:open
+ * @run testng/othervm --add-reads java.net.http=ALL-UNNAMED java.net.http/jdk.internal.net.http.websocket.ReaderTest
  */
 public final class ReaderDriver { }
diff --git a/test/jdk/java/net/httpclient/websocket/SendTest.java b/test/jdk/java/net/httpclient/websocket/SendTest.java
new file mode 100644
index 00000000000..f1bce0769e1
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/SendTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       SendTest
+ */
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.http.WebSocket;
+
+import static java.net.http.HttpClient.newHttpClient;
+import static java.net.http.WebSocket.NORMAL_CLOSURE;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
+
+public class SendTest {
+
+    private static final Class<NullPointerException> NPE = NullPointerException.class;
+
+    private DummyWebSocketServer server;
+    private WebSocket webSocket;
+
+    @AfterTest
+    public void cleanup() {
+        server.close();
+        webSocket.abort();
+    }
+
+    @Test
+    public void sendMethodsThrowNPE() throws IOException {
+        server = new DummyWebSocketServer();
+        server.open();
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                .join();
+
+        assertThrows(NPE, () -> webSocket.sendText(null, false));
+        assertThrows(NPE, () -> webSocket.sendText(null, true));
+        assertThrows(NPE, () -> webSocket.sendBinary(null, false));
+        assertThrows(NPE, () -> webSocket.sendBinary(null, true));
+        assertThrows(NPE, () -> webSocket.sendPing(null));
+        assertThrows(NPE, () -> webSocket.sendPong(null));
+        assertThrows(NPE, () -> webSocket.sendClose(NORMAL_CLOSURE, null));
+
+        webSocket.abort();
+
+        assertThrows(NPE, () -> webSocket.sendText(null, false));
+        assertThrows(NPE, () -> webSocket.sendText(null, true));
+        assertThrows(NPE, () -> webSocket.sendBinary(null, false));
+        assertThrows(NPE, () -> webSocket.sendBinary(null, true));
+        assertThrows(NPE, () -> webSocket.sendPing(null));
+        assertThrows(NPE, () -> webSocket.sendPong(null));
+        assertThrows(NPE, () -> webSocket.sendClose(NORMAL_CLOSURE, null));
+    }
+
+    // TODO: request in onClose/onError
+    // TODO: throw exception in onClose/onError
+    // TODO: exception is thrown from request()
+
+    @Test
+    public void sendCloseCompleted() throws IOException {
+        server = new DummyWebSocketServer();
+        server.open();
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                .join();
+        webSocket.sendClose(NORMAL_CLOSURE, "").join();
+        assertTrue(webSocket.isOutputClosed());
+        assertEquals(webSocket.getSubprotocol(), "");
+        webSocket.request(1); // No exceptions must be thrown
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/Support.java b/test/jdk/java/net/httpclient/websocket/Support.java
new file mode 100644
index 00000000000..b76177f170c
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/Support.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2018, 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.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static org.testng.Assert.assertThrows;
+
+public class Support {
+
+    private Support() { }
+
+    public static void assertFails(Class<? extends Throwable> clazz,
+                                    CompletionStage<?> stage) {
+        Support.assertCompletesExceptionally(clazz, stage);
+    }
+
+    public static void assertCompletesExceptionally(Class<? extends Throwable> clazz,
+                                                    CompletionStage<?> stage) {
+        CompletableFuture<?> cf =
+                CompletableFuture.completedFuture(null).thenCompose(x -> stage);
+        assertThrows(clazz, () -> {
+            try {
+                cf.join();
+            } catch (CompletionException e) {
+                throw e.getCause();
+            }
+        });
+    }
+
+    public static void assertHangs(CompletionStage<?> stage) {
+        Support.assertDoesNotCompleteWithin(5, TimeUnit.SECONDS, stage);
+    }
+
+    public static void assertDoesNotCompleteWithin(long timeout,
+                                                   TimeUnit unit,
+                                                   CompletionStage<?> stage) {
+        CompletableFuture<?> cf =
+                CompletableFuture.completedFuture(null).thenCompose(x -> stage);
+        assertThrows(TimeoutException.class, () -> cf.get(timeout, unit));
+    }
+
+    public static ByteBuffer fullCopy(ByteBuffer src) {
+        ByteBuffer copy = ByteBuffer.allocate(src.capacity());
+        int p = src.position();
+        int l = src.limit();
+        src.clear();
+        copy.put(src).position(p).limit(l);
+        src.position(p).limit(l);
+        return copy;
+    }
+
+    public static DummyWebSocketServer serverWithCannedData(int... data) {
+        byte[] copy = new byte[data.length];
+        for (int i = 0; i < data.length; i++) {
+            copy[i] = (byte) data[i];
+        }
+        return serverWithCannedData(copy);
+    }
+
+    public static DummyWebSocketServer serverWithCannedData(byte... data) {
+        byte[] copy = Arrays.copyOf(data, data.length);
+        return new DummyWebSocketServer() {
+            @Override
+            protected void write(SocketChannel ch) throws IOException {
+                int off = 0; int n = 1; // 1 byte at a time
+                while (off + n < copy.length + n) {
+//                    try {
+//                        TimeUnit.MICROSECONDS.sleep(500);
+//                    } catch (InterruptedException e) {
+//                        return;
+//                    }
+                    int len = Math.min(copy.length - off, n);
+                    ByteBuffer bytes = ByteBuffer.wrap(copy, off, len);
+                    off += len;
+                    ch.write(bytes);
+                }
+                super.write(ch);
+            }
+        };
+    }
+
+    /*
+     * This server does not read from the wire, allowing its client to fill up
+     * their send buffer. Used to test scenarios with outstanding send
+     * operations.
+     */
+    public static DummyWebSocketServer notReadingServer() {
+        return new DummyWebSocketServer() {
+            @Override
+            protected void read(SocketChannel ch) throws IOException {
+                try {
+                    Thread.sleep(Long.MAX_VALUE);
+                } catch (InterruptedException e) {
+                    throw new IOException(e);
+                }
+            }
+        };
+    }
+
+    public static DummyWebSocketServer writingServer(int... data) {
+        byte[] copy = new byte[data.length];
+        for (int i = 0; i < data.length; i++) {
+            copy[i] = (byte) data[i];
+        }
+        return new DummyWebSocketServer() {
+
+            @Override
+            protected void read(SocketChannel ch) throws IOException {
+                try {
+                    Thread.sleep(Long.MAX_VALUE);
+                } catch (InterruptedException e) {
+                    throw new IOException(e);
+                }
+            }
+
+            @Override
+            protected void write(SocketChannel ch) throws IOException {
+                int off = 0; int n = 1; // 1 byte at a time
+                while (off + n < copy.length + n) {
+//                    try {
+//                        TimeUnit.MICROSECONDS.sleep(500);
+//                    } catch (InterruptedException e) {
+//                        return;
+//                    }
+                    int len = Math.min(copy.length - off, n);
+                    ByteBuffer bytes = ByteBuffer.wrap(copy, off, len);
+                    off += len;
+                    ch.write(bytes);
+                }
+                super.write(ch);
+            }
+        };
+
+    }
+
+    public static String stringWith2NBytes(int n) {
+        // -- Russian Alphabet (33 characters, 2 bytes per char) --
+        char[] abc = {
+                0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, 0x0416,
+                0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
+                0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426,
+                0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E,
+                0x042F,
+        };
+        // repeat cyclically
+        StringBuilder sb = new StringBuilder(n);
+        for (int i = 0, j = 0; i < n; i++, j = (j + 1) % abc.length) {
+            sb.append(abc[j]);
+        }
+        String s = sb.toString();
+        assert s.length() == n && s.getBytes(StandardCharsets.UTF_8).length == 2 * n;
+        return s;
+    }
+
+    public static String malformedString() {
+        return new String(new char[]{0xDC00, 0xD800});
+    }
+
+    public static String incompleteString() {
+        return new String(new char[]{0xD800});
+    }
+
+    public static String stringWithNBytes(int n) {
+        char[] chars = new char[n];
+        Arrays.fill(chars, 'A');
+        return new String(chars);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/WSHandshakeException.java b/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java
similarity index 69%
rename from test/jdk/java/net/httpclient/websocket/WSHandshakeException.java
rename to test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java
index eebd38e87fc..b27906f64a0 100644
--- a/test/jdk/java/net/httpclient/websocket/WSHandshakeException.java
+++ b/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -26,33 +26,36 @@
  * @summary Basic test for WebSocketHandshakeException
  * @library /lib/testlibrary
  * @build jdk.testlibrary.SimpleSSLContext
- * @modules jdk.incubator.httpclient
+ * @modules java.net.http
  *          jdk.httpserver
- * @run testng/othervm WSHandshakeException
+ * @run testng/othervm -Djdk.internal.httpclient.debug=true WSHandshakeExceptionTest
  */
-;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.incubator.http.HttpClient;
-import javax.net.ssl.SSLContext;
-import jdk.incubator.http.WebSocket;
-import jdk.incubator.http.WebSocketHandshakeException;
+
+import java.net.InetAddress;
+import java.net.http.HttpClient;
+import java.net.http.WebSocket;
+import java.net.http.WebSocketHandshakeException;
 import jdk.testlibrary.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
+import javax.net.ssl.SSLContext;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.fail;
-import static org.testng.Assert.assertTrue;
 
-public class WSHandshakeException {
+public class WSHandshakeExceptionTest {
 
     SSLContext sslContext;
     HttpServer httpTestServer;         // HTTP/1.1    [ 2 servers ]
@@ -60,10 +63,9 @@ public class WSHandshakeException {
     String httpURI;
     String httpsURI;
 
-
     static final int ITERATION_COUNT = 10;
     // a shared executor helps reduce the amount of threads created by the test
-    static final Executor executor = Executors.newCachedThreadPool();
+    static final ExecutorService executor = Executors.newCachedThreadPool();
 
     @DataProvider(name = "variants")
     public Object[][] variants() {
@@ -83,9 +85,10 @@ HttpClient newHttpClient() {
     }
 
     @Test(dataProvider = "variants")
-    public void test(String uri, boolean sameClient) throws Exception {
+    public void test(String uri, boolean sameClient) {
         HttpClient client = null;
-        for (int i=0; i< ITERATION_COUNT; i++) {
+        for (int i = 0; i < ITERATION_COUNT; i++) {
+            System.out.printf("iteration %s%n", i);
             if (!sameClient || client == null)
                 client = newHttpClient();
 
@@ -95,15 +98,17 @@ public void test(String uri, boolean sameClient) throws Exception {
                       .join();
                 fail("Expected to throw");
             } catch (CompletionException ce) {
-                Throwable t = ce.getCause();
-                assertTrue(t instanceof WebSocketHandshakeException);
+                Throwable t = getCompletionCause(ce);
+                if (!(t instanceof WebSocketHandshakeException)) {
+                    throw new AssertionError("Unexpected exception", t);
+                }
                 WebSocketHandshakeException wse = (WebSocketHandshakeException) t;
+                assertNotNull(wse.getResponse());
                 assertEquals(wse.getResponse().statusCode(), 404);
             }
         }
     }
 
-
     @BeforeTest
     public void setup() throws Exception {
         sslContext = new SimpleSSLContext().get();
@@ -111,21 +116,32 @@ public void setup() throws Exception {
             throw new AssertionError("Unexpected null sslContext");
 
         // HTTP/1.1
-        InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+        InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
-        httpURI = "ws://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/";
+        httpURI = "ws://localhost:" + httpTestServer.getAddress().getPort() + "/";
 
         httpsTestServer = HttpsServer.create(sa, 0);
         httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
-        httpsURI = "wss://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/";
+        httpsURI = "wss://localhost:" + httpsTestServer.getAddress().getPort() + "/";
 
         httpTestServer.start();
         httpsTestServer.start();
     }
 
     @AfterTest
-    public void teardown() throws Exception {
+    public void teardown() {
         httpTestServer.stop(0);
         httpsTestServer.stop(0);
+        executor.shutdownNow();
+    }
+
+    private static Throwable getCompletionCause(Throwable x) {
+        if (!(x instanceof CompletionException)
+                && !(x instanceof ExecutionException)) return x;
+        final Throwable cause = x.getCause();
+        if (cause == null) {
+            throw new InternalError("Unexpected null cause", x);
+        }
+        return cause;
     }
 }
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java b/test/jdk/java/net/httpclient/websocket/WebSocketBuilderTest.java
similarity index 74%
rename from test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java
rename to test/jdk/java/net/httpclient/websocket/WebSocketBuilderTest.java
index 852c903da90..6fb94a9fa2e 100644
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java
+++ b/test/jdk/java/net/httpclient/websocket/WebSocketBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -21,14 +21,18 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+/*
+ * @test
+ * @bug 8159053
+ * @run testng/othervm WebSocketBuilderTest
+ */
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.net.URI;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.WebSocket;
+import java.net.http.HttpClient;
+import java.net.http.WebSocket;
 import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
@@ -36,15 +40,14 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static jdk.incubator.http.internal.websocket.TestSupport.assertCompletesExceptionally;
-import static jdk.incubator.http.internal.websocket.TestSupport.assertThrows;
+import static org.testng.Assert.assertThrows;
 
 /*
- * In some places in this class a new String is created out of a string literal.
+ * In some places in this test a new String is created out of a string literal.
  * The idea is to make sure the code under test relies on something better than
  * the reference equality ( == ) for string equality checks.
  */
-public class BuildingWebSocketTest {
+public final class WebSocketBuilderTest {
 
     private final static URI VALID_URI = URI.create("ws://websocket.example.com");
 
@@ -54,50 +57,50 @@ public void nullArguments() {
 
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .buildAsync(null, listener()));
+                             .buildAsync(null, listener()));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .buildAsync(VALID_URI, null));
+                             .buildAsync(VALID_URI, null));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .buildAsync(null, null));
+                             .buildAsync(null, null));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .header(null, "value"));
+                             .header(null, "value"));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .header("name", null));
+                             .header("name", null));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .header(null, null));
+                             .header(null, null));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .subprotocols(null));
+                             .subprotocols(null));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .subprotocols(null, "sub2.example.com"));
+                             .subprotocols(null, "sub2.example.com"));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .subprotocols("sub1.example.com", (String) null));
+                             .subprotocols("sub1.example.com", (String) null));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .subprotocols("sub1.example.com", (String[]) null));
+                             .subprotocols("sub1.example.com", (String[]) null));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .subprotocols("sub1.example.com", "sub2.example.com", null));
+                             .subprotocols("sub1.example.com", "sub2.example.com", null));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
                              .subprotocols("sub1.example.com", null, "sub3.example.com"));
         assertThrows(NullPointerException.class,
                      () -> c.newWebSocketBuilder()
-                            .connectTimeout(null));
+                             .connectTimeout(null));
     }
 
     @Test(dataProvider = "badURIs")
     void illegalURI(URI uri) {
         WebSocket.Builder b = HttpClient.newHttpClient().newWebSocketBuilder();
-        assertCompletesExceptionally(IllegalArgumentException.class,
-                                     b.buildAsync(uri, listener()));
+        assertFails(IllegalArgumentException.class,
+                    b.buildAsync(uri, listener()));
     }
 
     @Test
@@ -118,7 +121,7 @@ public void illegalHeaders() {
                         .header(header, "value")
                         .buildAsync(VALID_URI, listener());
 
-        headers.forEach(h -> assertCompletesExceptionally(IllegalArgumentException.class, f.apply(h)));
+        headers.forEach(h -> assertFails(IllegalArgumentException.class, f.apply(h)));
     }
 
     // TODO: test for bad syntax headers
@@ -129,8 +132,8 @@ public void illegalSubprotocolsSyntax(String s) {
         WebSocket.Builder b = HttpClient.newHttpClient()
                 .newWebSocketBuilder()
                 .subprotocols(s);
-        assertCompletesExceptionally(IllegalArgumentException.class,
-                                     b.buildAsync(VALID_URI, listener()));
+        assertFails(IllegalArgumentException.class,
+                    b.buildAsync(VALID_URI, listener()));
     }
 
     @Test(dataProvider = "duplicatingSubprotocols")
@@ -139,8 +142,8 @@ public void illegalSubprotocolsDuplicates(String mostPreferred,
         WebSocket.Builder b = HttpClient.newHttpClient()
                 .newWebSocketBuilder()
                 .subprotocols(mostPreferred, lesserPreferred);
-        assertCompletesExceptionally(IllegalArgumentException.class,
-                                     b.buildAsync(VALID_URI, listener()));
+        assertFails(IllegalArgumentException.class,
+                    b.buildAsync(VALID_URI, listener()));
     }
 
     @Test(dataProvider = "badConnectTimeouts")
@@ -148,8 +151,8 @@ public void illegalConnectTimeout(Duration d) {
         WebSocket.Builder b = HttpClient.newHttpClient()
                 .newWebSocketBuilder()
                 .connectTimeout(d);
-        assertCompletesExceptionally(IllegalArgumentException.class,
-                                     b.buildAsync(VALID_URI, listener()));
+        assertFails(IllegalArgumentException.class,
+                    b.buildAsync(VALID_URI, listener()));
     }
 
     @DataProvider
@@ -165,18 +168,18 @@ public Object[][] badURIs() {
     @DataProvider
     public Object[][] badConnectTimeouts() {
         return new Object[][]{
-                {Duration.ofDays   ( 0)},
-                {Duration.ofDays   (-1)},
-                {Duration.ofHours  ( 0)},
-                {Duration.ofHours  (-1)},
-                {Duration.ofMinutes( 0)},
+                {Duration.ofDays(0)},
+                {Duration.ofDays(-1)},
+                {Duration.ofHours(0)},
+                {Duration.ofHours(-1)},
+                {Duration.ofMinutes(0)},
                 {Duration.ofMinutes(-1)},
-                {Duration.ofSeconds( 0)},
+                {Duration.ofSeconds(0)},
                 {Duration.ofSeconds(-1)},
-                {Duration.ofMillis ( 0)},
-                {Duration.ofMillis (-1)},
-                {Duration.ofNanos  ( 0)},
-                {Duration.ofNanos  (-1)},
+                {Duration.ofMillis(0)},
+                {Duration.ofMillis(-1)},
+                {Duration.ofNanos(0)},
+                {Duration.ofNanos(-1)},
                 {Duration.ZERO},
         };
     }
@@ -222,4 +225,10 @@ public static Object[][] duplicatingSubprotocols() {
     private static WebSocket.Listener listener() {
         return new WebSocket.Listener() { };
     }
+
+    /* shortcut */
+    public static void assertFails(Class<? extends Throwable> clazz,
+                                   CompletionStage<?> stage) {
+        Support.assertCompletesExceptionally(clazz, stage);
+    }
 }
diff --git a/test/jdk/java/net/httpclient/websocket/WebSocketExtendedTest.java b/test/jdk/java/net/httpclient/websocket/WebSocketExtendedTest.java
new file mode 100644
index 00000000000..f297771f419
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/WebSocketExtendedTest.java
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8159053
+ *
+ *
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.httpclient.websocket.writeBufferSize=1024
+ *      -Djdk.httpclient.websocket.intermediateBufferSize=2048 WebSocketExtendedTest
+ */
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import static java.net.http.HttpClient.newHttpClient;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+
+/*
+ * This battery of tests exercises sending data (Text/Binary) messages with
+ * possible fragmentation.
+ */
+public class WebSocketExtendedTest {
+// * run testng/othervm
+// *      -Djdk.httpclient.websocket.writeBufferSize=16
+// *      -Djdk.httpclient.sendBufferSize=32 WebSocketTextTest
+
+    private final static Random random;
+    static {
+        long seed = System.currentTimeMillis();
+        System.out.println("seed=" + seed);
+        random = new Random(seed);
+    }
+
+    // FIXME ensure subsequent (sendText/Binary, false) only CONTINUATIONs
+
+    @Test(dataProvider = "binary")
+    public void binary(ByteBuffer expected) throws IOException, InterruptedException {
+        try (DummyWebSocketServer server = new DummyWebSocketServer()) {
+            server.open();
+            WebSocket ws = newHttpClient()
+                    .newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ws.sendBinary(expected.duplicate(), true).join();
+            ws.abort();
+            ByteBuffer data = server.read();
+            List<Frame> frames = readFrames(data);
+            assertEquals(frames.size(), 1);
+            Frame f = frames.get(0);
+            assertTrue(f.last);
+            assertEquals(f.opcode, Frame.Opcode.BINARY);
+            assertEquals(f.data, expected);
+        }
+    }
+
+    private static List<Frame> readFrames(ByteBuffer src) {
+        List<Frame> frames = new ArrayList<>();
+        Frame.Consumer consumer = new Frame.Consumer() {
+
+            ByteBuffer data;
+            Frame.Opcode opcode;
+            Frame.Masker masker = new Frame.Masker();
+            boolean last;
+
+            @Override
+            public void fin(boolean value) {
+                last = value;
+            }
+
+            @Override
+            public void rsv1(boolean value) {
+                if (value) {
+                    throw new AssertionError();
+                }
+            }
+
+            @Override
+            public void rsv2(boolean value) {
+                if (value) {
+                    throw new AssertionError();
+                }
+            }
+
+            @Override
+            public void rsv3(boolean value) {
+                if (value) {
+                    throw new AssertionError();
+                }
+            }
+
+            @Override
+            public void opcode(Frame.Opcode value) {
+                opcode = value;
+            }
+
+            @Override
+            public void mask(boolean value) {
+                if (!value) { // Frames from the client MUST be masked
+                    throw new AssertionError();
+                }
+            }
+
+            @Override
+            public void payloadLen(long value) {
+                data = ByteBuffer.allocate((int) value);
+            }
+
+            @Override
+            public void maskingKey(int value) {
+                masker.mask(value);
+            }
+
+            @Override
+            public void payloadData(ByteBuffer data) {
+                masker.transferMasking(data, this.data);
+            }
+
+            @Override
+            public void endFrame() {
+                frames.add(new Frame(opcode, this.data.flip(), last));
+            }
+        };
+
+        Frame.Reader r = new Frame.Reader();
+        while (src.hasRemaining()) {
+            r.readFrame(src, consumer);
+        }
+        return frames;
+    }
+
+    @Test(dataProvider = "pingPong")
+    public void ping(ByteBuffer expected) throws Exception {
+        try (DummyWebSocketServer server = new DummyWebSocketServer()) {
+            server.open();
+            WebSocket ws = newHttpClient()
+                    .newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ws.sendPing(expected.duplicate()).join();
+            ws.abort();
+            ByteBuffer data = server.read();
+            List<Frame> frames = readFrames(data);
+            assertEquals(frames.size(), 1);
+            Frame f = frames.get(0);
+            assertEquals(f.opcode, Frame.Opcode.PING);
+            ByteBuffer actual = ByteBuffer.allocate(expected.remaining());
+            actual.put(f.data);
+            actual.flip();
+            assertEquals(actual, expected);
+        }
+    }
+
+    @Test(dataProvider = "pingPong")
+    public void pong(ByteBuffer expected) throws Exception {
+        try (DummyWebSocketServer server = new DummyWebSocketServer()) {
+            server.open();
+            WebSocket ws = newHttpClient()
+                    .newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ws.sendPong(expected.duplicate()).join();
+            ws.abort();
+            ByteBuffer data = server.read();
+            List<Frame> frames = readFrames(data);
+            assertEquals(frames.size(), 1);
+            Frame f = frames.get(0);
+            assertEquals(f.opcode, Frame.Opcode.PONG);
+            ByteBuffer actual = ByteBuffer.allocate(expected.remaining());
+            actual.put(f.data);
+            actual.flip();
+            assertEquals(actual, expected);
+        }
+    }
+
+    @Test(dataProvider = "close")
+    public void close(int statusCode, String reason) throws Exception {
+        try (DummyWebSocketServer server = new DummyWebSocketServer()) {
+            server.open();
+            WebSocket ws = newHttpClient()
+                    .newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ws.sendClose(statusCode, reason).join();
+            ws.abort();
+            ByteBuffer data = server.read();
+            List<Frame> frames = readFrames(data);
+            assertEquals(frames.size(), 1);
+            Frame f = frames.get(0);
+            assertEquals(f.opcode, Frame.Opcode.CLOSE);
+            ByteBuffer actual = ByteBuffer.allocate(Frame.MAX_CONTROL_FRAME_PAYLOAD_SIZE);
+            actual.put(f.data);
+            actual.flip();
+            assertEquals(actual.getChar(), statusCode);
+            assertEquals(StandardCharsets.UTF_8.decode(actual).toString(), reason);
+        }
+    }
+
+    @Test(dataProvider = "text")
+    public void text(String expected) throws Exception {
+        try (DummyWebSocketServer server = new DummyWebSocketServer()) {
+            server.open();
+            WebSocket ws = newHttpClient()
+                    .newWebSocketBuilder()
+                    .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                    .join();
+            ws.sendText(expected, true).join();
+            ws.abort();
+            ByteBuffer data = server.read();
+            List<Frame> frames = readFrames(data);
+
+            int maxBytes = (int) StandardCharsets.UTF_8.newEncoder().maxBytesPerChar() * expected.length();
+            ByteBuffer actual = ByteBuffer.allocate(maxBytes);
+            frames.stream().forEachOrdered(f -> actual.put(f.data));
+            actual.flip();
+            assertEquals(StandardCharsets.UTF_8.decode(actual).toString(), expected);
+        }
+    }
+
+    @DataProvider(name = "pingPong")
+    public Object[][] pingPongSizes() {
+        return new Object[][]{
+                {bytes(  0)},
+                {bytes(  1)},
+                {bytes( 63)},
+                {bytes(125)},
+        };
+    }
+
+    @DataProvider(name = "close")
+    public Object[][] closeArguments() {
+        return new Object[][]{
+                {WebSocket.NORMAL_CLOSURE, utf8String( 0)},
+                {WebSocket.NORMAL_CLOSURE, utf8String( 1)},
+                // 123 / 3 = max reason bytes / max bytes per char
+                {WebSocket.NORMAL_CLOSURE, utf8String(41)},
+        };
+    }
+
+    private static String utf8String(int n) {
+        char[] abc = {
+                // -- English Alphabet (26 characters, 1 byte per char) --
+                0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
+                0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050,
+                0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
+                0x0059, 0x005A,
+                // -- Russian Alphabet (33 characters, 2 bytes per char) --
+                0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, 0x0416,
+                0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
+                0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426,
+                0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E,
+                0x042F,
+                // -- Hiragana base characters (46 characters, 3 bytes per char) --
+                0x3042, 0x3044, 0x3046, 0x3048, 0x304A, 0x304B, 0x304D, 0x304F,
+                0x3051, 0x3053, 0x3055, 0x3057, 0x3059, 0x305B, 0x305D, 0x305F,
+                0x3061, 0x3064, 0x3066, 0x3068, 0x306A, 0x306B, 0x306C, 0x306D,
+                0x306E, 0x306F, 0x3072, 0x3075, 0x3078, 0x307B, 0x307E, 0x307F,
+                0x3080, 0x3081, 0x3082, 0x3084, 0x3086, 0x3088, 0x3089, 0x308A,
+                0x308B, 0x308C, 0x308D, 0x308F, 0x3092, 0x3093,
+        };
+
+        assert new String(abc).getBytes(StandardCharsets.UTF_8).length > abc.length;
+
+        StringBuilder str = new StringBuilder(n);
+        random.ints(0, abc.length).limit(n).forEach(i -> str.append(abc[i]));
+        return str.toString();
+    }
+
+    @DataProvider(name = "text")
+    public Object[][] texts() {
+        return new Object[][]{
+                {utf8String(   0)},
+                {utf8String(1024)},
+        };
+    }
+
+    @DataProvider(name = "binary")
+    public Object[][] binary() {
+        return new Object[][]{
+                {bytes(   0)},
+                {bytes(1024)},
+        };
+    }
+
+    private static ByteBuffer bytes(int n) {
+        byte[] array = new byte[n];
+        random.nextBytes(array);
+        return ByteBuffer.wrap(array);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/WebSocketTest.java b/test/jdk/java/net/httpclient/websocket/WebSocketTest.java
new file mode 100644
index 00000000000..0821ac575e3
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/WebSocketTest.java
@@ -0,0 +1,510 @@
+/*
+ * Copyright (c) 2018, 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
+ * @build DummyWebSocketServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.websocket.debug=true
+ *       WebSocketTest
+ */
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.http.WebSocket;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static java.net.http.HttpClient.newHttpClient;
+import static java.net.http.WebSocket.NORMAL_CLOSURE;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+
+public class WebSocketTest {
+
+    private static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
+    private static final Class<IllegalStateException> ISE = IllegalStateException.class;
+    private static final Class<IOException> IOE = IOException.class;
+
+    /* shortcut */
+    private static void assertFails(Class<? extends Throwable> clazz,
+                                    CompletionStage<?> stage) {
+        Support.assertCompletesExceptionally(clazz, stage);
+    }
+
+    private DummyWebSocketServer server;
+    private WebSocket webSocket;
+
+    @AfterTest
+    public void cleanup() {
+        server.close();
+        webSocket.abort();
+    }
+
+    @Test
+    public void illegalArgument() throws IOException {
+        server = new DummyWebSocketServer();
+        server.open();
+        webSocket = newHttpClient()
+                .newWebSocketBuilder()
+                .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                .join();
+
+        assertFails(IAE, webSocket.sendPing(ByteBuffer.allocate(126)));
+        assertFails(IAE, webSocket.sendPing(ByteBuffer.allocate(127)));
+        assertFails(IAE, webSocket.sendPing(ByteBuffer.allocate(128)));
+        assertFails(IAE, webSocket.sendPing(ByteBuffer.allocate(129)));
+        assertFails(IAE, webSocket.sendPing(ByteBuffer.allocate(256)));
+
+        assertFails(IAE, webSocket.sendPong(ByteBuffer.allocate(126)));
+        assertFails(IAE, webSocket.sendPong(ByteBuffer.allocate(127)));
+        assertFails(IAE, webSocket.sendPong(ByteBuffer.allocate(128)));
+        assertFails(IAE, webSocket.sendPong(ByteBuffer.allocate(129)));
+        assertFails(IAE, webSocket.sendPong(ByteBuffer.allocate(256)));
+
+        assertFails(IOE, webSocket.sendText(Support.incompleteString(), true));
+        assertFails(IOE, webSocket.sendText(Support.incompleteString(), false));
+        assertFails(IOE, webSocket.sendText(Support.malformedString(), true));
+        assertFails(IOE, webSocket.sendText(Support.malformedString(), false));
+
+        assertFails(IAE, webSocket.sendClose(NORMAL_CLOSURE, Support.stringWithNBytes(124)));
+        assertFails(IAE, webSocket.sendClose(NORMAL_CLOSURE, Support.stringWithNBytes(125)));
+        assertFails(IAE, webSocket.sendClose(NORMAL_CLOSURE, Support.stringWithNBytes(128)));
+        assertFails(IAE, webSocket.sendClose(NORMAL_CLOSURE, Support.stringWithNBytes(256)));
+        assertFails(IAE, webSocket.sendClose(NORMAL_CLOSURE, Support.stringWithNBytes(257)));
+        assertFails(IAE, webSocket.sendClose(NORMAL_CLOSURE, Support.stringWith2NBytes((123 / 2) + 1)));
+        assertFails(IAE, webSocket.sendClose(NORMAL_CLOSURE, Support.malformedString()));
+        assertFails(IAE, webSocket.sendClose(NORMAL_CLOSURE, Support.incompleteString()));
+
+        assertFails(IAE, webSocket.sendClose(-2, "a reason"));
+        assertFails(IAE, webSocket.sendClose(-1, "a reason"));
+        assertFails(IAE, webSocket.sendClose(0, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1, "a reason"));
+        assertFails(IAE, webSocket.sendClose(500, "a reason"));
+        assertFails(IAE, webSocket.sendClose(998, "a reason"));
+        assertFails(IAE, webSocket.sendClose(999, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1002, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1003, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1006, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1007, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1009, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1010, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1012, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1013, "a reason"));
+        assertFails(IAE, webSocket.sendClose(1015, "a reason"));
+        assertFails(IAE, webSocket.sendClose(5000, "a reason"));
+        assertFails(IAE, webSocket.sendClose(32768, "a reason"));
+        assertFails(IAE, webSocket.sendClose(65535, "a reason"));
+        assertFails(IAE, webSocket.sendClose(65536, "a reason"));
+        assertFails(IAE, webSocket.sendClose(Integer.MAX_VALUE, "a reason"));
+        assertFails(IAE, webSocket.sendClose(Integer.MIN_VALUE, "a reason"));
+
+        assertThrows(IAE, () -> webSocket.request(Integer.MIN_VALUE));
+        assertThrows(IAE, () -> webSocket.request(Long.MIN_VALUE));
+        assertThrows(IAE, () -> webSocket.request(-1));
+        assertThrows(IAE, () -> webSocket.request(0));
+    }
+
+    @Test
+    public void partialBinaryThenText() throws IOException {
+        server = new DummyWebSocketServer();
+        server.open();
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                .join();
+        webSocket.sendBinary(ByteBuffer.allocate(16), false).join();
+        assertFails(ISE, webSocket.sendText("text", false));
+        assertFails(ISE, webSocket.sendText("text", true));
+        // Pings & Pongs are fine
+        webSocket.sendPing(ByteBuffer.allocate(125)).join();
+        webSocket.sendPong(ByteBuffer.allocate(125)).join();
+    }
+
+    @Test
+    public void partialTextThenBinary() throws IOException {
+        server = new DummyWebSocketServer();
+        server.open();
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                .join();
+
+        webSocket.sendText("text", false).join();
+        assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(16), false));
+        assertFails(ISE, webSocket.sendBinary(ByteBuffer.allocate(16), true));
+        // Pings & Pongs are fine
+        webSocket.sendPing(ByteBuffer.allocate(125)).join();
+        webSocket.sendPong(ByteBuffer.allocate(125)).join();
+    }
+
+    @Test
+    public void sendMethodsThrowIOE1() throws IOException {
+        server = new DummyWebSocketServer();
+        server.open();
+        webSocket = newHttpClient()
+                .newWebSocketBuilder()
+                .buildAsync(server.getURI(), new WebSocket.Listener() { })
+                .join();
+
+        webSocket.sendClose(NORMAL_CLOSURE, "ok").join();
+
+        assertFails(IOE, webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"));
+
+        assertFails(IOE, webSocket.sendText("", true));
+        assertFails(IOE, webSocket.sendText("", false));
+        assertFails(IOE, webSocket.sendText("abc", true));
+        assertFails(IOE, webSocket.sendText("abc", false));
+        assertFails(IOE, webSocket.sendBinary(ByteBuffer.allocate(0), true));
+        assertFails(IOE, webSocket.sendBinary(ByteBuffer.allocate(0), false));
+        assertFails(IOE, webSocket.sendBinary(ByteBuffer.allocate(1), true));
+        assertFails(IOE, webSocket.sendBinary(ByteBuffer.allocate(1), false));
+
+        assertFails(IOE, webSocket.sendPing(ByteBuffer.allocate(125)));
+        assertFails(IOE, webSocket.sendPing(ByteBuffer.allocate(124)));
+        assertFails(IOE, webSocket.sendPing(ByteBuffer.allocate(1)));
+        assertFails(IOE, webSocket.sendPing(ByteBuffer.allocate(0)));
+
+        assertFails(IOE, webSocket.sendPong(ByteBuffer.allocate(125)));
+        assertFails(IOE, webSocket.sendPong(ByteBuffer.allocate(124)));
+        assertFails(IOE, webSocket.sendPong(ByteBuffer.allocate(1)));
+        assertFails(IOE, webSocket.sendPong(ByteBuffer.allocate(0)));
+    }
+
+    @Test
+    public void sendMethodsThrowIOE2() throws Exception {
+        server = Support.serverWithCannedData(0x88, 0x00);
+        server.open();
+        CompletableFuture<Void> onCloseCalled = new CompletableFuture<>();
+        CompletableFuture<Void> canClose = new CompletableFuture<>();
+
+        WebSocket.Listener listener = new WebSocket.Listener() {
+            @Override
+            public CompletionStage<?> onClose(WebSocket webSocket,
+                                              int statusCode,
+                                              String reason) {
+                System.out.printf("onClose(%s, '%s')%n", statusCode, reason);
+                onCloseCalled.complete(null);
+                return canClose;
+            }
+
+            @Override
+            public void onError(WebSocket webSocket, Throwable error) {
+                System.out.println("onError(" + error + ")");
+                onCloseCalled.completeExceptionally(error);
+            }
+        };
+
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+
+        onCloseCalled.join();      // Wait for onClose to be called
+        canClose.complete(null);   // Signal to the WebSocket it can close the output
+        TimeUnit.SECONDS.sleep(5); // Give canClose some time to reach the WebSocket
+
+        assertFails(IOE, webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"));
+
+        assertFails(IOE, webSocket.sendText("", true));
+        assertFails(IOE, webSocket.sendText("", false));
+        assertFails(IOE, webSocket.sendText("abc", true));
+        assertFails(IOE, webSocket.sendText("abc", false));
+        assertFails(IOE, webSocket.sendBinary(ByteBuffer.allocate(0), true));
+        assertFails(IOE, webSocket.sendBinary(ByteBuffer.allocate(0), false));
+        assertFails(IOE, webSocket.sendBinary(ByteBuffer.allocate(1), true));
+        assertFails(IOE, webSocket.sendBinary(ByteBuffer.allocate(1), false));
+
+        assertFails(IOE, webSocket.sendPing(ByteBuffer.allocate(125)));
+        assertFails(IOE, webSocket.sendPing(ByteBuffer.allocate(124)));
+        assertFails(IOE, webSocket.sendPing(ByteBuffer.allocate(1)));
+        assertFails(IOE, webSocket.sendPing(ByteBuffer.allocate(0)));
+
+        assertFails(IOE, webSocket.sendPong(ByteBuffer.allocate(125)));
+        assertFails(IOE, webSocket.sendPong(ByteBuffer.allocate(124)));
+        assertFails(IOE, webSocket.sendPong(ByteBuffer.allocate(1)));
+        assertFails(IOE, webSocket.sendPong(ByteBuffer.allocate(0)));
+    }
+
+    @Test
+    public void simpleAggregatingBinaryMessages() throws IOException {
+        List<byte[]> expected = List.of("alpha", "beta", "gamma", "delta")
+                .stream()
+                .map(s -> s.getBytes(StandardCharsets.US_ASCII))
+                .collect(Collectors.toList());
+        int[] binary = new int[]{
+                0x82, 0x05, 0x61, 0x6c, 0x70, 0x68, 0x61, // [alpha]
+                0x02, 0x02, 0x62, 0x65,                   // [be
+                0x80, 0x02, 0x74, 0x61,                   // ta]
+                0x02, 0x01, 0x67,                         // [g
+                0x00, 0x01, 0x61,                         // a
+                0x00, 0x00,                               //
+                0x00, 0x00,                               //
+                0x00, 0x01, 0x6d,                         // m
+                0x00, 0x01, 0x6d,                         // m
+                0x80, 0x01, 0x61,                         // a]
+                0x8a, 0x00,                               // <PONG>
+                0x02, 0x04, 0x64, 0x65, 0x6c, 0x74,       // [delt
+                0x00, 0x01, 0x61,                         // a
+                0x80, 0x00,                               // ]
+                0x88, 0x00                                // <CLOSE>
+        };
+        CompletableFuture<List<byte[]>> actual = new CompletableFuture<>();
+
+        server = Support.serverWithCannedData(binary);
+        server.open();
+
+        WebSocket.Listener listener = new WebSocket.Listener() {
+
+            List<byte[]> collectedBytes = new ArrayList<>();
+            ByteBuffer buffer = ByteBuffer.allocate(1024);
+
+            @Override
+            public CompletionStage<?> onBinary(WebSocket webSocket,
+                                               ByteBuffer message,
+                                               boolean last) {
+                System.out.printf("onBinary(%s, %s)%n", message, last);
+                webSocket.request(1);
+
+                append(message);
+                if (last) {
+                    buffer.flip();
+                    byte[] bytes = new byte[buffer.remaining()];
+                    buffer.get(bytes);
+                    buffer.clear();
+                    processWholeBinary(bytes);
+                }
+                return null;
+            }
+
+            private void append(ByteBuffer message) {
+                if (buffer.remaining() < message.remaining()) {
+                    assert message.remaining() > 0;
+                    int cap = (buffer.capacity() + message.remaining()) * 2;
+                    ByteBuffer b = ByteBuffer.allocate(cap);
+                    b.put(buffer.flip());
+                    buffer = b;
+                }
+                buffer.put(message);
+            }
+
+            private void processWholeBinary(byte[] bytes) {
+                String stringBytes = new String(bytes, StandardCharsets.UTF_8);
+                System.out.println("processWholeBinary: " + stringBytes);
+                collectedBytes.add(bytes);
+            }
+
+            @Override
+            public CompletionStage<?> onClose(WebSocket webSocket,
+                                              int statusCode,
+                                              String reason) {
+                actual.complete(collectedBytes);
+                return null;
+            }
+
+            @Override
+            public void onError(WebSocket webSocket, Throwable error) {
+                actual.completeExceptionally(error);
+            }
+        };
+
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+
+        List<byte[]> a = actual.join();
+        assertEquals(a, expected);
+    }
+
+    @Test
+    public void simpleAggregatingTextMessages() throws IOException {
+
+        List<String> expected = List.of("alpha", "beta", "gamma", "delta");
+
+        int[] binary = new int[]{
+                0x81, 0x05, 0x61, 0x6c, 0x70, 0x68, 0x61, // "alpha"
+                0x01, 0x02, 0x62, 0x65,                   // "be
+                0x80, 0x02, 0x74, 0x61,                   // ta"
+                0x01, 0x01, 0x67,                         // "g
+                0x00, 0x01, 0x61,                         // a
+                0x00, 0x00,                               //
+                0x00, 0x00,                               //
+                0x00, 0x01, 0x6d,                         // m
+                0x00, 0x01, 0x6d,                         // m
+                0x80, 0x01, 0x61,                         // a"
+                0x8a, 0x00,                               // <PONG>
+                0x01, 0x04, 0x64, 0x65, 0x6c, 0x74,       // "delt
+                0x00, 0x01, 0x61,                         // a
+                0x80, 0x00,                               // "
+                0x88, 0x00                                // <CLOSE>
+        };
+        CompletableFuture<List<String>> actual = new CompletableFuture<>();
+
+        server = Support.serverWithCannedData(binary);
+        server.open();
+
+        WebSocket.Listener listener = new WebSocket.Listener() {
+
+            List<String> collectedStrings = new ArrayList<>();
+            StringBuilder text = new StringBuilder();
+
+            @Override
+            public CompletionStage<?> onText(WebSocket webSocket,
+                                             CharSequence message,
+                                             boolean last) {
+                System.out.printf("onText(%s, %s)%n", message, last);
+                webSocket.request(1);
+                text.append(message);
+                if (last) {
+                    String str = text.toString();
+                    text.setLength(0);
+                    processWholeText(str);
+                }
+                return null;
+            }
+
+            private void processWholeText(String string) {
+                System.out.println(string);
+                collectedStrings.add(string);
+            }
+
+            @Override
+            public CompletionStage<?> onClose(WebSocket webSocket,
+                                              int statusCode,
+                                              String reason) {
+                actual.complete(collectedStrings);
+                return null;
+            }
+
+            @Override
+            public void onError(WebSocket webSocket, Throwable error) {
+                actual.completeExceptionally(error);
+            }
+        };
+
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+
+        List<String> a = actual.join();
+        assertEquals(a, expected);
+    }
+
+    /*
+     * Exercises the scenario where requests for more messages are made prior to
+     * completing the returned CompletionStage instances.
+     */
+    @Test
+    public void aggregatingTextMessages() throws IOException {
+
+        List<String> expected = List.of("alpha", "beta", "gamma", "delta");
+
+        int[] binary = new int[]{
+                0x81, 0x05, 0x61, 0x6c, 0x70, 0x68, 0x61, // "alpha"
+                0x01, 0x02, 0x62, 0x65,                   // "be
+                0x80, 0x02, 0x74, 0x61,                   // ta"
+                0x01, 0x01, 0x67,                         // "g
+                0x00, 0x01, 0x61,                         // a
+                0x00, 0x00,                               //
+                0x00, 0x00,                               //
+                0x00, 0x01, 0x6d,                         // m
+                0x00, 0x01, 0x6d,                         // m
+                0x80, 0x01, 0x61,                         // a"
+                0x8a, 0x00,                               // <PONG>
+                0x01, 0x04, 0x64, 0x65, 0x6c, 0x74,       // "delt
+                0x00, 0x01, 0x61,                         // a
+                0x80, 0x00,                               // "
+                0x88, 0x00                                // <CLOSE>
+        };
+        CompletableFuture<List<String>> actual = new CompletableFuture<>();
+
+
+        server = Support.serverWithCannedData(binary);
+        server.open();
+
+        WebSocket.Listener listener = new WebSocket.Listener() {
+
+            List<CharSequence> parts = new ArrayList<>();
+            /*
+             * A CompletableFuture which will complete once the current
+             * message has been fully assembled. Until then the listener
+             * returns this instance for every call.
+             */
+            CompletableFuture<?> currentCf = new CompletableFuture<>();
+            List<String> collected = new ArrayList<>();
+
+            @Override
+            public CompletionStage<?> onText(WebSocket webSocket,
+                                             CharSequence message,
+                                             boolean last) {
+                parts.add(message);
+                if (!last) {
+                    webSocket.request(1);
+                } else {
+                    this.currentCf.thenRun(() -> webSocket.request(1));
+                    CompletableFuture<?> refCf = this.currentCf;
+                    processWholeMessage(new ArrayList<>(parts), refCf);
+                    currentCf = new CompletableFuture<>();
+                    parts.clear();
+                    return refCf;
+                }
+                return currentCf;
+            }
+
+            @Override
+            public CompletionStage<?> onClose(WebSocket webSocket,
+                                              int statusCode,
+                                              String reason) {
+                actual.complete(collected);
+                return null;
+            }
+
+            @Override
+            public void onError(WebSocket webSocket, Throwable error) {
+                actual.completeExceptionally(error);
+            }
+
+            public void processWholeMessage(List<CharSequence> data,
+                                            CompletableFuture<?> cf) {
+                StringBuilder b = new StringBuilder();
+                data.forEach(b::append);
+                String s = b.toString();
+                System.out.println(s);
+                cf.complete(null);
+                collected.add(s);
+            }
+        };
+
+        webSocket = newHttpClient().newWebSocketBuilder()
+                .buildAsync(server.getURI(), listener)
+                .join();
+
+        List<String> a = actual.join();
+        assertEquals(a, expected);
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/HeaderWriterTest.java b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/HeaderWriterTest.java
similarity index 91%
rename from test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/HeaderWriterTest.java
rename to test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/HeaderWriterTest.java
index 62f550b29f3..0e55eaf521f 100644
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/HeaderWriterTest.java
+++ b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/HeaderWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -21,11 +21,11 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
 import org.testng.annotations.Test;
-import jdk.incubator.http.internal.websocket.Frame.HeaderWriter;
-import jdk.incubator.http.internal.websocket.Frame.Opcode;
+import jdk.internal.net.http.websocket.Frame.HeaderWriter;
+import jdk.internal.net.http.websocket.Frame.Opcode;
 
 import java.nio.ByteBuffer;
 import java.util.OptionalInt;
@@ -33,8 +33,8 @@
 import static java.util.OptionalInt.empty;
 import static java.util.OptionalInt.of;
 import static org.testng.Assert.assertEquals;
-import static jdk.incubator.http.internal.websocket.TestSupport.assertThrows;
-import static jdk.incubator.http.internal.websocket.TestSupport.forEachPermutation;
+import static jdk.internal.net.http.websocket.TestSupport.assertThrows;
+import static jdk.internal.net.http.websocket.TestSupport.forEachPermutation;
 
 public class HeaderWriterTest {
 
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MaskerTest.java b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/MaskerTest.java
similarity index 94%
rename from test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MaskerTest.java
rename to test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/MaskerTest.java
index 7d6e03f9314..35270203773 100644
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MaskerTest.java
+++ b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/MaskerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
 import org.testng.annotations.Test;
 
@@ -30,9 +30,9 @@
 import java.util.stream.IntStream;
 
 import static org.testng.Assert.assertEquals;
-import static jdk.incubator.http.internal.websocket.Frame.Masker.transferMasking;
-import static jdk.incubator.http.internal.websocket.TestSupport.forEachBufferPartition;
-import static jdk.incubator.http.internal.websocket.TestSupport.fullCopy;
+import static jdk.internal.net.http.websocket.Frame.Masker.transferMasking;
+import static jdk.internal.net.http.websocket.TestSupport.forEachBufferPartition;
+import static jdk.internal.net.http.websocket.TestSupport.fullCopy;
 
 public class MaskerTest {
 
diff --git a/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/MessageQueueTest.java b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/MessageQueueTest.java
new file mode 100644
index 00000000000..61503f0e235
--- /dev/null
+++ b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/MessageQueueTest.java
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+package jdk.internal.net.http.websocket;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
+import static jdk.internal.net.http.websocket.MessageQueue.effectiveCapacityOf;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
+
+/*
+ * A unit test for MessageQueue. The test is aware of the details of the queue
+ * implementation.
+ */
+public class MessageQueueTest {
+
+    private static final Random r = new SecureRandom();
+
+    @DataProvider(name = "illegalCapacities")
+    public static Object[][] illegalCapacities() {
+        return new Object[][]{
+                new Object[]{Integer.MIN_VALUE},
+                new Object[]{-2},
+                new Object[]{-1},
+                new Object[]{ 0},
+        };
+    }
+
+    @Test(dataProvider = "illegalCapacities")
+    public void illegalCapacity(int n) {
+        assertThrows(IllegalArgumentException.class, () -> new MessageQueue(n));
+    }
+
+    @Test(dataProvider = "capacities")
+    public void emptiness(int n) {
+        assertTrue(new MessageQueue(n).isEmpty());
+    }
+
+    @Test(dataProvider = "capacities")
+    public void fullness(int n) throws IOException {
+        MessageQueue q = new MessageQueue(n);
+        int cap = effectiveCapacityOf(n);
+        Adder adder = new Adder();
+        Queue<Message> referenceQueue = new LinkedList<>();
+        for (int i = 0; i < cap; i++) {
+            Message m = createRandomMessage();
+            referenceQueue.add(m);
+            adder.add(q, m);
+        }
+        for (int i = 0; i < cap + 1; i++) {
+            Message m = createRandomMessage();
+            assertThrows(IOException.class, () -> adder.add(q, m));
+        }
+        for (int i = 0; i < cap; i++) {
+            Message expected = referenceQueue.remove();
+            Message actual = new Remover().removeFrom(q);
+            assertEquals(actual, expected);
+        }
+    }
+
+    private Message createRandomMessage() {
+        Message.Type[] values = Message.Type.values();
+        Message.Type type = values[r.nextInt(values.length)];
+        Supplier<? extends ByteBuffer> binarySupplier = null;
+        ByteBuffer binary = null;
+        CharBuffer text = null;
+        boolean isLast = false;
+        int statusCode = -1;
+        switch (type) {
+            case TEXT:
+                text = CharBuffer.allocate(r.nextInt(17));
+                isLast = r.nextBoolean();
+                break;
+            case BINARY:
+                binary = ByteBuffer.allocate(r.nextInt(19));
+                isLast = r.nextBoolean();
+                break;
+            case PING:
+                binary = ByteBuffer.allocate(r.nextInt(19));
+                break;
+            case PONG:
+                if (r.nextBoolean()) {
+                    binary = ByteBuffer.allocate(r.nextInt(19));
+                } else {
+                    binarySupplier = () -> ByteBuffer.allocate(r.nextInt(19));
+                }
+                break;
+            case CLOSE:
+                text = CharBuffer.allocate(r.nextInt(17));
+                statusCode = r.nextInt();
+                break;
+            default:
+                throw new AssertionError();
+        }
+        BiConsumer<Integer, Throwable> action = new BiConsumer<>() {
+            @Override
+            public void accept(Integer o, Throwable throwable) { }
+        };
+        CompletableFuture<Integer> future = new CompletableFuture<>();
+        return new Message(type, binarySupplier, binary, text, isLast, statusCode, r.nextInt(),
+                           action, future);
+    }
+
+    @Test(dataProvider = "capacities")
+    public void caterpillarWalk(int n) throws IOException {
+//        System.out.println("n: " + n);
+        int cap = effectiveCapacityOf(n);
+        for (int p = 1; p <= cap; p++) { // pace
+//            System.out.println("  pace: " + p);
+            MessageQueue q = new MessageQueue(n);
+            Queue<Message> referenceQueue = new LinkedList<>();
+            Adder adder = new Adder();
+            for (int k = 0; k < (cap / p) + 1; k++) {
+//                System.out.println("    cycle: " + k);
+                for (int i = 0; i < p; i++) {
+                    Message m = createRandomMessage();
+                    referenceQueue.add(m);
+                    adder.add(q, m);
+                }
+                Remover remover = new Remover();
+                for (int i = 0; i < p; i++) {
+                    Message expected = referenceQueue.remove();
+                    Message actual = remover.removeFrom(q);
+                    assertEquals(actual, expected);
+                }
+                assertTrue(q.isEmpty());
+            }
+        }
+    }
+
+    /* Exercises only concurrent additions */
+    @Test
+    public void halfConcurrency() throws ExecutionException, InterruptedException {
+        int n = Runtime.getRuntime().availableProcessors() + 2;
+        ExecutorService executorService = Executors.newFixedThreadPool(n);
+        CyclicBarrier start = new CyclicBarrier(n);
+        Adder adder = new Adder();
+        List<Future<?>> futures = new ArrayList<>(n);
+        try {
+            for (int k = 0; k < 1024; k++) {
+                MessageQueue q = new MessageQueue(n);
+                for (int i = 0; i < n; i++) {
+                    Message m = createRandomMessage();
+                    Future<Void> f = executorService.submit(() -> {
+                        start.await();
+                        adder.add(q, m);
+                        return null;
+                    });
+                    futures.add(f);
+                }
+                for (Future<?> f : futures) {
+                    f.get();    // Just to check for exceptions
+                }
+                futures.clear();
+            }
+        } finally {
+            executorService.shutdownNow();
+        }
+    }
+
+    // TODO: same message; different messages; a mix thereof
+
+    @Test
+    public void concurrency() throws ExecutionException, InterruptedException {
+        int nProducers = Runtime.getRuntime().availableProcessors() + 2;
+        int nThreads = nProducers + 1;
+        ExecutorService executorService = Executors.newFixedThreadPool(nThreads);
+        CyclicBarrier start = new CyclicBarrier(nThreads);
+        MessageQueue q = new MessageQueue(nProducers);
+        Adder adder = new Adder();
+        Remover remover = new Remover();
+        List<Message> expectedList = new ArrayList<>(nProducers);
+        List<Message> actualList = new ArrayList<>(nProducers);
+        List<Future<?>> futures = new ArrayList<>(nProducers);
+        try {
+            for (int k = 0; k < 1024; k++) {
+                for (int i = 0; i < nProducers; i++) {
+                    Message m = createRandomMessage();
+                    expectedList.add(m);
+                    Future<Void> f = executorService.submit(() -> {
+                        start.await();
+                        adder.add(q, m);
+                        return null;
+                    });
+                    futures.add(f);
+                }
+                Future<Void> consumer = executorService.submit(() -> {
+                    int i = 0;
+                    start.await();
+                    while (i < nProducers) {
+                        Message m = remover.removeFrom(q);
+                        if (m != null) {
+                            actualList.add(m);
+                            i++;
+                        }
+                    }
+                    return null;
+                });
+                for (Future<?> f : futures) {
+                    f.get();    // Just to check for exceptions
+                }
+                consumer.get(); // Waiting for consumer to collect all the messages
+                assertEquals(actualList.size(), expectedList.size());
+                for (Message m : expectedList) {
+                    assertTrue(actualList.remove(m));
+                }
+                assertTrue(actualList.isEmpty());
+                assertTrue(q.isEmpty());
+                expectedList.clear();
+                futures.clear();
+            }
+        } finally {
+            executorService.shutdownNow();
+        }
+    }
+
+    @Test(dataProvider = "capacities")
+    public void testSingleThreaded(int n) throws IOException {
+        Queue<Message> referenceQueue = new LinkedList<>();
+        MessageQueue q = new MessageQueue(n);
+        int cap = effectiveCapacityOf(n);
+        Adder adder = new Adder();
+        for (int i = 0; i < cap; i++) {
+            Message m = createRandomMessage();
+            referenceQueue.add(m);
+            adder.add(q, m);
+        }
+        for (int i = 0; i < cap; i++) {
+            Message expected = referenceQueue.remove();
+            Message actual = new Remover().removeFrom(q);
+            assertEquals(actual, expected);
+        }
+        assertTrue(q.isEmpty());
+    }
+
+    @DataProvider(name = "capacities")
+    public Object[][] capacities() {
+        return new Object[][]{
+                new Object[]{  1},
+                new Object[]{  2},
+                new Object[]{  3},
+                new Object[]{  4},
+                new Object[]{  5},
+                new Object[]{  6},
+                new Object[]{  7},
+                new Object[]{  8},
+                new Object[]{  9},
+                new Object[]{128},
+                new Object[]{256},
+        };
+    }
+
+    // -- auxiliary test infrastructure --
+
+    static class Adder {
+
+        @SuppressWarnings("unchecked")
+        void add(MessageQueue q, Message m) throws IOException {
+            switch (m.type) {
+                case TEXT:
+                    q.addText(m.text, m.isLast, m.attachment, m.action, m.future);
+                    break;
+                case BINARY:
+                    q.addBinary(m.binary, m.isLast, m.attachment, m.action, m.future);
+                    break;
+                case PING:
+                    q.addPing(m.binary, m.attachment, m.action, m.future);
+                    break;
+                case PONG:
+                    if (m.binarySupplier != null) {
+                        q.addPong(m.binarySupplier, m.attachment, m.action, m.future);
+                    } else {
+                        q.addPong(m.binary, m.attachment, m.action, m.future);
+                    }
+                    break;
+                case CLOSE:
+                    q.addClose(m.statusCode, m.text, m.attachment, m.action, m.future);
+                    break;
+                default:
+                    throw new InternalError();
+            }
+        }
+    }
+
+    static class Remover {
+
+        Message removeFrom(MessageQueue q) {
+            Message m = q.peek(new MessageQueue.QueueCallback<>() {
+
+                boolean called;
+
+                @Override
+                public <T> Message onText(CharBuffer message,
+                                          boolean isLast,
+                                          T attachment,
+                                          BiConsumer<? super T, ? super Throwable> action,
+                                          CompletableFuture<? super T> future) {
+                    assertFalse(called);
+                    called = true;
+                    return new Message(Message.Type.TEXT, null, null, message, isLast,
+                                       -1, attachment, action, future);
+                }
+
+                @Override
+                public <T> Message onBinary(ByteBuffer message,
+                                            boolean isLast,
+                                            T attachment,
+                                            BiConsumer<? super T, ? super Throwable> action,
+                                            CompletableFuture<? super T> future) {
+                    assertFalse(called);
+                    called = true;
+                    return new Message(Message.Type.BINARY, null, message, null, isLast,
+                                       -1, attachment, action, future);
+                }
+
+                @Override
+                public <T> Message onPing(ByteBuffer message,
+                                          T attachment,
+                                          BiConsumer<? super T, ? super Throwable> action,
+                                          CompletableFuture<? super T> future) {
+                    assertFalse(called);
+                    called = true;
+                    return new Message(Message.Type.PING, null, message, null, false,
+                                       -1, attachment, action, future);
+                }
+
+                @Override
+                public <T> Message onPong(ByteBuffer message,
+                                          T attachment,
+                                          BiConsumer<? super T, ? super Throwable> action,
+                                          CompletableFuture<? super T> future) {
+                    assertFalse(called);
+                    called = true;
+                    return new Message(Message.Type.PONG, null, message, null, false,
+                                       -1, attachment, action, future);
+                }
+
+                @Override
+                public <T> Message onPong(Supplier<? extends ByteBuffer> message,
+                                          T attachment,
+                                          BiConsumer<? super T, ? super Throwable> action,
+                                          CompletableFuture<? super T> future) {
+                    assertFalse(called);
+                    called = true;
+                    return new Message(Message.Type.PONG, message, null, null, false,
+                                       -1, attachment, action, future);
+                }
+
+                @Override
+                public <T> Message onClose(int statusCode,
+                                           CharBuffer reason,
+                                           T attachment,
+                                           BiConsumer<? super T, ? super Throwable> action,
+                                           CompletableFuture<? super T> future) {
+                    assertFalse(called);
+                    called = true;
+                    return new Message(Message.Type.CLOSE, null, null, reason, false,
+                                       statusCode, attachment, action, future);
+                }
+
+                @Override
+                public Message onEmpty() throws RuntimeException {
+                    return null;
+                }
+            });
+            if (m != null) {
+                q.remove();
+            }
+            return m;
+        }
+    }
+
+    static class Message {
+
+        private final Type type;
+        private final Supplier<? extends ByteBuffer> binarySupplier;
+        private final ByteBuffer binary;
+        private final CharBuffer text;
+        private final boolean isLast;
+        private final int statusCode;
+        private final Object attachment;
+        @SuppressWarnings("rawtypes")
+        private final BiConsumer action;
+        @SuppressWarnings("rawtypes")
+        private final CompletableFuture future;
+
+        <T> Message(Type type,
+                    Supplier<? extends ByteBuffer> binarySupplier,
+                    ByteBuffer binary,
+                    CharBuffer text,
+                    boolean isLast,
+                    int statusCode,
+                    T attachment,
+                    BiConsumer<? super T, ? super Throwable> action,
+                    CompletableFuture<? super T> future) {
+            this.type = type;
+            this.binarySupplier = binarySupplier;
+            this.binary = binary;
+            this.text = text;
+            this.isLast = isLast;
+            this.statusCode = statusCode;
+            this.attachment = attachment;
+            this.action = action;
+            this.future = future;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(type, binarySupplier, binary, text, isLast, statusCode, attachment, action, future);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Message message = (Message) o;
+            return isLast == message.isLast &&
+                    statusCode == message.statusCode &&
+                    type == message.type &&
+                    Objects.equals(binarySupplier, message.binarySupplier) &&
+                    Objects.equals(binary, message.binary) &&
+                    Objects.equals(text, message.text) &&
+                    Objects.equals(attachment, message.attachment) &&
+                    Objects.equals(action, message.action) &&
+                    Objects.equals(future, message.future);
+        }
+
+        enum Type {
+            TEXT,
+            BINARY,
+            PING,
+            PONG,
+            CLOSE
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReaderTest.java b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/ReaderTest.java
similarity index 96%
rename from test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReaderTest.java
rename to test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/ReaderTest.java
index 97cfe962137..c53ac88f69c 100644
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReaderTest.java
+++ b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/ReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -21,10 +21,10 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
 import org.testng.annotations.Test;
-import jdk.incubator.http.internal.websocket.Frame.Opcode;
+import jdk.internal.net.http.websocket.Frame.Opcode;
 
 import java.nio.ByteBuffer;
 import java.util.Optional;
@@ -36,8 +36,8 @@
 import static java.util.OptionalInt.empty;
 import static java.util.OptionalInt.of;
 import static org.testng.Assert.assertEquals;
-import static jdk.incubator.http.internal.websocket.TestSupport.assertThrows;
-import static jdk.incubator.http.internal.websocket.TestSupport.forEachBufferPartition;
+import static jdk.internal.net.http.websocket.TestSupport.assertThrows;
+import static jdk.internal.net.http.websocket.TestSupport.forEachBufferPartition;
 
 public class ReaderTest {
 
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/TestSupport.java b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/TestSupport.java
similarity index 94%
rename from test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/TestSupport.java
rename to test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/TestSupport.java
index d74fc8dbe1d..141ab82ca85 100644
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/TestSupport.java
+++ b/test/jdk/java/net/httpclient/websocket/java.net.http/jdk/internal/net/http/websocket/TestSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.incubator.http.internal.websocket;
+package jdk.internal.net.http.websocket;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -30,8 +30,6 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Stack;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -297,26 +295,16 @@ static Throwable assertThrows(Predicate<? super Throwable> predicate,
         } catch (Throwable t) {
             caught = t;
         }
+        if (caught == null) {
+            throw new AssertionFailedException("No exception was thrown");
+        }
         if (predicate.test(caught)) {
             System.out.println("Got expected exception: " + caught);
             return caught;
         }
-        if (caught == null) {
-            throw new AssertionFailedException("No exception was thrown");
-        }
         throw new AssertionFailedException("Caught exception didn't match the predicate", caught);
     }
 
-    /*
-     * Blocking assertion, waits for completion
-     */
-    static Throwable assertCompletesExceptionally(Class<? extends Throwable> clazz,
-                                                  CompletionStage<?> stage) {
-        CompletableFuture<?> cf =
-                CompletableFuture.completedFuture(null).thenCompose(x -> stage);
-        return assertThrows(t -> clazz == t.getCause().getClass(), cf::get);
-    }
-
     interface ThrowingProcedure {
         void run() throws Throwable;
     }
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockReceiver.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockReceiver.java
deleted file mode 100644
index 5129847d2dd..00000000000
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockReceiver.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.incubator.http.internal.websocket;
-
-import jdk.incubator.http.internal.common.Pair;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-import jdk.incubator.http.internal.common.SequentialScheduler.DeferredCompleter;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.function.Consumer;
-
-public class MockReceiver extends Receiver {
-
-    private final Iterator<Pair<CompletionStage<?>, Consumer<MessageStreamConsumer>>> iterator;
-    private final MessageStreamConsumer consumer;
-
-    public MockReceiver(MessageStreamConsumer consumer, RawChannel channel,
-                        Pair<CompletionStage<?>, Consumer<MessageStreamConsumer>>... pairs) {
-        super(consumer, channel);
-        this.consumer = consumer;
-        iterator = Arrays.asList(pairs).iterator();
-    }
-
-    @Override
-    protected SequentialScheduler createScheduler() {
-        class X { // Class is hack needed to allow the task to refer to the scheduler
-            SequentialScheduler scheduler = new SequentialScheduler(task());
-
-            SequentialScheduler.RestartableTask task() {
-                return new SequentialScheduler.RestartableTask() {
-                    @Override
-                    public void run(DeferredCompleter taskCompleter) {
-                        if (!scheduler.isStopped() && !demand.isFulfilled()) {
-                            if (!iterator.hasNext()) {
-                                taskCompleter.complete();
-                                return;
-                            }
-                            Pair<CompletionStage<?>, Consumer<MessageStreamConsumer>> p = iterator.next();
-                            CompletableFuture<?> cf = p.first.toCompletableFuture();
-                            if (cf.isDone()) { // Forcing synchronous execution
-                                p.second.accept(consumer);
-                                repeat(taskCompleter);
-                            } else {
-                                cf.whenCompleteAsync((r, e) -> {
-                                    p.second.accept(consumer);
-                                    repeat(taskCompleter);
-                                });
-                            }
-                        } else {
-                            taskCompleter.complete();
-                        }
-                    }
-
-                    private void repeat(DeferredCompleter taskCompleter) {
-                        taskCompleter.complete();
-                        scheduler.runOrSchedule();
-                    }
-                };
-            }
-        }
-        return new X().scheduler;
-    }
-}
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransmitter.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransmitter.java
deleted file mode 100644
index c65ec585dca..00000000000
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransmitter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.incubator.http.internal.websocket;
-
-import java.util.Queue;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.function.Consumer;
-
-public abstract class MockTransmitter extends Transmitter {
-
-    private final long startTime = System.currentTimeMillis();
-
-    private final Queue<OutgoingMessage> messages = new ConcurrentLinkedQueue<>();
-
-    public MockTransmitter() {
-        super(null);
-    }
-
-    @Override
-    public void send(OutgoingMessage message,
-                     Consumer<Exception> completionHandler) {
-        System.out.printf("[%6s ms.] begin send(%s)%n",
-                          System.currentTimeMillis() - startTime,
-                          message);
-        messages.add(message);
-        whenSent().whenComplete((r, e) -> {
-            System.out.printf("[%6s ms.] complete send(%s)%n",
-                              System.currentTimeMillis() - startTime,
-                              message);
-            if (e != null) {
-                completionHandler.accept((Exception) e);
-            } else {
-                completionHandler.accept(null);
-            }
-        });
-        System.out.printf("[%6s ms.] end send(%s)%n",
-                          System.currentTimeMillis() - startTime,
-                          message);
-    }
-
-    @Override
-    public void close() { }
-
-    protected abstract CompletionStage<?> whenSent();
-
-    public Queue<OutgoingMessage> queue() {
-        return messages;
-    }
-}
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransport.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransport.java
deleted file mode 100644
index bdbf8b1ac27..00000000000
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockTransport.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.incubator.http.internal.websocket;
-
-import java.nio.ByteBuffer;
-
-public class MockTransport extends TransportSupplier {
-
-    public MockTransport() {
-        super(new NullRawChannel());
-    }
-
-    public static class NullRawChannel implements RawChannel {
-
-        @Override
-        public void registerEvent(RawEvent event) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public ByteBuffer initialByteBuffer() {
-            return ByteBuffer.allocate(0);
-        }
-
-        @Override
-        public ByteBuffer read() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public long write(ByteBuffer[] srcs, int offset, int length) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void shutdownInput() {
-        }
-
-        @Override
-        public void shutdownOutput() {
-        }
-
-        @Override
-        public void close() {
-        }
-    }
-}
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReceivingTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReceivingTest.java
deleted file mode 100644
index 4a4858b651a..00000000000
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReceivingTest.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.incubator.http.internal.websocket;
-
-import jdk.incubator.http.WebSocket;
-import org.testng.annotations.Test;
-
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static java.util.concurrent.CompletableFuture.completedStage;
-import static jdk.incubator.http.WebSocket.MessagePart.FIRST;
-import static jdk.incubator.http.WebSocket.MessagePart.LAST;
-import static jdk.incubator.http.WebSocket.MessagePart.PART;
-import static jdk.incubator.http.WebSocket.MessagePart.WHOLE;
-import static jdk.incubator.http.WebSocket.NORMAL_CLOSURE;
-import static jdk.incubator.http.internal.common.Pair.pair;
-import static jdk.incubator.http.internal.websocket.MockListener.ListenerInvocation.onClose;
-import static jdk.incubator.http.internal.websocket.MockListener.ListenerInvocation.onError;
-import static jdk.incubator.http.internal.websocket.MockListener.ListenerInvocation.onOpen;
-import static jdk.incubator.http.internal.websocket.MockListener.ListenerInvocation.onPing;
-import static jdk.incubator.http.internal.websocket.MockListener.ListenerInvocation.onPong;
-import static jdk.incubator.http.internal.websocket.MockListener.ListenerInvocation.onText;
-import static org.testng.Assert.assertEquals;
-
-public class ReceivingTest {
-
-    // TODO: request in onClose/onError
-    // TODO: throw exception in onClose/onError
-    // TODO: exception is thrown from request()
-
-    @Test
-    public void testNonPositiveRequest() throws Exception {
-        MockListener listener = new MockListener(Long.MAX_VALUE) {
-            @Override
-            protected void onOpen0(WebSocket webSocket) {
-                webSocket.request(0);
-            }
-        };
-        MockTransport transport = new MockTransport() {
-            @Override
-            protected Receiver newReceiver(MessageStreamConsumer consumer) {
-                return new MockReceiver(consumer, channel, pair(now(), m -> m.onText("1", WHOLE)));
-            }
-        };
-        WebSocket ws = newInstance(listener, transport);
-        listener.onCloseOrOnErrorCalled().get(10, TimeUnit.SECONDS);
-        List<MockListener.ListenerInvocation> invocations = listener.invocations();
-        assertEquals(invocations, List.of(onOpen(ws), onError(ws, IllegalArgumentException.class)));
-    }
-
-    @Test
-    public void testText1() throws Exception {
-        MockListener listener = new MockListener(Long.MAX_VALUE);
-        MockTransport transport = new MockTransport() {
-            @Override
-            protected Receiver newReceiver(MessageStreamConsumer consumer) {
-                return new MockReceiver(consumer, channel,
-                                        pair(now(), m -> m.onText("1", FIRST)),
-                                        pair(now(), m -> m.onText("2", PART)),
-                                        pair(now(), m -> m.onText("3", LAST)),
-                                        pair(now(), m -> m.onClose(NORMAL_CLOSURE, "no reason")));
-            }
-        };
-        WebSocket ws = newInstance(listener, transport);
-        listener.onCloseOrOnErrorCalled().get(10, TimeUnit.SECONDS);
-        List<MockListener.ListenerInvocation> invocations = listener.invocations();
-        assertEquals(invocations, List.of(onOpen(ws),
-                                          onText(ws, "1", FIRST),
-                                          onText(ws, "2", PART),
-                                          onText(ws, "3", LAST),
-                                          onClose(ws, NORMAL_CLOSURE, "no reason")));
-    }
-
-    @Test
-    public void testText2() throws Exception {
-        MockListener listener = new MockListener(Long.MAX_VALUE);
-        MockTransport transport = new MockTransport() {
-            @Override
-            protected Receiver newReceiver(MessageStreamConsumer consumer) {
-                return new MockReceiver(consumer, channel,
-                                        pair(now(),      m -> m.onText("1", FIRST)),
-                                        pair(seconds(1), m -> m.onText("2", PART)),
-                                        pair(now(),      m -> m.onText("3", LAST)),
-                                        pair(seconds(1), m -> m.onClose(NORMAL_CLOSURE, "no reason")));
-            }
-        };
-        WebSocket ws = newInstance(listener, transport);
-        listener.onCloseOrOnErrorCalled().get(10, TimeUnit.SECONDS);
-        List<MockListener.ListenerInvocation> invocations = listener.invocations();
-        assertEquals(invocations, List.of(onOpen(ws),
-                                          onText(ws, "1", FIRST),
-                                          onText(ws, "2", PART),
-                                          onText(ws, "3", LAST),
-                                          onClose(ws, NORMAL_CLOSURE, "no reason")));
-    }
-
-    @Test
-    public void testTextIntermixedWithPongs() throws Exception {
-        MockListener listener = new MockListener(Long.MAX_VALUE);
-        MockTransport transport = new MockTransport() {
-            @Override
-            protected Receiver newReceiver(MessageStreamConsumer consumer) {
-                return new MockReceiver(consumer, channel,
-                                        pair(now(),      m -> m.onText("1", FIRST)),
-                                        pair(now(),      m -> m.onText("2", PART)),
-                                        pair(now(),      m -> m.onPong(ByteBuffer.allocate(16))),
-                                        pair(seconds(1), m -> m.onPong(ByteBuffer.allocate(32))),
-                                        pair(now(),      m -> m.onText("3", LAST)),
-                                        pair(now(),      m -> m.onPong(ByteBuffer.allocate(64))),
-                                        pair(now(),      m -> m.onClose(NORMAL_CLOSURE, "no reason")));
-            }
-        };
-        WebSocket ws = newInstance(listener, transport);
-        listener.onCloseOrOnErrorCalled().get(10, TimeUnit.SECONDS);
-        List<MockListener.ListenerInvocation> invocations = listener.invocations();
-        assertEquals(invocations, List.of(onOpen(ws),
-                                          onText(ws, "1", FIRST),
-                                          onText(ws, "2", PART),
-                                          onPong(ws, ByteBuffer.allocate(16)),
-                                          onPong(ws, ByteBuffer.allocate(32)),
-                                          onText(ws, "3", LAST),
-                                          onPong(ws, ByteBuffer.allocate(64)),
-                                          onClose(ws, NORMAL_CLOSURE, "no reason")));
-    }
-
-    @Test
-    public void testTextIntermixedWithPings() throws Exception {
-        MockListener listener = new MockListener(Long.MAX_VALUE);
-        MockTransport transport = new MockTransport() {
-            @Override
-            protected Receiver newReceiver(MessageStreamConsumer consumer) {
-                return new MockReceiver(consumer, channel,
-                                        pair(now(),      m -> m.onText("1", FIRST)),
-                                        pair(now(),      m -> m.onText("2", PART)),
-                                        pair(now(),      m -> m.onPing(ByteBuffer.allocate(16))),
-                                        pair(seconds(1), m -> m.onPing(ByteBuffer.allocate(32))),
-                                        pair(now(),      m -> m.onText("3", LAST)),
-                                        pair(now(),      m -> m.onPing(ByteBuffer.allocate(64))),
-                                        pair(now(),      m -> m.onClose(NORMAL_CLOSURE, "no reason")));
-            }
-
-            @Override
-            protected Transmitter newTransmitter() {
-                return new MockTransmitter() {
-                    @Override
-                    protected CompletionStage<?> whenSent() {
-                        return now();
-                    }
-                };
-            }
-        };
-        WebSocket ws = newInstance(listener, transport);
-        listener.onCloseOrOnErrorCalled().get(10, TimeUnit.SECONDS);
-        List<MockListener.ListenerInvocation> invocations = listener.invocations();
-        System.out.println(invocations);
-        assertEquals(invocations, List.of(onOpen(ws),
-                                          onText(ws, "1", FIRST),
-                                          onText(ws, "2", PART),
-                                          onPing(ws, ByteBuffer.allocate(16)),
-                                          onPing(ws, ByteBuffer.allocate(32)),
-                                          onText(ws, "3", LAST),
-                                          onPing(ws, ByteBuffer.allocate(64)),
-                                          onClose(ws, NORMAL_CLOSURE, "no reason")));
-    }
-
-    private static CompletionStage<?> seconds(long s) {
-        return new CompletableFuture<>().completeOnTimeout(null, s, TimeUnit.SECONDS);
-    }
-
-    private static CompletionStage<?> now() {
-        return completedStage(null);
-    }
-
-    private static WebSocket newInstance(WebSocket.Listener listener,
-                                         TransportSupplier transport) {
-        URI uri = URI.create("ws://localhost");
-        String subprotocol = "";
-        return WebSocketImpl.newInstance(uri, subprotocol, listener, transport);
-    }
-}
diff --git a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/SendingTest.java b/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/SendingTest.java
deleted file mode 100644
index 4150a87bbfe..00000000000
--- a/test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/SendingTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.incubator.http.internal.websocket;
-
-import jdk.incubator.http.WebSocket;
-import org.testng.annotations.Test;
-
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.util.Random;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static jdk.incubator.http.WebSocket.NORMAL_CLOSURE;
-import static jdk.incubator.http.internal.websocket.TestSupport.assertCompletesExceptionally;
-import static jdk.incubator.http.internal.websocket.WebSocketImpl.newInstance;
-import static org.testng.Assert.assertEquals;
-
-public class SendingTest {
-
-    @Test
-    public void sendTextImmediately() {
-        MockTransmitter t = new MockTransmitter() {
-            @Override
-            protected CompletionStage<?> whenSent() {
-                return CompletableFuture.completedFuture(null);
-            }
-        };
-        WebSocket ws = newWebSocket(t);
-        CompletableFuture.completedFuture(ws)
-                .thenCompose(w -> w.sendText("1", true))
-                .thenCompose(w -> w.sendText("2", true))
-                .thenCompose(w -> w.sendText("3", true))
-                .join();
-
-        assertEquals(t.queue().size(), 3);
-    }
-
-    @Test
-    public void sendTextWithDelay() {
-        MockTransmitter t = new MockTransmitter() {
-            @Override
-            protected CompletionStage<?> whenSent() {
-                return new CompletableFuture<>()
-                        .completeOnTimeout(null, 1, TimeUnit.SECONDS);
-            }
-        };
-        WebSocket ws = newWebSocket(t);
-        CompletableFuture.completedFuture(ws)
-                .thenCompose(w -> w.sendText("1", true))
-                .thenCompose(w -> w.sendText("2", true))
-                .thenCompose(w -> w.sendText("3", true))
-                .join();
-
-        assertEquals(t.queue().size(), 3);
-    }
-
-    @Test
-    public void sendTextMixedDelay() {
-        Random r = new Random();
-
-        MockTransmitter t = new MockTransmitter() {
-            @Override
-            protected CompletionStage<?> whenSent() {
-                return r.nextBoolean() ?
-                        new CompletableFuture<>().completeOnTimeout(null, 1, TimeUnit.SECONDS) :
-                        CompletableFuture.completedFuture(null);
-            }
-        };
-        WebSocket ws = newWebSocket(t);
-        CompletableFuture.completedFuture(ws)
-                .thenCompose(w -> w.sendText("1", true))
-                .thenCompose(w -> w.sendText("2", true))
-                .thenCompose(w -> w.sendText("3", true))
-                .thenCompose(w -> w.sendText("4", true))
-                .thenCompose(w -> w.sendText("5", true))
-                .thenCompose(w -> w.sendText("6", true))
-                .thenCompose(w -> w.sendText("7", true))
-                .thenCompose(w -> w.sendText("8", true))
-                .thenCompose(w -> w.sendText("9", true))
-                .join();
-
-        assertEquals(t.queue().size(), 9);
-    }
-
-    @Test
-    public void sendControlMessagesConcurrently() {
-
-        CompletableFuture<?> first = new CompletableFuture<>();
-
-        MockTransmitter t = new MockTransmitter() {
-
-            final AtomicInteger i = new AtomicInteger();
-
-            @Override
-            protected CompletionStage<?> whenSent() {
-                if (i.incrementAndGet() == 1) {
-                    return first;
-                } else {
-                    return CompletableFuture.completedFuture(null);
-                }
-            }
-        };
-        WebSocket ws = newWebSocket(t);
-
-        CompletableFuture<?> cf1 = ws.sendPing(ByteBuffer.allocate(0));
-        CompletableFuture<?> cf2 = ws.sendPong(ByteBuffer.allocate(0));
-        CompletableFuture<?> cf3 = ws.sendClose(NORMAL_CLOSURE, "");
-        CompletableFuture<?> cf4 = ws.sendClose(NORMAL_CLOSURE, "");
-        CompletableFuture<?> cf5 = ws.sendPing(ByteBuffer.allocate(0));
-        CompletableFuture<?> cf6 = ws.sendPong(ByteBuffer.allocate(0));
-
-        first.complete(null);
-        // Don't care about exceptional completion, only that all of them have
-        // completed
-        CompletableFuture.allOf(cf1, cf2, cf3, cf4, cf5, cf6)
-                .handle((v, e) -> null).join();
-
-        cf3.join(); /* Check that sendClose has completed normally */
-        cf4.join(); /* Check that repeated sendClose has completed normally */
-        assertCompletesExceptionally(IllegalStateException.class, cf5);
-        assertCompletesExceptionally(IllegalStateException.class, cf6);
-
-        assertEquals(t.queue().size(), 3); // 6 minus 3 that were not accepted
-    }
-
-    private static WebSocket newWebSocket(Transmitter transmitter) {
-        URI uri = URI.create("ws://localhost");
-        String subprotocol = "";
-        TransportSupplier transport = new MockTransport() {
-            @Override
-            public Transmitter transmitter() {
-                return transmitter;
-            }
-        };
-        return newInstance(uri,
-                           subprotocol,
-                           new MockListener(Long.MAX_VALUE),
-                           transport);
-    }
-}
diff --git a/test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java b/test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java
index ebca6852c42..abcf91ad114 100644
--- a/test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java
+++ b/test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java
@@ -29,6 +29,7 @@
  */
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.ProxySelector;
@@ -44,8 +45,8 @@
 import java.security.ProtectionDomain;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.WebSocket;
+import java.net.http.HttpClient;
+import java.net.http.WebSocket;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
@@ -74,7 +75,8 @@ static AccessControlContext noPermissions() {
     @BeforeTest
     public void setup() throws Exception {
         ProxyServer proxyServer = new ProxyServer(0, true);
-        proxyAddress = new InetSocketAddress("127.0.0.1", proxyServer.getPort());
+        proxyAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(),
+                                             proxyServer.getPort());
         webSocketServer = new DummyWebSocketServer();
         webSocketServer.open();
         wsURI = webSocketServer.getURI();
diff --git a/test/jdk/java/net/httpclient/websocket/security/httpclient.policy b/test/jdk/java/net/httpclient/websocket/security/httpclient.policy
index e63c2acd92a..8db060aed8b 100644
--- a/test/jdk/java/net/httpclient/websocket/security/httpclient.policy
+++ b/test/jdk/java/net/httpclient/websocket/security/httpclient.policy
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2017, 2018, 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
@@ -21,49 +21,7 @@
 // questions.
 //
 
-grant codeBase "jrt:/jdk.incubator.httpclient" {
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util";
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www";
-    permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
-
-    // ## why is SP not good enough. Check API @throws signatures and impl
-    permission java.net.SocketPermission "*","connect,resolve";
-    permission java.net.URLPermission "http:*","*:*";
-    permission java.net.URLPermission "https:*","*:*";
-    permission java.net.URLPermission "ws:*","*:*";
-    permission java.net.URLPermission "wss:*","*:*";
-    permission java.net.URLPermission "socket:*","CONNECT";  // proxy
-
-    // For request/response body processors, fromFile, asFile
-    permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
-
-    // ## look at the different property names!
-    permission java.util.PropertyPermission "jdk.httpclient.HttpClient.log","read";  // name!
-    permission java.util.PropertyPermission "jdk.httpclient.auth.retrylimit","read";
-    permission java.util.PropertyPermission "jdk.httpclient.connectionWindowSize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.enablepush","read";
-    permission java.util.PropertyPermission "jdk.httpclient.hpack.maxheadertablesize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.keepalive.timeout","read";
-    permission java.util.PropertyPermission "jdk.httpclient.maxframesize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.maxstreams","read";
-    permission java.util.PropertyPermission "jdk.httpclient.redirects.retrylimit","read";
-    permission java.util.PropertyPermission "jdk.httpclient.windowsize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.receiveBufferSize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.bufsize","read";
-    permission java.util.PropertyPermission "jdk.httpclient.internal.selector.timeout","read";
-    permission java.util.PropertyPermission "jdk.internal.httpclient.debug","read";
-    permission java.util.PropertyPermission "jdk.internal.httpclient.hpack.debug","read";
-    permission java.util.PropertyPermission "jdk.internal.httpclient.hpack.log.level","read";
-    permission java.util.PropertyPermission "test.src","read";
-
-    permission java.net.NetPermission "getProxySelector";
-
-    permission java.security.SecurityPermission "createAccessControlContext";
-};
-
 // bootstrap to get the test going, it will do its own restrictions
 grant codeBase "file:${test.classes}/*" {
     permission java.security.AllPermission;
 };
-
diff --git a/test/jdk/java/net/httpclient/websocket/ReceivingTestDriver.java b/test/jdk/java/net/httpclient/whitebox/AuthenticationFilterTestDriver.java
similarity index 75%
rename from test/jdk/java/net/httpclient/websocket/ReceivingTestDriver.java
rename to test/jdk/java/net/httpclient/whitebox/AuthenticationFilterTestDriver.java
index e327c9a5d38..e932455e409 100644
--- a/test/jdk/java/net/httpclient/websocket/ReceivingTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/AuthenticationFilterTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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,7 +23,6 @@
 
 /*
  * @test
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.websocket:open
- * @run testng/othervm --add-reads jdk.incubator.httpclient=ALL-UNNAMED jdk.incubator.httpclient/jdk.incubator.http.internal.websocket.ReceivingTest
+ * @modules java.net.http/jdk.internal.net.http
+ * @run testng java.net.http/jdk.internal.net.http.AuthenticationFilterTest
  */
-public class ReceivingTestDriver { }
diff --git a/test/jdk/java/net/httpclient/whitebox/ConnectionPoolTestDriver.java b/test/jdk/java/net/httpclient/whitebox/ConnectionPoolTestDriver.java
index 91fb1e02bac..598cbc0cec3 100644
--- a/test/jdk/java/net/httpclient/whitebox/ConnectionPoolTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/ConnectionPoolTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -27,6 +27,9 @@
  * @summary Verifies that the ConnectionPool correctly handle
  *          connection deadlines and purges the right connections
  *          from the cache.
- * @modules jdk.incubator.httpclient java.management
- * @run main/othervm --add-reads jdk.incubator.httpclient=java.management jdk.incubator.httpclient/jdk.incubator.http.ConnectionPoolTest
+ * @modules java.net.http/jdk.internal.net.http
+  *         java.management
+ * @run main/othervm
+ *       --add-reads java.net.http=java.management
+ *       java.net.http/jdk.internal.net.http.ConnectionPoolTest
  */
diff --git a/test/jdk/java/net/httpclient/whitebox/DefaultProxyDriver.java b/test/jdk/java/net/httpclient/whitebox/DefaultProxyDriver.java
new file mode 100644
index 00000000000..3e51b39489d
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/DefaultProxyDriver.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2018, 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
+ * @modules java.net.http/jdk.internal.net.http
+ * @summary Verifies that the HTTP Client, by default, uses the system-wide
+ * proxy selector, and that that selector supports the standard HTTP proxy
+ * system properties.
+ * @run testng/othervm
+ *     -Dhttp.proxyHost=foo.proxy.com
+ *     -Dhttp.proxyPort=9876
+ *     -Dhttp.nonProxyHosts=*.direct.com
+ *     -Dhttps.proxyHost=secure.proxy.com
+ *     -Dhttps.proxyPort=5443
+ *     java.net.http/jdk.internal.net.http.DefaultProxy
+ */
\ No newline at end of file
diff --git a/test/jdk/java/net/httpclient/whitebox/DemandTestDriver.java b/test/jdk/java/net/httpclient/whitebox/DemandTestDriver.java
index c2749dc6dc9..ea442878261 100644
--- a/test/jdk/java/net/httpclient/whitebox/DemandTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/DemandTestDriver.java
@@ -23,6 +23,6 @@
 
 /*
  * @test
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.common
- * @run testng jdk.incubator.httpclient/jdk.incubator.http.internal.common.DemandTest
+ * @modules java.net.http/jdk.internal.net.http.common
+ * @run testng java.net.http/jdk.internal.net.http.common.DemandTest
  */
diff --git a/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java b/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java
index cddf365700c..aea81fb0a0b 100644
--- a/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/FlowTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,6 +23,6 @@
 
 /*
  * @test
- * @modules jdk.incubator.httpclient
- * @run testng jdk.incubator.httpclient/jdk.incubator.http.FlowTest
+ * @modules java.net.http/jdk.internal.net.http
+ * @run testng java.net.http/jdk.internal.net.http.FlowTest
  */
diff --git a/test/jdk/java/net/httpclient/whitebox/FramesDecoderTestDriver.java b/test/jdk/java/net/httpclient/whitebox/FramesDecoderTestDriver.java
index 358123b8105..bdc8991fb03 100644
--- a/test/jdk/java/net/httpclient/whitebox/FramesDecoderTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/FramesDecoderTestDriver.java
@@ -24,7 +24,9 @@
 /*
  * @test
  * @bug 8195823
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.frame
- * @run testng/othervm -Djdk.internal.httpclient.debug=true jdk.incubator.httpclient/jdk.incubator.http.internal.frame.FramesDecoderTest
+ * @modules java.net.http/jdk.internal.net.http.frame
+ * @run testng/othervm
+ *       -Djdk.internal.httpclient.debug=true
+ *       java.net.http/jdk.internal.net.http.frame.FramesDecoderTest
  */
 
diff --git a/test/jdk/java/net/httpclient/whitebox/Http1HeaderParserTestDriver.java b/test/jdk/java/net/httpclient/whitebox/Http1HeaderParserTestDriver.java
index 265aa35ab12..b18142601a5 100644
--- a/test/jdk/java/net/httpclient/whitebox/Http1HeaderParserTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/Http1HeaderParserTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -24,6 +24,6 @@
 /*
  * @test
  * @bug 8195138
- * @modules jdk.incubator.httpclient
- * @run testng jdk.incubator.httpclient/jdk.incubator.http.Http1HeaderParserTest
+ * @modules java.net.http/jdk.internal.net.http
+ * @run testng java.net.http/jdk.internal.net.http.Http1HeaderParserTest
  */
diff --git a/test/jdk/java/net/httpclient/whitebox/MinimalFutureTestDriver.java b/test/jdk/java/net/httpclient/whitebox/MinimalFutureTestDriver.java
new file mode 100644
index 00000000000..316ca29e2a6
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/MinimalFutureTestDriver.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018, 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
+ * @modules java.net.http/jdk.internal.net.http.common
+ * @run testng java.net.http/jdk.internal.net.http.common.MinimalFutureTest
+ */
diff --git a/test/jdk/java/net/httpclient/whitebox/Driver.java b/test/jdk/java/net/httpclient/whitebox/RawChannelTestDriver.java
similarity index 80%
rename from test/jdk/java/net/httpclient/whitebox/Driver.java
rename to test/jdk/java/net/httpclient/whitebox/RawChannelTestDriver.java
index d69f7bf5244..77b1c3db8a5 100644
--- a/test/jdk/java/net/httpclient/whitebox/Driver.java
+++ b/test/jdk/java/net/httpclient/whitebox/RawChannelTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -24,7 +24,8 @@
 /*
  * @test
  * @bug 8151299 8164704
- * @modules jdk.incubator.httpclient
- * @run testng jdk.incubator.httpclient/jdk.incubator.http.SelectorTest
- * @run testng jdk.incubator.httpclient/jdk.incubator.http.RawChannelTest
+ * @modules java.net.http/jdk.internal.net.http
+ * @run testng java.net.http/jdk.internal.net.http.RawChannelTest
  */
+//-Djdk.internal.httpclient.websocket.debug=true
+
diff --git a/test/jdk/java/net/httpclient/whitebox/SSLEchoTubeTestDriver.java b/test/jdk/java/net/httpclient/whitebox/SSLEchoTubeTestDriver.java
index 7febdff3b9c..2ae82454cff 100644
--- a/test/jdk/java/net/httpclient/whitebox/SSLEchoTubeTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/SSLEchoTubeTestDriver.java
@@ -23,6 +23,8 @@
 
 /*
  * @test
- * @modules jdk.incubator.httpclient
- * @run testng/othervm -Djdk.internal.httpclient.debug=true jdk.incubator.httpclient/jdk.incubator.http.SSLEchoTubeTest
+ * @modules java.net.http/jdk.internal.net.http
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      java.net.http/jdk.internal.net.http.SSLEchoTubeTest
  */
diff --git a/test/jdk/java/net/httpclient/whitebox/SSLTubeTestDriver.java b/test/jdk/java/net/httpclient/whitebox/SSLTubeTestDriver.java
index fbd25f3abfb..e4809b60355 100644
--- a/test/jdk/java/net/httpclient/whitebox/SSLTubeTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/SSLTubeTestDriver.java
@@ -23,6 +23,8 @@
 
 /*
  * @test
- * @modules jdk.incubator.httpclient
- * @run testng/othervm -Djdk.internal.httpclient.debug=true jdk.incubator.httpclient/jdk.incubator.http.SSLTubeTest
+ * @modules java.net.http/jdk.internal.net.http
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      java.net.http/jdk.internal.net.http.SSLTubeTest
  */
diff --git a/test/jdk/java/net/httpclient/websocket/BuildingWebSocketDriver.java b/test/jdk/java/net/httpclient/whitebox/SelectorTestDriver.java
similarity index 73%
rename from test/jdk/java/net/httpclient/websocket/BuildingWebSocketDriver.java
rename to test/jdk/java/net/httpclient/whitebox/SelectorTestDriver.java
index b45e177da5f..226e644e903 100644
--- a/test/jdk/java/net/httpclient/websocket/BuildingWebSocketDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/SelectorTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,8 +23,7 @@
 
 /*
  * @test
- * @bug 8159053
- * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.websocket:open
- * @run testng/othervm --add-reads jdk.incubator.httpclient=ALL-UNNAMED jdk.incubator.httpclient/jdk.incubator.http.internal.websocket.BuildingWebSocketTest
+ * @bug 8151299 8164704
+ * @modules java.net.http/jdk.internal.net.http
+ * @run testng java.net.http/jdk.internal.net.http.SelectorTest
  */
-public final class BuildingWebSocketDriver { }
diff --git a/test/jdk/java/net/httpclient/whitebox/WrapperTestDriver.java b/test/jdk/java/net/httpclient/whitebox/WrapperTestDriver.java
index 23b8403f680..7ea2b07e3a7 100644
--- a/test/jdk/java/net/httpclient/whitebox/WrapperTestDriver.java
+++ b/test/jdk/java/net/httpclient/whitebox/WrapperTestDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,6 +23,6 @@
 
 /*
  * @test
- * @modules jdk.incubator.httpclient
- * @run testng jdk.incubator.httpclient/jdk.incubator.http.WrapperTest
+ * @modules java.net.http/jdk.internal.net.http
+ * @run testng java.net.http/jdk.internal.net.http.WrapperTest
  */
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/AbstractRandomTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractRandomTest.java
similarity index 98%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/AbstractRandomTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractRandomTest.java
index d90847cc07c..da951b70b9c 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/AbstractRandomTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractRandomTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.util.Random;
 
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/AbstractSSLTubeTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java
similarity index 98%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/AbstractSSLTubeTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java
index f24e84f8c58..6eb6f2c2313 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/AbstractSSLTubeTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java
@@ -21,11 +21,11 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.SSLTube;
-import jdk.incubator.http.internal.common.Utils;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.SSLTube;
+import jdk.internal.net.http.common.Utils;
 import org.testng.annotations.Test;
 
 import javax.net.ssl.KeyManagerFactory;
@@ -45,7 +45,6 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.List;
-import java.util.Random;
 import java.util.StringTokenizer;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AuthenticationFilterTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AuthenticationFilterTest.java
new file mode 100644
index 00000000000..ba8f7faf78c
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AuthenticationFilterTest.java
@@ -0,0 +1,565 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+package jdk.internal.net.http;
+
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import org.testng.annotations.AfterClass;
+
+import java.lang.ref.Reference;
+import java.net.Authenticator;
+import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URL;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.security.AccessController;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.net.http.HttpClient.Version;
+
+import static java.lang.String.format;
+import static java.lang.System.out;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static java.util.stream.Collectors.joining;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import static java.net.http.HttpClient.Version.HTTP_2;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static org.testng.Assert.*;
+
+public class AuthenticationFilterTest {
+
+    @DataProvider(name = "uris")
+    public Object[][] responses() {
+        return new Object[][] {
+                { "http://foo.com", HTTP_1_1, null },
+                { "http://foo.com", HTTP_2, null },
+                { "http://foo.com#blah", HTTP_1_1, null },
+                { "http://foo.com#blah", HTTP_2, null },
+                { "http://foo.com/x/y/z", HTTP_1_1, null },
+                { "http://foo.com/x/y/z", HTTP_2, null },
+                { "http://foo.com/x/y/z#blah", HTTP_1_1, null },
+                { "http://foo.com/x/y/z#blah", HTTP_2, null },
+                { "http://foo.com:80", HTTP_1_1, null },
+                { "http://foo.com:80", HTTP_2, null },
+                { "http://foo.com:80#blah", HTTP_1_1, null },
+                { "http://foo.com:80#blah", HTTP_2, null },
+                { "http://foo.com", HTTP_1_1, "localhost:8080" },
+                { "http://foo.com", HTTP_2, "localhost:8080" },
+                { "http://foo.com#blah", HTTP_1_1, "localhost:8080" },
+                { "http://foo.com#blah", HTTP_2, "localhost:8080" },
+                { "http://foo.com:8080", HTTP_1_1, "localhost:8080" },
+                { "http://foo.com:8080", HTTP_2, "localhost:8080" },
+                { "http://foo.com:8080#blah", HTTP_1_1, "localhost:8080" },
+                { "http://foo.com:8080#blah", HTTP_2, "localhost:8080" },
+                { "https://foo.com", HTTP_1_1, null },
+                { "https://foo.com", HTTP_2, null },
+                { "https://foo.com#blah", HTTP_1_1, null },
+                { "https://foo.com#blah", HTTP_2, null },
+                { "https://foo.com:443", HTTP_1_1, null },
+                { "https://foo.com:443", HTTP_2, null },
+                { "https://foo.com:443#blah", HTTP_1_1, null },
+                { "https://foo.com:443#blah", HTTP_2, null },
+                { "https://foo.com", HTTP_1_1, "localhost:8080" },
+                { "https://foo.com", HTTP_2, "localhost:8080" },
+                { "https://foo.com#blah", HTTP_1_1, "localhost:8080" },
+                { "https://foo.com#blah", HTTP_2, "localhost:8080" },
+                { "https://foo.com:8080", HTTP_1_1, "localhost:8080" },
+                { "https://foo.com:8080", HTTP_2, "localhost:8080" },
+                { "https://foo.com:8080#blah", HTTP_1_1, "localhost:8080" },
+                { "https://foo.com:8080#blah", HTTP_2, "localhost:8080" },
+                { "http://foo.com:80/x/y/z", HTTP_1_1, null },
+                { "http://foo.com:80/x/y/z", HTTP_2, null },
+                { "http://foo.com:80/x/y/z#blah", HTTP_1_1, null },
+                { "http://foo.com:80/x/y/z#blah", HTTP_2, null },
+                { "http://foo.com/x/y/z", HTTP_1_1, "localhost:8080" },
+                { "http://foo.com/x/y/z", HTTP_2, "localhost:8080" },
+                { "http://foo.com/x/y/z#blah", HTTP_1_1, "localhost:8080" },
+                { "http://foo.com/x/y/z#blah", HTTP_2, "localhost:8080" },
+                { "http://foo.com:8080/x/y/z", HTTP_1_1, "localhost:8080" },
+                { "http://foo.com:8080/x/y/z", HTTP_2, "localhost:8080" },
+                { "http://foo.com:8080/x/y/z#blah", HTTP_1_1, "localhost:8080" },
+                { "http://foo.com:8080/x/y/z#blah", HTTP_2, "localhost:8080" },
+                { "https://foo.com/x/y/z", HTTP_1_1, null },
+                { "https://foo.com/x/y/z", HTTP_2, null },
+                { "https://foo.com/x/y/z#blah", HTTP_1_1, null },
+                { "https://foo.com/x/y/z#blah", HTTP_2, null },
+                { "https://foo.com:443/x/y/z", HTTP_1_1, null },
+                { "https://foo.com:443/x/y/z", HTTP_2, null },
+                { "https://foo.com:443/x/y/z#blah", HTTP_1_1, null },
+                { "https://foo.com:443/x/y/z#blah", HTTP_2, null },
+                { "https://foo.com/x/y/z", HTTP_1_1, "localhost:8080" },
+                { "https://foo.com/x/y/z", HTTP_2, "localhost:8080" },
+                { "https://foo.com/x/y/z#blah", HTTP_1_1, "localhost:8080" },
+                { "https://foo.com/x/y/z#blah", HTTP_2, "localhost:8080" },
+                { "https://foo.com:8080/x/y/z", HTTP_1_1, "localhost:8080" },
+                { "https://foo.com:8080/x/y/z", HTTP_2, "localhost:8080" },
+                { "https://foo.com:8080/x/y/z#blah", HTTP_1_1, "localhost:8080" },
+                { "https://foo.com:8080/x/y/z#blah", HTTP_2, "localhost:8080" },
+        };
+    }
+
+    static final ConcurrentMap<String,Throwable> FAILED = new ConcurrentHashMap<>();
+
+    static boolean isNullOrEmpty(String s) {
+        return s == null || s.isEmpty();
+    }
+
+    @Test(dataProvider = "uris")
+    public void testAuthentication(String uri, Version v, String proxy) throws Exception {
+        String test = format("testAuthentication: {\"%s\", %s, \"%s\"}", uri, v, proxy);
+        try {
+            doTestAuthentication(uri, v, proxy);
+        } catch(Exception | Error x) {
+            FAILED.putIfAbsent(test, x);
+            throw x;
+        }
+    }
+
+    @AfterClass
+    public void printDiagnostic() {
+        if (FAILED.isEmpty()) {
+            out.println("All tests passed");
+            return;
+        }
+        // make sure failures don't disappear in the overflow
+        out.println("Failed tests: ");
+        FAILED.keySet().forEach(s ->
+                out.println("\t " + s.substring(s.indexOf(':')+1) + ","));
+        out.println();
+        FAILED.entrySet().forEach(e -> {
+                System.err.println("\n" + e.getKey()
+                        + " FAILED: " + e.getValue());
+                e.getValue().printStackTrace();
+        });
+    }
+
+    private void doTestAuthentication(String uri, Version v, String proxy) throws Exception {
+        int colon = proxy == null ? -1 : proxy.lastIndexOf(":");
+        ProxySelector ps = proxy == null ? NO_PROXY
+                : ProxySelector.of(InetSocketAddress.createUnresolved(
+                        proxy.substring(0, colon),
+                        Integer.parseInt(proxy.substring(colon+1))));
+        int unauthorized = proxy == null ? 401 : 407;
+
+        TestAuthenticator authenticator = new TestAuthenticator();
+
+        // Creates a HttpClientImpl
+        HttpClientBuilderImpl clientBuilder = new HttpClientBuilderImpl()
+                .authenticator(authenticator).proxy(ps);
+        HttpClientFacade facade = HttpClientImpl.create(clientBuilder);
+        HttpClientImpl client = facade.impl;
+        AuthenticationFilter filter = new AuthenticationFilter();
+
+        assertEquals(authenticator.COUNTER.get(), 0);
+
+        // Creates the first HttpRequestImpl, and call filter.request() with
+        // it. The expectation is that the filter will not add any credentials,
+        // because the cache is empty and we don't know which auth schemes the
+        // server supports yet.
+        URI reqURI = URI.create(uri);
+        HttpRequestBuilderImpl reqBuilder =
+                new HttpRequestBuilderImpl(reqURI);
+        HttpRequestImpl origReq = new HttpRequestImpl(reqBuilder);
+        HttpRequestImpl req = new HttpRequestImpl(origReq, ps);
+        MultiExchange<?> multi = new MultiExchange<Void>(origReq, req, client,
+                BodyHandlers.replacing(null),
+                null, AccessController.getContext());
+        Exchange<?> exchange = new Exchange<>(req, multi);
+        out.println("\nSimulating unauthenticated request to " + uri);
+        filter.request(req, multi);
+        assertFalse(req.getSystemHeaders().firstValue(authorization(true)).isPresent());
+        assertFalse(req.getSystemHeaders().firstValue(authorization(false)).isPresent());
+        assertEquals(authenticator.COUNTER.get(), 0);
+
+        // Creates the Response to the first request, and call filter.response
+        // with it. That response has a 401 or 407 status code.
+        // The expectation is that the filter will return a new request containing
+        // credentials, and will also cache the credentials in the multi exchange.
+        // The credentials shouldn't be put in the cache until the 200 response
+        // for that request arrives.
+        HttpHeadersImpl headers = new HttpHeadersImpl();
+        headers.addHeader(authenticate(proxy!=null),
+                "Basic realm=\"earth\"");
+        Response response = new Response(req, exchange, headers, null, unauthorized, v);
+        out.println("Simulating " + unauthorized
+                + " response from " + uri);
+        HttpRequestImpl next = filter.response(response);
+
+        out.println("Checking filter's response to "
+                + unauthorized + " from " + uri);
+        assertTrue(next != null, "next should not be null");
+        String[] up = check(reqURI, next.getSystemHeaders(), proxy);
+        assertEquals(authenticator.COUNTER.get(), 1);
+
+        // Now simulate a new successful exchange to get the credentials in the cache
+        // We first call filter.request with the request that was previously
+        // returned by the filter, then create a new Response with a 200 status
+        // code, and feed that to the filter with filter.response.
+        // At this point, the credentials will be added to the cache.
+        out.println("Simulating next request with credentials to " + uri);
+        exchange = new Exchange<>(next, multi);
+        filter.request(next, multi);
+        out.println("Checking credentials in request header after filter for " + uri);
+        check(reqURI, next.getSystemHeaders(), proxy);
+        check(next.uri(), next.getSystemHeaders(), proxy);
+        out.println("Simulating  successful response 200 from " + uri);
+        response = new Response(next, exchange, new HttpHeadersImpl(), null, 200, v);
+        next = filter.response(response);
+        assertTrue(next == null, "next should be null");
+        assertEquals(authenticator.COUNTER.get(), 1);
+
+        // Now verify that the cache is used for the next request to the same server.
+        // We're going to create a request to the same server by appending "/bar" to
+        // the original request path. Then we're going to feed that to filter.request
+        // The expectation is that filter.request will add the credentials to the
+        // request system headers, because it should find them in the cache.
+        int fragmentIndex = uri.indexOf('#');
+        String subpath = "/bar";
+        String prefix = uri;
+        String fragment =  "";
+        if (fragmentIndex > -1) {
+            prefix = uri.substring(0, fragmentIndex);
+            fragment = uri.substring(fragmentIndex);
+        }
+        URI reqURI2 = URI.create(prefix + subpath + fragment);
+        out.println("Simulating new request to " + reqURI2);
+        HttpRequestBuilderImpl reqBuilder2 =
+                new HttpRequestBuilderImpl(reqURI2);
+        HttpRequestImpl origReq2 = new HttpRequestImpl(reqBuilder2);
+        HttpRequestImpl req2 = new HttpRequestImpl(origReq2, ps);
+        MultiExchange<?> multi2 = new MultiExchange<Void>(origReq2, req2, client,
+                HttpResponse.BodyHandlers.replacing(null),
+                null, AccessController.getContext());
+        filter.request(req2, multi2);
+        out.println("Check that filter has added credentials from cache for " + reqURI2
+                + " with proxy " + req2.proxy());
+        String[] up2 = check(reqURI, req2.getSystemHeaders(), proxy);
+        assertTrue(Arrays.deepEquals(up, up2), format("%s:%s != %s:%s", up2[0], up2[1], up[0], up[1]));
+        assertEquals(authenticator.COUNTER.get(), 1);
+
+        // Now verify that the cache is not used if we send a request to a different server.
+        // We're going to append ".bar" to the original request host name, and feed that
+        // to filter.request.
+        // There are actually two cases: if we were using a proxy, then the new request
+        // should contain proxy credentials. If we were not using a proxy, then it should
+        // not contain any credentials at all.
+        URI reqURI3;
+        if (isNullOrEmpty(reqURI.getPath())
+                && isNullOrEmpty(reqURI.getFragment())
+                && reqURI.getPort() == -1) {
+            reqURI3 = URI.create(uri + ".bar");
+        } else {
+            reqURI3 = new URI(reqURI.getScheme(), reqURI.getUserInfo(),
+                         reqURI.getHost() + ".bar", reqURI.getPort(),
+                              reqURI.getPath(), reqURI.getQuery(),
+                              reqURI.getFragment());
+        }
+        out.println("Simulating new request to " + reqURI3);
+        HttpRequestBuilderImpl reqBuilder3 =
+                new HttpRequestBuilderImpl(reqURI3);
+        HttpRequestImpl origReq3 = new HttpRequestImpl(reqBuilder3);
+        HttpRequestImpl req3 = new HttpRequestImpl(origReq3, ps);
+        MultiExchange<?> multi3 = new MultiExchange<Void>(origReq3, req3, client,
+                HttpResponse.BodyHandlers.replacing(null),
+                null, AccessController.getContext());
+        filter.request(req3, multi3);
+        if (proxy == null) {
+            out.println("Check that filter has not added proxy credentials from cache for " + reqURI3);
+            assert !req3.getSystemHeaders().firstValue(authorization(true)).isPresent()
+                    : format("Unexpected proxy credentials found: %s",
+                    java.util.stream.Stream.of(getAuthorization(req3.getSystemHeaders(), true))
+                            .collect(joining(":")));
+            assertFalse(req3.getSystemHeaders().firstValue(authorization(true)).isPresent());
+        } else {
+            out.println("Check that filter has added proxy credentials from cache for " + reqURI3);
+            String[] up3 = check(reqURI, req3.getSystemHeaders(), proxy);
+            assertTrue(Arrays.deepEquals(up, up3), format("%s:%s != %s:%s", up3[0], up3[1], up[0], up[1]));
+        }
+        out.println("Check that filter has not added server credentials from cache for " + reqURI3);
+        assert !req3.getSystemHeaders().firstValue(authorization(false)).isPresent()
+                : format("Unexpected server credentials found: %s",
+                java.util.stream.Stream.of(getAuthorization(req3.getSystemHeaders(), false))
+                        .collect(joining(":")));
+        assertFalse(req3.getSystemHeaders().firstValue(authorization(false)).isPresent());
+        assertEquals(authenticator.COUNTER.get(), 1);
+
+        // Now we will verify that credentials for proxies are not used for servers and
+        // conversely.
+        // If we were using a proxy, we're now going to send a request to the proxy host,
+        // without using a proxy, and verify that filter.request neither add proxy credential
+        // or server credential to that host.
+        // I we were not using a proxy, we're going to send a request to the original
+        // server, using a proxy whose address matches the original server.
+        // We expect that the cache will add server credentials, but not proxy credentials.
+        int port = reqURI.getPort();
+        port = port == -1 ? defaultPort(reqURI.getScheme()) : port;
+        ProxySelector fakeProxy = proxy == null
+                ? ProxySelector.of(InetSocketAddress.createUnresolved(
+                reqURI.getHost(), port))
+                : NO_PROXY;
+        URI reqURI4 = proxy == null ? reqURI : new URI("http", null, req.proxy().getHostName(),
+                    req.proxy().getPort(), "/", null, null);
+        HttpRequestBuilderImpl reqBuilder4 = new HttpRequestBuilderImpl(reqURI4);
+        HttpRequestImpl origReq4 = new HttpRequestImpl(reqBuilder4);
+        HttpRequestImpl req4 = new HttpRequestImpl(origReq4, fakeProxy);
+        MultiExchange<?> multi4 = new MultiExchange<Void>(origReq4, req4, client,
+                HttpResponse.BodyHandlers.replacing(null), null,
+                AccessController.getContext());
+        out.println("Simulating new request to " + reqURI4 + " with a proxy " + req4.proxy());
+        assertTrue((req4.proxy() == null) == (proxy != null),
+                "(req4.proxy() == null) == (proxy != null) should be true");
+        filter.request(req4, multi4);
+        out.println("Check that filter has not added proxy credentials from cache for "
+                + reqURI4 + " (proxy: " + req4.proxy()  + ")");
+        assert !req4.getSystemHeaders().firstValue(authorization(true)).isPresent()
+                : format("Unexpected proxy credentials found: %s",
+                java.util.stream.Stream.of(getAuthorization(req4.getSystemHeaders(), true))
+                        .collect(joining(":")));
+        assertFalse(req4.getSystemHeaders().firstValue(authorization(true)).isPresent());
+        if (proxy != null) {
+            out.println("Check that filter has not added server credentials from cache for "
+                    + reqURI4 + " (proxy: " + req4.proxy()  + ")");
+            assert !req4.getSystemHeaders().firstValue(authorization(false)).isPresent()
+                    : format("Unexpected server credentials found: %s",
+                    java.util.stream.Stream.of(getAuthorization(req4.getSystemHeaders(), false))
+                            .collect(joining(":")));
+            assertFalse(req4.getSystemHeaders().firstValue(authorization(false)).isPresent());
+        } else {
+            out.println("Check that filter has added server credentials from cache for "
+                    + reqURI4 + " (proxy: " + req4.proxy()  + ")");
+            String[] up4 = check(reqURI, req4.getSystemHeaders(), proxy);
+            assertTrue(Arrays.deepEquals(up, up4),  format("%s:%s != %s:%s", up4[0], up4[1], up[0], up[1]));
+        }
+        assertEquals(authenticator.COUNTER.get(), 1);
+
+        if (proxy != null) {
+            // Now if we were using a proxy, we're going to send the same request than
+            // the original request, but without a proxy, and verify that this time
+            // the cache does not add any server or proxy credential. It should not
+            // add server credential because it should not have them (we only used
+            // proxy authentication so far) and it should not add proxy credentials
+            // because the request has no proxy.
+            HttpRequestBuilderImpl reqBuilder5 = new HttpRequestBuilderImpl(reqURI);
+            HttpRequestImpl origReq5 = new HttpRequestImpl(reqBuilder5);
+            HttpRequestImpl req5 = new HttpRequestImpl(origReq5, NO_PROXY);
+            MultiExchange<?> multi5 = new MultiExchange<Void>(origReq5, req5, client,
+                    HttpResponse.BodyHandlers.replacing(null), null,
+                    AccessController.getContext());
+            out.println("Simulating new request to " + reqURI + " with a proxy " + req5.proxy());
+            assertTrue(req5.proxy() == null, "req5.proxy() should be null");
+            Exchange<?> exchange5 = new Exchange<>(req5, multi5);
+            filter.request(req5, multi5);
+            out.println("Check that filter has not added server credentials from cache for "
+                    + reqURI + " (proxy: " + req5.proxy()  + ")");
+            assert !req5.getSystemHeaders().firstValue(authorization(false)).isPresent()
+                    : format("Unexpected server credentials found: %s",
+                    java.util.stream.Stream.of(getAuthorization(req5.getSystemHeaders(), false))
+                            .collect(joining(":")));
+            assertFalse(req5.getSystemHeaders().firstValue(authorization(false)).isPresent());
+            out.println("Check that filter has not added proxy credentials from cache for "
+                    + reqURI + " (proxy: " + req5.proxy()  + ")");
+            assert !req5.getSystemHeaders().firstValue(authorization(true)).isPresent()
+                    : format("Unexpected proxy credentials found: %s",
+                    java.util.stream.Stream.of(getAuthorization(req5.getSystemHeaders(), true))
+                            .collect(joining(":")));
+            assertFalse(req5.getSystemHeaders().firstValue(authorization(true)).isPresent());
+            assertEquals(authenticator.COUNTER.get(), 1);
+
+            // Now simulate a 401 response from the server
+            HttpHeadersImpl headers5 = new HttpHeadersImpl();
+            headers5.addHeader(authenticate(false),
+                    "Basic realm=\"earth\"");
+            unauthorized = 401;
+            Response response5 = new Response(req5, exchange5, headers5, null, unauthorized, v);
+            out.println("Simulating " + unauthorized
+                    + " response from " + uri);
+            HttpRequestImpl next5 = filter.response(response5);
+            assertEquals(authenticator.COUNTER.get(), 2);
+
+            out.println("Checking filter's response to "
+                    + unauthorized + " from " + uri);
+            assertTrue(next5 != null, "next5 should not be null");
+            String[] up5 = check(reqURI, next5.getSystemHeaders(), null);
+
+            // now simulate a 200 response from the server
+            exchange5 = new Exchange<>(next5, multi5);
+            filter.request(next5, multi5);
+            response5 = new Response(next5, exchange5, new HttpHeadersImpl(), null, 200, v);
+            filter.response(response5);
+            assertEquals(authenticator.COUNTER.get(), 2);
+
+            // now send the request again, with proxy this time, and it should have both
+            // server auth and proxy auth
+            HttpRequestBuilderImpl reqBuilder6 = new HttpRequestBuilderImpl(reqURI);
+            HttpRequestImpl origReq6 = new HttpRequestImpl(reqBuilder6);
+            HttpRequestImpl req6 = new HttpRequestImpl(origReq6, ps);
+            MultiExchange<?> multi6 = new MultiExchange<Void>(origReq6, req6, client,
+                    HttpResponse.BodyHandlers.replacing(null), null,
+                    AccessController.getContext());
+            out.println("Simulating new request to " + reqURI + " with a proxy " + req6.proxy());
+            assertTrue(req6.proxy() != null, "req6.proxy() should not be null");
+            Exchange<?> exchange6 = new Exchange<>(req6, multi6);
+            filter.request(req6, multi6);
+            out.println("Check that filter has added server credentials from cache for "
+                    + reqURI + " (proxy: " + req6.proxy()  + ")");
+            check(reqURI, req6.getSystemHeaders(), null);
+            out.println("Check that filter has added proxy credentials from cache for "
+                    + reqURI + " (proxy: " + req6.proxy()  + ")");
+            String[] up6 = check(reqURI, req6.getSystemHeaders(), proxy);
+            assertTrue(Arrays.deepEquals(up, up6), format("%s:%s != %s:%s", up6[0], up6[1], up[0], up[1]));
+            assertEquals(authenticator.COUNTER.get(), 2);
+        }
+
+        if (proxy == null && uri.contains("x/y/z")) {
+            URI reqURI7 = URI.create(prefix + "/../../w/z" + fragment);
+            assertTrue(reqURI7.getPath().contains("../../"));
+            HttpRequestBuilderImpl reqBuilder7 = new HttpRequestBuilderImpl(reqURI7);
+            HttpRequestImpl origReq7 = new HttpRequestImpl(reqBuilder7);
+            HttpRequestImpl req7 = new HttpRequestImpl(origReq7, ps);
+            MultiExchange<?> multi7 = new MultiExchange<Void>(origReq7, req7, client,
+                    HttpResponse.BodyHandlers.replacing(null), null,
+                    AccessController.getContext());
+            out.println("Simulating new request to " + reqURI7 + " with a proxy " + req7.proxy());
+            assertTrue(req7.proxy() == null, "req7.proxy() should be null");
+            Exchange<?> exchange7 = new Exchange<>(req7, multi7);
+            filter.request(req7, multi7);
+            out.println("Check that filter has not added server credentials from cache for "
+                    + reqURI7 + " (proxy: " + req7.proxy()  + ") [resolved uri: "
+                    + reqURI7.resolve(".") + " should not match " + reqURI.resolve(".") + "]");
+            assert !req7.getSystemHeaders().firstValue(authorization(false)).isPresent()
+                    : format("Unexpected server credentials found: %s",
+                    java.util.stream.Stream.of(getAuthorization(req7.getSystemHeaders(), false))
+                            .collect(joining(":")));
+            assertFalse(req7.getSystemHeaders().firstValue(authorization(false)).isPresent());
+            out.println("Check that filter has not added proxy credentials from cache for "
+                    + reqURI7 + " (proxy: " + req7.proxy()  + ")");
+            assert !req7.getSystemHeaders().firstValue(authorization(true)).isPresent()
+                    : format("Unexpected proxy credentials found: %s",
+                    java.util.stream.Stream.of(getAuthorization(req7.getSystemHeaders(), true))
+                            .collect(joining(":")));
+            assertFalse(req7.getSystemHeaders().firstValue(authorization(true)).isPresent());
+            assertEquals(authenticator.COUNTER.get(), 1);
+
+        }
+
+        Reference.reachabilityFence(facade);
+    }
+
+    static int defaultPort(String protocol) {
+        if ("http".equalsIgnoreCase(protocol)) return 80;
+        if ("https".equalsIgnoreCase(protocol)) return 443;
+        return -1;
+    }
+
+    static String authenticate(boolean proxy) {
+        return proxy ? "Proxy-Authenticate" : "WWW-Authenticate";
+    }
+    static String authorization(boolean proxy) {
+        return proxy ? "Proxy-Authorization" : "Authorization";
+    }
+
+    static String[] getAuthorization(HttpHeaders headers, boolean proxy) {
+        String auth = headers.firstValue(authorization(proxy)).get().substring(6);
+        String pw = new String(Base64.getDecoder().decode(auth), US_ASCII);
+        String[] up = pw.split(":");
+        up[1] = new String(Base64.getDecoder().decode(up[1]), US_ASCII);
+        return up;
+    }
+
+    static Authenticator.RequestorType requestorType(boolean proxy) {
+        return proxy ? Authenticator.RequestorType.PROXY
+                     : Authenticator.RequestorType.SERVER;
+    }
+
+    static String[] check(URI reqURI, HttpHeaders headers, String proxy) throws Exception {
+        out.println("Next request headers: " + headers.map());
+        String[] up = getAuthorization(headers, proxy != null);
+        String u = up[0];
+        String p = up[1];
+        out.println("user:password: " + u + ":" + p);
+        String protocol = proxy != null ? "http" : reqURI.getScheme();
+        String expectedUser = "u." + protocol;
+        assertEquals(u, expectedUser);
+        String host = proxy == null ? reqURI.getHost() :
+                proxy.substring(0, proxy.lastIndexOf(':'));
+        int port = proxy == null ? reqURI.getPort()
+                : Integer.parseInt(proxy.substring(proxy.lastIndexOf(':')+1));
+        String expectedPw = concat(requestorType(proxy!=null),
+                "basic", protocol, host,
+                port, "earth", reqURI.toURL());
+        assertEquals(p, expectedPw);
+        return new String[] {u, p};
+    }
+
+    static String concat(Authenticator.RequestorType reqType,
+                           String authScheme,
+                           String requestingProtocol,
+                           String requestingHost,
+                           int requestingPort,
+                           String realm,
+                           URL requestingURL) {
+        return new StringBuilder()
+                .append(reqType).append(":")
+                .append(authScheme).append(":")
+                .append(String.valueOf(realm))
+                .append("[")
+                .append(requestingProtocol).append(':')
+                .append(requestingHost).append(':')
+                .append(requestingPort).append("]")
+                .append("/").append(String.valueOf(requestingURL))
+                .toString();
+    }
+
+    static class TestAuthenticator extends Authenticator {
+        final AtomicLong COUNTER = new AtomicLong();
+        @Override
+        public PasswordAuthentication getPasswordAuthentication() {
+            COUNTER.incrementAndGet();
+            return new PasswordAuthentication("u."+getRequestingProtocol(),
+                    Base64.getEncoder().encodeToString(concat().getBytes(US_ASCII))
+                            .toCharArray());
+        }
+
+        String concat() {
+            return AuthenticationFilterTest.concat(
+                    getRequestorType(),
+                    getRequestingScheme(),
+                    getRequestingProtocol(),
+                    getRequestingHost(),
+                    getRequestingPort(),
+                    getRequestingPrompt(),
+                    getRequestingURL());
+        }
+
+    }
+}
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ConnectionPoolTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java
similarity index 94%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ConnectionPoolTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java
index 0f99fb1cebe..536bad3592f 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ConnectionPoolTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/ConnectionPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
@@ -42,7 +42,10 @@
 import java.time.temporal.ChronoUnit;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
-import jdk.incubator.http.internal.common.FlowTube;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import jdk.internal.net.http.common.FlowTube;
 
 /**
  * @summary Verifies that the ConnectionPool correctly handle
@@ -190,8 +193,6 @@ public HttpConnectionStub(HttpClient client,
         @Override boolean isSecure() {return secured;}
         @Override boolean isProxied() {return proxy!=null;}
         @Override ConnectionPool.CacheKey cacheKey() {return key;}
-        @Override void shutdownInput() throws IOException {}
-        @Override void shutdownOutput() throws IOException {}
         @Override
         public void close() {
             closed=true;
@@ -207,10 +208,6 @@ public String toString() {
         @Override public CompletableFuture<Void> connectAsync() {return error();}
         @Override SocketChannel channel() {return error();}
         @Override
-        HttpConnection.DetachedConnectionChannel detachChannel() {
-            return error();
-        }
-        @Override
         FlowTube getConnectionFlow() {return flow;}
     }
     // Emulates an HttpClient that has a strong reference to its connection pool.
@@ -229,7 +226,7 @@ public HttpClientStub(ConnectionPool pool) {
         @Override public Optional<Executor> executor() {return error();}
         @Override
         public <T> HttpResponse<T> send(HttpRequest req,
-                HttpResponse.BodyHandler<T> responseBodyHandler)
+                                        HttpResponse.BodyHandler<T> responseBodyHandler)
                 throws IOException, InterruptedException {
             return error();
         }
@@ -239,8 +236,9 @@ public <T> CompletableFuture<HttpResponse<T>> sendAsync(HttpRequest req,
             return error();
         }
         @Override
-        public <U, T> CompletableFuture<U> sendAsync(HttpRequest req,
-                HttpResponse.MultiSubscriber<U, T> multiSubscriber) {
+        public <T> CompletableFuture<HttpResponse<T>> sendAsync(HttpRequest req,
+                HttpResponse.BodyHandler<T> bodyHandler,
+                HttpResponse.PushPromiseHandler<T> multiHandler) {
             return error();
         }
     }
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/DefaultProxy.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/DefaultProxy.java
new file mode 100644
index 00000000000..96d08ae2c34
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/DefaultProxy.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+package jdk.internal.net.http;
+
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.util.List;
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+
+public class DefaultProxy {
+
+    static ProxySelector getProxySelector() {
+        return (((HttpClientFacade)HttpClient.newHttpClient()).impl).proxySelector();
+    }
+
+    @Test
+    public void testDefault() {
+        ProxySelector ps = getProxySelector();
+        System.out.println("HttpClientImpl proxySelector:" + ps);
+        assertEquals(ps, ProxySelector.getDefault());
+    }
+
+    // From the test driver
+    // -Dhttp.proxyHost=foo.proxy.com
+    // -Dhttp.proxyPort=9876
+    // -Dhttp.nonProxyHosts=*.direct.com
+    @Test
+    public void testHttpProxyProps() {
+        ProxySelector ps = getProxySelector();
+
+        URI uri = URI.create("http://foo.com/example.html");
+        List<Proxy> plist = ps.select(uri);
+        System.out.println("proxy list for " + uri + " : " + plist);
+        assertEquals(plist.size(), 1);
+        Proxy proxy = plist.get(0);
+        assertEquals(proxy.type(), Proxy.Type.HTTP);
+        InetSocketAddress expectedAddr =
+                InetSocketAddress.createUnresolved("foo.proxy.com", 9876);
+        assertEquals(proxy.address(), expectedAddr);
+
+        // nonProxyHosts
+        uri = URI.create("http://foo.direct.com/example.html");
+        plist = ps.select(uri);
+        System.out.println("proxy list for " + uri + " : " + plist);
+        assertEquals(plist.size(), 1);
+        proxy = plist.get(0);
+        assertEquals(proxy.type(), Proxy.Type.DIRECT);
+        assertEquals(proxy.address(), null);
+    }
+
+    // From the test driver
+    // -Dhttp.proxyHost=secure.proxy.com
+    // -Dhttp.proxyPort=5443
+    @Test
+    public void testHttpsProxyProps() {
+        ProxySelector ps = getProxySelector();
+
+        URI uri = URI.create("https://foo.com/example.html");
+        List<Proxy> plist = ps.select(uri);
+        System.out.println("proxy list for " + uri + " : " + plist);
+        assertEquals(plist.size(), 1);
+        Proxy proxy = plist.get(0);
+        assertEquals(proxy.type(), Proxy.Type.HTTP);
+        InetSocketAddress expectedAddr =
+                InetSocketAddress.createUnresolved("secure.proxy.com", 5443);
+        assertEquals(proxy.address(), expectedAddr);
+
+        // nonProxyHosts
+        uri = URI.create("https://foo.direct.com/example.html");
+        plist = ps.select(uri);
+        System.out.println("proxy list for " + uri + " : " + plist);
+        assertEquals(plist.size(), 1);
+        proxy = plist.get(0);
+        assertEquals(proxy.type(), Proxy.Type.DIRECT);
+        assertEquals(proxy.address(), null);
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/FlowTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java
similarity index 98%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/FlowTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java
index 5f4cc7ef147..e34a75229e1 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/FlowTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -29,6 +29,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.security.KeyManagementException;
@@ -54,9 +56,9 @@
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.*;
 import javax.net.ssl.TrustManagerFactory;
-import jdk.incubator.http.internal.common.Utils;
+import jdk.internal.net.http.common.Utils;
 import org.testng.annotations.Test;
-import jdk.incubator.http.internal.common.SSLFlowDelegate;
+import jdk.internal.net.http.common.SSLFlowDelegate;
 
 @Test
 public class FlowTest extends AbstractRandomTest {
@@ -196,14 +198,16 @@ static class SSLLoopbackSubscriber implements Subscriber<List<ByteBuffer>> {
                               ExecutorService exec,
                               CountDownLatch allBytesReceived) throws IOException {
             SSLServerSocketFactory fac = ctx.getServerSocketFactory();
-            SSLServerSocket serv = (SSLServerSocket) fac.createServerSocket(0);
+            SSLServerSocket serv = (SSLServerSocket) fac.createServerSocket();
+            serv.setReuseAddress(false);
+            serv.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             SSLParameters params = serv.getSSLParameters();
             params.setApplicationProtocols(new String[]{"proto2"});
             serv.setSSLParameters(params);
 
 
             int serverPort = serv.getLocalPort();
-            clientSock = new Socket("127.0.0.1", serverPort);
+            clientSock = new Socket("localhost", serverPort);
             serverSock = (SSLSocket) serv.accept();
             this.buffer = new LinkedBlockingQueue<>();
             this.allBytesReceived = allBytesReceived;
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/Http1HeaderParserTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/Http1HeaderParserTest.java
similarity index 99%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/Http1HeaderParserTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/Http1HeaderParserTest.java
index 5b4f40a5e67..c7e727091c7 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/Http1HeaderParserTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/Http1HeaderParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.io.ByteArrayInputStream;
 import java.net.ProtocolException;
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/RawChannelTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/RawChannelTest.java
similarity index 84%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/RawChannelTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/RawChannelTest.java
index 9cb59d59d11..3ebd4bf3e92 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/RawChannelTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/RawChannelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -21,28 +21,32 @@
  * questions.
  */
 
-package jdk.incubator.http;
-
-import jdk.incubator.http.internal.websocket.RawChannel;
-import jdk.incubator.http.internal.websocket.WebSocketRequest;
-import org.testng.annotations.Test;
+package jdk.internal.net.http;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.channels.SelectionKey;
 import java.util.Random;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import jdk.internal.net.http.websocket.RawChannel;
+import jdk.internal.net.http.websocket.WebSocketRequest;
+import org.testng.annotations.Test;
+import static java.net.http.HttpResponse.BodyHandlers.discarding;
 import static org.testng.Assert.assertEquals;
 
 /*
@@ -56,6 +60,8 @@ public class RawChannelTest {
     private final AtomicLong serverWritten = new AtomicLong();
     private final AtomicLong clientRead = new AtomicLong();
     private final AtomicLong serverRead = new AtomicLong();
+    private CompletableFuture<Void> outputCompleted = new CompletableFuture<>();
+    private CompletableFuture<Void> inputCompleted = new CompletableFuture<>();
 
     /*
      * Since at this level we don't have any control over the low level socket
@@ -79,7 +85,9 @@ public class RawChannelTest {
 
     @Test
     public void test() throws Exception {
-        try (ServerSocket server = new ServerSocket(0)) {
+        try (ServerSocket server = new ServerSocket()) {
+            server.setReuseAddress(false);
+            server.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port = server.getLocalPort();
             new TestServer(server).start();
 
@@ -115,7 +123,9 @@ public void handle() {
                     if (i > 3) { // Fill up the send buffer not more than 3 times
                         try {
                             chan.shutdownOutput();
+                            outputCompleted.complete(null);
                         } catch (IOException e) {
+                            outputCompleted.completeExceptionally(e);
                             e.printStackTrace();
                         }
                         return;
@@ -155,10 +165,12 @@ public void handle() {
                         try {
                             read = chan.read();
                         } catch (IOException e) {
+                            inputCompleted.completeExceptionally(e);
                             e.printStackTrace();
                         }
                         if (read == null) {
                             print("OP_READ EOF");
+                            inputCompleted.complete(null);
                             break;
                         } else if (!read.hasRemaining()) {
                             print("OP_READ stall");
@@ -177,6 +189,15 @@ public void handle() {
                     print("OP_READ read %s bytes (%s total)", total, clientRead.get());
                 }
             });
+            CompletableFuture.allOf(outputCompleted,inputCompleted)
+                    .whenComplete((r,t) -> {
+                        try {
+                            print("closing channel");
+                            chan.close();
+                        } catch (IOException x) {
+                            x.printStackTrace();
+                        }
+                    });
             exit.await(); // All done, we need to compare results:
             assertEquals(clientRead.get(), serverWritten.get());
             assertEquals(serverRead.get(), clientWritten.get());
@@ -184,7 +205,7 @@ public void handle() {
     }
 
     private static RawChannel channelOf(int port) throws Exception {
-        URI uri = URI.create("http://127.0.0.1:" + port + "/");
+        URI uri = URI.create("http://localhost:" + port + "/");
         print("raw channel to %s", uri.toString());
         HttpRequest req = HttpRequest.newBuilder(uri).build();
         // Switch on isWebSocket flag to prevent the connection from
@@ -192,7 +213,7 @@ private static RawChannel channelOf(int port) throws Exception {
         ((WebSocketRequest)req).isWebSocket(true);
         HttpClient client = HttpClient.newHttpClient();
         try {
-            HttpResponse<?> r = client.send(req, discard(null));
+            HttpResponse<?> r = client.send(req, discarding());
             r.body();
             return ((HttpResponseImpl) r).rawChannel();
         } finally {
@@ -224,7 +245,6 @@ public void run() {
                     try {
                         long n = readSlowly(is);
                         print("Server read %s bytes", n);
-                        serverRead.addAndGet(n);
                         s.shutdownInput();
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -235,7 +255,6 @@ public void run() {
                     try {
                         long n = writeSlowly(os);
                         print("Server written %s bytes", n);
-                        serverWritten.addAndGet(n);
                         s.shutdownOutput();
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -285,8 +304,10 @@ private long writeSlowly(OutputStream os) throws Exception {
             long total = first.length;
             os.write(first);
             os.flush();
+            serverWritten.addAndGet(first.length);
 
             // wait until initial bytes were read
+            print("Server wrote total %d: awaiting initialReadStall", total);
             initialReadStall.await();
 
             // make sure there is something to read, otherwise readStall
@@ -295,15 +316,20 @@ private long writeSlowly(OutputStream os) throws Exception {
             os.write(first);
             os.flush();
             total += first.length;
+            serverWritten.addAndGet(first.length);
 
             // Let's wait for the signal from the raw channel that its read has
             // stalled, and then continue sending a bit more stuff
+            print("Server wrote total %d: awaiting readStall", total);
             readStall.await();
+            print("readStall unblocked, writing 32k");
             for (int i = 0; i < 32; i++) {
                 byte[] b = byteArrayOfSize(1024);
                 os.write(b);
                 os.flush();
+                serverWritten.addAndGet(b.length);
                 total += b.length;
+                print("Server wrote total %d", total);
                 TimeUnit.MILLISECONDS.sleep(1);
             }
             return total;
@@ -312,11 +338,14 @@ private long writeSlowly(OutputStream os) throws Exception {
         private long readSlowly(InputStream is) throws Exception {
             // Wait for the raw channel to fill up its send buffer
             writeStall.await();
+            print("writingStall unblocked, start reading");
             long overall = 0;
             byte[] array = new byte[1024];
             for (int n = 0; n != -1; n = is.read(array)) {
+                serverRead.addAndGet(n);
                 TimeUnit.MILLISECONDS.sleep(1);
                 overall += n;
+                print("Server read total: %d", overall);
             }
             return overall;
         }
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLEchoTubeTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLEchoTubeTest.java
similarity index 96%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLEchoTubeTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLEchoTubeTest.java
index b818bcc71be..3b9b8c9fbd5 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLEchoTubeTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLEchoTubeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -21,13 +21,13 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
-import jdk.incubator.http.internal.common.Demand;
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.SSLTube;
-import jdk.incubator.http.internal.common.SequentialScheduler;
-import jdk.incubator.http.internal.common.Utils;
+import jdk.internal.net.http.common.Demand;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.SSLTube;
+import jdk.internal.net.http.common.SequentialScheduler;
+import jdk.internal.net.http.common.Utils;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -313,21 +313,21 @@ public void onNext(List<ByteBuffer> item) {
             System.out.printf("EchoTube add %s [requested:%s, queue:%s]%n",
                     Utils.remaining(item), requested, queue.size());
             queue.add(item);
-            processingScheduler.deferOrSchedule(executor);
+            processingScheduler.runOrSchedule(executor);
         }
 
         @Override
         public void onError(Throwable throwable) {
             System.out.println("EchoTube add " + throwable);
             queue.add(throwable);
-            processingScheduler.deferOrSchedule(executor);
+            processingScheduler.runOrSchedule(executor);
         }
 
         @Override
         public void onComplete() {
             System.out.println("EchoTube add EOF");
             queue.add(EOF);
-            processingScheduler.deferOrSchedule(executor);
+            processingScheduler.runOrSchedule(executor);
         }
 
         @Override
@@ -344,7 +344,7 @@ public void request(long n) {
                     throw new InternalError();
                 }
                 if (demand.increase(n)) {
-                    processingScheduler.deferOrSchedule(executor);
+                    processingScheduler.runOrSchedule(executor);
                 }
             }
 
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLTubeTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLTubeTest.java
similarity index 95%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLTubeTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLTubeTest.java
index d9897a38ec0..ac251f9ba7d 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLTubeTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SSLTubeTest.java
@@ -21,11 +21,11 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
-import jdk.incubator.http.internal.common.FlowTube;
-import jdk.incubator.http.internal.common.SSLFlowDelegate;
-import jdk.incubator.http.internal.common.Utils;
+import jdk.internal.net.http.common.FlowTube;
+import jdk.internal.net.http.common.SSLFlowDelegate;
+import jdk.internal.net.http.common.Utils;
 import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
@@ -37,6 +37,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.util.List;
@@ -83,14 +85,16 @@ private static class SSLLoopbackSubscriber implements FlowTube {
                               ExecutorService exec,
                               CountDownLatch allBytesReceived) throws IOException {
             SSLServerSocketFactory fac = ctx.getServerSocketFactory();
-            SSLServerSocket serv = (SSLServerSocket) fac.createServerSocket(0);
+            SSLServerSocket serv = (SSLServerSocket) fac.createServerSocket();
+            serv.setReuseAddress(false);
+            serv.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             SSLParameters params = serv.getSSLParameters();
             params.setApplicationProtocols(new String[]{"proto2"});
             serv.setSSLParameters(params);
 
 
             int serverPort = serv.getLocalPort();
-            clientSock = new Socket("127.0.0.1", serverPort);
+            clientSock = new Socket("localhost", serverPort);
             serverSock = (SSLSocket) serv.accept();
             this.buffer = new LinkedBlockingQueue<>();
             this.allBytesReceived = allBytesReceived;
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SelectorTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SelectorTest.java
similarity index 92%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SelectorTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SelectorTest.java
index 21ffc4d18e8..ae9c9b1ea39 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SelectorTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SelectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.net.*;
 import java.io.*;
@@ -29,13 +29,15 @@
 import java.nio.ByteBuffer;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import org.testng.annotations.Test;
+import jdk.internal.net.http.websocket.RawChannel;
 import static java.lang.System.out;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
-
-import org.testng.annotations.Test;
-import jdk.incubator.http.internal.websocket.RawChannel;
+import static java.net.http.HttpResponse.BodyHandlers.discarding;
 
 /**
  * Whitebox test of selector mechanics. Currently only a simple test
@@ -79,7 +81,9 @@ String readSomeBytes(RawChannel chan) {
     @Test
     public void test() throws Exception {
 
-        try (ServerSocket server = new ServerSocket(0)) {
+        try (ServerSocket server = new ServerSocket()) {
+            server.setReuseAddress(false);
+            server.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
             int port = server.getLocalPort();
 
             out.println("Listening on port " + server.getLocalPort());
@@ -144,14 +148,14 @@ public void handle() {
     }
 
     static RawChannel getARawChannel(int port) throws Exception {
-        URI uri = URI.create("http://127.0.0.1:" + port + "/");
+        URI uri = URI.create("http://localhost:" + port + "/");
         out.println("client connecting to " + uri.toString());
         HttpRequest req = HttpRequest.newBuilder(uri).build();
         // Otherwise HttpClient will think this is an ordinary connection and
         // thus all ordinary procedures apply to it, e.g. it must be put into
         // the cache
         ((HttpRequestImpl) req).isWebSocket(true);
-        HttpResponse<?> r = defaultClient().send(req, discard(null));
+        HttpResponse<?> r = defaultClient().send(req, discarding());
         r.body();
         return ((HttpResponseImpl) r).rawChannel();
     }
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/WrapperTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/WrapperTest.java
similarity index 98%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/WrapperTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/WrapperTest.java
index 6cfcdf3f53e..6dad2cc75b5 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/WrapperTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/WrapperTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.incubator.http;
+package jdk.internal.net.http;
 
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
@@ -29,7 +29,7 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 import org.testng.annotations.Test;
-import jdk.incubator.http.internal.common.SubscriberWrapper;
+import jdk.internal.net.http.common.SubscriberWrapper;
 
 @Test
 public class WrapperTest {
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/internal/common/DemandTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/DemandTest.java
similarity index 99%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/internal/common/DemandTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/DemandTest.java
index ab291da4a65..4ea604fd488 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/internal/common/DemandTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/DemandTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.common;
+package jdk.internal.net.http.common;
 
 import org.testng.annotations.Test;
 
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/MinimalFutureTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/MinimalFutureTest.java
new file mode 100644
index 00000000000..01798a645a2
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/common/MinimalFutureTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+package jdk.internal.net.http.common;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static org.testng.Assert.assertThrows;
+
+public class MinimalFutureTest {
+
+    @Test(dataProvider = "futures")
+    public void test(CompletableFuture<Object> mf) {
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        try {
+            assertNoObtrusion(mf.thenApply(MinimalFutureTest::apply));
+            assertNoObtrusion(mf.thenApplyAsync(MinimalFutureTest::apply));
+            assertNoObtrusion(mf.thenApplyAsync(MinimalFutureTest::apply, executor));
+
+            assertNoObtrusion(mf.thenAccept(MinimalFutureTest::accept));
+            assertNoObtrusion(mf.thenAcceptAsync(MinimalFutureTest::accept));
+            assertNoObtrusion(mf.thenAcceptAsync(MinimalFutureTest::accept, executor));
+
+            assertNoObtrusion(mf.thenRun(MinimalFutureTest::run));
+            assertNoObtrusion(mf.thenRunAsync(MinimalFutureTest::run));
+            assertNoObtrusion(mf.thenRunAsync(MinimalFutureTest::run, executor));
+
+            assertNoObtrusion(mf.thenCombine(otherFuture(), MinimalFutureTest::apply));
+            assertNoObtrusion(mf.thenCombineAsync(otherFuture(), MinimalFutureTest::apply));
+            assertNoObtrusion(mf.thenCombineAsync(otherFuture(), MinimalFutureTest::apply, executor));
+
+            assertNoObtrusion(mf.thenAcceptBoth(otherFuture(), MinimalFutureTest::accept));
+            assertNoObtrusion(mf.thenAcceptBothAsync(otherFuture(), MinimalFutureTest::accept));
+            assertNoObtrusion(mf.thenAcceptBothAsync(otherFuture(), MinimalFutureTest::accept, executor));
+
+            assertNoObtrusion(mf.runAfterBoth(otherFuture(), MinimalFutureTest::run));
+            assertNoObtrusion(mf.runAfterBothAsync(otherFuture(), MinimalFutureTest::run));
+            assertNoObtrusion(mf.runAfterBothAsync(otherFuture(), MinimalFutureTest::run, executor));
+
+            // "either" methods may return something else if otherFuture() is
+            // not MinimalFuture
+
+            assertNoObtrusion(mf.applyToEither(otherFuture(), MinimalFutureTest::apply));
+            assertNoObtrusion(mf.applyToEitherAsync(otherFuture(), MinimalFutureTest::apply));
+            assertNoObtrusion(mf.applyToEitherAsync(otherFuture(), MinimalFutureTest::apply, executor));
+
+            assertNoObtrusion(mf.acceptEither(otherFuture(), MinimalFutureTest::accept));
+            assertNoObtrusion(mf.acceptEitherAsync(otherFuture(), MinimalFutureTest::accept));
+            assertNoObtrusion(mf.acceptEitherAsync(otherFuture(), MinimalFutureTest::accept, executor));
+
+            assertNoObtrusion(mf.runAfterEither(otherFuture(), MinimalFutureTest::run));
+            assertNoObtrusion(mf.runAfterEitherAsync(otherFuture(), MinimalFutureTest::run));
+            assertNoObtrusion(mf.runAfterEitherAsync(otherFuture(), MinimalFutureTest::run, executor));
+
+            assertNoObtrusion(mf.thenCompose(MinimalFutureTest::completionStageOf));
+            assertNoObtrusion(mf.thenComposeAsync(MinimalFutureTest::completionStageOf));
+            assertNoObtrusion(mf.thenComposeAsync(MinimalFutureTest::completionStageOf, executor));
+
+            assertNoObtrusion(mf.handle(MinimalFutureTest::relay));
+            assertNoObtrusion(mf.handleAsync(MinimalFutureTest::relay));
+            assertNoObtrusion(mf.handleAsync(MinimalFutureTest::relay, executor));
+
+            assertNoObtrusion(mf.whenComplete(MinimalFutureTest::accept));
+            assertNoObtrusion(mf.whenCompleteAsync(MinimalFutureTest::accept));
+            assertNoObtrusion(mf.whenCompleteAsync(MinimalFutureTest::accept, executor));
+
+            assertNoObtrusion(mf.toCompletableFuture());
+            assertNoObtrusion(mf.exceptionally(t -> null));
+
+            assertNoObtrusion(mf);
+            assertNoObtrusion(mf.copy());
+            assertNoObtrusion(mf.newIncompleteFuture());
+        } finally {
+            executor.shutdownNow();
+        }
+    }
+
+    private static CompletableFuture<Object> otherFuture() {
+        return MinimalFuture.completedFuture(new Object());
+    }
+
+    private static Object relay(Object r, Throwable e) {
+        if (e != null)
+            throw new CompletionException(e);
+        else
+            return r;
+    }
+
+    private static CompletableFuture<?> completionStageOf(Object r) {
+        return new CompletableFuture<>();
+    }
+
+    private static void accept(Object arg) {
+    }
+
+    private static void accept(Object arg1, Object arg2) {
+    }
+
+    private static void run() {
+    }
+
+    private static Object apply(Object arg) {
+        return new Object();
+    }
+
+    private static Object apply(Object arg1, Object arg2) {
+        return new Object();
+    }
+
+
+    @DataProvider(name = "futures")
+    public Object[][] futures() {
+
+        MinimalFuture<Object> mf = new MinimalFuture<>();
+        mf.completeExceptionally(new Throwable());
+
+        MinimalFuture<Object> mf1 = new MinimalFuture<>();
+        mf1.complete(new Object());
+
+        return new Object[][]{
+                new Object[]{new MinimalFuture<>()},
+                new Object[]{MinimalFuture.failedFuture(new Throwable())},
+                new Object[]{MinimalFuture.completedFuture(new Object())},
+                new Object[]{mf},
+                new Object[]{mf1},
+        };
+    }
+
+    private void assertNoObtrusion(CompletableFuture<?> cf) {
+        assertThrows(UnsupportedOperationException.class,
+                     () -> cf.obtrudeValue(null));
+        assertThrows(UnsupportedOperationException.class,
+                     () -> cf.obtrudeException(new RuntimeException()));
+    }
+}
diff --git a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/internal/frame/FramesDecoderTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/frame/FramesDecoderTest.java
similarity index 99%
rename from test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/internal/frame/FramesDecoderTest.java
rename to test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/frame/FramesDecoderTest.java
index a6f8162bea8..3db439d1c00 100644
--- a/test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/internal/frame/FramesDecoderTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/frame/FramesDecoderTest.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package jdk.incubator.http.internal.frame;
+package jdk.internal.net.http.frame;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java b/test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java
index 17e50c70354..47143dc3b2b 100644
--- a/test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java
+++ b/test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java
@@ -53,27 +53,44 @@ public class SimpleSSLContext {
      * source directory
      */
     public SimpleSSLContext() throws IOException {
-        String paths = System.getProperty("test.src.path");
-        StringTokenizer st = new StringTokenizer(paths, File.pathSeparator);
-        boolean securityExceptions = false;
-        while (st.hasMoreTokens()) {
-            String path = st.nextToken();
-            try {
-                File f = new File(path, "jdk/testlibrary/testkeys");
-                if (f.exists()) {
-                    try (FileInputStream fis = new FileInputStream(f)) {
-                        init(fis);
-                        return;
+        try {
+            AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
+                @Override
+                public Void run() throws Exception {
+                    String paths = System.getProperty("test.src.path");
+                    StringTokenizer st = new StringTokenizer(paths, File.pathSeparator);
+                    boolean securityExceptions = false;
+                    while (st.hasMoreTokens()) {
+                        String path = st.nextToken();
+                        try {
+                            File f = new File(path, "jdk/testlibrary/testkeys");
+                            if (f.exists()) {
+                                try (FileInputStream fis = new FileInputStream(f)) {
+                                    init(fis);
+                                    return null;
+                                }
+                            }
+                        } catch (SecurityException e) {
+                            // catch and ignore because permission only required
+                            // for one entry on path (at most)
+                            securityExceptions = true;
+                        }
+                    }
+                    if (securityExceptions) {
+                        System.err.println("SecurityExceptions thrown on loading testkeys");
                     }
+                    return null;
                 }
-            } catch (SecurityException e) {
-                // catch and ignore because permission only required
-                // for one entry on path (at most)
-                securityExceptions = true;
-            }
-        }
-        if (securityExceptions) {
-            System.err.println("SecurityExceptions thrown on loading testkeys");
+            });
+        } catch (PrivilegedActionException pae) {
+            Throwable t = pae.getCause() != null ? pae.getCause() : pae;
+            if (t instanceof IOException)
+                throw (IOException)t;
+            if (t instanceof RuntimeException)
+                throw (RuntimeException)t;
+            if (t instanceof Error)
+                throw (Error)t;
+            throw new RuntimeException(t);
         }
     }
 
diff --git a/test/jdk/lib/testlibrary/jdk/testlibrary/testkeys b/test/jdk/lib/testlibrary/jdk/testlibrary/testkeys
index 7059a4c22f0fcb1b23a9a749d7b521e764ee7f67..ddb9f305561ea874af5da7766411c3283c0ba2bc 100644
GIT binary patch
literal 2321
zcmY+Dc{CIX8^&idW^9QeTWClk%vhT!F_w|6Bg$4L`w~(pMoiXj7%IXw)~3idmKj^t
z7!4sr5u#`iNy#$e`o8mh_n!O5d){+?&-*@qJr9Zm=LZ47C=#q23RjB9#c%Kfxq<m4
z7z09r)$HR+6ba1xFA1~*A%QkgB+$?OS%vcc?~9KI2+Ajca`s^+>Nu3=|9IbA5`wtc
z@LSsd@>#ncr4lD&u?M%=7W~>EFrd?V-^*L(a;8{yVeE}>aKw#{yM$`0oZ-0?g;xWZ
z8b3?e$kT_iP%oLc@JSr!B@<^8cakF}7`!r!V?{jFll^Rbr+HxOE&6;o<?9f?U!jY^
zhG@s7Iaul?yF8+VLT`CiRd)|yyQpZ+3A^O0?kiV{QfQY8$RGRkqtV}_SJr|pOy7xO
z)|M<H&8)&tJ=^(`SfJjovJDL6)GwQsir8XnMGQg+m{#U5fIGH1Fp`r9RS$G5nr%_^
zd;sx?F;$;7+Gg3=kiA;Z?^>>WcSC3#ANS=JskgM28SY}NTr*!zdbd7ApUHDh#)>UA
z4}PQ!c_Gf<Fz3mx3^SyzoZ6zwHEKk^+f9!?!@={Mv)ZQ3UA2XTi1Zmc_~p7*AWuYa
zOr%)0IVFe6Zc4kcWMtB<wYpV`#%w;{t6SU2%{stPJf1{V^x)tnd5hjm%$F(0Dj1Ce
zZJ#62N$bVr3=AmQOfb+MB=iytf;yd0<GzM<P8y5Io={K>(Hf74vrc$OYZC)1Y1eRP
z)C;4_M5ueqMPCH@HjR0XHKyq?G%Mv1wNC=FDX}go#z<c-p{A#m3yFw3&AHsPtrj_X
zdtGdKlM#1>V{BcPO9m`%OQ$ABgGLPvnuzYzODp~9paC<>6a4*~ur-uy(KpX-Xo^J8
za%KvzOIg|r^^CVrh1PF4GK`#4Ts$d#4@IIj$KLVG*A|CmP_Og&k_7QnG$tM@QE1bU
z9-J&bgkNK5ER1;Rk28F>1qN9HN1wv`M+JSrpSF?332F8IZAs*3xpcG0Q6bF3gcP3B
zEUq$xU;V*!^OSWK;WOG0b@=Zn!x3mfX#qeOzz5(C@B(-MZU911NB)sT&<Kc-olk&=
zELsbFQcGJ?T^)r%YoJJ6fBt>M4b3NUCGVpo5D>7xNdG9ne{}%*pAO7h4|UxGSYeW{
zD|54gIIjoViB<pYKs1R9$GPf<9z2(nU2kJ&LT`6KmOaSHYb~27XjFV2>7?hLDt4%_
z;BwUTDrnEsqNi^D)t-FrolZ2_{?DJ<yRNBADg}ZVA_S9OD}8KOzWt`6+=m&JXfNU9
zcob>e##-2-N8C1#(BRCo+u)e$hKyBf)wkBQ-bs)%1$3on#sF?Vx{27JNLAr-b7FMD
ziDhbIFwIROXZYuPx{$3VMMEQ#z9v-yHamf(_38f_J07xN+LVhIb0J>6x&G*Y?~`NP
zSCsZHnr|*knIS5THVYgKCQeiZlavQmtyj+={72jQ-7=sVD5H}OA6-3w@Y~g4C#Roi
zTh={(QcDKI5lT)5ZmfA#{OYANl`~4p;_Gr94x-G}!yJEb$5(VY=BtqCvjR#t%iHWX
z0evNLW%0aXr0~mK_HblEe3|CD20hk3^oR1(C|PwWn<R(6Q>zx$n}|<!sh`d#dhssn
zepYh{4fB?#(*w+22$=Yc^wVYn+bm0e>t;!aEbRrqsjqHQ;~O>+Oi#eb-gTebfnE!|
zC)sj#k6oTbpKf#O3gQuvR!c=o&NX5eba(WF`<TF?0C~~-^%GNi=tS7s*-6};`|}o^
ziBL_y$0&{@^O}U!jB{1;L6af#VYHta>-H~Io7InTo9VB9^i-tzU+7WsMs|lzUMFwI
zsb`Y03JdCo9__C4PCbz5QCDP1(dC;iMBh$hL}`;tbY9S)_?#<?Dg0lIJ&&DeQhO{#
z<s%#s%@FR(X$#kr{oc?qhLFhL_1ye0FLQs|cZs0iywsbeIt$rRIe2@+we}ZSC7ZiB
z*F^uosUws9kv~dEuedXwSQfLJ+$OzPS$GR^tt4t9hbg*ZV|5O#7-N(U;kpTnWlx2u
zdf4>FfSu$aGR3qlz7F|Fx!iTt1V#{<7^R2ndamq@F*Rz(>x$!~OL(&N-0eSRtO&0#
z>)tg8XIi`ExsQ!1;HiPKe-uo57BL-u$_J0cD;p0>Wk@nD>ju6vW_4r7k?l#|*jTo?
zow(JWu~QT6z3f5PrWAvU#5E*(X7S?mJ<sYIx+(AWm!9f55V?Z*slhDKoDs1RbAjD_
zN3Z%5T*h77>P4@0oBrD|&-BbT;<X(QG<tAuq6-`O&Fn5kRpW~1<Y>7hM?to8+_!~5
zV#%PhE=ErvRq=r}8R34#3j<ZU^jO6ks4}ug<wY8!XtgNdo-yw51ByoO+6rgoXr<@8
zSwOwfylBO(LbO1j<Z0(2MZ3h|eq6-Erv<_<6eQ6urfF9mm3aEdtJAWjBh3@?rYt)v
z{NSgb1ek6IGaNIYw@G#qT<6)j_A3^-g>Z*FC2sA#*2CrJJMk*K&C~Z+!{f=BgU@~H
z?2~uA>u`VMFxwt9zVOxjb(}N$qs5sd^oA2s=QxNLgMkcGi|?`xfiG<Xy5DR@!S10h
zBpjd=u&WMTVXOuU=Pv}Aw8~%=s#B(>;m4?_8<3^t4TW)GsS)ZigkxFWX&b~|$GH9r
zr8=QpdbN*dLVJ8Y(+A{E2BZ_G$<(sS%7KwXVT3hUM9QsQqo7lh!dSVAcDDV}OX5_5
z`%(5YEvv^4iI7M9N`tz+CzoHoK7(pyw37$)hrw5c!dyO^(7I~we{&tNYYUiompOzH
zz~Hu!qAH7qVq9A#L-pYkPv3tS-Mv`&8z(+9+f!GeRg!8S;Zz?)MFRNBeq`%tRUNn)
znV>~xq-%h`;{vi~7fq9Qbpu5vZk3K+Zt^KA@ZX)C_Fv^|5{NczHs3&`l$ew!vx!S`
znT|WW%(zB~f`T!JG=(~YI)Z{jxs(OKAPFu21YrTU9;5WeR4Wa=RzemaDk!)`CkP@%
cN1pvNnE*ekOv&^3R&AG&dD#R62FB<A1yw>kKmY&$

literal 1369
zcmezO_TO6u1_mY|W&~sQ^30U<)RJN#pQ*UZcs@{Ww?Pxrb^|^(E^RhO7Dg>5K}JSa
z29_qK#dSaSez)CveZGl>_74S_=~fcTiYFdh`+V84@#Wo`MBCl(eg(-XNXX9Pjq`cf
zURD2{H>~{Y+^owv8~#5?{M2!(-RGm~;wCmRkJB4m{nl*b-1=c|Y+jOYe1ezJn!790
zy?tElE6dJ`pAPna?&#8Xf@`OziQ`(&N3zG>ewN!P7_(=+`I&c4pTg5)_Qb9apTTls
z`o?W{84nyfG%1!lx;|NmW4T?Z?aZ*I{zPRHHS4SA9=Ob}`mp@9cA@YG6B7$zmpKwE
zgZ~+bc3K9Ri5JwTN`z^z`_Om5src8K7{=AT`R&REPg128O}Dn<7fQb?DqSUY^Xgg6
z*f4qDqxY(I*iZD6Fg+sroSnDc>Nn>lhTbJ>EgD1vt?%5Q<xsBF(U7Q9tAE1fZ0$_x
zgP)FvO<gMZvd?Xy)4qd3RaK0k6Kt)WU!1J?diIcsTCUb3iQ~*~CiF~eSgIta`@1?!
zXP4JY{}WG@vz;VghW)+u==yH{eJnh!tb9ci+Wx+lE$gshOI7~D>rpI~AJez>QYPml
z_CuF${l9ixx#!sf_P2lT$*!0`+qI>TC40h3&yBHvX0cxnnXvw)!!GHM`3oy@W(axI
zS8U@*xn=x)wd&+01uGW6e{!?zN8Yi$>pvO@R#~Y}ml2#lu~6lisozysr+W70_Wx5A
zx_?eP7$jU8`}Y8I&CkURwP}YXr1hq@+?cUp+rbHmQ9PaxvwAJg80XHZOgYRS610i)
z+@d$n(&o4PFh5tItFS}%JinWD?SZ#;`Nz22>zPDnZ<#(jSW^2B-xdzfZnx06cb#5L
zGwU?@`%+27(c)9-?hhQ5cQyvuiX5LfId{RP5T;{4r#%;0?yRN68}}_T{JH2pwgNVx
zuq19@vn&O-q)!XZUi&R|+2!Jn7jsQMZM!J3JaUW5x#=<!O|vI~(==;@o~eN)FeQfp
zQ*w|&6XR|s7AMWS+YNZxIJMe5+P?ELGP1BT7!(+C8*s8QhqAB<Gld2l@)&S|I2^*v
zY5Dmu9=kAeF_6b=zzve)5@w00tf(-QGLQgqxrGIt^E2~`OLJ3;6rdRiCdVu+2o=$*
zsI020)Jx9KHINhMH83?WHZV0bGcq$ai~@7b42+@N0dP^{eB@98W_0GpUIv54PNv32
zhEq$f6n<h^ZY;M(Z)su^w~>wJrP_d-D<{XwYGu_fk>$N^&Mm;N>HpVb*_kt2&ac&b
z^m=2JX)@E@dA!fR`mOtB&HsF%@3j}o!MhEA%zu9M=4p|vHP$+YmhbAFG^RZjeI)&L
zt9z2l^}Cu~iwb`&y%zL3!gKM>YYPJswJ%CWta+r|&&15gz=-TTV5Bhv-DPOG$&%s7
z-u&p2??K11&##G}^5^i`iN%Kt%Z=Ou&;HT<e9MddgxBt=n=ZajdaS(hrG1cgPr-#S
z0qc3MdKAh(?*3l9*{x*S!^x*zUmW_$7+3jdt(9;8@=vX?;+FmiT6-o=`{1%w`R>uK
z!W*p3UD1mUH)=W_QCW5E_Riv)U(PPjm65Y>`xY?$h>=A7^lxq1GmY-umeU0Qm9#9T


From 403601a2323adbfb45fc2ce02e64d06285a8e270 Mon Sep 17 00:00:00 2001
From: sherman <unknown>
Date: Tue, 17 Apr 2018 11:20:50 -0700
Subject: [PATCH 167/196] 8194750: Console.readPassword does not save/restore
 tty settings Reviewed-by: martin, alanb

---
 .../share/classes/java/io/Console.java        | 29 +++++++++++++++----
 .../unix/native/libjava/Console_md.c          | 11 +++++++
 .../windows/native/libjava/Console_md.c       | 11 +++++++
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java
index 53a91a9c075..e18837f2160 100644
--- a/src/java.base/share/classes/java/io/Console.java
+++ b/src/java.base/share/classes/java/io/Console.java
@@ -311,8 +311,9 @@ public char[] readPassword(String fmt, Object ... args) {
         char[] passwd = null;
         synchronized (writeLock) {
             synchronized(readLock) {
+                boolean echoWasOn;
                 try {
-                    echoOff = echo(false);
+                    echoWasOn = echo(false);
                 } catch (IOException x) {
                     throw new IOError(x);
                 }
@@ -325,7 +326,7 @@ public char[] readPassword(String fmt, Object ... args) {
                     ioe = new IOError(x);
                 } finally {
                     try {
-                        echoOff = echo(true);
+                        echo(echoWasOn);
                     } catch (IOException x) {
                         if (ioe == null)
                             ioe = new IOError(x);
@@ -372,8 +373,20 @@ public void flush() {
     private Charset cs;
     private char[] rcb;
     private static native String encoding();
+    /*
+     * Sets the console echo status to {@code on} and returns the previous
+     * console on/off status.
+     * @param on    the echo status to set to. {@code true} for echo on and
+     *              {@code false} for echo off
+     * @return true if the previous console echo status is on
+     */
     private static native boolean echo(boolean on) throws IOException;
-    private static boolean echoOff;
+    /*
+     * Returns the current console echo on/off status.
+     * @return true if the cosole echo is on
+     */
+    private static native boolean echo0() throws IOException;
+    private static boolean echoOn;
 
     private char[] readline(boolean zeroOut) throws IOException {
         int len = reader.read(rcb, 0, rcb.length);
@@ -527,9 +540,8 @@ public int read(char cbuf[], int offset, int length)
                     new Runnable() {
                         public void run() {
                             try {
-                                if (echoOff) {
-                                    echo(true);
-                                }
+                                if (cons != null)
+                                    echo(echoOn);
                             } catch (IOException x) { }
                         }
                     });
@@ -579,5 +591,10 @@ private Console() {
                      readLock,
                      cs));
         rcb = new char[1024];
+        try {
+            echoOn = echo0();
+        } catch (IOException x) {
+            echoOn = true;
+        }
     }
 }
diff --git a/src/java.base/unix/native/libjava/Console_md.c b/src/java.base/unix/native/libjava/Console_md.c
index c8faa1656a6..be0fcf1acb2 100644
--- a/src/java.base/unix/native/libjava/Console_md.c
+++ b/src/java.base/unix/native/libjava/Console_md.c
@@ -67,3 +67,14 @@ Java_java_io_Console_echo(JNIEnv *env,
     }
     return old;
 }
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_Console_echo0(JNIEnv *env, jclass cls) {
+    struct termios tio;
+    int tty = fileno(stdin);
+    if (tcgetattr(tty, &tio) == -1) {
+        JNU_ThrowIOExceptionWithLastError(env, "tcgetattr failed");
+        return JNI_TRUE;
+    }
+    return (tio.c_lflag & ECHO) != 0;
+}
diff --git a/src/java.base/windows/native/libjava/Console_md.c b/src/java.base/windows/native/libjava/Console_md.c
index 173b2ffeb4a..d3c74343b0b 100644
--- a/src/java.base/windows/native/libjava/Console_md.c
+++ b/src/java.base/windows/native/libjava/Console_md.c
@@ -82,3 +82,14 @@ Java_java_io_Console_echo(JNIEnv *env, jclass cls, jboolean on)
     }
     return old;
 }
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_Console_echo0(JNIEnv *env, jclass cls)
+{
+    DWORD fdwMode;
+    if (! GetConsoleMode(hStdIn, &fdwMode)) {
+        JNU_ThrowIOExceptionWithLastError(env, "GetConsoleMode failed");
+        return JNI_TRUE;
+    }
+    return (fdwMode & ENABLE_ECHO_INPUT) != 0;
+}

From cf110d28ffecf9ef19768a3046813891a2c266f8 Mon Sep 17 00:00:00 2001
From: ctornqvi <unknown>
Date: Tue, 17 Apr 2018 16:18:22 -0400
Subject: [PATCH 168/196] 8201609: Split test/jdk/:tier2 to enable better
 parallel execution Reviewed-by: alanb, darcy

---
 test/jdk/TEST.groups | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 7aa78e54e35..93d260cfb9a 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -37,19 +37,30 @@ tier1 = \
     tools/pack200
 
 tier2 = \
+    :tier2_part1 \
+    :tier2_part2 \
+    :tier2_part3
+
+# com/sun/crypto/provider/Cipher is in tier1 because of JDK-8132855
+tier2_part1 = \
+    :jdk_security \
+    -com/sun/crypto/provider/Cipher
+
+# sun/nio/cs/ISO8859x.java and java/nio/Buffer are in tier1 because of JDK-8132854
+tier2_part2 = \
+    :core_tools \
+    -tools/pack200 \
     :jdk_io \
     :jdk_nio \
-    -sun/nio/cs/ISO8859x.java \
     -java/nio/Buffer \
-    :jdk_net \
-    :jdk_time \
-    :jdk_security \
-    -com/sun/crypto/provider/Cipher \
+    -sun/nio/cs/ISO8859x.java \
+    :jdk_other \
     :jdk_text \
-    :core_tools \
-    -tools/pack200 \
-    :jdk_other
+    :jdk_time
 
+tier2_part3 = \
+    :jdk_net
+   
 tier3 = \
     :jdk_rmi \
     :jdk_beans \

From 26ff9a63d3cda979f60d4d25cc1b3c40660796c1 Mon Sep 17 00:00:00 2001
From: ccheung <unknown>
Date: Tue, 17 Apr 2018 16:19:48 -0700
Subject: [PATCH 169/196] 8197972: Always verify non-system classes during CDS
 dump time Summary: use -Verify:remote even if the user specifies
 -Xverify:none during CDS dump time Reviewed-by: iklam, mseledtsov, jiangli

---
 .../jtreg/runtime/appcds/VerifierTest.java    | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/appcds/VerifierTest.java b/test/hotspot/jtreg/runtime/appcds/VerifierTest.java
index 93e8189cc82..bfdfe2566ca 100644
--- a/test/hotspot/jtreg/runtime/appcds/VerifierTest.java
+++ b/test/hotspot/jtreg/runtime/appcds/VerifierTest.java
@@ -46,6 +46,8 @@ public class VerifierTest implements Opcodes {
         "shared archive file was created with less restrictive verification setting";
     static final String VFY_ERR = "java.lang.VerifyError";
     static final String PASS_RESULT = "Hi, how are you?";
+    static final String VFY_INFO_MESSAGE =
+        "All non-system classes will be verified (-Xverify:remote) during CDS dump time.";
 
     enum Testset1Part {
         A, B
@@ -137,7 +139,7 @@ static void testset_1(String jar, String[] noAppClasses, String[] appClasses, Te
             {"app",   VFY_ALL,    VFY_ALL,    VFY_ERR },
             {"app",   VFY_ALL,    VFY_NONE,   ERR },
             // Dump app/ext with -Xverify:none
-            {"app",   VFY_NONE,   VFY_REMOTE, MAP_FAIL},
+            {"app",   VFY_NONE,   VFY_REMOTE, VFY_ERR},
             {"app",   VFY_NONE,   VFY_ALL,    MAP_FAIL},
             {"app",   VFY_NONE,   VFY_NONE,   ERR },
             // Dump sys only with -Xverify:remote
@@ -188,6 +190,10 @@ static void testset_1(String jar, String[] noAppClasses, String[] appClasses, Te
                                                             // issue - assert failure when dumping archive with the -Xverify:all
                                                             "-Xms256m",
                                                             "-Xmx256m");
+                if (dump_setting.equals(VFY_NONE) &&
+                    runtime_setting.equals(VFY_REMOTE)) {
+                    dumpOutput.shouldContain(VFY_INFO_MESSAGE);
+                }
             }
             TestCommon.run("-cp", jar,
                            runtime_setting,
@@ -221,10 +227,11 @@ static void testset_2(String jarName_greet, String jarName_hi) throws Exception
             {"app",   VFY_ALL,    VFY_ALL,    PASS_RESULT },
             {"app",   VFY_ALL,    VFY_NONE,   PASS_RESULT },
             // Dump app/ext with -Xverify:none
-            {"app",   VFY_NONE,   VFY_REMOTE, MAP_FAIL},
+            {"app",   VFY_NONE,   VFY_REMOTE, PASS_RESULT},
             {"app",   VFY_NONE,   VFY_ALL,    MAP_FAIL},
             {"app",   VFY_NONE,   VFY_NONE,   PASS_RESULT },
         };
+        String prev_dump_setting = "";
         for (int i = 0; i < config2.length; i ++) {
             // config2[i][0] is always set to "app" in this test
             String dump_setting = config2[i][1];
@@ -233,17 +240,24 @@ static void testset_2(String jarName_greet, String jarName_hi) throws Exception
             System.out.println("Test case [" + i + "]: dumping " + config2[i][0] +
                                " with " + dump_setting +
                                ", run with " + runtime_setting);
-            OutputAnalyzer dumpOutput = TestCommon.dump(
-                                                        jar, appClasses, dump_setting,
-                                                        "-XX:+UnlockDiagnosticVMOptions",
-                                                        // FIXME: the following options are for working around a GC
-                                                        // issue - assert failure when dumping archive with the -Xverify:all
-                                                        "-Xms256m",
-                                                        "-Xmx256m");
+            if (!dump_setting.equals(prev_dump_setting)) {
+                OutputAnalyzer dumpOutput = TestCommon.dump(
+                                                            jar, appClasses, dump_setting,
+                                                            "-XX:+UnlockDiagnosticVMOptions",
+                                                            // FIXME: the following options are for working around a GC
+                                                            // issue - assert failure when dumping archive with the -Xverify:all
+                                                            "-Xms256m",
+                                                            "-Xmx256m");
+                if (dump_setting.equals(VFY_NONE) &&
+                    runtime_setting.equals(VFY_REMOTE)) {
+                    dumpOutput.shouldContain(VFY_INFO_MESSAGE);
+                }
+            }
             TestCommon.run("-cp", jar,
                            runtime_setting,
                            "Hi")
                 .ifNoMappingFailure(output -> checkRuntimeOutput(output, expected_output_str));
+           prev_dump_setting = dump_setting;
         }
     }
 

From 40c71214325a13efb344bc530ef3c3aa0cc7edd3 Mon Sep 17 00:00:00 2001
From: xiaofeya <unknown>
Date: Tue, 17 Apr 2018 23:27:41 -0700
Subject: [PATCH 170/196] 8194260: Point-to-point interface should be excluded
 from java/net/ipv6tests/* Reviewed-by: chegar, vtewari

---
 test/jdk/java/net/ipv6tests/ScopeTests.java |   6 +-
 test/jdk/java/net/ipv6tests/TcpTest.java    |   5 +-
 test/jdk/java/net/ipv6tests/Tests.java      | 144 ++++----------------
 test/jdk/java/net/ipv6tests/UdpTest.java    |  15 +-
 4 files changed, 48 insertions(+), 122 deletions(-)

diff --git a/test/jdk/java/net/ipv6tests/ScopeTests.java b/test/jdk/java/net/ipv6tests/ScopeTests.java
index 2fda70b0afe..3acd43955e5 100644
--- a/test/jdk/java/net/ipv6tests/ScopeTests.java
+++ b/test/jdk/java/net/ipv6tests/ScopeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -25,6 +25,10 @@
  * @test
  * @bug 4868820
  * @summary IPv6 support for Windows XP and 2003 server
+ * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
+ * @run main ScopeTests
  */
 
 import java.net.*;
diff --git a/test/jdk/java/net/ipv6tests/TcpTest.java b/test/jdk/java/net/ipv6tests/TcpTest.java
index 815a6097c7b..ad8c2f8c6e7 100644
--- a/test/jdk/java/net/ipv6tests/TcpTest.java
+++ b/test/jdk/java/net/ipv6tests/TcpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -26,6 +26,9 @@
  * @bug 4868820
  * @key intermittent
  * @summary IPv6 support for Windows XP and 2003 server
+ * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
  * @run main TcpTest -d
  */
 
diff --git a/test/jdk/java/net/ipv6tests/Tests.java b/test/jdk/java/net/ipv6tests/Tests.java
index d258b982be8..398a3e71693 100644
--- a/test/jdk/java/net/ipv6tests/Tests.java
+++ b/test/jdk/java/net/ipv6tests/Tests.java
@@ -21,9 +21,19 @@
  * questions.
  */
 
-import java.net.*;
-import java.io.*;
-import java.util.*;
+import jdk.test.lib.NetworkConfiguration;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
 
 public class Tests {
 
@@ -174,126 +184,26 @@ public static void dprintln (String s) {
         }
     }
 
-    static int numberInterfaces () {
-        try {
-            Enumeration ifs = NetworkInterface.getNetworkInterfaces();
-            int nifs=0;
-            while (ifs.hasMoreElements()) {
-                nifs++;
-                ifs.nextElement();
-            }
-            return nifs;
-        } catch (SocketException e) {
-            return 0;
-        }
-    }
-
-    public static Enumeration ipv4Addresses() {
-        return new AddrEnum (Inet4Address.class);
-    }
-
     public static Inet4Address getFirstLocalIPv4Address () {
-        Enumeration e = ipv4Addresses();
-        if (!e.hasMoreElements()) {
-            return null;
-        }
-        return (Inet4Address)e.nextElement();
+        return getNetworkConfig().ip4Addresses()
+                                 .filter(a -> !a.isLoopbackAddress())
+                                 .findFirst()
+                                 .orElse(null);
     }
 
     public static Inet6Address getFirstLocalIPv6Address () {
-        Enumeration e = ipv6Addresses();
-        if (!e.hasMoreElements()) {
-            return null;
-        }
-        return (Inet6Address)e.nextElement();
-    }
-
-    public static Enumeration ipv6Addresses() {
-        return new AddrEnum (Inet6Address.class);
+        return getNetworkConfig().ip6Addresses()
+                                 .filter(a -> !a.isLoopbackAddress())
+                                 .findFirst()
+                                 .orElse(null);
     }
 
-    /* enumerates the Inet4Addresses or Inet6Addresses on the system */
-
-    private static class AddrEnum implements Enumeration {
-
-        Enumeration ifs;
-        NetworkInterface currIf = null;
-        InetAddress nextAddr=null;
-        Enumeration addrs=null;
-        Class filter;
-
-        static final byte[] fe80_loopback = new byte [] {
-            (byte)0xfe,(byte)0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,1
-        };
-
-        AddrEnum (Class filter) {
-            this.filter = filter;
-            try {
-                ifs = NetworkInterface.getNetworkInterfaces();
-            } catch (SocketException e) {}
-        }
-
-        public boolean hasMoreElements () {
-            if (nextAddr == null) {
-                nextAddr = getNext();
-            }
-            return (nextAddr != null);
-        }
-
-        public Object nextElement () {
-            if (!hasMoreElements()) {
-                throw new NoSuchElementException ("no more addresses");
-            }
-            Object next = nextAddr;
-            nextAddr = null;
-            return next;
-        }
-
-        private InetAddress getNext() {
-            while (true) {
-                if (currIf == null) {
-                    currIf = getNextIf();
-                    if (currIf == null) {
-                        return null;
-                    }
-                    addrs = currIf.getInetAddresses();
-                }
-                while (addrs.hasMoreElements()) {
-                    InetAddress addr = (InetAddress) addrs.nextElement();
-                    if (filter.isInstance (addr) && !addr.isLoopbackAddress()
-                            && !addr.isAnyLocalAddress()) {
-                        if (Arrays.equals (addr.getAddress(), fe80_loopback)) {
-                            continue;
-                        }
-                        return addr;
-                    }
-                }
-                currIf = null;
-            }
-        }
-
-        private NetworkInterface getNextIf () {
-            if (ifs != null) {
-                while (ifs.hasMoreElements()) {
-                    NetworkInterface nic = (NetworkInterface)ifs.nextElement();
-                    // Skip (Windows)Teredo Tunneling Pseudo-Interface
-                    if (isWindows) {
-                        String dName = nic.getDisplayName();
-                        if (dName != null && dName.contains("Teredo"))
-                            continue;
-                    } else if (isMacOS && nic.getName().contains("awdl")) {
-                        continue;
-                    }
-                    try {
-                        if (nic.isUp() && !nic.isLoopback())
-                            return nic;
-                    } catch (SocketException e) {
-                        // ignore
-                    }
-                }
-            }
-
-            return null;
+    private static NetworkConfiguration getNetworkConfig() {
+        try {
+            return NetworkConfiguration.probe();
+        } catch (IOException e) {
+            System.out.println("Failed to probe NetworkConfiguration");
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/test/jdk/java/net/ipv6tests/UdpTest.java b/test/jdk/java/net/ipv6tests/UdpTest.java
index 4b3f9b02700..3b0e23176ee 100644
--- a/test/jdk/java/net/ipv6tests/UdpTest.java
+++ b/test/jdk/java/net/ipv6tests/UdpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -25,10 +25,19 @@
  * @test
  * @bug 4868820
  * @summary IPv6 support for Windows XP and 2003 server
+ * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
+ * @run main UdpTest
  */
 
-import java.net.*;
-import java.io.*;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.PortUnreachableException;
+import java.net.SocketTimeoutException;
 
 public class UdpTest extends Tests {
     static DatagramSocket c3, s1, s2, s3;

From 7c4bd89aff29c7ca8508c81b9da51a3a2dd47e97 Mon Sep 17 00:00:00 2001
From: rehn <unknown>
Date: Wed, 18 Apr 2018 09:25:51 +0200
Subject: [PATCH 171/196] 8195099: Concurrent safe-memory-reclamation mechanism
 Summary: This implement a globalcounter with RCU semantics. Reviewed-by:
 acorn, coleenp, dcubed, eosterlund, gziemski, mlarsson, kbarrett, dholmes

---
 .../gtest/utilities/test_globalCounter.cpp    | 117 +++++++++++++
 .../utilities/utilitiesHelper.inline.hpp      | 155 ++++++++++++++++++
 2 files changed, 272 insertions(+)
 create mode 100644 test/hotspot/gtest/utilities/test_globalCounter.cpp
 create mode 100644 test/hotspot/gtest/utilities/utilitiesHelper.inline.hpp

diff --git a/test/hotspot/gtest/utilities/test_globalCounter.cpp b/test/hotspot/gtest/utilities/test_globalCounter.cpp
new file mode 100644
index 00000000000..d5235610052
--- /dev/null
+++ b/test/hotspot/gtest/utilities/test_globalCounter.cpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+#include "precompiled.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/orderAccess.inline.hpp"
+#include "runtime/os.hpp"
+#include "utilities/globalCounter.hpp"
+#include "utilities/globalCounter.inline.hpp"
+#include "utilitiesHelper.inline.hpp"
+
+#define GOOD 1337
+#define BAD  4711
+
+struct TestData {
+  long test_value;
+};
+
+class RCUReaderThread : public JavaTestThread {
+public:
+  static volatile bool _exit;
+  volatile TestData** _test;
+  Semaphore* _wrt_start;
+  RCUReaderThread(Semaphore* post, volatile TestData** test, Semaphore* wrt_start)
+    : JavaTestThread(post), _test(test), _wrt_start(wrt_start) {};
+  virtual ~RCUReaderThread(){}
+  void main_run() {
+    _wrt_start->signal();
+    while (!_exit) {
+      GlobalCounter::critical_section_begin(this);
+      volatile TestData* test = OrderAccess::load_acquire(_test);
+      long value = OrderAccess::load_acquire(&test->test_value);
+      ASSERT_EQ(value, GOOD);
+      GlobalCounter::critical_section_end(this);
+      {
+        GlobalCounter::CriticalSection cs(this);
+        volatile TestData* test = OrderAccess::load_acquire(_test);
+        long value = OrderAccess::load_acquire(&test->test_value);
+        ASSERT_EQ(value, GOOD);
+      }
+    }
+  }
+};
+
+volatile bool RCUReaderThread::_exit = false;
+
+class RCUWriterThread : public JavaTestThread {
+public:
+  RCUWriterThread(Semaphore* post) : JavaTestThread(post) {
+  };
+  virtual ~RCUWriterThread(){}
+  void main_run() {
+    static const int NUMBER_OF_READERS = 4;
+    Semaphore post;
+    Semaphore wrt_start;
+    volatile TestData* test = NULL;
+
+    RCUReaderThread* reader1 = new RCUReaderThread(&post, &test, &wrt_start);
+    RCUReaderThread* reader2 = new RCUReaderThread(&post, &test, &wrt_start);
+    RCUReaderThread* reader3 = new RCUReaderThread(&post, &test, &wrt_start);
+    RCUReaderThread* reader4 = new RCUReaderThread(&post, &test, &wrt_start);
+
+    TestData* tmp = new TestData();
+    tmp->test_value = GOOD;
+    OrderAccess::release_store_fence(&test, tmp);
+
+    reader1->doit();
+    reader2->doit();
+    reader3->doit();
+    reader4->doit();
+
+    int nw = NUMBER_OF_READERS;
+    while (nw > 0) {
+      wrt_start.wait();
+      --nw;
+    }
+    jlong stop_ms = os::javaTimeMillis() + 1000; // 1 seconds max test time
+    for (int i = 0; i < 100000 && stop_ms > os::javaTimeMillis(); i++) {
+      volatile TestData* free_tmp = test;
+      tmp = new TestData();
+      tmp->test_value = GOOD;
+      OrderAccess::release_store(&test, tmp);
+      GlobalCounter::write_synchronize();
+      free_tmp->test_value = BAD;
+      delete free_tmp;
+    }
+    RCUReaderThread::_exit = true;
+    for (int i = 0; i < NUMBER_OF_READERS; i++) {
+      post.wait();
+    }
+  }
+};
+
+TEST_VM(GlobalCounter, critical_section) {
+  RCUReaderThread::_exit = false;
+  mt_test_doer<RCUWriterThread>();
+}
diff --git a/test/hotspot/gtest/utilities/utilitiesHelper.inline.hpp b/test/hotspot/gtest/utilities/utilitiesHelper.inline.hpp
new file mode 100644
index 00000000000..f8dce75c6eb
--- /dev/null
+++ b/test/hotspot/gtest/utilities/utilitiesHelper.inline.hpp
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+#ifndef GTEST_UTILITIES_HELPER_INLINE_HPP
+#define GTEST_UTILITIES_HELPER_INLINE_HPP
+
+#include "runtime/mutex.hpp"
+#include "runtime/semaphore.hpp"
+#include "runtime/thread.hpp"
+#include "runtime/vmThread.hpp"
+#include "runtime/vm_operations.hpp"
+#include "unittest.hpp"
+
+class VM_StopSafepoint : public VM_Operation {
+public:
+  Semaphore* _test_complete;
+  VM_StopSafepoint(Semaphore* wait_for) : _test_complete(wait_for) {}
+  VMOp_Type type() const          { return VMOp_Dummy; }
+  Mode evaluation_mode() const    { return _no_safepoint; }
+  bool is_cheap_allocated() const { return false; }
+  void doit()                     { _test_complete->wait(); }
+};
+
+// This class and thread keep the non-safepoint op running while we do our testing.
+class VMThreadBlocker : public JavaThread {
+public:
+  Semaphore* _unblock;
+  Semaphore* _done;
+  VMThreadBlocker(Semaphore* ub, Semaphore* done) : _unblock(ub), _done(done) {
+  }
+  virtual ~VMThreadBlocker() {}
+  void run() {
+    this->set_thread_state(_thread_in_vm);
+    {
+      MutexLocker ml(Threads_lock);
+      Threads::add(this);
+    }
+    VM_StopSafepoint ss(_unblock);
+    VMThread::execute(&ss);
+    _done->signal();
+    Threads::remove(this);
+    this->smr_delete();
+  }
+  void doit() {
+    if (os::create_thread(this, os::os_thread)) {
+      os::start_thread(this);
+    } else {
+      ASSERT_TRUE(false);
+    }
+  }
+};
+
+// For testing in a real JavaThread.
+class JavaTestThread : public JavaThread {
+public:
+  Semaphore* _post;
+  JavaTestThread(Semaphore* post)
+    : _post(post) {
+  }
+  virtual ~JavaTestThread() {}
+
+  void prerun() {
+    this->set_thread_state(_thread_in_vm);
+    {
+      MutexLocker ml(Threads_lock);
+      Threads::add(this);
+    }
+    {
+      MutexLockerEx ml(SR_lock(), Mutex::_no_safepoint_check_flag);
+    }
+  }
+
+  virtual void main_run() = 0;
+
+  void run() {
+    prerun();
+    main_run();
+    postrun();
+  }
+
+  void postrun() {
+    Threads::remove(this);
+    _post->signal();
+    this->smr_delete();
+  }
+
+  void doit() {
+    if (os::create_thread(this, os::os_thread)) {
+      os::start_thread(this);
+    } else {
+      ASSERT_TRUE(false);
+    }
+  }
+};
+
+template <typename FUNC>
+class SingleTestThread : public JavaTestThread {
+public:
+  FUNC& _f;
+  SingleTestThread(Semaphore* post, FUNC& f)
+    : JavaTestThread(post), _f(f) {
+  }
+
+  virtual ~SingleTestThread(){}
+
+  virtual void main_run() {
+    _f(this);
+  }
+};
+
+template <typename TESTFUNC>
+static void nomt_test_doer(TESTFUNC &f) {
+  Semaphore post, block_done, vmt_done;
+  VMThreadBlocker* blocker = new VMThreadBlocker(&block_done, &vmt_done);
+  blocker->doit();
+  SingleTestThread<TESTFUNC>* stt = new SingleTestThread<TESTFUNC>(&post, f);
+  stt->doit();
+  post.wait();
+  block_done.signal();
+  vmt_done.wait();
+}
+
+template <typename RUNNER>
+static void mt_test_doer() {
+  Semaphore post, block_done, vmt_done;
+  VMThreadBlocker* blocker = new VMThreadBlocker(&block_done, &vmt_done);
+  blocker->doit();
+  RUNNER* runner = new RUNNER(&post);
+  runner->doit();
+  post.wait();
+  block_done.signal();
+  vmt_done.wait();
+}
+
+#endif // include guard

From b0961ede087a8b0dddc52dcf02bb162fdaeb21b9 Mon Sep 17 00:00:00 2001
From: dnsimon <unknown>
Date: Wed, 18 Apr 2018 11:11:38 +0200
Subject: [PATCH 172/196] 8187490: HotSpotGraalMBean should be moved to Graal
 management module Reviewed-by: alanb, mchung, iveresov

---
 make/common/Modules.gmk                       |  3 +-
 .../share/classes/module-info.java            |  3 +-
 .../share/classes/module-info.java            |  3 -
 .../compiler/hotspot/jmx/GraalMBeans.java     | 91 -------------------
 4 files changed, 3 insertions(+), 97 deletions(-)
 delete mode 100644 src/jdk.internal.vm.compiler.management/share/classes/org/graalvm/compiler/hotspot/jmx/GraalMBeans.java

diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index f7105ea4b1c..9bc76095abe 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -76,6 +76,7 @@ BOOT_MODULES += \
 UPGRADEABLE_MODULES += \
     java.compiler \
     jdk.internal.vm.compiler \
+    jdk.internal.vm.compiler.management \
     #
 
 
@@ -103,7 +104,6 @@ PLATFORM_MODULES += \
     jdk.crypto.ec \
     jdk.dynalink \
     jdk.httpserver \
-    jdk.internal.vm.compiler.management \
     jdk.jsobject \
     jdk.localedata \
     jdk.naming.dns \
@@ -189,6 +189,7 @@ HOTSPOT_MODULES := \
     jdk.hotspot.agent \
     jdk.internal.vm.ci \
     jdk.internal.vm.compiler \
+    jdk.internal.vm.compiler.management \
     #
 
 ################################################################################
diff --git a/src/java.management/share/classes/module-info.java b/src/java.management/share/classes/module-info.java
index 26f34ba21b9..2b2054cb724 100644
--- a/src/java.management/share/classes/module-info.java
+++ b/src/java.management/share/classes/module-info.java
@@ -64,8 +64,7 @@
     exports sun.management.counter.perf to
         jdk.management.agent;
     exports sun.management.spi to
-        jdk.management,
-        jdk.internal.vm.compiler.management;
+        jdk.management;
 
     uses javax.management.remote.JMXConnectorProvider;
     uses javax.management.remote.JMXConnectorServerProvider;
diff --git a/src/jdk.internal.vm.compiler.management/share/classes/module-info.java b/src/jdk.internal.vm.compiler.management/share/classes/module-info.java
index 328648d4456..4461f7969ed 100644
--- a/src/jdk.internal.vm.compiler.management/share/classes/module-info.java
+++ b/src/jdk.internal.vm.compiler.management/share/classes/module-info.java
@@ -34,8 +34,5 @@
     requires jdk.management;
     requires jdk.internal.vm.ci;
     requires jdk.internal.vm.compiler;
-
-    provides sun.management.spi.PlatformMBeanProvider with
-        org.graalvm.compiler.hotspot.jmx.GraalMBeans;
 }
 
diff --git a/src/jdk.internal.vm.compiler.management/share/classes/org/graalvm/compiler/hotspot/jmx/GraalMBeans.java b/src/jdk.internal.vm.compiler.management/share/classes/org/graalvm/compiler/hotspot/jmx/GraalMBeans.java
deleted file mode 100644
index 0161f92a216..00000000000
--- a/src/jdk.internal.vm.compiler.management/share/classes/org/graalvm/compiler/hotspot/jmx/GraalMBeans.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-package org.graalvm.compiler.hotspot.jmx;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import jdk.vm.ci.runtime.JVMCI;
-import jdk.vm.ci.runtime.JVMCICompiler;
-import jdk.vm.ci.runtime.JVMCIRuntime;
-import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
-import sun.management.spi.PlatformMBeanProvider;
-import sun.management.spi.PlatformMBeanProvider.PlatformComponent;
-
-public final class GraalMBeans extends PlatformMBeanProvider {
-    @Override
-    public List<PlatformComponent<?>> getPlatformComponentList() {
-        List<PlatformComponent<?>> components = new ArrayList<>();
-        try {
-            Object bean = findGraalRuntimeBean();
-            if (bean != null) {
-                components.add(new HotSpotRuntimeMBeanComponent(bean));
-            }
-        } catch (InternalError | LinkageError err) {
-            // go on and ignore
-        }
-        return components;
-    }
-
-    public static Object findGraalRuntimeBean() {
-        JVMCIRuntime r = JVMCI.getRuntime();
-        JVMCICompiler c = r.getCompiler();
-        if (c instanceof HotSpotGraalCompiler) {
-            return ((HotSpotGraalCompiler) c).mbean();
-        }
-        return null;
-    }
-
-    private static final class HotSpotRuntimeMBeanComponent implements PlatformComponent<Object> {
-
-        private final String name;
-        private final Object mbean;
-
-        HotSpotRuntimeMBeanComponent(Object mbean) {
-            this.name = "org.graalvm.compiler.hotspot:type=Options";
-            this.mbean = mbean;
-        }
-
-        @Override
-        public Set<Class<?>> mbeanInterfaces() {
-            return Collections.emptySet();
-        }
-
-        @Override
-        public Set<String> mbeanInterfaceNames() {
-            return Collections.emptySet();
-        }
-
-        @Override
-        public String getObjectNamePattern() {
-            return name;
-        }
-
-        @Override
-        public Map<String, Object> nameToMBeanMap() {
-            return Collections.<String, Object>singletonMap(name, mbean);
-        }
-    }
-}

From fa705c47dc75cc68c7b96d2617a22ea322a0f73a Mon Sep 17 00:00:00 2001
From: alanb <unknown>
Date: Wed, 18 Apr 2018 10:20:09 +0100
Subject: [PATCH 173/196] 8201315: (se) Allow SelectableChannel.register to be
 invoked while selection operation is in progress Reviewed-by: bpb

---
 .../java/nio/channels/SelectableChannel.java  |  39 ++-----
 .../java/nio/channels/SelectionKey.java       |  25 ++--
 .../classes/java/nio/channels/Selector.java   |  60 +++++-----
 .../spi/AbstractSelectableChannel.java        |  71 +++++++-----
 .../classes/sun/nio/ch/SelectorImpl.java      |  84 ++++++++------
 .../Selector/RegisterDuringSelect.java        | 109 ++++++++++++++++++
 6 files changed, 245 insertions(+), 143 deletions(-)
 create mode 100644 test/jdk/java/nio/channels/Selector/RegisterDuringSelect.java

diff --git a/src/java.base/share/classes/java/nio/channels/SelectableChannel.java b/src/java.base/share/classes/java/nio/channels/SelectableChannel.java
index f0030fb13e3..170a449316b 100644
--- a/src/java.base/share/classes/java/nio/channels/SelectableChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/SelectableChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -117,12 +117,6 @@ protected SelectableChannel() { }
      */
     public abstract int validOps();
 
-    // Internal state:
-    //   keySet, may be empty but is never null, typ. a tiny array
-    //   boolean isRegistered, protected by key set
-    //   regLock, lock object to prevent duplicate registrations
-    //   blocking mode, protected by regLock
-
     /**
      * Tells whether or not this channel is currently registered with any
      * selectors.  A newly-created channel is not registered.
@@ -135,8 +129,6 @@ protected SelectableChannel() { }
      * @return {@code true} if, and only if, this channel is registered
      */
     public abstract boolean isRegistered();
-    //
-    // sync(keySet) { return isRegistered; }
 
     /**
      * Retrieves the key representing the channel's registration with the given
@@ -150,8 +142,6 @@ protected SelectableChannel() { }
      *          currently registered with that selector
      */
     public abstract SelectionKey keyFor(Selector sel);
-    //
-    // sync(keySet) { return findKey(sel); }
 
     /**
      * Registers this channel with the given selector, returning a selection
@@ -171,12 +161,12 @@ protected SelectableChannel() { }
      * will be {@code att}.
      *
      * <p> This method may be invoked at any time.  If this method is invoked
-     * while another invocation of this method or of the {@link
-     * #configureBlocking(boolean) configureBlocking} method is in progress
-     * then it will first block until the other operation is complete.  This
-     * method will then synchronize on the selector's key set and therefore may
-     * block if invoked concurrently with another registration or selection
-     * operation involving the same selector. </p>
+     * while a selection operation is in progress then it has no effect upon
+     * that operation; the new registration or change to the key's interest set
+     * will be seen by the next selection operation.  If this method is invoked
+     * while an invocation of {@link #configureBlocking(boolean) configureBlocking}
+     * is in progress then it will block until the channel's blocking mode has
+     * been adjusted.
      *
      * <p> If this channel is closed while this operation is in progress then
      * the key returned by this method will have been cancelled and will
@@ -218,16 +208,6 @@ protected SelectableChannel() { }
      */
     public abstract SelectionKey register(Selector sel, int ops, Object att)
         throws ClosedChannelException;
-    //
-    // sync(regLock) {
-    //   sync(keySet) { look for selector }
-    //   if (channel found) { set interest ops -- may block in selector;
-    //                        return key; }
-    //   create new key -- may block somewhere in selector;
-    //   sync(keySet) { add key; }
-    //   attach(attachment);
-    //   return key;
-    // }
 
     /**
      * Registers this channel with the given selector, returning a selection
@@ -314,11 +294,6 @@ public final SelectionKey register(Selector sel, int ops)
      */
     public abstract SelectableChannel configureBlocking(boolean block)
         throws IOException;
-    //
-    // sync(regLock) {
-    //   sync(keySet) { throw IBME if block && isRegistered; }
-    //   change mode;
-    // }
 
     /**
      * Tells whether or not every I/O operation on this channel will block
diff --git a/src/java.base/share/classes/java/nio/channels/SelectionKey.java b/src/java.base/share/classes/java/nio/channels/SelectionKey.java
index 6af664fa96b..ad08fe43822 100644
--- a/src/java.base/share/classes/java/nio/channels/SelectionKey.java
+++ b/src/java.base/share/classes/java/nio/channels/SelectionKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -86,15 +86,9 @@
  * attached via the {@link #attach attach} method and then later retrieved via
  * the {@link #attachment() attachment} method.
  *
- * <p> Selection keys are safe for use by multiple concurrent threads.  The
- * operations of reading and writing the interest set will, in general, be
- * synchronized with certain operations of the selector.  Exactly how this
- * synchronization is performed is implementation-dependent: In a naive
- * implementation, reading or writing the interest set may block indefinitely
- * if a selection operation is already in progress; in a high-performance
- * implementation, reading or writing the interest set may block briefly, if at
- * all.  In any case, a selection operation will always use the interest-set
- * value that was current at the moment that the operation began.  </p>
+ * <p> Selection keys are safe for use by multiple concurrent threads.  A
+ * selection operation will always use the interest-set value that was current
+ * at the moment that the operation began.  </p>
  *
  *
  * @author Mark Reinhold
@@ -164,10 +158,7 @@ protected SelectionKey() { }
      * Retrieves this key's interest set.
      *
      * <p> It is guaranteed that the returned set will only contain operation
-     * bits that are valid for this key's channel.
-     *
-     * <p> This method may be invoked at any time.  Whether or not it blocks,
-     * and for how long, is implementation-dependent.  </p>
+     * bits that are valid for this key's channel. </p>
      *
      * @return  This key's interest set
      *
@@ -179,8 +170,10 @@ protected SelectionKey() { }
     /**
      * Sets this key's interest set to the given value.
      *
-     * <p> This method may be invoked at any time.  Whether or not it blocks,
-     * and for how long, is implementation-dependent.  </p>
+     * <p> This method may be invoked at any time.  If this method is invoked
+     * while a selection operation is in progress then it has no effect upon
+     * that operation; the change to the key's interest set will be seen by the
+     * next selection operation.
      *
      * @param  ops  The new interest set
      *
diff --git a/src/java.base/share/classes/java/nio/channels/Selector.java b/src/java.base/share/classes/java/nio/channels/Selector.java
index cae3ff2c137..7b0f39c15e4 100644
--- a/src/java.base/share/classes/java/nio/channels/Selector.java
+++ b/src/java.base/share/classes/java/nio/channels/Selector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -84,11 +84,10 @@
  * operations.  A key may be removed directly from the selected-key set by
  * invoking the set's {@link java.util.Set#remove(java.lang.Object) remove}
  * method or by invoking the {@link java.util.Iterator#remove() remove} method
- * of an {@link java.util.Iterator iterator} obtained from the
- * set.  Keys are never removed from the selected-key set in any other way;
- * they are not, in particular, removed as a side effect of selection
- * operations.  Keys may not be added directly to the selected-key set. </p>
- *
+ * of an {@link java.util.Iterator iterator} obtained from the set.
+ * All keys may be removed from the selected-key set by invoking the set's
+ * {@link java.util.Set#clear() clear} method.  Keys may not be added directly
+ * to the selected-key set. </p>
  *
  * <a id="selop"></a>
  * <h2>Selection</h2>
@@ -144,12 +143,12 @@
  *
  * <h2>Concurrency</h2>
  *
- * <p> Selectors are themselves safe for use by multiple concurrent threads;
- * their key sets, however, are not.
+ * <p> A Selector and its key set are safe for use by multiple concurrent
+ * threads.  Its selected-key set and cancelled-key set, however, are not.
  *
- * <p> The selection operations synchronize on the selector itself, on the key
- * set, and on the selected-key set, in that order.  They also synchronize on
- * the cancelled-key set during steps (1) and (3) above.
+ * <p> The selection operations synchronize on the selector itself, on the
+ * selected-key set, in that order.  They also synchronize on the cancelled-key
+ * set during steps (1) and (3) above.
  *
  * <p> Changes made to the interest sets of a selector's keys while a
  * selection operation is in progress have no effect upon that operation; they
@@ -180,20 +179,27 @@
  *
  * </ul>
  *
- * <p> The {@link #close close} method synchronizes on the selector and all
- * three key sets in the same order as in a selection operation.
+ * <p> The {@link #close close} method synchronizes on the selector and its
+ * selected-key set in the same order as in a selection operation.
  *
  * <a id="ksc"></a>
- *
- * <p> A selector's key and selected-key sets are not, in general, safe for use
- * by multiple concurrent threads.  If such a thread might modify one of these
- * sets directly then access should be controlled by synchronizing on the set
- * itself.  The iterators returned by these sets' {@link
- * java.util.Set#iterator() iterator} methods are <i>fail-fast:</i> If the set
- * is modified after the iterator is created, in any way except by invoking the
- * iterator's own {@link java.util.Iterator#remove() remove} method, then a
- * {@link java.util.ConcurrentModificationException} will be thrown. </p>
- *
+ * <p> A Selector's key set is safe for use by multiple concurrent threads.
+ * Retrieval operations from the key set do not generally block and so may
+ * overlap with new registrations that add to the set, or with the cancellation
+ * steps of selection operations that remove keys from the set.  Iterators and
+ * spliterators return elements reflecting the state of the set at some point at
+ * or since the creation of the iterator/spliterator.  They do not throw
+ * {@link java.util.ConcurrentModificationException ConcurrentModificationException}.
+ *
+ * <a id="sksc"></a>
+ * <p> A selector's selected-key set is not, in general, safe for use by
+ * multiple concurrent threads.  If such a thread might modify the set directly
+ * then access should be controlled by synchronizing on the set itself.  The
+ * iterators returned by the set's {@link java.util.Set#iterator() iterator}
+ * methods are <i>fail-fast:</i> If the set is modified after the iterator is
+ * created, in any way except by invoking the iterator's own {@link
+ * java.util.Iterator#remove() remove} method, then a {@link
+ * java.util.ConcurrentModificationException} will be thrown. </p>
  *
  * @author Mark Reinhold
  * @author JSR-51 Expert Group
@@ -249,7 +255,8 @@ public static Selector open() throws IOException {
      * attempt to modify the key set will cause an {@link
      * UnsupportedOperationException} to be thrown.
      *
-     * <p> The key set is <a href="#ksc">not thread-safe</a>. </p>
+     * <p> The set is <a href="#ksc">safe</a> for use by multiple concurrent
+     * threads.  </p>
      *
      * @return  This selector's key set
      *
@@ -265,7 +272,7 @@ public static Selector open() throws IOException {
      * selected-key set.  Any attempt to add an object to the key set will
      * cause an {@link UnsupportedOperationException} to be thrown.
      *
-     * <p> The selected-key set is <a href="#ksc">not thread-safe</a>. </p>
+     * <p> The selected-key set is <a href="#sksc">not thread-safe</a>.  </p>
      *
      * @return  This selector's selected-key set
      *
@@ -326,8 +333,7 @@ public static Selector open() throws IOException {
      * @throws  IllegalArgumentException
      *          If the value of the timeout argument is negative
      */
-    public abstract int select(long timeout)
-        throws IOException;
+    public abstract int select(long timeout) throws IOException;
 
     /**
      * Selects a set of keys whose corresponding channels are ready for I/O
diff --git a/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java b/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
index df5b1fb6ace..d389df32a53 100644
--- a/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
@@ -108,7 +108,7 @@ private void addKey(SelectionKey k) {
                 if (keys[i] == null)
                     break;
         } else if (keys == null) {
-            keys =  new SelectionKey[3];
+            keys = new SelectionKey[2];
         } else {
             // Grow key array
             int n = keys.length * 2;
@@ -123,14 +123,14 @@ private void addKey(SelectionKey k) {
     }
 
     private SelectionKey findKey(Selector sel) {
-        synchronized (keyLock) {
-            if (keys == null)
-                return null;
-            for (int i = 0; i < keys.length; i++)
-                if ((keys[i] != null) && (keys[i].selector() == sel))
-                    return keys[i];
+        assert Thread.holdsLock(keyLock);
+        if (keys == null)
             return null;
-        }
+        for (int i = 0; i < keys.length; i++)
+            if ((keys[i] != null) && (keys[i].selector() == sel))
+                return keys[i];
+        return null;
+
     }
 
     void removeKey(SelectionKey k) {                    // package-private
@@ -166,7 +166,9 @@ public final boolean isRegistered() {
     }
 
     public final SelectionKey keyFor(Selector sel) {
-        return findKey(sel);
+        synchronized (keyLock) {
+            return findKey(sel);
+        }
     }
 
     /**
@@ -195,32 +197,31 @@ public final SelectionKey keyFor(Selector sel) {
      *
      * @throws  IllegalArgumentException {@inheritDoc}
      */
-    public final SelectionKey register(Selector sel, int ops,
-                                       Object att)
+    public final SelectionKey register(Selector sel, int ops, Object att)
         throws ClosedChannelException
     {
+        if ((ops & ~validOps()) != 0)
+            throw new IllegalArgumentException();
+        if (!isOpen())
+            throw new ClosedChannelException();
         synchronized (regLock) {
-            if (!isOpen())
-                throw new ClosedChannelException();
-            if ((ops & ~validOps()) != 0)
-                throw new IllegalArgumentException();
             if (isBlocking())
                 throw new IllegalBlockingModeException();
-            SelectionKey k = findKey(sel);
-            if (k != null) {
-                k.interestOps(ops);
-                k.attach(att);
-            }
-            if (k == null) {
-                // New registration
-                synchronized (keyLock) {
-                    if (!isOpen())
-                        throw new ClosedChannelException();
+            synchronized (keyLock) {
+                // re-check if channel has been closed
+                if (!isOpen())
+                    throw new ClosedChannelException();
+                SelectionKey k = findKey(sel);
+                if (k != null) {
+                    k.attach(att);
+                    k.interestOps(ops);
+                } else {
+                    // New registration
                     k = ((AbstractSelector)sel).register(this, ops, att);
                     addKey(k);
                 }
+                return k;
             }
-            return k;
         }
     }
 
@@ -239,12 +240,20 @@ public final SelectionKey register(Selector sel, int ops,
      */
     protected final void implCloseChannel() throws IOException {
         implCloseSelectableChannel();
+
+        // clone keys to avoid calling cancel when holding keyLock
+        SelectionKey[] copyOfKeys = null;
         synchronized (keyLock) {
-            int count = (keys == null) ? 0 : keys.length;
-            for (int i = 0; i < count; i++) {
-                SelectionKey k = keys[i];
-                if (k != null)
-                    k.cancel();
+            if (keys != null) {
+                copyOfKeys = keys.clone();
+            }
+        }
+
+        if (copyOfKeys != null) {
+            for (SelectionKey k : copyOfKeys) {
+                if (k != null) {
+                    k.cancel();   // invalidate and adds key to cancelledKey set
+                }
             }
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
index 73792a6d6d1..281c95bc483 100644
--- a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
@@ -37,17 +37,18 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 
 /**
  * Base Selector implementation class.
  */
 
-public abstract class SelectorImpl
+abstract class SelectorImpl
     extends AbstractSelector
 {
     // The set of keys registered with this Selector
-    protected final Set<SelectionKey> keys;
+    private final Set<SelectionKey> keys;
 
     // The set of keys with data ready for an operation
     protected final Set<SelectionKey> selectedKeys;
@@ -58,7 +59,7 @@ public abstract class SelectorImpl
 
     protected SelectorImpl(SelectorProvider sp) {
         super(sp);
-        keys = new HashSet<>();
+        keys = ConcurrentHashMap.newKeySet();
         selectedKeys = new HashSet<>();
         publicKeys = Collections.unmodifiableSet(keys);
         publicSelectedKeys = Util.ungrowableSet(selectedKeys);
@@ -82,11 +83,8 @@ public final Set<SelectionKey> selectedKeys() {
     }
 
     /**
-     * Returns the public view of the key sets
+     * Returns the public view of the selected-key set
      */
-    protected final Set<SelectionKey> nioKeys() {
-        return publicKeys;
-    }
     protected final Set<SelectionKey> nioSelectedKeys() {
         return publicSelectedKeys;
     }
@@ -116,18 +114,14 @@ protected final void end(boolean blocking) {
     private int lockAndDoSelect(long timeout) throws IOException {
         synchronized (this) {
             ensureOpen();
-            synchronized (publicKeys) {
-                synchronized (publicSelectedKeys) {
-                    return doSelect(timeout);
-                }
+            synchronized (publicSelectedKeys) {
+                return doSelect(timeout);
             }
         }
     }
 
     @Override
-    public final int select(long timeout)
-        throws IOException
-    {
+    public final int select(long timeout) throws IOException {
         if (timeout < 0)
             throw new IllegalArgumentException("Negative timeout");
         return lockAndDoSelect((timeout == 0) ? -1 : timeout);
@@ -135,7 +129,7 @@ public final int select(long timeout)
 
     @Override
     public final int select() throws IOException {
-        return select(0);
+        return lockAndDoSelect(-1);
     }
 
     @Override
@@ -143,32 +137,33 @@ public final int selectNow() throws IOException {
         return lockAndDoSelect(0);
     }
 
+    /**
+     * Invoked by implCloseSelector to close the selector.
+     */
+    protected abstract void implClose() throws IOException;
+
     @Override
     public final void implCloseSelector() throws IOException {
         wakeup();
         synchronized (this) {
             implClose();
-            synchronized (publicKeys) {
-                synchronized (publicSelectedKeys) {
-                    // Deregister channels
-                    Iterator<SelectionKey> i = keys.iterator();
-                    while (i.hasNext()) {
-                        SelectionKeyImpl ski = (SelectionKeyImpl)i.next();
-                        deregister(ski);
-                        SelectableChannel selch = ski.channel();
-                        if (!selch.isOpen() && !selch.isRegistered())
-                            ((SelChImpl)selch).kill();
-                        selectedKeys.remove(ski);
-                        i.remove();
-                    }
-                    assert selectedKeys.isEmpty() && keys.isEmpty();
+            synchronized (publicSelectedKeys) {
+                // Deregister channels
+                Iterator<SelectionKey> i = keys.iterator();
+                while (i.hasNext()) {
+                    SelectionKeyImpl ski = (SelectionKeyImpl)i.next();
+                    deregister(ski);
+                    SelectableChannel selch = ski.channel();
+                    if (!selch.isOpen() && !selch.isRegistered())
+                        ((SelChImpl)selch).kill();
+                    selectedKeys.remove(ski);
+                    i.remove();
                 }
+                assert selectedKeys.isEmpty() && keys.isEmpty();
             }
         }
     }
 
-    protected abstract void implClose() throws IOException;
-
     @Override
     protected final SelectionKey register(AbstractSelectableChannel ch,
                                           int ops,
@@ -179,12 +174,21 @@ protected final SelectionKey register(AbstractSelectableChannel ch,
         SelectionKeyImpl k = new SelectionKeyImpl((SelChImpl)ch, this);
         k.attach(attachment);
 
-        // register with selector (if needed) before adding to key set
+        // register (if needed) before adding to key set
         implRegister(k);
-        synchronized (publicKeys) {
-            keys.add(k);
+
+        // add to the selector's key set, removing it immediately if the selector
+        // is closed. The key is not in the channel's key set at this point but
+        // it may be observed by a thread iterating over the selector's key set.
+        keys.add(k);
+        try {
+            k.interestOps(ops);
+        } catch (ClosedSelectorException e) {
+            assert ch.keyFor(this) == null;
+            keys.remove(k);
+            k.cancel();
+            throw e;
         }
-        k.interestOps(ops);
         return k;
     }
 
@@ -198,11 +202,16 @@ protected void implRegister(SelectionKeyImpl ski) {
         ensureOpen();
     }
 
+    /**
+     * Removes the key from the selector
+     */
     protected abstract void implDereg(SelectionKeyImpl ski) throws IOException;
 
+    /**
+     * Invoked by selection operations to process the cancelled-key set
+     */
     protected final void processDeregisterQueue() throws IOException {
         assert Thread.holdsLock(this);
-        assert Thread.holdsLock(publicKeys);
         assert Thread.holdsLock(publicSelectedKeys);
 
         Set<SelectionKey> cks = cancelledKeys();
@@ -231,7 +240,8 @@ protected final void processDeregisterQueue() throws IOException {
     }
 
     /**
-     * Change the event set in the selector
+     * Invoked by interestOps to ensure the interest ops are updated at the
+     * next selection operation.
      */
     protected abstract void setEventOps(SelectionKeyImpl ski);
 }
diff --git a/test/jdk/java/nio/channels/Selector/RegisterDuringSelect.java b/test/jdk/java/nio/channels/Selector/RegisterDuringSelect.java
new file mode 100644
index 00000000000..bb1791b6905
--- /dev/null
+++ b/test/jdk/java/nio/channels/Selector/RegisterDuringSelect.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8201315
+ * @summary Test that channels can be registered, interest ops can changed,
+ *          and keys cancelled while a selection operation is in progress.
+ */
+
+import java.io.IOException;
+import java.nio.channels.Pipe;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.Phaser;
+
+public class RegisterDuringSelect {
+
+    static Callable<Void> selectLoop(Selector sel, Phaser barrier) {
+        return new Callable<Void>() {
+            @Override
+            public Void call() throws IOException {
+                for (;;) {
+                    sel.select();
+                    if (sel.isOpen()) {
+                        barrier.arriveAndAwaitAdvance();
+                    } else {
+                        // closed
+                        return null;
+                    }
+                }
+            }
+        };
+    }
+    /**
+     * Invoke register, interestOps, and cancel concurrently with a thread
+     * doing a selection operation
+     */
+    public static void main(String args[]) throws Exception {
+        Future<Void> result;
+
+        ExecutorService pool = Executors.newFixedThreadPool(1);
+        try (Selector sel = Selector.open()) {
+            Phaser barrier = new Phaser(2);
+
+            // submit task to do the select loop
+            result = pool.submit(selectLoop(sel, barrier));
+
+            Pipe p = Pipe.open();
+            try {
+                Pipe.SourceChannel sc = p.source();
+                sc.configureBlocking(false);
+
+                System.out.println("register ...");
+                SelectionKey key = sc.register(sel, SelectionKey.OP_READ);
+                if (!sel.keys().contains(key))
+                    throw new RuntimeException("key not in key set");
+                sel.wakeup();
+                barrier.arriveAndAwaitAdvance();
+
+                System.out.println("interestOps ...");
+                key.interestOps(0);
+                sel.wakeup();
+                barrier.arriveAndAwaitAdvance();
+
+                System.out.println("cancel ...");
+                key.cancel();
+                sel.wakeup();
+                barrier.arriveAndAwaitAdvance();
+                if (sel.keys().contains(key))
+                    throw new RuntimeException("key not removed from key set");
+
+            } finally {
+                p.source().close();
+                p.sink().close();
+            }
+
+        } finally {
+            pool.shutdown();
+        }
+
+        // ensure selectLoop completes without exception
+        result.get();
+
+    }
+}

From 1c40a29ff8070105bce603caf87b79a0c12a179a Mon Sep 17 00:00:00 2001
From: tschatzl <unknown>
Date: Wed, 18 Apr 2018 11:36:48 +0200
Subject: [PATCH 174/196] 8201487: Do not rebalance reference processing queues
 if not doing parallel reference processing Reviewed-by: sangheki, kbarrett

---
 .../jtreg/gc/logging/TestPrintReferences.java | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
index b5437cadc3d..18b89617ce9 100644
--- a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
+++ b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
@@ -54,30 +54,36 @@ public class TestPrintReferences {
   static final String gcLogTimeRegex = ".* GC\\([0-9]+\\) ";
 
   public static void main(String[] args) throws Exception {
+    test(true);
+    test(false);
+  }
+
+  static String indent(int count) {
+    return " {" + count + "}";
+  }
+
+  public static void test(boolean parallelRefProcEnabled) throws Exception {
     ProcessBuilder pb_enabled = ProcessTools.createJavaProcessBuilder("-Xlog:gc+phases+ref=debug",
                                                                       "-XX:+UseG1GC",
                                                                       "-Xmx32M",
                                                                       // Explicit thread setting is required to avoid using only 1 thread
+                                                                      "-XX:" + (parallelRefProcEnabled ? "+" : "-") + "ParallelRefProcEnabled",
                                                                       "-XX:ParallelGCThreads=2",
                                                                       GCTest.class.getName());
     OutputAnalyzer output = new OutputAnalyzer(pb_enabled.start());
 
-    checkLogFormat(output);
+    checkLogFormat(output, parallelRefProcEnabled);
     checkLogValue(output);
 
     output.shouldHaveExitValue(0);
   }
 
-  static String indent(int count) {
-    return " {" + count + "}";
-  }
-
   // Find the first Reference Processing log and check its format.
-  public static void checkLogFormat(OutputAnalyzer output) {
+  public static void checkLogFormat(OutputAnalyzer output, boolean parallelRefProcEnabled) {
     String countRegex = "[0-9]+";
     String timeRegex = doubleRegex + "ms";
     String totalRegex = gcLogTimeRegex + indent(4) + referenceProcessing + ": " + timeRegex + "\n";
-    String balanceRegex = gcLogTimeRegex + indent(8) + "Balance queues: " + timeRegex + "\n";
+    String balanceRegex = parallelRefProcEnabled ? gcLogTimeRegex + indent(8) + "Balance queues: " + timeRegex + "\n" : "";
     String softRefRegex = gcLogTimeRegex + indent(6) + softReference + ": " + timeRegex + "\n";
     String weakRefRegex = gcLogTimeRegex + indent(6) + weakReference + ": " + timeRegex + "\n";
     String finalRefRegex = gcLogTimeRegex + indent(6) + finalReference + ": " + timeRegex + "\n";

From 9ebf431ad0831ca68fce543bd337a37b3655b343 Mon Sep 17 00:00:00 2001
From: tschatzl <unknown>
Date: Wed, 18 Apr 2018 11:36:48 +0200
Subject: [PATCH 175/196] 8201596: java.lang.ref.Reference processing total
 time logging broken Summary: Fix "Reference Processing" and add "Weak
 Processing" time Reviewed-by: kbarrett, sangheki

---
 test/hotspot/jtreg/gc/g1/TestGCLogMessages.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
index 1dd184c070b..641cc0bdafa 100644
--- a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
+++ b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -144,6 +144,8 @@ public boolean isAvailable() {
         // Reference Processing
         new LogMessageWithLevel("Reference Processing", Level.DEBUG),
         new LogMessageWithLevel("Reference Enqueuing", Level.DEBUG),
+        // VM internal reference processing
+        new LogMessageWithLevel("Weak Processing", Level.DEBUG),
 
         new LogMessageWithLevelC2OrJVMCIOnly("DerivedPointerTable Update", Level.DEBUG),
         new LogMessageWithLevel("Start New Collection Set", Level.DEBUG),

From a7ac4980e407c8b31e9dbb185b341a879f843f63 Mon Sep 17 00:00:00 2001
From: ksrini <unknown>
Date: Mon, 16 Apr 2018 16:52:08 -0700
Subject: [PATCH 176/196] 8198793: Add launcher support for preview features
 Reviewed-by: mchung, sundar

---
 .../share/classes/sun/launcher/resources/launcher.properties    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
index 88317fbcb35..6cdde5aadb7 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
@@ -113,6 +113,8 @@ java.launcher.opt.footer = \
 \                  one or more argument files containing options\n\
 \    -disable-@files\n\
 \                  prevent further argument file expansion\n\
+\    --enable-preview\n\
+\                  allow classes to depend on preview features of this release
 \To specify an argument for a long option, you can use --<name>=<value> or\n\
 \--<name> <value>.\n
 

From cafc683ffdfa85e43bbb87d992a2002be9b8ddb1 Mon Sep 17 00:00:00 2001
From: dnsimon <unknown>
Date: Wed, 18 Apr 2018 15:57:19 +0200
Subject: [PATCH 177/196] 8201794: [Graal] fix regressions from JDK-8187490
 Reviewed-by: alanb, mchung

---
 .../management/HotSpotGraalManagement.java    | 29 +++++++++++++++++++
 .../jdk/modules/etc/UpgradeableModules.java   |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalManagement.java

diff --git a/src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalManagement.java b/src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalManagement.java
new file mode 100644
index 00000000000..d4176d18e48
--- /dev/null
+++ b/src/jdk.internal.vm.compiler.management/share/classes/org.graalvm.compiler.hotspot.management/src/org/graalvm/compiler/hotspot/management/HotSpotGraalManagement.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2018, 2018, 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.
+ */
+package org.graalvm.compiler.hotspot.management;
+
+/**
+ * Placeholder until next Graal update.
+ */
+public final class HotSpotGraalManagement  {
+}
diff --git a/test/jdk/jdk/modules/etc/UpgradeableModules.java b/test/jdk/jdk/modules/etc/UpgradeableModules.java
index 9bb157d667e..9d50045e86d 100644
--- a/test/jdk/jdk/modules/etc/UpgradeableModules.java
+++ b/test/jdk/jdk/modules/etc/UpgradeableModules.java
@@ -46,6 +46,7 @@ public class UpgradeableModules {
         List.of("java.compiler",
                 "java.jnlp",
                 "jdk.internal.vm.compiler",
+                "jdk.internal.vm.compiler.management",
                 "jdk.deploy",
                 "jdk.javaws",
                 "jdk.plugin",

From a433774956f76a9227ad5784a057b7de4b6a3cd9 Mon Sep 17 00:00:00 2001
From: clanger <unknown>
Date: Mon, 16 Apr 2018 12:50:10 +0530
Subject: [PATCH 178/196] 8201369: Inet4AddressImpl_getLocalHostName reverse
 lookup on Solaris only Reviewed-by: clanger, chegar Contributed-by:
 sshamaia@in.ibm.com

---
 src/java.base/unix/native/libnet/Inet4AddressImpl.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/java.base/unix/native/libnet/Inet4AddressImpl.c b/src/java.base/unix/native/libnet/Inet4AddressImpl.c
index 829ad20c0a5..ceaaa309e4e 100644
--- a/src/java.base/unix/native/libnet/Inet4AddressImpl.c
+++ b/src/java.base/unix/native/libnet/Inet4AddressImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -68,6 +68,7 @@ Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
     hostname[0] = '\0';
     if (gethostname(hostname, NI_MAXHOST) != 0) {
         strcpy(hostname, "localhost");
+#if defined(__solaris__)
     } else {
         // try to resolve hostname via nameservice
         // if it is known but getnameinfo fails, hostname will still be the
@@ -86,6 +87,12 @@ Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
             freeaddrinfo(res);
         }
     }
+#else
+    } else {
+        // make sure string is null-terminated
+        hostname[NI_MAXHOST] = '\0';
+    }
+#endif
     return (*env)->NewStringUTF(env, hostname);
 }
 

From c55344872a8aa940032f52eeea7c63bd527d0a05 Mon Sep 17 00:00:00 2001
From: alanb <unknown>
Date: Mon, 16 Apr 2018 09:36:01 +0100
Subject: [PATCH 179/196] 8194734: Handle to jimage file inherited into child
 processes (win) Reviewed-by: alanb Contributed-by:
 alexandr.miloslavskiy@gmail.com

---
 src/java.base/windows/native/libjimage/osSupport_windows.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/java.base/windows/native/libjimage/osSupport_windows.cpp b/src/java.base/windows/native/libjimage/osSupport_windows.cpp
index fff5468c191..97e074bb0f4 100644
--- a/src/java.base/windows/native/libjimage/osSupport_windows.cpp
+++ b/src/java.base/windows/native/libjimage/osSupport_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -38,7 +38,8 @@
  * Return the file descriptor.
  */
 jint osSupport::openReadOnly(const char *path) {
-    return ::open(path, 0, 0);
+    // jimage file descriptors must not be inherited by child processes
+    return ::open(path, O_BINARY | O_NOINHERIT, O_RDONLY);
 }
 
 /**

From ff84945d322a5f8325a3e871e218d254e6af1e22 Mon Sep 17 00:00:00 2001
From: clanger <unknown>
Date: Thu, 19 Apr 2018 12:12:05 +0200
Subject: [PATCH 180/196] 8202000: AIX build broken after JDK-8195099
 Reviewed-by: goetz, stuefe, mbaesken

---
 .../hotspot/gtest/utilities/test_globalCounter.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/hotspot/gtest/utilities/test_globalCounter.cpp b/test/hotspot/gtest/utilities/test_globalCounter.cpp
index d5235610052..52ad41b654b 100644
--- a/test/hotspot/gtest/utilities/test_globalCounter.cpp
+++ b/test/hotspot/gtest/utilities/test_globalCounter.cpp
@@ -29,8 +29,8 @@
 #include "utilities/globalCounter.inline.hpp"
 #include "utilitiesHelper.inline.hpp"
 
-#define GOOD 1337
-#define BAD  4711
+#define GOOD_VALUE 1337
+#define BAD_VALUE  4711
 
 struct TestData {
   long test_value;
@@ -50,13 +50,13 @@ class RCUReaderThread : public JavaTestThread {
       GlobalCounter::critical_section_begin(this);
       volatile TestData* test = OrderAccess::load_acquire(_test);
       long value = OrderAccess::load_acquire(&test->test_value);
-      ASSERT_EQ(value, GOOD);
+      ASSERT_EQ(value, GOOD_VALUE);
       GlobalCounter::critical_section_end(this);
       {
         GlobalCounter::CriticalSection cs(this);
         volatile TestData* test = OrderAccess::load_acquire(_test);
         long value = OrderAccess::load_acquire(&test->test_value);
-        ASSERT_EQ(value, GOOD);
+        ASSERT_EQ(value, GOOD_VALUE);
       }
     }
   }
@@ -81,7 +81,7 @@ class RCUWriterThread : public JavaTestThread {
     RCUReaderThread* reader4 = new RCUReaderThread(&post, &test, &wrt_start);
 
     TestData* tmp = new TestData();
-    tmp->test_value = GOOD;
+    tmp->test_value = GOOD_VALUE;
     OrderAccess::release_store_fence(&test, tmp);
 
     reader1->doit();
@@ -98,10 +98,10 @@ class RCUWriterThread : public JavaTestThread {
     for (int i = 0; i < 100000 && stop_ms > os::javaTimeMillis(); i++) {
       volatile TestData* free_tmp = test;
       tmp = new TestData();
-      tmp->test_value = GOOD;
+      tmp->test_value = GOOD_VALUE;
       OrderAccess::release_store(&test, tmp);
       GlobalCounter::write_synchronize();
-      free_tmp->test_value = BAD;
+      free_tmp->test_value = BAD_VALUE;
       delete free_tmp;
     }
     RCUReaderThread::_exit = true;

From 42c84f4080dda8b15ec9a230491622a045bf669d Mon Sep 17 00:00:00 2001
From: simonis <unknown>
Date: Mon, 16 Apr 2018 14:29:27 +0530
Subject: [PATCH 181/196] 8201540: [AIX] Extend the set of supported charsets
 in java.base Reviewed-by: alanb, sherman, simonis Contributed-by:
 bhamaram@in.ibm.com

---
 make/data/charsetmapping/charsets             | 16 ++++++++++++---
 make/data/charsetmapping/stdcs-aix            | 20 +++++++++++++++++++
 .../build/tools/charsetmapping/SPI.java       |  4 ++--
 .../{IBM942C.java => IBM942C.java.template}   |  6 +++---
 .../{IBM943C.java => IBM943C.java.template}   |  6 +++---
 5 files changed, 41 insertions(+), 11 deletions(-)
 rename src/jdk.charsets/share/classes/sun/nio/cs/ext/{IBM942C.java => IBM942C.java.template} (95%)
 rename src/jdk.charsets/share/classes/sun/nio/cs/ext/{IBM943C.java => IBM943C.java.template} (94%)

diff --git a/make/data/charsetmapping/charsets b/make/data/charsetmapping/charsets
index cb721ac15bf..a5ea13b7cab 100644
--- a/make/data/charsetmapping/charsets
+++ b/make/data/charsetmapping/charsets
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2018, 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
@@ -326,6 +326,8 @@ charset windows-1252 MS1252
     ascii   true
     alias   cp1252			# JDK historical
     alias   cp5348			# Euro IBM CCSID
+    alias   ibm-1252
+    alias   ibm1252
 
 charset windows-1253 MS1253
     package sun.nio.cs
@@ -933,11 +935,16 @@ charset x-IBM942 IBM942          # IBM & PC/MSDOS encodings
 
 charset x-IBM942C IBM942C
     package sun.nio.cs.ext
-    type    source
+    type    template
     alias   cp942C               # JDK historical
     alias   ibm942C
     alias   ibm-942C
     alias   942C
+    alias   cp932
+    alias   ibm932
+    alias   ibm-932
+    alias   932
+    alias   x-ibm932
 
 charset x-IBM943 IBM943
     package sun.nio.cs.ext
@@ -952,7 +959,7 @@ charset x-IBM943 IBM943
 
 charset x-IBM943C IBM943C
     package sun.nio.cs.ext
-    type    source
+    type    template
     alias   cp943C               # JDK historical
     alias   ibm943C
     alias   ibm-943C
@@ -1519,6 +1526,9 @@ charset x-IBM1383 IBM1383
     alias   ibm1383
     alias   ibm-1383
     alias   1383
+    alias   ibmeuccn
+    alias   ibm-euccn
+    alias   cpeuccn
 
 charset x-IBM970 IBM970
     package sun.nio.cs.ext
diff --git a/make/data/charsetmapping/stdcs-aix b/make/data/charsetmapping/stdcs-aix
index 4e82cc21440..30cdc528766 100644
--- a/make/data/charsetmapping/stdcs-aix
+++ b/make/data/charsetmapping/stdcs-aix
@@ -1,6 +1,26 @@
 #
 #   generate these charsets into sun.nio.cs
 #
+Big5
+Big5_Solaris
+Big5_HKSCS
 EUC_CN
 EUC_KR
 GBK
+GB18030
+IBM856
+IBM921
+IBM922
+IBM942
+IBM942C
+IBM943
+IBM943C
+IBM950
+IBM970
+IBM1046
+IBM1124
+IBM1383
+ISO_8859_6
+ISO_8859_8
+MS1252
+TIS_620
diff --git a/make/jdk/src/classes/build/tools/charsetmapping/SPI.java b/make/jdk/src/classes/build/tools/charsetmapping/SPI.java
index f4b94d0e85c..3ed09fd938b 100644
--- a/make/jdk/src/classes/build/tools/charsetmapping/SPI.java
+++ b/make/jdk/src/classes/build/tools/charsetmapping/SPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -129,7 +129,7 @@ public static void genClass(String type,
                      } else if (line.indexOf("_INCLUDE_ALIASES_MAP_") != -1) {
                          Hasher.genClass(out, aliasKeys, aliasValues,
                                          null, "Aliases", "String",
-                                         11, 3, true, false, false);
+                                         12, 3, true, false, false);
                      } else if (line.indexOf("_INCLUDE_CLASSES_MAP_") != -1) {
                          Hasher.genClass(out, clzKeys, clzValues,
                                          null, "Classes", "String",
diff --git a/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java.template
similarity index 95%
rename from src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java
rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java.template
index 2054609f5dc..26b7cd14b99 100644
--- a/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java
+++ b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package sun.nio.cs.ext;
+package $PACKAGE$;
 
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
@@ -36,7 +36,7 @@
 public class IBM942C extends Charset implements HistoricallyNamedCharset
 {
     public IBM942C() {
-        super("x-IBM942C", ExtendedCharsets.aliasesFor("x-IBM942C"));
+        super("x-IBM942C", $ALIASES$);
     }
 
     public String historicalName() {
diff --git a/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java.template
similarity index 94%
rename from src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java
rename to src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java.template
index fefc9af4231..5b145857c95 100644
--- a/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java
+++ b/src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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,7 +23,7 @@
  * questions.
  */
 
-package sun.nio.cs.ext;
+package $PACKAGE$;
 
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
@@ -36,7 +36,7 @@ public class IBM943C extends Charset implements HistoricallyNamedCharset
 {
 
     public IBM943C() {
-        super("x-IBM943C", ExtendedCharsets.aliasesFor("x-IBM943C"));
+        super("x-IBM943C", $ALIASES$);
     }
 
     public String historicalName() {

From a8491b5349cf16f4157fea006cc79c4f17debd02 Mon Sep 17 00:00:00 2001
From: clanger <unknown>
Date: Mon, 16 Apr 2018 11:11:52 +0200
Subject: [PATCH 182/196] 8200719: Cannot connect to IPv6 host when exists any
 active network interface without IPv6 address Reviewed-by: clanger, chegar
 Contributed-by: joelpelaez@gmail.com

---
 src/java.base/unix/native/libnet/net_util_md.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
index 9e36d159fcf..a770d2bb082 100644
--- a/src/java.base/unix/native/libnet/net_util_md.c
+++ b/src/java.base/unix/native/libnet/net_util_md.c
@@ -89,7 +89,9 @@ void setDefaultScopeID(JNIEnv *env, struct sockaddr *him)
     }
     int defaultIndex;
     struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)him;
-    if (sin6->sin6_family == AF_INET6 && (sin6->sin6_scope_id == 0)) {
+    if (sin6->sin6_family == AF_INET6 && (sin6->sin6_scope_id == 0) &&
+        (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) ||
+         IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))) {
         defaultIndex = (*env)->GetStaticIntField(env, ni_class,
                                                  ni_defaultIndexID);
         sin6->sin6_scope_id = defaultIndex;

From 2b67693003dd00b49874617a73d6a1740bce16f8 Mon Sep 17 00:00:00 2001
From: goetz <unknown>
Date: Mon, 16 Apr 2018 11:08:07 +0200
Subject: [PATCH 183/196] 8201584: Fix configure on SLES 11 after 8201483
 Reviewed-by: ihse, simonis

---
 make/autoconf/hotspot.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 98a3ef44554..2d630bcb154 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -443,7 +443,7 @@ AC_DEFUN_ONCE([HOTSPOT_FINALIZE_JVM_FEATURES],
     AC_MSG_RESULT(["$JVM_FEATURES_FOR_VARIANT"])
 
     # Validate features (for configure script errors, not user errors)
-    INVALID_FEATURES=`$GREP -Fvx "${VALID_JVM_FEATURES// /$'\n'}" <<< "${JVM_FEATURES_FOR_VARIANT// /$'\n'}"`
+    BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES_FOR_VARIANT, $VALID_JVM_FEATURES)
     if test "x$INVALID_FEATURES" != x; then
       AC_MSG_ERROR([Internal configure script error. Invalid JVM feature(s): $INVALID_FEATURES])
     fi

From 74b3995555c2cd7df1b33df1fd2b3502bf4b56c6 Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Fri, 20 Apr 2018 21:54:36 +0200
Subject: [PATCH 184/196] 8201536: configure fails compiler check due to bad
 -m32 flag Reviewed-by: erikj

---
 make/autoconf/flags.m4 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
index fef76f8fbba..472e7a638a2 100644
--- a/make/autoconf/flags.m4
+++ b/make/autoconf/flags.m4
@@ -233,15 +233,17 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
   # The sysroot flags are needed for configure to be able to run the compilers
   FLAGS_SETUP_SYSROOT_FLAGS
 
+  # For solstudio and xlc, the word size flag is required for correct behavior.
+  # For clang/gcc, the flag is only strictly required for reduced builds, but
+  # set it always where possible (x86, sparc and ppc).
   if test "x$TOOLCHAIN_TYPE" = xxlc; then
     MACHINE_FLAG="-q${OPENJDK_TARGET_CPU_BITS}"
-  elif test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
-    if test "x$OPENJDK_TARGET_CPU" != xaarch64 &&
-       test "x$OPENJDK_TARGET_CPU" != xarm &&
-       test "x$OPENJDK_TARGET_CPU" != xmips &&
-       test "x$OPENJDK_TARGET_CPU" != xmipsel &&
-       test "x$OPENJDK_TARGET_CPU" != xmips64 &&
-       test "x$OPENJDK_TARGET_CPU" != xmips64el; then
+  elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+    MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
+  elif test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+    if test "x$OPENJDK_TARGET_CPU_ARCH" = xx86 ||
+        test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc ||
+        test "x$OPENJDK_TARGET_CPU_ARCH" = xppc; then
       MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
     fi
   fi

From 019797a3fa1a47eae5e68b9c739b20ba51272916 Mon Sep 17 00:00:00 2001
From: kvn <unknown>
Date: Fri, 20 Apr 2018 14:30:57 -0700
Subject: [PATCH 185/196] 8201850: [AOT] vm crash when run test
 compiler/aot/fingerprint/SelfChangedCDS.java Summary: set AOT specific
 compressed oop shift value before CDS archive load Reviewed-by: iklam,
 jiangli

---
 .../compiler/aot/fingerprint/CDSDumper.java   |  9 ++++++--
 .../aot/fingerprint/SelfChangedCDS.java       | 23 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java b/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java
index e789f07e2b7..b0bc027ced5 100644
--- a/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java
@@ -31,18 +31,19 @@
 import jdk.test.lib.process.ProcessTools;
 
 // Usage:
-// java CDSDumper <classpath> <classlist> <archive> <class1> <class2> ...
+// java CDSDumper <classpath> <classlist> <archive> <heapsize> <class1> <class2> ...
 public class CDSDumper {
     public static void main(String[] args) throws Exception {
         String classpath = args[0];
         String classlist = args[1];
         String archive = args[2];
+        String heapsize = args[3];
 
         // Prepare the classlist
         FileOutputStream fos = new FileOutputStream(classlist);
         PrintStream ps = new PrintStream(fos);
 
-        for (int i=3; i<args.length; i++) {
+        for (int i=4; i<args.length; i++) {
             ps.println(args[i].replace('.', '/'));
         }
         ps.close();
@@ -50,6 +51,7 @@ public static void main(String[] args) throws Exception {
 
         // Dump the archive
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+            heapsize,
             "-XX:+IgnoreUnrecognizedVMOptions",
             "-XX:+UnlockCommercialFeatures",
             "-XX:+UseAppCDS",
@@ -58,9 +60,12 @@ public static void main(String[] args) throws Exception {
             "-XX:ExtraSharedClassListFile=" + classlist,
             "-XX:SharedArchiveFile=" + archive,
             "-Xshare:dump",
+            "-Xlog:gc+heap+coops",
             "-Xlog:cds");
 
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        System.out.println("[stdout = " + output.getStdout() + "]");
+        System.out.println("[stderr = " + output.getStderr() + "]");
         output.shouldContain("Loading classes to share");
         output.shouldHaveExitValue(0);
     }
diff --git a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java
index 70f73836a40..e63dc2ea97e 100644
--- a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java
@@ -36,7 +36,7 @@
  *      -class compiler.aot.fingerprint.Blah
  *
  * @run driver ClassFileInstaller -jar SelfChangedCDS.jar compiler.aot.fingerprint.Blah
- * @run main compiler.aot.fingerprint.CDSDumper SelfChangedCDS.jar SelfChangedCDS.classlist SelfChangedCDS.jsa
+ * @run main compiler.aot.fingerprint.CDSDumper SelfChangedCDS.jar SelfChangedCDS.classlist SelfChangedCDS.jsa -showversion
  *      compiler.aot.fingerprint.Blah
  *
  * @run main compiler.aot.fingerprint.CDSRunner -cp SelfChangedCDS.jar
@@ -46,6 +46,7 @@
  *      -XX:+UnlockDiagnosticVMOptions -XX:SharedArchiveFile=SelfChangedCDS.jsa
  *      -XX:+IgnoreUnrecognizedVMOptions
  *      -Xshare:auto -XX:+UnlockCommercialFeatures -XX:+UseAppCDS -showversion
+ *      -Xlog:cds -Xlog:gc+heap+coops
  *      -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
  *      compiler.aot.fingerprint.Blah TEST-UNMODIFIED
  *
@@ -61,6 +62,26 @@
  *      -XX:+UnlockDiagnosticVMOptions -XX:SharedArchiveFile=SelfChangedCDS.jsa
  *      -XX:+IgnoreUnrecognizedVMOptions
  *      -Xshare:auto -XX:+UnlockCommercialFeatures -XX:+UseAppCDS -showversion
+ *      -Xlog:cds -Xlog:gc+heap+coops
  *      -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
  *      compiler.aot.fingerprint.Blah TEST-MODIFIED
+ *
+ *
+ * @run driver compiler.aot.AotCompiler -libname libSelfChanged.so
+ *      -class compiler.aot.fingerprint.Blah
+ *      -extraopt -Xmx512m
+ *
+ * @run main compiler.aot.fingerprint.CDSDumper SelfChangedCDS.jar SelfChangedCDS.classlist SelfChangedCDS.jsa -Xmx512m
+ *      compiler.aot.fingerprint.Blah
+ *
+ * @run main compiler.aot.fingerprint.CDSRunner -Xmx512m -cp SelfChangedCDS.jar
+ *      compiler.aot.fingerprint.Blah TEST-UNMODIFIED
+ * @run main compiler.aot.fingerprint.CDSRunner -Xmx512m -cp SelfChangedCDS.jar
+ *      -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ *      -XX:+UnlockDiagnosticVMOptions -XX:SharedArchiveFile=SelfChangedCDS.jsa
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -Xshare:auto -XX:+UnlockCommercialFeatures -XX:+UseAppCDS -showversion
+ *      -Xlog:cds -Xlog:gc+heap+coops
+ *      -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
+ *      compiler.aot.fingerprint.Blah TEST-UNMODIFIED
  */

From c3c0ec4254ada50e39cb3c6a6e5cdd2688204535 Mon Sep 17 00:00:00 2001
From: mdoerr <unknown>
Date: Wed, 18 Apr 2018 11:19:32 +0200
Subject: [PATCH 186/196] 8198756: Lazy allocation of compiler threads
 Reviewed-by: kvn

---
 test/hotspot/jtreg/runtime/whitebox/WBStackSize.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/whitebox/WBStackSize.java b/test/hotspot/jtreg/runtime/whitebox/WBStackSize.java
index dc5fb024044..f702864e5a7 100644
--- a/test/hotspot/jtreg/runtime/whitebox/WBStackSize.java
+++ b/test/hotspot/jtreg/runtime/whitebox/WBStackSize.java
@@ -82,7 +82,9 @@ static void testStackOverflow() {
     }
 
     public static void main(String[] args) {
-        long configStackSize = wb.getIntxVMFlag("ThreadStackSize") * K;
+        boolean isCompilerThread = Thread.currentThread().getName().indexOf(" CompilerThread") > 0;
+        long configStackSize = isCompilerThread ? wb.getIntxVMFlag("CompilerThreadStackSize") * K
+                                                : wb.getIntxVMFlag("ThreadStackSize") * K;
         System.out.println("ThreadStackSize VM option: " + configStackSize);
 
         long stackProtectionSize = wb.getIntxVMFlag("StackShadowPages") * wb.getVMPageSize();

From da7e266d4ede463a8dd627efd920c8320acfbc7c Mon Sep 17 00:00:00 2001
From: Adam Farley <adam.farley@uk.ibm.com>
Date: Wed, 18 Apr 2018 13:55:48 +0100
Subject: [PATCH 187/196] Remove unwanted patches

One patch is just a copyright statement without any code, and
the other is a copyright statement paired with a typo.

Signed-off-by: Adam Farley <adam.farley@uk.ibm.com>
---
 .../classes/java/nio/Direct-X-Buffer-bin.java.template    | 6 ------
 .../jlink/internal/plugins/GenerateJLIClassesPlugin.java  | 8 +-------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template
index 2bd3a10ed51..a6fed522fa4 100644
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template
@@ -1,9 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2000, 2018 All Rights Reserved
- * ===========================================================================
- */
-
 /*
  * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java
index 1154cbb8517..7397abc8c1f 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java
@@ -1,9 +1,3 @@
-/*
- * ===========================================================================
- * (c) Copyright IBM Corp. 2016, 2017 All Rights Reserved
- * ===========================================================================
- */
-
 /*
  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,7 +101,7 @@ public String getDescription() {
 
     @Override
     public Set<State> getState() {
-        return EnumSet.of(State.AUTO_ENABLE, State.FUNCTIONAL);
+        return EnumSet.of(State.AUTO_ENABLED, State.FUNCTIONAL);
     }
 
     @Override

From f21148221cb62d2c4bafd913953afdb260761d17 Mon Sep 17 00:00:00 2001
From: coleenp <unknown>
Date: Wed, 18 Apr 2018 12:06:53 -0400
Subject: [PATCH 188/196] 8201505: Use WeakHandle for
 ProtectionDomainCacheTable and ResolvedMethodTable 8193524: Redefining a
 method that removes use of 1 or more lambda expressions causes the JVM to
 hang Summary: Remove oop pointers from runtime data structures. Reviewed-by:
 lfoltan, stefank Contributed-by: coleen.phillimore@oracle.com,
 lois.foltan@oracle.com

---
 test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java b/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java
index d8e047b5d05..9a3395a625d 100644
--- a/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java
+++ b/test/hotspot/jtreg/runtime/MemberName/MemberNameLeak.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -61,7 +61,7 @@ public static void test(String gc) throws Throwable {
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("ResolvedMethod entry added for MemberNameLeak$Leak.callMe()V");
         output.shouldContain("ResolvedMethod entry found for MemberNameLeak$Leak.callMe()V");
-        output.shouldContain("ResolvedMethod entry removed for MemberNameLeak$Leak.callMe()V");
+        output.shouldContain("ResolvedMethod entry removed");
         output.shouldHaveExitValue(0);
     }
 

From 92861b2418b500ed996e7955416392edefcfacbf Mon Sep 17 00:00:00 2001
From: darcy <unknown>
Date: Wed, 18 Apr 2018 10:03:49 -0700
Subject: [PATCH 189/196] 8201766: Mark TimSortStackSize2.java as
 intermittently failing Reviewed-by: dholmes

---
 test/jdk/TEST.groups                             | 8 +++++---
 test/jdk/java/util/Arrays/TimSortStackSize2.java | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 93d260cfb9a..2058c33f819 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -1,4 +1,4 @@
-#  Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2013, 2018, 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
@@ -34,12 +34,14 @@ tier1 = \
     java/nio/Buffer \
     com/sun/crypto/provider/Cipher \
     :jdk_math \
-    tools/pack200
+    tools/pack200 \
+    -java/util/Arrays/TimSortStackSize2.java
 
 tier2 = \
     :tier2_part1 \
     :tier2_part2 \
-    :tier2_part3
+    :tier2_part3 \
+    java/util/Arrays/TimSortStackSize2.java
 
 # com/sun/crypto/provider/Cipher is in tier1 because of JDK-8132855
 tier2_part1 = \
diff --git a/test/jdk/java/util/Arrays/TimSortStackSize2.java b/test/jdk/java/util/Arrays/TimSortStackSize2.java
index 494e0f098bd..bc5d71abffa 100644
--- a/test/jdk/java/util/Arrays/TimSortStackSize2.java
+++ b/test/jdk/java/util/Arrays/TimSortStackSize2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -34,6 +34,7 @@
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *     -XX:+WhiteBoxAPI TimSortStackSize2
  * @summary Test TimSort stack size on big arrays
+ * @key intermittent
  */
 import java.util.ArrayList;
 import java.util.Arrays;

From 370172c05d6d06db3ff28e8ad4e6e53cffbbcc75 Mon Sep 17 00:00:00 2001
From: vromero <unknown>
Date: Wed, 18 Apr 2018 16:02:53 -0400
Subject: [PATCH 190/196] 8196433: use the new error diagnostic approach at
 javac.Main Reviewed-by: jjg

---
 .../propertiesparser/parser/MessageType.java  |   6 +-
 .../sun/tools/javac/api/JavacTaskImpl.java    |   4 +-
 .../com/sun/tools/javac/main/Arguments.java   |  89 ++----
 .../com/sun/tools/javac/main/Main.java        |  30 +-
 .../com/sun/tools/javac/main/Option.java      |  52 ++--
 .../sun/tools/javac/main/OptionHelper.java    |   8 +-
 .../tools/javac/resources/compiler.properties | 133 ++++++++-
 .../tools/javac/resources/javac.properties    |  71 -----
 .../util/AbstractDiagnosticFormatter.java     |  10 +-
 .../sun/tools/javac/util/JavacMessages.java   |  59 +++-
 .../classes/com/sun/tools/javac/util/Log.java |  10 +-
 .../jdk/javadoc/tool/BadOptionsTest.java      |  10 +-
 .../tools/javac/6410653/T6410653.java         |  59 ----
 ...ctProfileBCPOptionsIfUsedTogetherTest.java |  69 -----
 .../tools/javac/diags/CheckResourceKeys.java  |   3 +-
 .../tools/javac/diags/examples.not-yet.txt    |  32 +++
 .../DirPathElementNotDirectory.java           |   3 +-
 .../tools/javac/doclint/DocLintTest.java      |   4 +-
 .../javac/doclint/IncludePackagesTest.java    |   4 +-
 .../tools/javac/modules/AddExportsTest.java   |   8 +-
 .../tools/javac/modules/AddLimitMods.java     |   2 +-
 .../tools/javac/modules/AddModulesTest.java   |   6 +-
 .../tools/javac/modules/AddReadsTest.java     |   8 +-
 .../tools/javac/modules/LimitModulesTest.java |   8 +-
 .../javac/modules/ModuleSourcePathTest.java   |   4 +-
 .../tools/javac/modules/PatchModulesTest.java |   8 +-
 .../options/release/ReleaseOptionClashes.java |  89 ------
 .../options/smokeTests/OptionSmokeTest.java   | 266 ++++++++++++++++++
 .../javac/platform/PlatformProviderTest.java  |   4 +-
 .../tools/javadoc/BadOptionsTest.java         |   8 +-
 .../tools/lib/toolbox/JavacTask.java          |  12 +-
 31 files changed, 638 insertions(+), 441 deletions(-)
 delete mode 100644 test/langtools/tools/javac/6410653/T6410653.java
 delete mode 100644 test/langtools/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
 delete mode 100644 test/langtools/tools/javac/options/release/ReleaseOptionClashes.java
 create mode 100644 test/langtools/tools/javac/options/smokeTests/OptionSmokeTest.java

diff --git a/make/langtools/tools/propertiesparser/parser/MessageType.java b/make/langtools/tools/propertiesparser/parser/MessageType.java
index a6ae325d541..29f1e16d160 100644
--- a/make/langtools/tools/propertiesparser/parser/MessageType.java
+++ b/make/langtools/tools/propertiesparser/parser/MessageType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -86,13 +86,17 @@ public enum SimpleType implements MessageType {
         NAME("name", "Name", "com.sun.tools.javac.util"),
         NUMBER("number", "int", null),
         OPTION_NAME("option name", "Option", "com.sun.tools.javac.main"),
+        PROFILE("profile", "Profile", "com.sun.tools.javac.jvm"),
+        SOURCE("source", "Source", "com.sun.tools.javac.code"),
         SOURCE_VERSION("source version", "SourceVersion", "javax.lang.model"),
         STRING("string", "String", null),
         SYMBOL("symbol", "Symbol", "com.sun.tools.javac.code"),
         SYMBOL_KIND("symbol kind", "Kind", "com.sun.tools.javac.code.Kinds"),
         KIND_NAME("kind name", "KindName", "com.sun.tools.javac.code.Kinds"),
+        TARGET("target", "Target", "com.sun.tools.javac.jvm"),
         TOKEN("token", "TokenKind", "com.sun.tools.javac.parser.Tokens"),
         TYPE("type", "Type", "com.sun.tools.javac.code"),
+        URL("url", "URL", "java.net"),
         SET("set", "Set", "java.util"),
         LIST("list", "List", "java.util"),
         OBJECT("object", "Object", null),
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
index 5f43a5b28e3..852fb1d03c4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -172,7 +172,7 @@ private <T> T handleExceptions(Callable<T> c, T sysErrorResult, T abnormalErrorR
             if (compiler == null || compiler.errorCount() == 0
                     || Options.instance(context).isSet("dev")) {
                 Log log = Log.instance(context);
-                log.printLines(PrefixKind.JAVAC, "msg.bug", JavaCompiler.version());
+                log.printLines("msg.bug", JavaCompiler.version());
                 ex.printStackTrace(log.getWriter(WriterKind.NOTICE));
             }
             return abnormalErrorResult;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
index 99853cc9c61..4a22425f3a1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
@@ -54,7 +54,6 @@
 import com.sun.tools.doclint.DocLint;
 import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.code.Source;
-import com.sun.tools.javac.code.Source.Feature;
 import com.sun.tools.javac.file.BaseFileManager;
 import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.jvm.Profile;
@@ -66,6 +65,7 @@
 import com.sun.tools.javac.resources.CompilerProperties.Warnings;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.JCDiagnostic;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticInfo;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.ListBuffer;
 import com.sun.tools.javac.util.Log;
@@ -295,7 +295,7 @@ public boolean handleReleaseOptions(Predicate<Iterable<String>> additionalOption
         String platformString = options.get(Option.RELEASE);
 
         checkOptionAllowed(platformString == null,
-                option -> error("err.release.bootclasspath.conflict", option.getPrimaryName()),
+                option -> reportDiag(Errors.ReleaseBootclasspathConflict(option)),
                 Option.BOOT_CLASS_PATH, Option.XBOOTCLASSPATH, Option.XBOOTCLASSPATH_APPEND,
                 Option.XBOOTCLASSPATH_PREPEND,
                 Option.ENDORSEDDIRS, Option.DJAVA_ENDORSED_DIRS,
@@ -308,7 +308,7 @@ public boolean handleReleaseOptions(Predicate<Iterable<String>> additionalOption
                     PlatformUtils.lookupPlatformDescription(platformString);
 
             if (platformDescription == null) {
-                error("err.unsupported.release.version", platformString);
+                reportDiag(Errors.UnsupportedReleaseVersion(platformString));
                 return false;
             }
 
@@ -363,7 +363,7 @@ private boolean doProcessArgs(Iterable<String> args,
         while (argIter.hasNext()) {
             String arg = argIter.next();
             if (arg.isEmpty()) {
-                error("err.invalid.flag", arg);
+                reportDiag(Errors.InvalidFlag(arg));
                 return false;
             }
 
@@ -392,7 +392,7 @@ private boolean doProcessArgs(Iterable<String> args,
             }
 
             // none of the above
-            error("err.invalid.flag", arg);
+            reportDiag(Errors.InvalidFlag(arg));
             return false;
         }
 
@@ -457,9 +457,9 @@ public boolean validate() {
             if (!emptyAllowed) {
                 if (!errors) {
                     if (JavaCompiler.explicitAnnotationProcessingRequested(options)) {
-                        error("err.no.source.files.classes");
+                        reportDiag(Errors.NoSourceFilesClasses);
                     } else {
-                        error("err.no.source.files");
+                        reportDiag(Errors.NoSourceFiles);
                     }
                 }
                 return false;
@@ -520,13 +520,9 @@ public boolean validate() {
             if (target.compareTo(source.requiredTarget()) < 0) {
                 if (targetString != null) {
                     if (sourceString == null) {
-                        error("warn.target.default.source.conflict",
-                                targetString,
-                                source.requiredTarget().name);
+                        reportDiag(Warnings.TargetDefaultSourceConflict(targetString, source.requiredTarget()));
                     } else {
-                        error("warn.source.target.conflict",
-                                sourceString,
-                                source.requiredTarget().name);
+                        reportDiag(Warnings.SourceTargetConflict(sourceString, source.requiredTarget()));
                     }
                     return false;
                 } else {
@@ -539,13 +535,11 @@ public boolean validate() {
         if (options.isSet(Option.PREVIEW)) {
             if (sourceString == null) {
                 //enable-preview must be used with explicit -source or --release
-                error("err.preview.without.source.or.release");
+                report(Errors.PreviewWithoutSourceOrRelease);
                 return false;
             } else if (source != Source.DEFAULT) {
                 //enable-preview must be used with latest source version
-                error("err.preview.not.latest",
-                        sourceString,
-                        Source.DEFAULT.name);
+                report(Errors.PreviewNotLatest(sourceString, Source.DEFAULT));
                 return false;
             }
         }
@@ -554,18 +548,18 @@ public boolean validate() {
         if (profileString != null) {
             Profile profile = Profile.lookup(profileString);
             if (!profile.isValid(target)) {
-                error("warn.profile.target.conflict", profileString, target.name);
+                reportDiag(Warnings.ProfileTargetConflict(profile, target));
             }
 
             // This check is only effective in command line mode,
             // where the file manager options are added to options
             if (options.get(Option.BOOT_CLASS_PATH) != null) {
-                error("err.profile.bootclasspath.conflict");
+                reportDiag(Errors.ProfileBootclasspathConflict);
             }
         }
 
         if (options.isSet(Option.SOURCE_PATH) && options.isSet(Option.MODULE_SOURCE_PATH)) {
-            error("err.sourcepath.modulesourcepath.conflict");
+            reportDiag(Errors.SourcepathModulesourcepathConflict);
         }
 
         boolean lintOptions = options.isUnset(Option.XLINT_CUSTOM, "-" + LintCategory.OPTIONS.option);
@@ -586,15 +580,15 @@ public boolean validate() {
         }
 
         if (target.compareTo(Target.MIN) < 0) {
-            log.error(Errors.OptionRemovedTarget(target.name, Target.MIN.name));
+            log.error(Errors.OptionRemovedTarget(target, Target.MIN));
         } else if (target == Target.MIN && lintOptions) {
-            log.warning(LintCategory.OPTIONS, Warnings.OptionObsoleteTarget(target.name));
+            log.warning(LintCategory.OPTIONS, Warnings.OptionObsoleteTarget(target));
             obsoleteOptionFound = true;
         }
 
         final Target t = target;
         checkOptionAllowed(t.compareTo(Target.JDK1_8) <= 0,
-                option -> error("err.option.not.allowed.with.target", option.getPrimaryName(), t.name),
+                option -> reportDiag(Errors.OptionNotAllowedWithTarget(option, t)),
                 Option.BOOT_CLASS_PATH,
                 Option.XBOOTCLASSPATH_PREPEND, Option.XBOOTCLASSPATH, Option.XBOOTCLASSPATH_APPEND,
                 Option.ENDORSEDDIRS, Option.DJAVA_ENDORSED_DIRS,
@@ -602,7 +596,7 @@ public boolean validate() {
                 Option.PROFILE);
 
         checkOptionAllowed(t.compareTo(Target.JDK1_9) >= 0,
-                option -> error("err.option.not.allowed.with.target", option.getPrimaryName(), t.name),
+                option -> reportDiag(Errors.OptionNotAllowedWithTarget(option, t)),
                 Option.MODULE_SOURCE_PATH, Option.UPGRADE_MODULE_PATH,
                 Option.SYSTEM, Option.MODULE_PATH, Option.ADD_MODULES,
                 Option.ADD_EXPORTS, Option.ADD_OPENS, Option.ADD_READS,
@@ -610,7 +604,7 @@ public boolean validate() {
                 Option.PATCH_MODULE);
 
         if (lintOptions && options.isSet(Option.PARAMETERS) && !target.hasMethodParameters()) {
-            log.warning(Warnings.OptionParametersUnsupported(target.name, Target.JDK1_8.name));
+            log.warning(Warnings.OptionParametersUnsupported(target, Target.JDK1_8));
         }
 
         if (fm.hasLocation(StandardLocation.MODULE_SOURCE_PATH)) {
@@ -871,7 +865,7 @@ private boolean checkDirectory(Option option) {
         }
         Path file = Paths.get(value);
         if (Files.exists(file) && !Files.isDirectory(file)) {
-            error("err.file.not.directory", value);
+            reportDiag(Errors.FileNotDirectory(value));
             return false;
         }
         return true;
@@ -889,35 +883,19 @@ void checkOptionAllowed(boolean allowed, ErrorReporter r, Option... opts) {
         }
     }
 
-    void error(JCDiagnostic.Error error) {
+    void reportDiag(DiagnosticInfo diag) {
         errors = true;
         switch (errorMode) {
             case ILLEGAL_ARGUMENT: {
-                String msg = log.localize(error);
+                String msg = log.localize(diag);
                 throw new PropagatedException(new IllegalArgumentException(msg));
             }
             case ILLEGAL_STATE: {
-                String msg = log.localize(error);
+                String msg = log.localize(diag);
                 throw new PropagatedException(new IllegalStateException(msg));
             }
             case LOG:
-                report(error);
-        }
-    }
-
-    void error(String key, Object... args) {
-        errors = true;
-        switch (errorMode) {
-            case ILLEGAL_ARGUMENT: {
-                String msg = log.localize(PrefixKind.JAVAC, key, args);
-                throw new PropagatedException(new IllegalArgumentException(msg));
-            }
-            case ILLEGAL_STATE: {
-                String msg = log.localize(PrefixKind.JAVAC, key, args);
-                throw new PropagatedException(new IllegalStateException(msg));
-            }
-            case LOG:
-                report(key, args);
+                report(diag);
         }
     }
 
@@ -932,22 +910,17 @@ void error(Option.InvalidValueException f) {
                 throw new PropagatedException(new IllegalStateException(msg, f.getCause()));
             }
             case LOG:
-                log.printRawLines(ownName + ": " + msg);
+                log.printRawLines(msg);
         }
     }
 
-    void warning(String key, Object... args) {
-        report(key, args);
-    }
-
-    private void report(String key, Object... args) {
+    private void report(DiagnosticInfo diag) {
         // Would be good to have support for -XDrawDiagnostics here
-        log.printRawLines(ownName + ": " + log.localize(PrefixKind.JAVAC, key, args));
-    }
-
-    private void report(JCDiagnostic.Error error) {
-        // Would be good to have support for -XDrawDiagnostics here
-        log.printRawLines(ownName + ": " + log.localize(error));
+        if (diag instanceof JCDiagnostic.Error) {
+            log.error((JCDiagnostic.Error)diag);
+        } else if (diag instanceof JCDiagnostic.Warning){
+            log.warning((JCDiagnostic.Warning)diag);
+        }
     }
 
     private JavaFileManager getFileManager() {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java
index cc4eb631a76..7e37e56b4fa 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -49,7 +49,9 @@
 import com.sun.tools.javac.main.CommandLine.UnmatchedQuote;
 import com.sun.tools.javac.platform.PlatformDescription;
 import com.sun.tools.javac.processing.AnnotationProcessingError;
+import com.sun.tools.javac.resources.CompilerProperties.Errors;
 import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticInfo;
 import com.sun.tools.javac.util.Log.PrefixKind;
 import com.sun.tools.javac.util.Log.WriterKind;
 
@@ -138,19 +140,22 @@ public Main(String name, PrintWriter out, PrintWriter err) {
 
     /** Report a usage error.
      */
-    void error(String key, Object... args) {
+    void reportDiag(DiagnosticInfo diag) {
         if (apiMode) {
-            String msg = log.localize(PrefixKind.JAVAC, key, args);
+            String msg = log.localize(diag);
             throw new PropagatedException(new IllegalStateException(msg));
         }
-        warning(key, args);
+        reportHelper(diag);
         log.printLines(PrefixKind.JAVAC, "msg.usage", ownName);
     }
 
-    /** Report a warning.
+    /** Report helper.
      */
-    void warning(String key, Object... args) {
-        log.printRawLines(ownName + ": " + log.localize(PrefixKind.JAVAC, key, args));
+    void reportHelper(DiagnosticInfo diag) {
+        String msg = log.localize(diag);
+        String errorPrefix = log.localize(Errors.Error);
+        msg = msg.startsWith(errorPrefix) ? msg : errorPrefix + msg;
+        log.printRawLines(msg);
     }
 
 
@@ -209,10 +214,10 @@ public void put(String name, String value) { }
         try {
             argv = CommandLine.parse(ENV_OPT_NAME, argv);
         } catch (UnmatchedQuote ex) {
-            error("err.unmatched.quote", ex.variableName);
+            reportDiag(Errors.UnmatchedQuote(ex.variableName));
             return Result.CMDERR;
         } catch (FileNotFoundException | NoSuchFileException e) {
-            warning("err.file.not.found", e.getMessage());
+            reportHelper(Errors.FileNotFound(e.getMessage()));
             return Result.SYSERR;
         } catch (IOException ex) {
             log.printLines(PrefixKind.JAVAC, "msg.io");
@@ -366,11 +371,10 @@ private boolean twoClassLoadersInUse(IllegalAccessError iae) {
                     CodeSource otherClassCodeSource = otherClass.getProtectionDomain().getCodeSource();
                     CodeSource javacCodeSource = this.getClass().getProtectionDomain().getCodeSource();
                     if (otherClassCodeSource != null && javacCodeSource != null) {
-                        log.printLines(PrefixKind.JAVAC, "err.two.class.loaders.2",
-                                otherClassCodeSource.getLocation(),
-                                javacCodeSource.getLocation());
+                        log.printLines(Errors.TwoClassLoaders2(otherClassCodeSource.getLocation(),
+                                javacCodeSource.getLocation()));
                     } else {
-                        log.printLines(PrefixKind.JAVAC, "err.two.class.loaders.1");
+                        log.printLines(Errors.TwoClassLoaders1);
                     }
                     return true;
                 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index 8c7a3da8fc7..ca7188fe7e9 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -59,6 +59,7 @@
 import com.sun.tools.javac.jvm.Target;
 import com.sun.tools.javac.platform.PlatformProvider;
 import com.sun.tools.javac.processing.JavacProcessingEnvironment;
+import com.sun.tools.javac.resources.CompilerProperties.Errors;
 import com.sun.tools.javac.util.Assert;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Log.PrefixKind;
@@ -197,7 +198,7 @@ public void process(OptionHelper helper, String option) {
         @Override
         public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
             if (arg.isEmpty()) {
-                throw helper.newInvalidValueException("err.no.value.for.option", option);
+                throw helper.newInvalidValueException(Errors.NoValueForOption(option));
             } else if (getPattern().matcher(arg).matches()) {
                 String prev = helper.get(PATCH_MODULE);
                 if (prev == null) {
@@ -209,13 +210,13 @@ public void process(OptionHelper helper, String option, String arg) throws Inval
                             .collect(Collectors.toSet())
                             .contains(argModulePackage);
                     if (isRepeated) {
-                        throw helper.newInvalidValueException("err.repeated.value.for.patch.module", argModulePackage);
+                        throw helper.newInvalidValueException(Errors.RepeatedValueForPatchModule(argModulePackage));
                     } else {
                         super.process(helper, option, prev + '\0' + arg);
                     }
                 }
             } else {
-                throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
+                throw helper.newInvalidValueException(Errors.BadValueForOption(option, arg));
             }
         }
 
@@ -290,7 +291,7 @@ public void process(OptionHelper helper, String option, String arg) throws Inval
         public void process(OptionHelper helper, String option, String operand) throws InvalidValueException {
             Source source = Source.lookup(operand);
             if (source == null) {
-                throw helper.newInvalidValueException("err.invalid.source", operand);
+                throw helper.newInvalidValueException(Errors.InvalidSource(operand));
             }
             super.process(helper, option, operand);
         }
@@ -301,7 +302,7 @@ public void process(OptionHelper helper, String option, String operand) throws I
         public void process(OptionHelper helper, String option, String operand) throws InvalidValueException {
             Target target = Target.lookup(operand);
             if (target == null) {
-                throw helper.newInvalidValueException("err.invalid.target", operand);
+                throw helper.newInvalidValueException(Errors.InvalidTarget(operand));
             }
             super.process(helper, option, operand);
         }
@@ -337,7 +338,7 @@ protected void help(Log log) {
         public void process(OptionHelper helper, String option, String operand) throws InvalidValueException {
             Profile profile = Profile.lookup(operand);
             if (profile == null) {
-                throw helper.newInvalidValueException("err.invalid.profile", operand);
+                throw helper.newInvalidValueException(Errors.InvalidProfile(operand));
             }
             super.process(helper, option, operand);
         }
@@ -392,12 +393,12 @@ public boolean hasArg() {
         public void process(OptionHelper helper, String option) throws InvalidValueException {
             int argLength = option.length();
             if (argLength == 2) {
-                throw helper.newInvalidValueException("err.empty.A.argument");
+                throw helper.newInvalidValueException(Errors.EmptyAArgument);
             }
             int sepIndex = option.indexOf('=');
             String key = option.substring(2, (sepIndex != -1 ? sepIndex : argLength) );
             if (!JavacProcessingEnvironment.isValidOptionName(key)) {
-                throw helper.newInvalidValueException("err.invalid.A.key", option);
+                throw helper.newInvalidValueException(Errors.InvalidAKey(option));
             }
             helper.put(option, option);
         }
@@ -410,14 +411,13 @@ public void process(OptionHelper helper, String option) throws InvalidValueExcep
         public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
             String prev = helper.get(DEFAULT_MODULE_FOR_CREATED_FILES);
             if (prev != null) {
-                throw helper.newInvalidValueException("err.option.too.many",
-                                                      DEFAULT_MODULE_FOR_CREATED_FILES.primaryName);
+                throw helper.newInvalidValueException(Errors.OptionTooMany(DEFAULT_MODULE_FOR_CREATED_FILES.primaryName));
             } else if (arg.isEmpty()) {
-                throw helper.newInvalidValueException("err.no.value.for.option", option);
+                throw helper.newInvalidValueException(Errors.NoValueForOption(option));
             } else if (getPattern().matcher(arg).matches()) {
                 helper.put(DEFAULT_MODULE_FOR_CREATED_FILES.primaryName, arg);
             } else {
-                throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
+                throw helper.newInvalidValueException(Errors.BadValueForOption(option, arg));
             }
         }
 
@@ -487,7 +487,7 @@ public void process(OptionHelper helper, String option, String arg) throws Inval
                 Log log = helper.getLog();
                 log.setWriters(new PrintWriter(new FileWriter(arg), true));
             } catch (java.io.IOException e) {
-                throw helper.newInvalidValueException("err.error.writing.file", arg, e);
+                throw helper.newInvalidValueException(Errors.ErrorWritingFile(arg, e.getMessage()));
             }
             super.process(helper, option, arg);
         }
@@ -570,12 +570,12 @@ public void process(OptionHelper helper, String option, String arg) {
         @Override
         public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
             if (arg.isEmpty()) {
-                throw helper.newInvalidValueException("err.no.value.for.option", option);
+                throw helper.newInvalidValueException(Errors.NoValueForOption(option));
             } else if (getPattern().matcher(arg).matches()) {
                 String prev = helper.get(ADD_EXPORTS);
                 helper.put(ADD_EXPORTS.primaryName, (prev == null) ? arg : prev + '\0' + arg);
             } else {
-                throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
+                throw helper.newInvalidValueException(Errors.BadValueForOption(option, arg));
             }
         }
 
@@ -591,12 +591,12 @@ public Pattern getPattern() {
         @Override
         public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
             if (arg.isEmpty()) {
-                throw helper.newInvalidValueException("err.no.value.for.option", option);
+                throw helper.newInvalidValueException(Errors.NoValueForOption(option));
             } else if (getPattern().matcher(arg).matches()) {
                 String prev = helper.get(ADD_READS);
                 helper.put(ADD_READS.primaryName, (prev == null) ? arg : prev + '\0' + arg);
             } else {
-                throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
+                throw helper.newInvalidValueException(Errors.BadValueForOption(option, arg));
             }
         }
 
@@ -612,14 +612,14 @@ public Pattern getPattern() {
         @Override
         public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
             if (arg.isEmpty()) {
-                throw helper.newInvalidValueException("err.no.value.for.option", option);
+                throw helper.newInvalidValueException(Errors.NoValueForOption(option));
             } else if (getPattern().matcher(arg).matches()) {
                 String prev = helper.get(ADD_MODULES);
                 // since the individual values are simple names, we can simply join the
                 // values of multiple --add-modules options with ','
                 helper.put(ADD_MODULES.primaryName, (prev == null) ? arg : prev + ',' + arg);
             } else {
-                throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
+                throw helper.newInvalidValueException(Errors.BadValueForOption(option, arg));
             }
         }
 
@@ -633,11 +633,11 @@ public Pattern getPattern() {
         @Override
         public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
             if (arg.isEmpty()) {
-                throw helper.newInvalidValueException("err.no.value.for.option", option);
+                throw helper.newInvalidValueException(Errors.NoValueForOption(option));
             } else if (getPattern().matcher(arg).matches()) {
                 helper.put(LIMIT_MODULES.primaryName, arg); // last one wins
             } else {
-                throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
+                throw helper.newInvalidValueException(Errors.BadValueForOption(option, arg));
             }
         }
 
@@ -651,13 +651,13 @@ public Pattern getPattern() {
         @Override
         public void process(OptionHelper helper, String option, String arg) throws InvalidValueException {
             if (arg.isEmpty()) {
-                throw helper.newInvalidValueException("err.no.value.for.option", option);
+                throw helper.newInvalidValueException(Errors.NoValueForOption(option));
             } else {
                 // use official parser if available
                 try {
                     ModuleDescriptor.Version.parse(arg);
                 } catch (IllegalArgumentException e) {
-                    throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
+                    throw helper.newInvalidValueException(Errors.BadValueForOption(option, arg));
                 }
             }
             super.process(helper, option, arg);
@@ -692,10 +692,10 @@ public void process(OptionHelper helper, String option) throws InvalidValueExcep
             if (option.endsWith(".java") ) {
                 Path p = Paths.get(option);
                 if (!Files.exists(p)) {
-                    throw helper.newInvalidValueException("err.file.not.found", p);
+                    throw helper.newInvalidValueException(Errors.FileNotFound(p.toString()));
                 }
                 if (!Files.isRegularFile(p)) {
-                    throw helper.newInvalidValueException("err.file.not.file", p);
+                    throw helper.newInvalidValueException(Errors.FileNotFile(p));
                 }
                 helper.addFile(p);
             } else {
@@ -1078,7 +1078,7 @@ public void handleOption(OptionHelper helper, String arg, Iterator<String> rest)
                 operand = arg.substring(sep + 1);
             } else {
                 if (!rest.hasNext()) {
-                    throw helper.newInvalidValueException("err.req.arg", arg);
+                    throw helper.newInvalidValueException(Errors.ReqArg(this.primaryName));
                 }
                 option = arg;
                 operand = rest.next();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java
index bc5363f73cc..dca8926cf3c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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
@@ -27,7 +27,9 @@
 
 import java.nio.file.Path;
 
+import com.sun.tools.javac.resources.CompilerProperties.Errors;
 import com.sun.tools.javac.util.JCDiagnostic;
+import com.sun.tools.javac.util.JCDiagnostic.Error;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Log.PrefixKind;
 
@@ -89,8 +91,8 @@ public abstract class OptionHelper {
      * @param args the arguments, if any, for the resource string
      * @return the InvalidValueException
      */
-    Option.InvalidValueException newInvalidValueException(String key, Object... args) {
-        return new Option.InvalidValueException(getLog().localize(PrefixKind.JAVAC, key, args));
+    Option.InvalidValueException newInvalidValueException(Error error) {
+        return new Option.InvalidValueException(getLog().localize(error));
     }
 
     /** Record a file to be compiled. */
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 169529a6396..a0209aaa8d1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -39,13 +39,18 @@
 # name              a name, typically a Java identifier
 # number            an integer
 # option name       the name of a command line option
-# source version    a source version number, such as 1.5, 1.6, 1.7
+# path              a path
+# profile           a profile name
+# source            a source version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.code.Source
+# source version    a source version number, such as 1.5, 1.6, 1.7, taken from a javax.lang.model.SourceVersion
 # string            a general string
 # symbol            the name of a declared type
 # symbol kind       the kind of a symbol (i.e. method, variable)
 # kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
+# target            a target version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.jvm.Target
 # token             the name of a non-terminal in source code; see compiler.misc.token.*
 # type              a Java type; e.g. int, X, X<T>
+# url               a URL
 # object            a Java object (unspecified)
 # unused            the value is not used in this message
 #
@@ -1779,7 +1784,7 @@ compiler.warn.source.no.bootclasspath=\
 compiler.warn.option.obsolete.source=\
     source value {0} is obsolete and will be removed in a future release
 
-# 0: string
+# 0: target
 compiler.warn.option.obsolete.target=\
     target value {0} is obsolete and will be removed in a future release
 
@@ -1787,12 +1792,12 @@ compiler.warn.option.obsolete.target=\
 compiler.err.option.removed.source=\
     Source option {0} is no longer supported. Use {1} or later.
 
-# 0: string, 1: string
+# 0: target, 1: target
 compiler.err.option.removed.target=\
     Target option {0} is no longer supported. Use {1} or later.
 
 
-# 0: string, 1: string
+# 0: target, 1: target
 compiler.warn.option.parameters.unsupported=\
     -parameters is not supported for target value {0}. Use {1} or later.
 
@@ -3257,3 +3262,123 @@ compiler.warn.leaks.not.accessible.unexported.qualified=\
 # 0: string, 1: string
 compiler.err.illegal.argument.for.option=\
     illegal argument for {0}: {1}
+
+
+############################################
+# messages previouly at javac.properties
+
+compiler.err.empty.A.argument=\
+    -A requires an argument; use ''-Akey'' or ''-Akey=value''
+
+# 0: string
+compiler.err.invalid.A.key=\
+    key in annotation processor option ''{0}'' is not a dot-separated sequence of identifiers
+
+# 0: string
+compiler.err.invalid.flag=\
+    invalid flag: {0}
+
+compiler.err.profile.bootclasspath.conflict=\
+    profile and bootclasspath options cannot be used together
+
+# 0: string
+compiler.err.invalid.profile=\
+    invalid profile: {0}
+
+# 0: string
+compiler.err.invalid.target=\
+    invalid target release: {0}
+
+# 0: option name, 1: target
+compiler.err.option.not.allowed.with.target=\
+    option {0} not allowed with target {1}
+
+# 0: string
+compiler.err.option.too.many=\
+    option {0} can only be specified once
+
+compiler.err.no.source.files=\
+    no source files
+
+compiler.err.no.source.files.classes=\
+    no source files or class names
+
+# 0: string
+compiler.err.req.arg=\
+    {0} requires an argument
+
+# 0: string
+compiler.err.invalid.source=\
+    invalid source release: {0}
+
+# 0: string, 1: string
+compiler.err.error.writing.file=\
+    error writing {0}; {1}
+
+compiler.err.sourcepath.modulesourcepath.conflict=\
+    cannot specify both --source-path and --module-source-path
+
+# 0: string, 1: target
+compiler.warn.source.target.conflict=\
+    source release {0} requires target release {1}
+
+# 0: string, 1: target
+compiler.warn.target.default.source.conflict=\
+    target release {0} conflicts with default source release {1}
+
+# 0: profile, 1: target
+compiler.warn.profile.target.conflict=\
+    profile {0} is not valid for target release {1}
+
+# 0: string
+compiler.err.file.not.directory=\
+    not a directory: {0}
+
+# 0: object
+compiler.err.file.not.file=\
+    not a file: {0}
+
+compiler.err.two.class.loaders.1=\
+    javac is split between multiple class loaders: check your configuration
+
+# 0: url, 1: url
+compiler.err.two.class.loaders.2=\
+    javac is split between multiple class loaders:\n\
+    one class comes from file: {0}\n\
+    while javac comes from {1}
+
+# 0: string, 1: string
+compiler.err.bad.value.for.option=\
+    bad value for {0} option: ''{1}''
+
+# 0: string
+compiler.err.no.value.for.option=\
+    no value for {0} option
+
+# 0: string
+compiler.err.repeated.value.for.patch.module=\
+    --patch-module specified more than once for {0}
+
+# 0: string
+compiler.err.unmatched.quote=\
+    unmatched quote in environment variable {0}
+
+# 0: option name
+compiler.err.release.bootclasspath.conflict=\
+    option {0} cannot be used together with --release
+
+# 0: string
+compiler.err.unsupported.release.version=\
+    release version {0} not supported
+
+# 0: string
+compiler.err.file.not.found=\
+    file not found: {0}
+
+# 0: string, 1: source
+compiler.err.preview.not.latest=\
+    invalid source release {0} with --enable-preview\n\
+    (preview language features are only supported for release {1})
+
+compiler.err.preview.without.source.or.release=\
+    --enable-preview must be used with either -source or --release
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index 169f697ad92..c45d93a3fcc 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -335,71 +335,6 @@ javac.opt.inherit_runtime_environment=\
 javac.opt.default.module.for.created.files=\
     Fallback target module for files created by annotation processors, if none specified or inferred.
 
-## errors
-
-javac.err.empty.A.argument=\
-    -A requires an argument; use ''-Akey'' or ''-Akey=value''
-javac.err.invalid.arg=\
-    invalid argument: {0}
-javac.err.invalid.A.key=\
-     key in annotation processor option ''{0}'' is not a dot-separated sequence of identifiers
-javac.err.invalid.flag=\
-    invalid flag: {0}
-javac.err.profile.bootclasspath.conflict=\
-    profile and bootclasspath options cannot be used together
-javac.err.invalid.profile=\
-    invalid profile: {0}
-javac.err.invalid.target=\
-    invalid target release: {0}
-javac.err.option.not.allowed.with.target=\
-    option {0} not allowed with target {1}
-javac.err.option.too.many=\
-    option {0} can only be specified once
-javac.err.no.source.files=\
-    no source files
-javac.err.no.source.files.classes=\
-    no source files or class names
-javac.err.req.arg=\
-    {0} requires an argument
-javac.err.invalid.source=\
-    invalid source release: {0}
-javac.err.error.writing.file=\
-    error writing {0}; {1}
-javac.err.sourcepath.modulesourcepath.conflict=\
-    cannot specify both --source-path and --module-source-path
-javac.warn.source.target.conflict=\
-    source release {0} requires target release {1}
-javac.warn.target.default.source.conflict=\
-    target release {0} conflicts with default source release {1}
-javac.warn.profile.target.conflict=\
-    profile {0} is not valid for target release {1}
-javac.err.preview.not.latest=\
-    invalid source release {0} with --enable-preview\n\
-    (preview language features are only supported for release {1})
-javac.err.preview.without.source.or.release=\
-    --enable-preview must be used with either -source or --release
-javac.err.file.not.found=\
-    file not found: {0}
-javac.err.file.not.directory=\
-    not a directory: {0}
-javac.err.file.not.file=\
-    not a file: {0}
-javac.err.two.class.loaders.1=\
-    javac is split between multiple class loaders: check your configuration
-javac.err.two.class.loaders.2=\
-    javac is split between multiple class loaders:\n\
-    one class comes from file: {0}\n\
-    while javac comes from {1}
-javac.err.bad.value.for.option=\
-    bad value for {0} option: ''{1}''
-javac.err.no.value.for.option=\
-    no value for {0} option
-javac.err.repeated.value.for.patch.module=\
-    --patch-module specified more than once for {0}
-
-javac.err.unmatched.quote=\
-    unmatched quote in environment variable %s
-
 ## messages
 
 javac.msg.usage.header=\
@@ -437,9 +372,3 @@ Consult the following stack trace for details.\n
 
 javac.version={0} {1}
 javac.fullVersion={0} full version "{1}"
-
-javac.err.release.bootclasspath.conflict=\
-    option {0} cannot be used together with --release
-
-javac.err.unsupported.release.version=\
-    release version {0} not supported
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
index 0571990a730..7a657b7dc88 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -43,11 +43,13 @@
 import com.sun.tools.javac.api.Formattable;
 import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.code.Printer;
+import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Type.CapturedType;
 import com.sun.tools.javac.file.PathFileObject;
 import com.sun.tools.javac.jvm.Profile;
+import com.sun.tools.javac.jvm.Target;
 import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.tree.Pretty;
@@ -211,6 +213,12 @@ else if (arg instanceof Option) {
         else if (arg instanceof Formattable) {
             return ((Formattable)arg).toString(l, messages);
         }
+        else if (arg instanceof Target) {
+            return ((Target)arg).name;
+        }
+        else if (arg instanceof Source) {
+            return ((Source)arg).name;
+        }
         else {
             return String.valueOf(arg);
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java
index 2663b60020b..17b12c0f206 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -26,6 +26,7 @@
 package com.sun.tools.javac.util;
 
 import com.sun.tools.javac.api.Messages;
+
 import java.lang.ref.SoftReference;
 import java.util.ResourceBundle;
 import java.util.MissingResourceException;
@@ -34,6 +35,10 @@
 import java.util.Locale;
 import java.util.Map;
 
+import com.sun.tools.javac.api.DiagnosticFormatter;
+import com.sun.tools.javac.util.JCDiagnostic.Factory;
+import com.sun.tools.javac.resources.CompilerProperties.Errors;
+
 /**
  *  Support for formatted localized messages.
  *
@@ -61,6 +66,9 @@ public static JavacMessages instance(Context context) {
     private Locale currentLocale;
     private List<ResourceBundle> currentBundles;
 
+    private DiagnosticFormatter<JCDiagnostic> diagFormatter;
+    private JCDiagnostic.Factory diagFactory;
+
     public Locale getCurrentLocale() {
         return currentLocale;
     }
@@ -73,11 +81,18 @@ public void setCurrentLocale(Locale locale) {
         this.currentLocale = locale;
     }
 
+    Context context;
+
     /** Creates a JavacMessages object.
      */
     public JavacMessages(Context context) {
         this(defaultBundleName, context.get(Locale.class));
+        this.context = context;
         context.put(messagesKey, this);
+        Options options = Options.instance(context);
+        boolean rawDiagnostics = options.isSet("rawDiagnostics");
+        this.diagFormatter = rawDiagnostics ? new RawDiagnosticFormatter(options) :
+                                                  new BasicDiagnosticFormatter(options, this);
     }
 
     /** Creates a JavacMessages object.
@@ -140,6 +155,10 @@ public String getLocalizedString(String key, Object... args) {
         return getLocalizedString(currentLocale, key, args);
     }
 
+    public String getLocalizedString(JCDiagnostic.DiagnosticInfo diagInfo) {
+        return getLocalizedString(currentLocale, diagInfo);
+    }
+
     @Override
     public String getLocalizedString(Locale l, String key, Object... args) {
         if (l == null)
@@ -147,6 +166,12 @@ public String getLocalizedString(Locale l, String key, Object... args) {
         return getLocalizedString(getBundles(l), key, args);
     }
 
+    public String getLocalizedString(Locale l, JCDiagnostic.DiagnosticInfo diagInfo) {
+        if (l == null)
+            l = getCurrentLocale();
+        return getLocalizedString(getBundles(l), diagInfo);
+    }
+
     /* Static access:
      * javac has a firmly entrenched notion of a default message bundle
      * which it can access from any static context. This is used to get
@@ -185,7 +210,7 @@ public static ResourceBundle getDefaultBundle() {
         }
     }
 
-    private static String getLocalizedString(List<ResourceBundle> bundles,
+    static private String getLocalizedString(List<ResourceBundle> bundles,
                                              String key,
                                              Object... args) {
        String msg = null;
@@ -205,6 +230,36 @@ private static String getLocalizedString(List<ResourceBundle> bundles,
        return MessageFormat.format(msg, args);
     }
 
+    private String getLocalizedString(List<ResourceBundle> bundles, JCDiagnostic.DiagnosticInfo diagInfo) {
+        String msg = null;
+        for (List<ResourceBundle> l = bundles; l.nonEmpty() && msg == null; l = l.tail) {
+            ResourceBundle rb = l.head;
+            try {
+                msg = rb.getString(diagInfo.key());
+            }
+            catch (MissingResourceException e) {
+                // ignore, try other bundles in list
+            }
+        }
+        if (msg == null) {
+            msg = "compiler message file broken: key=" + diagInfo.key() +
+                " arguments={0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}";
+        }
+        if (diagInfo == Errors.Error) {
+            return MessageFormat.format(msg, new Object[0]);
+        } else {
+            return diagFormatter.format(getDiagFactory().create(DiagnosticSource.NO_SOURCE, null, diagInfo),
+                    getCurrentLocale());
+        }
+    }
+
+    JCDiagnostic.Factory getDiagFactory() {
+        if (diagFactory == null) {
+            this.diagFactory = JCDiagnostic.Factory.instance(context);
+        }
+        return diagFactory;
+    }
+
     /**
      * This provides a way for the JavacMessager to retrieve a
      * ResourceBundle from another module such as jdk.javadoc.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
index fc1789deeab..87908253857 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -42,6 +42,7 @@
 import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticInfo;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
 
@@ -597,6 +598,11 @@ public void printLines(String key, Object... args) {
         printRawLines(noticeWriter, localize(key, args));
     }
 
+    public void printLines(DiagnosticInfo diag) {
+        PrintWriter noticeWriter = writers.get(WriterKind.NOTICE);
+        printRawLines(noticeWriter, localize(diag));
+    }
+
     public void printLines(PrefixKind pk, String key, Object... args) {
         PrintWriter noticeWriter = writers.get(WriterKind.NOTICE);
         printRawLines(noticeWriter, localize(pk, key, args));
@@ -789,7 +795,7 @@ public String localize(JCDiagnostic.DiagnosticInfo diagInfo) {
         if (useRawMessages) {
             return diagInfo.key();
         } else {
-            return messages.getLocalizedString(diagInfo.key(), diagInfo.args);
+            return messages.getLocalizedString(diagInfo);
         }
     }
 
diff --git a/test/langtools/jdk/javadoc/tool/BadOptionsTest.java b/test/langtools/jdk/javadoc/tool/BadOptionsTest.java
index ed0a9471415..d40c8640c73 100644
--- a/test/langtools/jdk/javadoc/tool/BadOptionsTest.java
+++ b/test/langtools/jdk/javadoc/tool/BadOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -79,7 +79,7 @@ public void testAddModulesEmptyArg() {
                 .run(Task.Expect.FAIL)
                 .writeAll();
         checkFound(result.getOutput(Task.OutputKind.DIRECT),
-                "javadoc: error - no value for --add-modules option");
+                "javadoc: error - error: no value for --add-modules option");
         checkNotFound(result, "Exception", "at jdk.javadoc/");
     }
 
@@ -104,7 +104,7 @@ public void testAddExportsEmptyArg() {
                 .run(Task.Expect.FAIL)
                 .writeAll();
         checkFound(result.getOutput(Task.OutputKind.DIRECT),
-                "javadoc: error - no value for --add-exports option");
+                "javadoc: error - error: no value for --add-exports option");
         checkNotFound(result, "Exception", "at jdk.javadoc/");
     }
 
@@ -116,7 +116,7 @@ public void testAddExportsBadArg() {
                 .run(Task.Expect.FAIL)
                 .writeAll();
         checkFound(result.getOutput(Task.OutputKind.DIRECT),
-                "javadoc: error - bad value for --add-exports option");
+                "javadoc: error - error: bad value for --add-exports option: 'm/p'");
         checkNotFound(result, "Exception", "at jdk.javadoc/");
     }
 
@@ -146,7 +146,7 @@ public void testSourcePathAndModuleSourceConflict() throws IOException {
                 .run(Task.Expect.FAIL)
                 .writeAll();
         checkFound(result.getOutput(Task.OutputKind.DIRECT),
-                "javadoc: cannot specify both --source-path and --module-source-path");
+                "error: cannot specify both --source-path and --module-source-path");
         checkFound(result.getOutput(Task.OutputKind.DIRECT),
                 "1 error");
     }
diff --git a/test/langtools/tools/javac/6410653/T6410653.java b/test/langtools/tools/javac/6410653/T6410653.java
deleted file mode 100644
index 632574c9327..00000000000
--- a/test/langtools/tools/javac/6410653/T6410653.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006, 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.
- *
- * 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
- * @bug     6410653 6401277
- * @summary REGRESSION: javac crashes if -d or -s argument is a file
- * @author  Peter von der Ah\u00e9
- * @modules java.compiler
- *          jdk.compiler/com.sun.tools.javac.util:open
- */
-
-import java.lang.reflect.Field;
-import java.io.File;
-import java.io.ByteArrayOutputStream;
-import javax.tools.*;
-
-public class T6410653 {
-    public static void main(String... args) throws Exception {
-        File testSrc = new File(System.getProperty("test.src"));
-        String source = new File(testSrc, "T6410653.java").getPath();
-        Tool compiler = ToolProvider.getSystemJavaCompiler();
-        Module compilerModule = compiler.getClass().getModule();
-        Class<?> log = Class.forName(compilerModule, "com.sun.tools.javac.util.Log");
-        Field useRawMessages = log.getDeclaredField("useRawMessages");
-        useRawMessages.setAccessible(true);
-        useRawMessages.setBoolean(null, true);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        compiler.run(null, null, out, "-d", source, source);
-        System.err.println(">>>" + out + "<<<");
-        useRawMessages.setBoolean(null, false);
-        if (!out.toString().equals(String.format("%s%n",
-                                                 "javac: javac.err.file.not.directory"))) {
-            throw new AssertionError(out);
-        }
-        System.out.println("Test PASSED.  Running javac again to see localized output:");
-        compiler.run(null, null, System.out, "-d", source, source);
-    }
-}
diff --git a/test/langtools/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java b/test/langtools/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
deleted file mode 100644
index b58be233bca..00000000000
--- a/test/langtools/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- *
- * 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
- * @bug 8009640
- * @summary -profile <compact> does not work when -bootclasspath specified
- * @library /tools/lib
- * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.util
- *          jdk.jdeps/com.sun.tools.javap
- * @build toolbox.ToolBox toolbox.JavacTask
- * @run main CheckRejectProfileBCPOptionsIfUsedTogetherTest
- */
-
-import java.nio.file.Paths;
-
-import com.sun.tools.javac.util.Assert;
-
-import toolbox.JavacTask;
-import toolbox.Task;
-import toolbox.ToolBox;
-
-public class CheckRejectProfileBCPOptionsIfUsedTogetherTest {
-
-    private static final String TestSrc =
-        "public class Test {\n" +
-        "    javax.swing.JButton b;\n" +
-        "}";
-
-    public static void main(String args[]) throws Exception {
-        ToolBox tb = new ToolBox();
-        tb.writeFile("Test.java", TestSrc);
-
-        Task.Result result = new JavacTask(tb, Task.Mode.CMDLINE)
-                .options("-profile", "compact1",
-                        "-bootclasspath", Paths.get(ToolBox.testJDK, "jre/lib/rt.jar").toString())
-                .files("Test.java")
-                .run(Task.Expect.FAIL)
-                .writeAll();
-
-        String out = result.getOutput(Task.OutputKind.DIRECT);
-        Assert.check(out.startsWith(
-                "javac: profile and bootclasspath options cannot be used together"),
-                "Incorrect javac error output");
-    }
-
-}
diff --git a/test/langtools/tools/javac/diags/CheckResourceKeys.java b/test/langtools/tools/javac/diags/CheckResourceKeys.java
index dee1155f31f..d7965c21b4b 100644
--- a/test/langtools/tools/javac/diags/CheckResourceKeys.java
+++ b/test/langtools/tools/javac/diags/CheckResourceKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -233,7 +233,6 @@ private boolean isMandatoryWarningString(String s) {
         "compiler.misc.non.denotable.type",                 // UNUSED
         "compiler.misc.unnamed.package",                    // should be required, CR 6964147
         "compiler.warn.proc.type.already.exists",           // TODO in JavacFiler
-        "javac.err.invalid.arg",                            // UNUSED ??
         "javac.opt.arg.class",                              // UNUSED ??
         "javac.opt.arg.pathname",                           // UNUSED ??
         "javac.opt.moreinfo",                               // option commented out
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index a531ae00e13..0072d89c1e0 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -157,3 +157,35 @@ compiler.err.duplicate.module.on.path
 compiler.err.locn.module-info.not.allowed.on.patch.path
 compiler.misc.cant.resolve.modules
 compiler.misc.file.does.not.contain.module
+
+# these keys were in javac.properties and examples are hard to be produced for them
+# basically because in most cases the compilation ends with an exception
+compiler.err.bad.value.for.option
+compiler.err.empty.A.argument
+compiler.err.error.writing.file
+compiler.err.file.not.directory
+compiler.err.file.not.file
+compiler.err.file.not.found
+compiler.err.invalid.A.key
+compiler.err.invalid.flag
+compiler.err.invalid.profile
+compiler.err.invalid.source
+compiler.err.invalid.target
+compiler.err.no.source.files.classes
+compiler.err.no.value.for.option
+compiler.err.option.not.allowed.with.target
+compiler.err.option.too.many
+compiler.err.profile.bootclasspath.conflict
+compiler.err.release.bootclasspath.conflict
+compiler.err.repeated.value.for.patch.module
+compiler.err.req.arg
+compiler.err.sourcepath.modulesourcepath.conflict
+compiler.err.two.class.loaders.1
+compiler.err.two.class.loaders.2
+compiler.err.unmatched.quote
+compiler.err.unsupported.release.version
+compiler.warn.profile.target.conflict
+compiler.warn.source.target.conflict
+compiler.warn.target.default.source.conflict
+compiler.err.preview.not.latest
+compiler.err.preview.without.source.or.release
\ No newline at end of file
diff --git a/test/langtools/tools/javac/diags/examples/DirPathElementNotDirectory/DirPathElementNotDirectory.java b/test/langtools/tools/javac/diags/examples/DirPathElementNotDirectory/DirPathElementNotDirectory.java
index eef03129995..f5c95911e9d 100644
--- a/test/langtools/tools/javac/diags/examples/DirPathElementNotDirectory/DirPathElementNotDirectory.java
+++ b/test/langtools/tools/javac/diags/examples/DirPathElementNotDirectory/DirPathElementNotDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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,5 +22,6 @@
  */
 
 // key: compiler.warn.dir.path.element.not.directory
+// key: compiler.err.no.source.files
 // options: -Xlint:path
 // run: simple
diff --git a/test/langtools/tools/javac/doclint/DocLintTest.java b/test/langtools/tools/javac/doclint/DocLintTest.java
index 003923096d9..471bd084585 100644
--- a/test/langtools/tools/javac/doclint/DocLintTest.java
+++ b/test/langtools/tools/javac/doclint/DocLintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -84,7 +84,7 @@ private enum Message {
         DL_ERR9(ERROR, "Test.java:9:14: compiler.err.proc.messager: reference not found"),
         DL_WRN12(WARNING, "Test.java:12:9: compiler.warn.proc.messager: no description for @return"),
 
-        OPT_BADARG(ERROR, "invalid flag: -Xdoclint:badarg");
+        OPT_BADARG(ERROR, "error: invalid flag: -Xdoclint:badarg");
 
         final Diagnostic.Kind kind;
         final String text;
diff --git a/test/langtools/tools/javac/doclint/IncludePackagesTest.java b/test/langtools/tools/javac/doclint/IncludePackagesTest.java
index 85cd8dd1036..e857b088f38 100644
--- a/test/langtools/tools/javac/doclint/IncludePackagesTest.java
+++ b/test/langtools/tools/javac/doclint/IncludePackagesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -96,7 +96,7 @@ private enum Message {
         p1sp1sp2T(ERROR, "p1sp1sp2T.java:2:12: compiler.err.proc.messager: malformed HTML"),
         p2T(ERROR, "p2T.java:2:12: compiler.err.proc.messager: malformed HTML"),
         Default(ERROR, "Default.java:1:12: compiler.err.proc.messager: malformed HTML"),
-        INVALID_PACKAGE_ERROR(ERROR, "invalid flag: -Xdoclint/package:wrong+package");
+        INVALID_PACKAGE_ERROR(ERROR, "error: invalid flag: -Xdoclint/package:wrong+package");
 
         final Diagnostic.Kind kind;
         final String text;
diff --git a/test/langtools/tools/javac/modules/AddExportsTest.java b/test/langtools/tools/javac/modules/AddExportsTest.java
index 75aa92ea14e..b871777d91a 100644
--- a/test/langtools/tools/javac/modules/AddExportsTest.java
+++ b/test/langtools/tools/javac/modules/AddExportsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -62,7 +62,7 @@ private void testEmpty(Path src, Path classes, String... options) throws Excepti
                 .getOutput(Task.OutputKind.DIRECT);
 
         checkOutputContains(log,
-            "javac: no value for --add-exports option");
+            "error: no value for --add-exports option");
     }
 
     @Test
@@ -123,7 +123,7 @@ void testEmptyList(Path src, Path classes, String option) throws Exception {
                 .getOutput(Task.OutputKind.DIRECT);
 
         checkOutputContains(log,
-            "javac: bad value for --add-exports option: '" + option + "'");
+            "error: bad value for --add-exports option: '" + option + "'");
     }
 
     @Test
@@ -158,7 +158,7 @@ private void testMissingSourcePart(Path src, Path classes, String option) throws
                 .getOutput(Task.OutputKind.DIRECT);
 
         checkOutputContains(log,
-            "javac: bad value for --add-exports option: '" + option + "'");
+            "error: bad value for --add-exports option: '" + option + "'");
     }
 
     @Test
diff --git a/test/langtools/tools/javac/modules/AddLimitMods.java b/test/langtools/tools/javac/modules/AddLimitMods.java
index e1f6b884b00..564f55e10d1 100644
--- a/test/langtools/tools/javac/modules/AddLimitMods.java
+++ b/test/langtools/tools/javac/modules/AddLimitMods.java
@@ -264,7 +264,7 @@ public void testAllModulePath(Path base) throws Exception {
                    .writeAll()
                    .getOutputLines(Task.OutputKind.DIRECT);
 
-        if (!actual.contains("javac: option --add-modules not allowed with target 1.8")) {
+        if (!actual.contains("- compiler.err.option.not.allowed.with.target: --add-modules, 1.8")) {
             throw new IllegalStateException("incorrect errors; actual=" + actual);
         }
 
diff --git a/test/langtools/tools/javac/modules/AddModulesTest.java b/test/langtools/tools/javac/modules/AddModulesTest.java
index 8856fc38f5f..f7a87c592c9 100644
--- a/test/langtools/tools/javac/modules/AddModulesTest.java
+++ b/test/langtools/tools/javac/modules/AddModulesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -73,7 +73,7 @@ private void testEmpty(Path src, Path classes, String... options) throws Excepti
                 .getOutput(Task.OutputKind.DIRECT);
 
         checkOutputContains(log,
-            "javac: no value for --add-modules option");
+            "error: no value for --add-modules option");
     }
 
     @Test
@@ -120,7 +120,7 @@ public void testEmptyList(Path base) throws Exception {
                 .getOutput(Task.OutputKind.DIRECT);
 
         checkOutputContains(log,
-            "javac: bad value for --add-modules option");
+            "error: bad value for --add-modules option");
     }
 
     @Test
diff --git a/test/langtools/tools/javac/modules/AddReadsTest.java b/test/langtools/tools/javac/modules/AddReadsTest.java
index 32d023e1d8f..620c6c130e2 100644
--- a/test/langtools/tools/javac/modules/AddReadsTest.java
+++ b/test/langtools/tools/javac/modules/AddReadsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -352,7 +352,7 @@ private void testEmpty(Path src, Path classes, String... options) throws Excepti
                 .getOutput(Task.OutputKind.DIRECT);
 
         checkOutputContains(log,
-            "javac: no value for --add-reads option");
+            "error: no value for --add-reads option");
     }
 
     @Test
@@ -421,7 +421,7 @@ private void testEmptyList(Path src, Path classes, String option) throws Excepti
                 .getOutput(Task.OutputKind.DIRECT);
 
         checkOutputContains(log,
-            "javac: bad value for --add-reads option: '" + option + "'");
+            "error: bad value for --add-reads option: '" + option + "'");
     }
 
     @Test
@@ -572,7 +572,7 @@ public void testNoEquals(Path base) throws Exception {
                 .getOutput(Task.OutputKind.DIRECT);
 
         checkOutputContains(log,
-            "javac: bad value for --add-reads option: 'm1x:m2x'");
+            "error: bad value for --add-reads option: 'm1x:m2x'");
     }
 
     @Test
diff --git a/test/langtools/tools/javac/modules/LimitModulesTest.java b/test/langtools/tools/javac/modules/LimitModulesTest.java
index 55a01455583..8bc4b54ed03 100644
--- a/test/langtools/tools/javac/modules/LimitModulesTest.java
+++ b/test/langtools/tools/javac/modules/LimitModulesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -58,7 +58,7 @@ public void testEmpty(Path base) throws Exception {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("javac: no value for --limit-modules option"))
+        if (!log.contains("error: no value for --limit-modules option"))
             throw new Exception("expected output not found");
 
         log = new JavacTask(tb, Task.Mode.CMDLINE)
@@ -70,7 +70,7 @@ public void testEmpty(Path base) throws Exception {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("javac: no value for --limit-modules option"))
+        if (!log.contains("error: no value for --limit-modules option"))
             throw new Exception("expected output not found");
     }
 
@@ -127,7 +127,7 @@ public void testEmptyList(Path base) throws Exception {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("javac: bad value for --limit-modules option"))
+        if (!log.contains("error: bad value for --limit-modules option"))
             throw new Exception("expected output not found");
     }
 
diff --git a/test/langtools/tools/javac/modules/ModuleSourcePathTest.java b/test/langtools/tools/javac/modules/ModuleSourcePathTest.java
index c351eb5204c..52b2d3d8a7c 100644
--- a/test/langtools/tools/javac/modules/ModuleSourcePathTest.java
+++ b/test/langtools/tools/javac/modules/ModuleSourcePathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -76,7 +76,7 @@ public void testSourcePathConflict(Path base) throws Exception {
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
 
-        if (!log.contains("cannot specify both --source-path and --module-source-path"))
+        if (!log.contains("compiler.err.sourcepath.modulesourcepath.conflict"))
             throw new Exception("expected diagnostic not found");
     }
 
diff --git a/test/langtools/tools/javac/modules/PatchModulesTest.java b/test/langtools/tools/javac/modules/PatchModulesTest.java
index 6543c868994..50a745bea71 100644
--- a/test/langtools/tools/javac/modules/PatchModulesTest.java
+++ b/test/langtools/tools/javac/modules/PatchModulesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -98,19 +98,19 @@ public void testMultiple(Path base) throws Exception {
     @Test
     public void testDuplicates(Path base) throws Exception {
         test(asList("java.base=a", "java.compiler=b", "java.base=c"),
-            false, "--patch-module specified more than once for java.base");
+            false, "error: --patch-module specified more than once for java.base");
     }
 
     @Test
     public void testEmpty(Path base) throws Exception {
         test(asList(""),
-            false, "no value for --patch-module option");
+            false, "error: no value for --patch-module option");
     }
 
     @Test
     public void testInvalid(Path base) throws Exception {
         test(asList("java.base/java.lang=."),
-            false, "bad value for --patch-module option: 'java.base/java.lang=.'");
+            false, "error: bad value for --patch-module option: 'java.base/java.lang=.'");
     }
 
     void test(List<String> patches, String expect) throws Exception {
diff --git a/test/langtools/tools/javac/options/release/ReleaseOptionClashes.java b/test/langtools/tools/javac/options/release/ReleaseOptionClashes.java
deleted file mode 100644
index c0a3b193c46..00000000000
--- a/test/langtools/tools/javac/options/release/ReleaseOptionClashes.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.
- *
- * 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
- * @bug 8072480
- * @summary Verify option clash between --release and -source is reported correctly.
- * @modules jdk.compiler/com.sun.tools.javac.util:open
- */
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.tools.Tool;
-import javax.tools.ToolProvider;
-
-public class ReleaseOptionClashes {
-    public static void main(String... args) throws Exception {
-        new ReleaseOptionClashes().run();
-    }
-
-    void run() throws Exception {
-        doRunTest("7", "-bootclasspath", "any");
-        doRunTest("7", "-Xbootclasspath:any");
-        doRunTest("7", "-Xbootclasspath/a:any");
-        doRunTest("7", "-Xbootclasspath/p:any");
-        doRunTest("7", "-endorseddirs", "any");
-        doRunTest("7", "-extdirs", "any");
-        doRunTest("7", "-source", "8");
-        doRunTest("7", "-target", "8");
-        doRunTest("9", "--system", "none");
-        doRunTest("9", "--upgrade-module-path", "any");
-    }
-
-    void doRunTest(String release, String... args) throws Exception {
-        System.out.println("Testing clashes for arguments: " + Arrays.asList(args));
-        Class<?> log = Class.forName("com.sun.tools.javac.util.Log", true, cl);
-        Field useRawMessages = log.getDeclaredField("useRawMessages");
-        useRawMessages.setAccessible(true);
-        useRawMessages.setBoolean(null, true);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        List<String> options = new ArrayList<>();
-        options.addAll(Arrays.asList("--release", release));
-        options.addAll(Arrays.asList(args));
-        options.add(System.getProperty("test.src") + File.separator + "ReleaseOptionClashes.java");
-        compiler.run(null, null, out, options.toArray(new String[0]));
-        useRawMessages.setBoolean(null, false);
-        if (!out.toString().equals(String.format("%s%n%s%n",
-                                                 "javac: javac.err.release.bootclasspath.conflict",
-                                                 "javac.msg.usage")) &&
-            //-Xbootclasspath:any produces two warnings: one for -bootclasspath and one for -Xbootclasspath:
-            !out.toString().equals(String.format("%s%n%s%n%s%n%s%n",
-                                                 "javac: javac.err.release.bootclasspath.conflict",
-                                                 "javac.msg.usage",
-                                                 "javac: javac.err.release.bootclasspath.conflict",
-                                                 "javac.msg.usage"))) {
-            throw new AssertionError(out);
-        }
-        System.out.println("Test PASSED.  Running javac again to see localized output:");
-        compiler.run(null, null, System.out, options.toArray(new String[0]));
-    }
-
-    Tool compiler = ToolProvider.getSystemJavaCompiler();
-    ClassLoader cl = compiler.getClass().getClassLoader();
-}
diff --git a/test/langtools/tools/javac/options/smokeTests/OptionSmokeTest.java b/test/langtools/tools/javac/options/smokeTests/OptionSmokeTest.java
new file mode 100644
index 00000000000..2c428a6c419
--- /dev/null
+++ b/test/langtools/tools/javac/options/smokeTests/OptionSmokeTest.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8196433
+ * @summary use the new error diagnostic approach at javac.Main
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ *          jdk.jdeps/com.sun.tools.javap
+ * @build toolbox.ToolBox toolbox.JavacTask toolbox.TestRunner
+ * @run main OptionSmokeTest
+ */
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import com.sun.tools.javac.util.Assert;
+
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+import toolbox.JavacTask;
+import toolbox.Task;
+
+public class OptionSmokeTest extends TestRunner {
+    ToolBox tb = new ToolBox();
+
+    public OptionSmokeTest() {
+        super(System.err);
+    }
+
+    protected void runTests() throws Exception {
+        runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    Path[] findJavaFiles(Path... paths) throws Exception {
+        return tb.findJavaFiles(paths);
+    }
+
+    public static void main(String... args) throws Exception {
+        new OptionSmokeTest().runTests();
+    }
+
+    @Test
+    public void optionA1(Path base) throws Exception {
+        doTest(base,
+                "error: -A requires an argument; use '-Akey' or '-Akey=value'",
+                "-A");
+    }
+
+    @Test
+    public void optionA2(Path base) throws Exception {
+        doTest(base,
+                "error: key in annotation processor option '-A1e=2' is not a dot-separated sequence of identifiers",
+                "-A1e=2");
+    }
+
+    @Test
+    public void noFlag(Path base) throws Exception {
+        doTest(base, "error: invalid flag: -noFlag", "-noFlag");
+    }
+
+    @Test
+    public void profileAndBSP(Path base) throws Exception {
+        doTest(base, "error: profile and bootclasspath options cannot be used together",
+                "-profile compact1 -bootclasspath . -target 8 -source 8");
+    }
+
+    @Test
+    public void invalidProfile(Path base) throws Exception {
+        doTest(base, "error: invalid profile: noProfile",
+                "-profile noProfile");
+    }
+
+    @Test
+    public void invalidTarget(Path base) throws Exception {
+        doTest(base, "error: invalid target release: 999999",
+                "-target 999999");
+    }
+
+    @Test
+    public void optionNotAvailableWithTarget(Path base) throws Exception {
+        doTest(base, "error: option -profile not allowed with target 11",
+                "-profile compact1 -target 11");
+    }
+
+    @Test
+    public void optionTooMany(Path base) throws Exception {
+        doTest(base, "error: option --default-module-for-created-files can only be specified once",
+                "--default-module-for-created-files=m1x --default-module-for-created-files=m1x");
+    }
+
+    @Test
+    public void noSrcFiles(Path base) throws Exception {
+        doTestNoSource(base, "error: no source files", "-target 11");
+    }
+
+    @Test
+    public void requiresArg(Path base) throws Exception {
+        doTestNoSource(base, "error: -target requires an argument", "-target");
+    }
+
+    @Test
+    public void invalidSource(Path base) throws Exception {
+        doTestNoSource(base, "error: invalid source release: 999999", "-source 999999");
+    }
+
+    @Test
+    public void sourceAndModuleSourceCantBeTogether(Path base) throws Exception {
+        doTest(base, "error: cannot specify both --source-path and --module-source-path",
+                "--source-path . --module-source-path .");
+    }
+
+    @Test
+    public void sourceAndTargetMismatch(Path base) throws Exception {
+        doTest(base, "warning: source release 11 requires target release 11",
+                "-source 11 -target 10");
+    }
+
+    @Test
+    public void targetConflictsWithDefaultSource(Path base) throws Exception {
+        doTest(base, "warning: target release 10 conflicts with default source release 11",
+                "-target 10");
+    }
+
+    @Test
+    public void profileNotValidForTarget(Path base) throws Exception {
+        doTest(base, "warning: profile compact2 is not valid for target release 1.7",
+                "-profile compact2 -target 7 -source 7");
+    }
+
+    @Test
+    public void fileNotFound(Path base) throws Exception {
+        String log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .files("notExistent/T.java")
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+        Assert.check(log.startsWith("error: file not found: notExistent" + fileSeparator + "T.java"),
+                "real value of log:" + log);
+    }
+
+    static final String fileSeparator = System.getProperty("file.separator");
+
+    @Test
+    public void notADirectory(Path base) throws Exception {
+        doTest(base, "error: not a directory: notADirectory" + fileSeparator + "src" + fileSeparator + "Dummy.java",
+                "-d notADirectory" + fileSeparator + "src" + fileSeparator + "Dummy.java");
+    }
+
+    @Test
+    public void notAFile(Path base) throws Exception {
+        // looks like a java file, it is a directory
+        Path dir = base.resolve("dir.java");
+        tb.createDirectories(dir);
+        String log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .spaceSeparatedOptions("-XDsourcefile " + dir)
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+        Assert.check(log.startsWith("error: not a file: notAFile" + fileSeparator + "dir.java"));
+    }
+
+    @Test
+    public void badValueForOption(Path base) throws Exception {
+        doTestNoSource(base, "error: bad value for --patch-module option: \'notExistent\'",
+                "--patch-module notExistent");
+    }
+
+    @Test
+    public void patchModuleMoreThanOnce(Path base) throws Exception {
+        doTestNoSource(base, "error: --patch-module specified more than once for m",
+                "--patch-module m=. --patch-module m=.");
+    }
+
+    @Test
+    public void unmatchedQuoteInEnvVar(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, "class Dummy {}");
+        String log = new JavacTask(tb, Task.Mode.EXEC)
+                .envVar("JDK_JAVAC_OPTIONS", "--add-exports jdk.compiler" + fileSeparator + "com.sun.tools.javac.jvm=\"ALL-UNNAMED")
+                .files(findJavaFiles(src))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutput(Task.OutputKind.STDERR);
+        Assert.check(log.startsWith("error: unmatched quote in environment variable JDK_JAVAC_OPTIONS"));
+    }
+
+    @Test
+    public void optionCantBeUsedWithRelease(Path base) throws Exception {
+        doTestNoSource(base, "error: option -source cannot be used together with --release",
+                "--release 7 -source 7");
+    }
+
+    @Test
+    public void releaseVersionNotSupported(Path base) throws Exception {
+        doTestNoSource(base, "error: release version 99999999 not supported",
+                "--release 99999999");
+    }
+
+    // taken from former test: tools/javac/options/release/ReleaseOptionClashes
+    @Test
+    public void releaseAndBootclasspath(Path base) throws Exception {
+        doTestNoSource(base, "error: option --boot-class-path cannot be used together with --release",
+                "--release 7 -bootclasspath any");
+        doTestNoSource(base, "error: option -Xbootclasspath: cannot be used together with --release",
+                "--release 7 -Xbootclasspath:any");
+        doTestNoSource(base, "error: option -Xbootclasspath/p: cannot be used together with --release",
+                "--release 7 -Xbootclasspath/p:any");
+        doTestNoSource(base, "error: option -endorseddirs cannot be used together with --release",
+                "--release 7 -endorseddirs any");
+        doTestNoSource(base, "error: option -extdirs cannot be used together with --release",
+                "--release 7 -extdirs any");
+        doTestNoSource(base, "error: option -source cannot be used together with --release",
+                "--release 7 -source 8");
+        doTestNoSource(base, "error: option -target cannot be used together with --release",
+                "--release 7 -target 8");
+        doTestNoSource(base, "error: option --system cannot be used together with --release",
+                "--release 9 --system none");
+        doTestNoSource(base, "error: option --upgrade-module-path cannot be used together with --release",
+                "--release 9 --upgrade-module-path any");
+    }
+
+    void doTest(Path base, String output, String options) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, "class Dummy { }");
+        String log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .spaceSeparatedOptions(options)
+                .files(findJavaFiles(src))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+        Assert.check(log.startsWith(output), "expected:\n" + output + '\n' + "found:\n" + log);
+    }
+
+    void doTestNoSource(Path base, String output, String options) throws Exception {
+        String log = new JavacTask(tb, Task.Mode.CMDLINE)
+                .spaceSeparatedOptions(options)
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutput(Task.OutputKind.DIRECT);
+        Assert.check(log.startsWith(output), "expected:\n" + output + '\n' + "found:\n" + log);
+    }
+}
diff --git a/test/langtools/tools/javac/platform/PlatformProviderTest.java b/test/langtools/tools/javac/platform/PlatformProviderTest.java
index f180525575e..e9e3183326b 100644
--- a/test/langtools/tools/javac/platform/PlatformProviderTest.java
+++ b/test/langtools/tools/javac/platform/PlatformProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -141,7 +141,7 @@ void doTestFailure() {
         List<String> expectedOutput =
                 Arrays.asList("getSupportedPlatformNames",
                               "getPlatform(fail, )",
-                              "javac: javac.err.unsupported.release.version",
+                              "error: release version fail not supported",
                               "javac.msg.usage");
         List<String> actualOutput = result.getOutputLines(Task.OutputKind.STDERR);
         result.writeAll();
diff --git a/test/langtools/tools/javadoc/BadOptionsTest.java b/test/langtools/tools/javadoc/BadOptionsTest.java
index 54ce232df83..faa461fabbc 100644
--- a/test/langtools/tools/javadoc/BadOptionsTest.java
+++ b/test/langtools/tools/javadoc/BadOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -96,7 +96,7 @@ public void testAddModulesEmptyArg() {
                 .run(Task.Expect.FAIL)
                 .writeAll();
         checkFound(result.getOutput(Task.OutputKind.DIRECT),
-                "javadoc: error - no value for --add-modules option");
+                "javadoc: error - error: no value for --add-modules option");
         checkNotFound(result, "Exception", "at jdk.javadoc/");
     }
 
@@ -122,7 +122,7 @@ public void testAddExportsEmptyArg() {
                 .run(Task.Expect.FAIL)
                 .writeAll();
         checkFound(result.getOutput(Task.OutputKind.DIRECT),
-                "javadoc: error - no value for --add-exports option");
+                "javadoc: error - error: no value for --add-exports option");
         checkNotFound(result, "Exception", "at jdk.javadoc/");
     }
 
@@ -135,7 +135,7 @@ public void testAddExportsBadArg() {
                 .run(Task.Expect.FAIL)
                 .writeAll();
         checkFound(result.getOutput(Task.OutputKind.DIRECT),
-                "javadoc: error - bad value for --add-exports option");
+                "javadoc: error - error: bad value for --add-exports option: 'm/p'");
         checkNotFound(result, "Exception", "at jdk.javadoc/");
     }
 
diff --git a/test/langtools/tools/lib/toolbox/JavacTask.java b/test/langtools/tools/lib/toolbox/JavacTask.java
index 3805f9cb1f6..ead7262f6b5 100644
--- a/test/langtools/tools/lib/toolbox/JavacTask.java
+++ b/test/langtools/tools/lib/toolbox/JavacTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -177,6 +177,16 @@ public JavacTask options(String... options) {
         return this;
     }
 
+    /**
+     * Sets the options.
+     * @param spaceSeparatedOption the space separated options
+     * @return this task object
+     */
+    public JavacTask spaceSeparatedOptions(String spaceSeparatedOption) {
+        this.options = Arrays.asList(spaceSeparatedOption.split("\\s+"));
+        return this;
+    }
+
     /**
      * Sets the options.
      * @param options the options

From 3a1f09540f145ea550e8e946f481958e79f8194d Mon Sep 17 00:00:00 2001
From: vtheeyarath <unknown>
Date: Wed, 18 Apr 2018 10:30:57 -0700
Subject: [PATCH 191/196] 8184693: add Pattern.isEmpty Summary: added method
 Pattern.isEmpty Reviewed-by: forax, chegar, smarks, psandoz, rriggs

---
 src/java.base/share/classes/java/util/Optional.java | 13 ++++++++++++-
 .../share/classes/java/util/OptionalDouble.java     | 13 ++++++++++++-
 .../share/classes/java/util/OptionalInt.java        | 13 ++++++++++++-
 .../share/classes/java/util/OptionalLong.java       | 13 ++++++++++++-
 test/jdk/java/util/Optional/Basic.java              |  2 ++
 test/jdk/java/util/Optional/BasicDouble.java        |  2 ++
 test/jdk/java/util/Optional/BasicInt.java           |  2 ++
 test/jdk/java/util/Optional/BasicLong.java          |  2 ++
 8 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java
index f4fef8aadef..0b62a6fa917 100644
--- a/src/java.base/share/classes/java/util/Optional.java
+++ b/src/java.base/share/classes/java/util/Optional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -159,6 +159,17 @@ public boolean isPresent() {
         return value != null;
     }
 
+    /**
+     * If a value is  not present, returns {@code true}, otherwise
+     * {@code false}.
+     *
+     * @return  {@code true} if a value is not present, otherwise {@code false}
+     * @since   11
+     */
+    public boolean isEmpty() {
+        return value == null;
+    }
+
     /**
      * If a value is present, performs the given action with the value,
      * otherwise does nothing.
diff --git a/src/java.base/share/classes/java/util/OptionalDouble.java b/src/java.base/share/classes/java/util/OptionalDouble.java
index 26ec32878e3..9eb4d46e4b3 100644
--- a/src/java.base/share/classes/java/util/OptionalDouble.java
+++ b/src/java.base/share/classes/java/util/OptionalDouble.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -139,6 +139,17 @@ public boolean isPresent() {
         return isPresent;
     }
 
+    /**
+     * If a value is not present, returns {@code true}, otherwise
+     * {@code false}.
+     *
+     * @return  {@code true} if a value is not present, otherwise {@code false}
+     * @since   11
+     */
+    public boolean isEmpty() {
+        return !isPresent;
+    }
+
     /**
      * If a value is present, performs the given action with the value,
      * otherwise does nothing.
diff --git a/src/java.base/share/classes/java/util/OptionalInt.java b/src/java.base/share/classes/java/util/OptionalInt.java
index 61afe0206d1..7f97200f585 100644
--- a/src/java.base/share/classes/java/util/OptionalInt.java
+++ b/src/java.base/share/classes/java/util/OptionalInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -139,6 +139,17 @@ public boolean isPresent() {
         return isPresent;
     }
 
+    /**
+     * If a value is not present, returns {@code true}, otherwise
+     * {@code false}.
+     *
+     * @return  {@code true} if a value is not present, otherwise {@code false}
+     * @since   11
+     */
+    public boolean isEmpty() {
+        return !isPresent;
+    }
+
     /**
      * If a value is present, performs the given action with the value,
      * otherwise does nothing.
diff --git a/src/java.base/share/classes/java/util/OptionalLong.java b/src/java.base/share/classes/java/util/OptionalLong.java
index ae8f0a77e3e..dc25a52666c 100644
--- a/src/java.base/share/classes/java/util/OptionalLong.java
+++ b/src/java.base/share/classes/java/util/OptionalLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -139,6 +139,17 @@ public boolean isPresent() {
         return isPresent;
     }
 
+    /**
+     * If a value is not present, returns {@code true}, otherwise
+     * {@code false}.
+     *
+     * @return  {@code true} if a value is not present, otherwise {@code false}
+     * @since   11
+     */
+    public boolean isEmpty() {
+        return !isPresent;
+    }
+
     /**
      * If a value is present, performs the given action with the value,
      * otherwise does nothing.
diff --git a/test/jdk/java/util/Optional/Basic.java b/test/jdk/java/util/Optional/Basic.java
index f1b126d2eee..43bcf4e2fff 100644
--- a/test/jdk/java/util/Optional/Basic.java
+++ b/test/jdk/java/util/Optional/Basic.java
@@ -52,6 +52,7 @@ void checkEmpty(Optional<String> empty) {
         assertFalse(empty.equals("unexpected"));
 
         assertFalse(empty.isPresent());
+        assertTrue(empty.isEmpty());
         assertEquals(empty.hashCode(), 0);
         assertEquals(empty.orElse("x"), "x");
         assertEquals(empty.orElseGet(() -> "y"), "y");
@@ -87,6 +88,7 @@ void checkPresent(Optional<String> opt, String expected) {
         assertFalse(opt.equals("unexpected"));
 
         assertTrue(opt.isPresent());
+        assertFalse(opt.isEmpty());
         assertEquals(opt.hashCode(), expected.hashCode());
         assertEquals(opt.orElse("unexpected"), expected);
         assertEquals(opt.orElseGet(() -> "unexpected"), expected);
diff --git a/test/jdk/java/util/Optional/BasicDouble.java b/test/jdk/java/util/Optional/BasicDouble.java
index 7778f1964b3..b57f383d524 100644
--- a/test/jdk/java/util/Optional/BasicDouble.java
+++ b/test/jdk/java/util/Optional/BasicDouble.java
@@ -51,6 +51,7 @@ void checkEmpty(OptionalDouble empty) {
         assertFalse(empty.equals("unexpected"));
 
         assertFalse(empty.isPresent());
+        assertTrue(empty.isEmpty());
         assertEquals(empty.hashCode(), 0);
         assertEquals(empty.orElse(UNEXPECTED), UNEXPECTED);
         assertEquals(empty.orElseGet(() -> UNEXPECTED), UNEXPECTED);
@@ -86,6 +87,7 @@ void checkPresent(OptionalDouble opt, double expected) {
         assertFalse(opt.equals("unexpected"));
 
         assertTrue(opt.isPresent());
+        assertFalse(opt.isEmpty());
         assertEquals(opt.hashCode(), Double.hashCode(expected));
         assertEquals(opt.orElse(UNEXPECTED), expected);
         assertEquals(opt.orElseGet(() -> UNEXPECTED), expected);
diff --git a/test/jdk/java/util/Optional/BasicInt.java b/test/jdk/java/util/Optional/BasicInt.java
index 50a8fd4ba66..e80dcfc7aea 100644
--- a/test/jdk/java/util/Optional/BasicInt.java
+++ b/test/jdk/java/util/Optional/BasicInt.java
@@ -52,6 +52,7 @@ void checkEmpty(OptionalInt empty) {
         assertFalse(empty.equals("unexpected"));
 
         assertFalse(empty.isPresent());
+        assertTrue(empty.isEmpty());
         assertEquals(empty.hashCode(), 0);
         assertEquals(empty.orElse(UNEXPECTED), UNEXPECTED);
         assertEquals(empty.orElseGet(() -> UNEXPECTED), UNEXPECTED);
@@ -87,6 +88,7 @@ void checkPresent(OptionalInt opt, int expected) {
         assertFalse(opt.equals("unexpected"));
 
         assertTrue(opt.isPresent());
+        assertFalse(opt.isEmpty());
         assertEquals(opt.hashCode(), Integer.hashCode(expected));
         assertEquals(opt.orElse(UNEXPECTED), expected);
         assertEquals(opt.orElseGet(() -> UNEXPECTED), expected);
diff --git a/test/jdk/java/util/Optional/BasicLong.java b/test/jdk/java/util/Optional/BasicLong.java
index a88a31594d3..93bca6b16d0 100644
--- a/test/jdk/java/util/Optional/BasicLong.java
+++ b/test/jdk/java/util/Optional/BasicLong.java
@@ -51,6 +51,7 @@ void checkEmpty(OptionalLong empty) {
         assertFalse(empty.equals("unexpected"));
 
         assertFalse(empty.isPresent());
+        assertTrue(empty.isEmpty());
         assertEquals(empty.hashCode(), 0);
         assertEquals(empty.orElse(UNEXPECTED), UNEXPECTED);
         assertEquals(empty.orElseGet(() -> UNEXPECTED), UNEXPECTED);
@@ -86,6 +87,7 @@ void checkPresent(OptionalLong opt, long expected) {
         assertFalse(opt.equals("unexpected"));
 
         assertTrue(opt.isPresent());
+        assertFalse(opt.isEmpty());
         assertEquals(opt.hashCode(), Long.hashCode(expected));
         assertEquals(opt.orElse(UNEXPECTED), expected);
         assertEquals(opt.orElseGet(() -> UNEXPECTED), expected);

From 86a806c437b0bab26d23c1320a15a4e1eb0c6a74 Mon Sep 17 00:00:00 2001
From: igerasim <unknown>
Date: Thu, 19 Apr 2018 09:36:06 -0700
Subject: [PATCH 192/196] 8201510: Merge TwoStacksPlainSocketImpl into
 DualStackPlainSocketImpl [win] Reviewed-by: chegar

---
 .../java/net/DualStackPlainSocketImpl.java    | 126 ++--
 .../classes/java/net/PlainSocketImpl.java     |  59 +-
 .../java/net/TwoStacksPlainSocketImpl.java    | 324 -----------
 .../native/libnet/DualStackPlainSocketImpl.c  | 102 +++-
 .../native/libnet/TwoStacksPlainSocketImpl.c  | 550 ------------------
 test/jdk/java/net/Socket/RejectIPv6.java      |  71 +++
 .../net/Socket/setReuseAddress/Basic.java     |   8 +-
 .../net/Socket/setReuseAddress/Restart.java   |   6 +-
 8 files changed, 253 insertions(+), 993 deletions(-)
 delete mode 100644 src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java
 delete mode 100644 src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c
 create mode 100644 test/jdk/java/net/Socket/RejectIPv6.java

diff --git a/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java b/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java
index 4015df7ff4b..13d232638d6 100644
--- a/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java
+++ b/src/java.base/windows/classes/java/net/DualStackPlainSocketImpl.java
@@ -26,14 +26,18 @@
 
 import java.io.IOException;
 import java.io.FileDescriptor;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import sun.security.action.GetPropertyAction;
 import jdk.internal.misc.SharedSecrets;
 import jdk.internal.misc.JavaIOFileDescriptorAccess;
 
 /**
- * This class defines the plain SocketImpl that is used on Windows platforms
- * greater or equal to Windows Vista. These platforms have a dual
- * layer TCP/IP stack and can handle both IPv4 and IPV6 through a
- * single file descriptor.
+ * This class defines the plain SocketImpl.
+ * When java.net.preferIPv4Stack system property is set to true, it uses
+ * IPv4-only socket.
+ * When java.net.preferIPv4Stack is set to false, it handles both IPv4
+ * and IPv6 through a single file descriptor.
  *
  * @author Chris Hegarty
  */
@@ -43,30 +47,43 @@ class DualStackPlainSocketImpl extends AbstractPlainSocketImpl {
     private static final JavaIOFileDescriptorAccess fdAccess =
         SharedSecrets.getJavaIOFileDescriptorAccess();
 
-    // true if this socket is exclusively bound
-    private final boolean exclusiveBind;
+    private static final boolean preferIPv4Stack =
+            Boolean.parseBoolean(AccessController.doPrivileged(
+                new GetPropertyAction("java.net.preferIPv4Stack", "false")));
 
-    // emulates SO_REUSEADDR when exclusiveBind is true
+    /**
+     * Empty value of sun.net.useExclusiveBind is treated as 'true'.
+     */
+    private static final boolean useExclusiveBind;
+
+    static {
+        String exclBindProp = AccessController.doPrivileged(
+                new GetPropertyAction("sun.net.useExclusiveBind", ""));
+        useExclusiveBind = exclBindProp.isEmpty()
+                || Boolean.parseBoolean(exclBindProp);
+    }
+
+    // emulates SO_REUSEADDR when useExclusiveBind is true
     private boolean isReuseAddress;
 
-    public DualStackPlainSocketImpl(boolean exclBind) {
-        exclusiveBind = exclBind;
+    public DualStackPlainSocketImpl() {
     }
 
-    public DualStackPlainSocketImpl(FileDescriptor fd, boolean exclBind) {
+    public DualStackPlainSocketImpl(FileDescriptor fd) {
         this.fd = fd;
-        exclusiveBind = exclBind;
     }
 
+    @Override
     void socketCreate(boolean stream) throws IOException {
         if (fd == null)
             throw new SocketException("Socket closed");
 
-        int newfd = socket0(stream, false /*v6 Only*/);
+        int newfd = socket0(stream);
 
         fdAccess.set(fd, newfd);
     }
 
+    @Override
     void socketConnect(InetAddress address, int port, int timeout)
         throws IOException {
         int nativefd = checkAndReturnNativeFD();
@@ -74,6 +91,9 @@ void socketConnect(InetAddress address, int port, int timeout)
         if (address == null)
             throw new NullPointerException("inet address argument is null.");
 
+        if (preferIPv4Stack && !(address instanceof Inet4Address))
+            throw new SocketException("Protocol family not supported");
+
         int connectResult;
         if (timeout <= 0) {
             connectResult = connect0(nativefd, address, port);
@@ -97,13 +117,17 @@ void socketConnect(InetAddress address, int port, int timeout)
             localport = localPort0(nativefd);
     }
 
+    @Override
     void socketBind(InetAddress address, int port) throws IOException {
         int nativefd = checkAndReturnNativeFD();
 
         if (address == null)
             throw new NullPointerException("inet address argument is null.");
 
-        bind0(nativefd, address, port, exclusiveBind);
+        if (preferIPv4Stack && !(address instanceof Inet4Address))
+            throw new SocketException("Protocol family not supported");
+
+        bind0(nativefd, address, port, useExclusiveBind);
         if (port == 0) {
             localport = localPort0(nativefd);
         } else {
@@ -113,12 +137,14 @@ void socketBind(InetAddress address, int port) throws IOException {
         this.address = address;
     }
 
+    @Override
     void socketListen(int backlog) throws IOException {
         int nativefd = checkAndReturnNativeFD();
 
         listen0(nativefd, backlog);
     }
 
+    @Override
     void socketAccept(SocketImpl s) throws IOException {
         int nativefd = checkAndReturnNativeFD();
 
@@ -148,13 +174,17 @@ void socketAccept(SocketImpl s) throws IOException {
         s.port = isa.getPort();
         s.address = isa.getAddress();
         s.localport = localport;
+        if (preferIPv4Stack && !(s.address instanceof Inet4Address))
+            throw new SocketException("Protocol family not supported");
     }
 
+    @Override
     int socketAvailable() throws IOException {
         int nativefd = checkAndReturnNativeFD();
         return available0(nativefd);
     }
 
+    @Override
     void socketClose0(boolean useDeferredClose/*unused*/) throws IOException {
         if (fd == null)
             throw new SocketException("Socket closed");
@@ -167,6 +197,7 @@ void socketClose0(boolean useDeferredClose/*unused*/) throws IOException {
         close0(nativefd);
     }
 
+    @Override
     void socketShutdown(int howto) throws IOException {
         int nativefd = checkAndReturnNativeFD();
         shutdown0(nativefd, howto);
@@ -174,41 +205,51 @@ void socketShutdown(int howto) throws IOException {
 
     // Intentional fallthrough after SO_REUSEADDR
     @SuppressWarnings("fallthrough")
+    @Override
     void socketSetOption(int opt, boolean on, Object value)
         throws SocketException {
-        int nativefd = checkAndReturnNativeFD();
 
-        if (opt == SO_TIMEOUT) {  // timeout implemented through select.
-            return;
-        }
         // SO_REUSEPORT is not supported on Windows.
         if (opt == SO_REUSEPORT) {
             throw new UnsupportedOperationException("unsupported option");
         }
 
+        int nativefd = checkAndReturnNativeFD();
+
+        if (opt == SO_TIMEOUT) {
+            if (preferIPv4Stack) {
+                // Don't enable the socket option on ServerSocket as it's
+                // meaningless (we don't receive on a ServerSocket).
+                if (serverSocket == null) {
+                    setSoTimeout0(nativefd, ((Integer)value).intValue());
+                }
+            } // else timeout is implemented through select.
+            return;
+        }
+
         int optionValue = 0;
 
         switch(opt) {
-            case SO_REUSEADDR :
-                if (exclusiveBind) {
+            case SO_REUSEADDR:
+                if (useExclusiveBind) {
                     // SO_REUSEADDR emulated when using exclusive bind
                     isReuseAddress = on;
                     return;
                 }
                 // intentional fallthrough
-            case TCP_NODELAY :
-            case SO_OOBINLINE :
-            case SO_KEEPALIVE :
+            case TCP_NODELAY:
+            case SO_OOBINLINE:
+            case SO_KEEPALIVE:
                 optionValue = on ? 1 : 0;
                 break;
-            case SO_SNDBUF :
-            case SO_RCVBUF :
-            case IP_TOS :
+            case SO_SNDBUF:
+            case SO_RCVBUF:
+            case IP_TOS:
                 optionValue = ((Integer)value).intValue();
                 break;
-            case SO_LINGER :
+            case SO_LINGER:
                 if (on) {
-                    optionValue =  ((Integer)value).intValue();
+                    optionValue = ((Integer)value).intValue();
                 } else {
                     optionValue = -1;
                 }
@@ -220,7 +261,15 @@ void socketSetOption(int opt, boolean on, Object value)
         setIntOption(nativefd, opt, optionValue);
     }
 
-    int socketGetOption(int opt, Object iaContainerObj) throws SocketException {
+    @Override
+    int socketGetOption(int opt, Object iaContainerObj)
+        throws SocketException {
+
+        // SO_REUSEPORT is not supported on Windows.
+        if (opt == SO_REUSEPORT) {
+            throw new UnsupportedOperationException("unsupported option");
+        }
+
         int nativefd = checkAndReturnNativeFD();
 
         // SO_BINDADDR is not a socket option.
@@ -228,27 +277,24 @@ int socketGetOption(int opt, Object iaContainerObj) throws SocketException {
             localAddress(nativefd, (InetAddressContainer)iaContainerObj);
             return 0;  // return value doesn't matter.
         }
-        // SO_REUSEPORT is not supported on Windows.
-        if (opt == SO_REUSEPORT) {
-            throw new UnsupportedOperationException("unsupported option");
-        }
 
         // SO_REUSEADDR emulated when using exclusive bind
-        if (opt == SO_REUSEADDR && exclusiveBind)
-            return isReuseAddress? 1 : -1;
+        if (opt == SO_REUSEADDR && useExclusiveBind)
+            return isReuseAddress ? 1 : -1;
 
         int value = getIntOption(nativefd, opt);
 
         switch (opt) {
-            case TCP_NODELAY :
-            case SO_OOBINLINE :
-            case SO_KEEPALIVE :
-            case SO_REUSEADDR :
+            case TCP_NODELAY:
+            case SO_OOBINLINE:
+            case SO_KEEPALIVE:
+            case SO_REUSEADDR:
                 return (value == 0) ? -1 : 1;
         }
         return value;
     }
 
+    @Override
     void socketSendUrgentData(int data) throws IOException {
         int nativefd = checkAndReturnNativeFD();
         sendOOB(nativefd, data);
@@ -271,7 +317,7 @@ private int checkAndReturnNativeFD() throws SocketException {
 
     static native void initIDs();
 
-    static native int socket0(boolean stream, boolean v6Only) throws IOException;
+    static native int socket0(boolean stream) throws IOException;
 
     static native void bind0(int fd, InetAddress localAddress, int localport,
                              boolean exclBind)
@@ -300,6 +346,8 @@ static native int connect0(int fd, InetAddress remote, int remotePort)
 
     static native void setIntOption(int fd, int cmd, int optionValue) throws SocketException;
 
+    static native void setSoTimeout0(int fd, int timeout) throws SocketException;
+
     static native int getIntOption(int fd, int cmd) throws SocketException;
 
     static native void sendOOB(int fd, int data) throws IOException;
diff --git a/src/java.base/windows/classes/java/net/PlainSocketImpl.java b/src/java.base/windows/classes/java/net/PlainSocketImpl.java
index 6c27d775a84..b93190c389f 100644
--- a/src/java.base/windows/classes/java/net/PlainSocketImpl.java
+++ b/src/java.base/windows/classes/java/net/PlainSocketImpl.java
@@ -25,20 +25,13 @@
 package java.net;
 
 import java.io.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import sun.security.action.GetPropertyAction;
 
 /*
  * This class PlainSocketImpl simply delegates to the appropriate real
  * SocketImpl. We do this because PlainSocketImpl is already extended
  * by SocksSocketImpl.
  * <p>
- * There are two possibilities for the real SocketImpl,
- * TwoStacksPlainSocketImpl or DualStackPlainSocketImpl. We use
- * DualStackPlainSocketImpl on systems that have a dual stack
- * TCP implementation. Otherwise we create an instance of
- * TwoStacksPlainSocketImpl and delegate to it.
+ * There is one possibility for the real SocketImpl: DualStackPlainSocketImpl.
  *
  * @author Chris Hegarty
  */
@@ -46,44 +39,18 @@
 class PlainSocketImpl extends AbstractPlainSocketImpl {
     private AbstractPlainSocketImpl impl;
 
-    /* java.net.preferIPv4Stack */
-    private static final boolean preferIPv4Stack;
-
-    /* True if exclusive binding is on for Windows */
-    private static final boolean exclusiveBind;
-
-    static {
-        preferIPv4Stack = Boolean.parseBoolean(
-        AccessController.doPrivileged(
-                new GetPropertyAction("java.net.preferIPv4Stack")));
-
-        String exclBindProp = AccessController.doPrivileged(
-                new GetPropertyAction("sun.net.useExclusiveBind", ""));
-        exclusiveBind = (exclBindProp.isEmpty())
-                ? true
-                : Boolean.parseBoolean(exclBindProp);
-    }
-
     /**
      * Constructs an empty instance.
      */
     PlainSocketImpl() {
-        if (!preferIPv4Stack) {
-            impl = new DualStackPlainSocketImpl(exclusiveBind);
-        } else {
-            impl = new TwoStacksPlainSocketImpl(exclusiveBind);
-        }
+        impl = new DualStackPlainSocketImpl();
     }
 
     /**
      * Constructs an instance with the given file descriptor.
      */
     PlainSocketImpl(FileDescriptor fd) {
-        if (!preferIPv4Stack) {
-            impl = new DualStackPlainSocketImpl(fd, exclusiveBind);
-        } else {
-            impl = new TwoStacksPlainSocketImpl(fd, exclusiveBind);
-        }
+        impl = new DualStackPlainSocketImpl(fd);
     }
 
     // Override methods in SocketImpl that access impl's fields.
@@ -148,18 +115,10 @@ protected void connect(SocketAddress address, int timeout) throws IOException {
     }
 
     public void setOption(int opt, Object val) throws SocketException {
-        if (opt == SocketOptions.SO_REUSEPORT) {
-            // SO_REUSEPORT is not supported on Windows.
-            throw new UnsupportedOperationException("unsupported option");
-        }
         impl.setOption(opt, val);
     }
 
     public Object getOption(int opt) throws SocketException {
-        if (opt == SocketOptions.SO_REUSEPORT) {
-            // SO_REUSEPORT is not supported on Windows.
-            throw new UnsupportedOperationException("unsupported option");
-        }
         return impl.getOption(opt);
     }
 
@@ -271,8 +230,8 @@ public int getTimeout() {
 
     // Override methods in AbstractPlainSocketImpl that need to be implemented.
 
-    void socketCreate(boolean isServer) throws IOException {
-        impl.socketCreate(isServer);
+    void socketCreate(boolean stream) throws IOException {
+        impl.socketCreate(stream);
     }
 
     void socketConnect(InetAddress address, int port, int timeout)
@@ -307,18 +266,10 @@ void socketShutdown(int howto) throws IOException {
 
     void socketSetOption(int cmd, boolean on, Object value)
         throws SocketException {
-        if (cmd == SocketOptions.SO_REUSEPORT) {
-            // SO_REUSEPORT is not supported on Windows.
-            throw new UnsupportedOperationException("unsupported option");
-        }
         impl.socketSetOption(cmd, on, value);
     }
 
     int socketGetOption(int opt, Object iaContainerObj) throws SocketException {
-        if (opt == SocketOptions.SO_REUSEPORT) {
-            // SO_REUSEPORT is not supported on Windows.
-            throw new UnsupportedOperationException("unsupported option");
-        }
         return impl.socketGetOption(opt, iaContainerObj);
     }
 
diff --git a/src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java b/src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java
deleted file mode 100644
index 35bbd6ed1c8..00000000000
--- a/src/java.base/windows/classes/java/net/TwoStacksPlainSocketImpl.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (c) 2007, 2018, 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;
-
-import java.io.IOException;
-import java.io.FileDescriptor;
-import sun.net.ResourceManager;
-import jdk.internal.misc.SharedSecrets;
-import jdk.internal.misc.JavaIOFileDescriptorAccess;
-
-/*
- * This class defines the plain SocketImpl that is used when
- * the System property java.net.preferIPv4Stack is set to true.
- *
- * @author Chris Hegarty
- */
-
-class TwoStacksPlainSocketImpl extends AbstractPlainSocketImpl {
-
-    private static final JavaIOFileDescriptorAccess fdAccess =
-        SharedSecrets.getJavaIOFileDescriptorAccess();
-
-    // true if this socket is exclusively bound
-    private final boolean exclusiveBind;
-
-    // emulates SO_REUSEADDR when exclusiveBind is true
-    private boolean isReuseAddress;
-
-    public TwoStacksPlainSocketImpl(boolean exclBind) {
-        exclusiveBind = exclBind;
-    }
-
-    public TwoStacksPlainSocketImpl(FileDescriptor fd, boolean exclBind) {
-        this.fd = fd;
-        exclusiveBind = exclBind;
-    }
-
-    void socketCreate(boolean stream) throws IOException {
-        if (fd == null)
-            throw new SocketException("Socket closed");
-
-        int newfd = socket0(stream, false /*v6 Only*/);
-
-        fdAccess.set(fd, newfd);
-    }
-
-    @Override
-    void socketConnect(InetAddress address, int port, int timeout)
-        throws IOException {
-        int nativefd = checkAndReturnNativeFD();
-
-        if (address == null)
-            throw new NullPointerException("inet address argument is null.");
-
-        int connectResult;
-        if (timeout <= 0) {
-            connectResult = connect0(nativefd, address, port);
-        } else {
-            configureBlocking(nativefd, false);
-            try {
-                connectResult = connect0(nativefd, address, port);
-                if (connectResult == WOULDBLOCK) {
-                    waitForConnect(nativefd, timeout);
-                }
-            } finally {
-                configureBlocking(nativefd, true);
-            }
-        }
-        /*
-         * We need to set the local port field. If bind was called
-         * previous to the connect (by the client) then localport field
-         * will already be set.
-         */
-        if (localport == 0)
-            localport = localPort0(nativefd);
-    }
-
-    @Override
-    void socketBind(InetAddress address, int port) throws IOException {
-        int nativefd = checkAndReturnNativeFD();
-
-        if (address == null)
-            throw new NullPointerException("inet address argument is null.");
-
-        bind0(nativefd, address, port, exclusiveBind);
-        if (port == 0) {
-            localport = localPort0(nativefd);
-        } else {
-            localport = port;
-        }
-
-        this.address = address;
-    }
-
-    @Override
-    void socketListen(int backlog) throws IOException {
-        int nativefd = checkAndReturnNativeFD();
-
-        listen0(nativefd, backlog);
-    }
-
-    @Override
-    void socketAccept(SocketImpl s) throws IOException {
-        int nativefd = checkAndReturnNativeFD();
-
-        if (s == null)
-            throw new NullPointerException("socket is null");
-
-        int newfd = -1;
-        InetSocketAddress[] isaa = new InetSocketAddress[1];
-        if (timeout <= 0) {
-            newfd = accept0(nativefd, isaa);
-        } else {
-            configureBlocking(nativefd, false);
-            try {
-                waitForNewConnection(nativefd, timeout);
-                newfd = accept0(nativefd, isaa);
-                if (newfd != -1) {
-                    configureBlocking(newfd, true);
-                }
-            } finally {
-                configureBlocking(nativefd, true);
-            }
-        }
-        /* Update (SocketImpl)s' fd */
-        fdAccess.set(s.fd, newfd);
-        /* Update socketImpls remote port, address and localport */
-        InetSocketAddress isa = isaa[0];
-        s.port = isa.getPort();
-        s.address = isa.getAddress();
-        s.localport = localport;
-    }
-
-    @Override
-    int socketAvailable() throws IOException {
-        int nativefd = checkAndReturnNativeFD();
-        return available0(nativefd);
-    }
-
-    @Override
-    void socketClose0(boolean useDeferredClose/*unused*/) throws IOException {
-        if (fd == null)
-            throw new SocketException("Socket closed");
-
-        if (!fd.valid())
-            return;
-
-        final int nativefd = fdAccess.get(fd);
-        fdAccess.set(fd, -1);
-        close0(nativefd);
-    }
-
-    @Override
-    void socketShutdown(int howto) throws IOException {
-        int nativefd = checkAndReturnNativeFD();
-        shutdown0(nativefd, howto);
-    }
-
-    // Intentional fallthrough after SO_REUSEADDR
-    @SuppressWarnings("fallthrough")
-    @Override
-    void socketSetOption(int opt, boolean on, Object value)
-        throws SocketException {
-        int nativefd = checkAndReturnNativeFD();
-
-        if (opt == SO_TIMEOUT) {
-            // Don't enable the socket option on ServerSocket as it's
-            // meaningless (we don't receive on a ServerSocket).
-            if (serverSocket == null) {
-                setSoTimeout0(nativefd, ((Integer)value).intValue());
-            }
-            return;
-        }
-        // SO_REUSEPORT is not supported on Windows.
-        if (opt == SO_REUSEPORT) {
-            throw new UnsupportedOperationException("unsupported option");
-        }
-
-        int optionValue = 0;
-
-        switch(opt) {
-            case SO_REUSEADDR :
-                if (exclusiveBind) {
-                    // SO_REUSEADDR emulated when using exclusive bind
-                    isReuseAddress = on;
-                    return;
-                }
-                // intentional fallthrough
-            case TCP_NODELAY :
-            case SO_OOBINLINE :
-            case SO_KEEPALIVE :
-                optionValue = on ? 1 : 0;
-                break;
-            case SO_SNDBUF :
-            case SO_RCVBUF :
-            case IP_TOS :
-                optionValue = ((Integer)value).intValue();
-                break;
-            case SO_LINGER :
-                if (on) {
-                    optionValue =  ((Integer)value).intValue();
-                } else {
-                    optionValue = -1;
-                }
-                break;
-            default :/* shouldn't get here */
-                throw new SocketException("Option not supported");
-        }
-
-        setIntOption(nativefd, opt, optionValue);
-    }
-
-    @Override
-    int socketGetOption(int opt, Object iaContainerObj) throws SocketException {
-        int nativefd = checkAndReturnNativeFD();
-
-        // SO_BINDADDR is not a socket option.
-        if (opt == SO_BINDADDR) {
-            localAddress(nativefd, (InetAddressContainer)iaContainerObj);
-            return 0;  // return value doesn't matter.
-        }
-        // SO_REUSEPORT is not supported on Windows.
-        if (opt == SO_REUSEPORT) {
-            throw new UnsupportedOperationException("unsupported option");
-        }
-
-        // SO_REUSEADDR emulated when using exclusive bind
-        if (opt == SO_REUSEADDR && exclusiveBind)
-            return isReuseAddress? 1 : -1;
-
-        int value = getIntOption(nativefd, opt);
-
-        switch (opt) {
-            case TCP_NODELAY :
-            case SO_OOBINLINE :
-            case SO_KEEPALIVE :
-            case SO_REUSEADDR :
-                return (value == 0) ? -1 : 1;
-        }
-        return value;
-    }
-
-    @Override
-    void socketSendUrgentData(int data) throws IOException {
-        int nativefd = checkAndReturnNativeFD();
-        sendOOB(nativefd, data);
-    }
-
-    private int checkAndReturnNativeFD() throws SocketException {
-        if (fd == null || !fd.valid())
-            throw new SocketException("Socket closed");
-
-        return fdAccess.get(fd);
-    }
-
-    static final int WOULDBLOCK = -2;       // Nothing available (non-blocking)
-
-    static {
-        initIDs();
-    }
-
-    /* Native methods */
-
-    static native void initIDs();
-
-    static native int socket0(boolean stream, boolean v6Only) throws IOException;
-
-    static native void bind0(int fd, InetAddress localAddress, int localport,
-                             boolean exclBind)
-        throws IOException;
-
-    static native int connect0(int fd, InetAddress remote, int remotePort)
-        throws IOException;
-
-    static native void waitForConnect(int fd, int timeout) throws IOException;
-
-    static native int localPort0(int fd) throws IOException;
-
-    static native void localAddress(int fd, InetAddressContainer in) throws SocketException;
-
-    static native void listen0(int fd, int backlog) throws IOException;
-
-    static native int accept0(int fd, InetSocketAddress[] isaa) throws IOException;
-
-    static native void waitForNewConnection(int fd, int timeout) throws IOException;
-
-    static native int available0(int fd) throws IOException;
-
-    static native void close0(int fd) throws IOException;
-
-    static native void shutdown0(int fd, int howto) throws IOException;
-
-    static native void setIntOption(int fd, int cmd, int optionValue) throws SocketException;
-
-    static native void setSoTimeout0(int fd, int timeout) throws SocketException;
-
-    static native int getIntOption(int fd, int cmd) throws SocketException;
-
-    static native void sendOOB(int fd, int data) throws IOException;
-
-    static native void configureBlocking(int fd, boolean blocking) throws IOException;
-}
diff --git a/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c b/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c
index 0ae73f3f761..73c226efff2 100644
--- a/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c
+++ b/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -27,8 +27,8 @@
 #include "java_net_DualStackPlainSocketImpl.h"
 #include "java_net_SocketOptions.h"
 
-#define SET_BLOCKING 0
-#define SET_NONBLOCKING 1
+#define SET_BLOCKING     0
+#define SET_NONBLOCKING  1
 
 static jclass isa_class;        /* java.net.InetSocketAddress */
 static jmethodID isa_ctorID;    /* InetSocketAddress(InetAddress, int) */
@@ -60,22 +60,28 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_initIDs
  * Signature: (ZZ)I
  */
 JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_socket0
-  (JNIEnv *env, jclass clazz, jboolean stream, jboolean v6Only /*unused*/) {
+  (JNIEnv *env, jclass clazz, jboolean stream) {
     int fd, rv, opt=0;
+    int type = (stream ? SOCK_STREAM : SOCK_DGRAM);
+    int domain = ipv6_available() ? AF_INET6 : AF_INET;
+
+    fd = NET_Socket(domain, type, 0);
 
-    fd = NET_Socket(AF_INET6, (stream ? SOCK_STREAM : SOCK_DGRAM), 0);
     if (fd == INVALID_SOCKET) {
         NET_ThrowNew(env, WSAGetLastError(), "create");
         return -1;
     }
 
-    rv = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &opt, sizeof(opt));
-    if (rv == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "create");
+    if (domain == AF_INET6) {
+        rv = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &opt,
+                        sizeof(opt));
+        if (rv == SOCKET_ERROR) {
+            NET_ThrowNew(env, WSAGetLastError(), "create");
+            closesocket(fd);
+            return -1;
+        }
     }
 
-    SetHandleInformation((HANDLE)(UINT_PTR)fd, HANDLE_FLAG_INHERIT, FALSE);
-
     return fd;
 }
 
@@ -90,10 +96,11 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_bind0
 {
     SOCKETADDRESS sa;
     int rv, sa_len = 0;
+    jboolean v4MappedAddress = ipv6_available() ? JNI_TRUE : JNI_FALSE;
 
     if (NET_InetAddressToSockaddr(env, iaObj, port, &sa,
-                                  &sa_len, JNI_TRUE) != 0) {
-      return;
+                                  &sa_len, v4MappedAddress) != 0) {
+        return;
     }
 
     rv = NET_WinBind(fd, &sa, sa_len, exclBind);
@@ -111,10 +118,11 @@ JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_connect0
   (JNIEnv *env, jclass clazz, jint fd, jobject iaObj, jint port) {
     SOCKETADDRESS sa;
     int rv, sa_len = 0;
+    jboolean v4MappedAddress = ipv6_available() ? JNI_TRUE : JNI_FALSE;
 
     if (NET_InetAddressToSockaddr(env, iaObj, port, &sa,
-                                  &sa_len, JNI_TRUE) != 0) {
-      return -1;
+                                  &sa_len, v4MappedAddress) != 0) {
+        return -1;
     }
 
     rv = connect(fd, &sa.sa, sa_len);
@@ -124,7 +132,8 @@ JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_connect0
             return java_net_DualStackPlainSocketImpl_WOULDBLOCK;
         } else if (err == WSAEADDRNOTAVAIL) {
             JNU_ThrowByName(env, JNU_JAVANETPKG "ConnectException",
-                "connect: Address is invalid on local machine, or port is not valid on remote machine");
+                "connect: Address is invalid on local machine,"
+                " or port is not valid on remote machine");
         } else {
             NET_ThrowNew(env, err, "connect");
         }
@@ -200,6 +209,10 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_waitForConnect
     if (rv == 0) {
         JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
                         "Unable to establish connection");
+    } else if (!ipv6_available() && rv == WSAEADDRNOTAVAIL) {
+        JNU_ThrowByName(env, JNU_JAVANETPKG "ConnectException",
+                        "connect: Address is invalid on local machine,"
+                        " or port is not valid on remote machine");
     } else {
         NET_ThrowNew(env, rv, "connect");
     }
@@ -284,13 +297,7 @@ JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_accept0
     newfd = accept(fd, &sa.sa, &len);
 
     if (newfd == INVALID_SOCKET) {
-        if (WSAGetLastError() == -2) {
-            JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
-                            "operation interrupted");
-        } else {
-            JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-                            "socket closed");
-        }
+        NET_ThrowNew(env, WSAGetLastError(), "accept failed");
         return -1;
     }
 
@@ -298,6 +305,10 @@ JNIEXPORT jint JNICALL Java_java_net_DualStackPlainSocketImpl_accept0
 
     ia = NET_SockaddrToInetAddress(env, &sa, &port);
     isa = (*env)->NewObject(env, isa_class, isa_ctorID, ia, port);
+    if (isa == NULL) {
+        closesocket(newfd);
+        return -1;
+    }
     (*env)->SetObjectArrayElement(env, isaa, 0, isa);
 
     return newfd;
@@ -400,6 +411,51 @@ Java_java_net_DualStackPlainSocketImpl_setIntOption
     }
 }
 
+/*
+ * Class:     java_net_DualStackPlainSocketImpl
+ * Method:    setSoTimeout0
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL
+Java_java_net_DualStackPlainSocketImpl_setSoTimeout0
+  (JNIEnv *env, jclass clazz, jint fd, jint timeout)
+{
+    /*
+     * SO_TIMEOUT is the socket option used to specify the timeout
+     * for ServerSocket.accept and Socket.getInputStream().read.
+     * It does not typically map to a native level socket option.
+     * For Windows we special-case this and use the SOL_SOCKET/SO_RCVTIMEO
+     * socket option to specify a receive timeout on the socket. This
+     * receive timeout is applicable to Socket only and the socket
+     * option should not be set on ServerSocket.
+     */
+
+    /*
+     * SO_RCVTIMEO is only supported on Microsoft's implementation
+     * of Windows Sockets so if WSAENOPROTOOPT returned then
+     * reset flag and timeout will be implemented using
+     * select() -- see SocketInputStream.socketRead.
+     */
+    if (isRcvTimeoutSupported) {
+        /*
+         * Disable SO_RCVTIMEO if timeout is <= 5 second.
+         */
+        if (timeout <= 5000) {
+            timeout = 0;
+        }
+
+        if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout,
+            sizeof(timeout)) < 0) {
+            int err = WSAGetLastError();
+            if (err == WSAENOPROTOOPT) {
+                isRcvTimeoutSupported = JNI_FALSE;
+            } else {
+                NET_ThrowNew(env, err, "setsockopt SO_RCVTIMEO");
+            }
+        }
+    }
+}
+
 /*
  * Class:     java_net_DualStackPlainSocketImpl
  * Method:    getIntOption
@@ -466,7 +522,7 @@ JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_configureBlocking
     int result;
 
     if (blocking == JNI_TRUE) {
-        arg = SET_BLOCKING;    // 0
+        arg = SET_BLOCKING;      // 0
     } else {
         arg = SET_NONBLOCKING;   // 1
     }
diff --git a/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c b/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c
deleted file mode 100644
index 23c424bcda8..00000000000
--- a/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
- * Copyright (c) 1997, 2018, 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.
- */
-#include "net_util.h"
-
-#include "java_net_TwoStacksPlainSocketImpl.h"
-#include "java_net_SocketOptions.h"
-#include "java_net_InetAddress.h"
-
-#define SET_BLOCKING 0
-#define SET_NONBLOCKING 1
-
-static jclass isa_class;        /* java.net.InetSocketAddress */
-static jmethodID isa_ctorID;    /* InetSocketAddress(InetAddress, int) */
-
-/************************************************************************
- * TwoStacksPlainSocketImpl
- */
-
-/*
- * The initIDs function is called whenever TwoStacksPlainSocketImpl is
- * loaded, to cache fieldIds for efficiency. This is called everytime
- * the Java class is loaded.
- *
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_initIDs
-  (JNIEnv *env, jclass clazz) {
-
-    jclass cls = (*env)->FindClass(env, "java/net/InetSocketAddress");
-    CHECK_NULL(cls);
-    isa_class = (*env)->NewGlobalRef(env, cls);
-    CHECK_NULL(isa_class);
-    isa_ctorID = (*env)->GetMethodID(env, cls, "<init>",
-                                     "(Ljava/net/InetAddress;I)V");
-    CHECK_NULL(isa_ctorID);
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socket0
- * Signature: (ZZ)I
- */
-JNIEXPORT jint JNICALL Java_java_net_TwoStacksPlainSocketImpl_socket0
-  (JNIEnv *env, jclass clazz, jboolean stream, jboolean v6Only /*unused*/) {
-    int fd;
-
-    fd = socket(AF_INET, (stream ? SOCK_STREAM: SOCK_DGRAM), 0);
-    if (fd == INVALID_SOCKET) {
-        NET_ThrowNew(env, WSAGetLastError(), "create");
-        return -1;
-    }
-
-    SetHandleInformation((HANDLE)(UINT_PTR)fd, HANDLE_FLAG_INHERIT, FALSE);
-
-    return fd;
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    bind0
- * Signature: (ILjava/net/InetAddress;I)V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_bind0
-  (JNIEnv *env, jclass clazz, jint fd, jobject iaObj, jint port,
-   jboolean exclBind)
-{
-    SOCKETADDRESS sa;
-    int rv, sa_len = 0;
-    /* family is an int field of iaObj */
-    int family;
-
-    family = getInetAddress_family(env, iaObj);
-    if (family != java_net_InetAddress_IPv4) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-                        "Protocol family not supported");
-        return;
-    }
-
-    if (NET_InetAddressToSockaddr(env, iaObj, port, &sa,
-                                  &sa_len, JNI_FALSE) != 0) {
-        return;
-    }
-
-    rv = NET_WinBind(fd, &sa, sa_len, exclBind);
-
-    if (rv == SOCKET_ERROR)
-        NET_ThrowNew(env, WSAGetLastError(), "NET_Bind");
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    connect0
- * Signature: (ILjava/net/InetAddress;I)I
- */
-JNIEXPORT jint JNICALL Java_java_net_TwoStacksPlainSocketImpl_connect0
-  (JNIEnv *env, jclass clazz, jint fd, jobject iaObj, jint port) {
-    SOCKETADDRESS sa;
-    int rv, sa_len = 0;
-    int family;
-
-    if (NET_InetAddressToSockaddr(env, iaObj, port, &sa,
-                                  &sa_len, JNI_FALSE) != 0) {
-        return -1;
-    }
-
-    family = sa.sa.sa_family;
-    if (family != AF_INET) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-                        "Protocol family not supported");
-        return -1;
-    }
-
-    rv = connect(fd, &sa.sa, sa_len);
-    if (rv == SOCKET_ERROR) {
-        int err = WSAGetLastError();
-        if (err == WSAEWOULDBLOCK) {
-            return java_net_TwoStacksPlainSocketImpl_WOULDBLOCK;
-        } else if (err == WSAEADDRNOTAVAIL) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG "ConnectException",
-                "connect: Address is invalid on local machine, or port is not valid on remote machine");
-        } else {
-            NET_ThrowNew(env, err, "connect");
-        }
-        return -1;  // return value not important.
-    }
-    return rv;
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    waitForConnect
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_waitForConnect
-  (JNIEnv *env, jclass clazz, jint fd, jint timeout) {
-    int rv, retry;
-    int optlen = sizeof(rv);
-    fd_set wr, ex;
-    struct timeval t;
-
-    FD_ZERO(&wr);
-    FD_ZERO(&ex);
-    FD_SET(fd, &wr);
-    FD_SET(fd, &ex);
-    t.tv_sec = timeout / 1000;
-    t.tv_usec = (timeout % 1000) * 1000;
-
-    /*
-     * Wait for timeout, connection established or
-     * connection failed.
-     */
-    rv = select(fd+1, 0, &wr, &ex, &t);
-
-    /*
-     * Timeout before connection is established/failed so
-     * we throw exception and shutdown input/output to prevent
-     * socket from being used.
-     * The socket should be closed immediately by the caller.
-     */
-    if (rv == 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
-                        "connect timed out");
-        shutdown( fd, SD_BOTH );
-        return;
-    }
-    /*
-     * Socket is writable or error occurred. On some Windows editions
-     * the socket will appear writable when the connect fails so we
-     * check for error rather than writable.
-     */
-    if (!FD_ISSET(fd, &ex)) {
-        return;         /* connection established */
-    }
-
-    /*
-     * Connection failed. The logic here is designed to work around
-     * bug on Windows NT whereby using getsockopt to obtain the
-     * last error (SO_ERROR) indicates there is no error. The workaround
-     * on NT is to allow winsock to be scheduled and this is done by
-     * yielding and retrying. As yielding is problematic in heavy
-     * load conditions we attempt up to 3 times to get the error reason.
-     */
-    for (retry=0; retry<3; retry++) {
-        NET_GetSockOpt(fd, SOL_SOCKET, SO_ERROR,
-                       (char*)&rv, &optlen);
-        if (rv) {
-            break;
-        }
-        Sleep(0);
-    }
-
-    if (rv == 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-                        "Unable to establish connection");
-    } else if (rv == WSAEADDRNOTAVAIL) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG "ConnectException",
-                        "connect: Address is invalid on local machine,"
-                        " or port is not valid on remote machine");
-    } else {
-        NET_ThrowNew(env, rv, "connect");
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    localPort0
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_java_net_TwoStacksPlainSocketImpl_localPort0
-  (JNIEnv *env, jclass clazz, jint fd) {
-    SOCKETADDRESS sa;
-    int len = sizeof(sa);
-
-    if (getsockname(fd, &sa.sa, &len) == SOCKET_ERROR) {
-        if (WSAGetLastError() == WSAENOTSOCK) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-                    "Socket closed");
-        } else {
-            NET_ThrowNew(env, WSAGetLastError(), "getsockname failed");
-        }
-        return -1;
-    }
-    return (int) ntohs((u_short)GET_PORT(&sa));
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    localAddress
- * Signature: (ILjava/net/InetAddressContainer;)V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_localAddress
-  (JNIEnv *env, jclass clazz, jint fd, jobject iaContainerObj) {
-    int port;
-    SOCKETADDRESS sa;
-    int len = sizeof(sa);
-    jobject iaObj;
-    jclass iaContainerClass;
-    jfieldID iaFieldID;
-
-    if (getsockname(fd, &sa.sa, &len) == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "Error getting socket name");
-        return;
-    }
-    iaObj = NET_SockaddrToInetAddress(env, &sa, &port);
-    CHECK_NULL(iaObj);
-
-    iaContainerClass = (*env)->GetObjectClass(env, iaContainerObj);
-    iaFieldID = (*env)->GetFieldID(env, iaContainerClass, "addr", "Ljava/net/InetAddress;");
-    CHECK_NULL(iaFieldID);
-    (*env)->SetObjectField(env, iaContainerObj, iaFieldID, iaObj);
-}
-
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    listen0
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_listen0
-  (JNIEnv *env, jclass clazz, jint fd, jint backlog) {
-    if (listen(fd, backlog) == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "listen failed");
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    accept0
- * Signature: (I[Ljava/net/InetSocketAddress;)I
- */
-JNIEXPORT jint JNICALL Java_java_net_TwoStacksPlainSocketImpl_accept0
-  (JNIEnv *env, jclass clazz, jint fd, jobjectArray isaa) {
-    int newfd, port=0;
-    jobject isa;
-    jobject ia;
-    SOCKETADDRESS sa;
-    int len = sizeof(sa);
-
-    memset((char *)&sa, 0, len);
-    newfd = accept(fd, &sa.sa, &len);
-
-    if (newfd < 0) {
-        if (newfd == -2) {
-            JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
-                            "operation interrupted");
-        } else {
-            JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-                            "socket closed");
-        }
-        return -1;
-    }
-
-    SetHandleInformation((HANDLE)(UINT_PTR)newfd, HANDLE_FLAG_INHERIT, 0);
-
-    if (sa.sa.sa_family != AF_INET) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
-                        "Protocol family not supported");
-        NET_SocketClose(newfd);
-        return -1;
-    }
-
-    ia = NET_SockaddrToInetAddress(env, &sa, &port);
-    isa = (*env)->NewObject(env, isa_class, isa_ctorID, ia, port);
-    (*env)->SetObjectArrayElement(env, isaa, 0, isa);
-
-    return newfd;
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    waitForNewConnection
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_waitForNewConnection
-  (JNIEnv *env, jclass clazz, jint fd, jint timeout) {
-    int rv;
-
-    rv = NET_Timeout(fd, timeout);
-    if (rv == 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
-                        "Accept timed out");
-    } else if (rv == -1) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "socket closed");
-    } else if (rv == -2) {
-        JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
-                        "operation interrupted");
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    available0
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_java_net_TwoStacksPlainSocketImpl_available0
-  (JNIEnv *env, jclass clazz, jint fd) {
-    jint available = -1;
-
-    if ((ioctlsocket(fd, FIONREAD, &available)) == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "socket available");
-    }
-
-    return available;
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    close0
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_close0
-  (JNIEnv *env, jclass clazz, jint fd) {
-     NET_SocketClose(fd);
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    shutdown0
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_shutdown0
-  (JNIEnv *env, jclass clazz, jint fd, jint howto) {
-    shutdown(fd, howto);
-}
-
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    setIntOption
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL
-Java_java_net_TwoStacksPlainSocketImpl_setIntOption
-  (JNIEnv *env, jclass clazz, jint fd, jint cmd, jint value)
-{
-    int level = 0, opt = 0;
-    struct linger linger = {0, 0};
-    char *parg;
-    int arglen;
-
-    if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
-        JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
-        return;
-    }
-
-    if (opt == java_net_SocketOptions_SO_LINGER) {
-        parg = (char *)&linger;
-        arglen = sizeof(linger);
-        if (value >= 0) {
-            linger.l_onoff = 1;
-            linger.l_linger = (unsigned short)value;
-        } else {
-            linger.l_onoff = 0;
-            linger.l_linger = 0;
-        }
-    } else {
-        parg = (char *)&value;
-        arglen = sizeof(value);
-    }
-
-    if (NET_SetSockOpt(fd, level, opt, parg, arglen) < 0) {
-        NET_ThrowNew(env, WSAGetLastError(), "setsockopt");
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    setSoTimeout0
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL
-Java_java_net_TwoStacksPlainSocketImpl_setSoTimeout0
-  (JNIEnv *env, jclass clazz, jint fd, jint timeout)
-{
-    /*
-     * SO_TIMEOUT is the socket option used to specify the timeout
-     * for ServerSocket.accept and Socket.getInputStream().read.
-     * It does not typically map to a native level socket option.
-     * For Windows we special-case this and use the SOL_SOCKET/SO_RCVTIMEO
-     * socket option to specify a receive timeout on the socket. This
-     * receive timeout is applicable to Socket only and the socket
-     * option should not be set on ServerSocket.
-     */
-
-    /*
-     * SO_RCVTIMEO is only supported on Microsoft's implementation
-     * of Windows Sockets so if WSAENOPROTOOPT returned then
-     * reset flag and timeout will be implemented using
-     * select() -- see SocketInputStream.socketRead.
-     */
-    if (isRcvTimeoutSupported) {
-        /*
-         * Disable SO_RCVTIMEO if timeout is <= 5 second.
-         */
-        if (timeout <= 5000) {
-            timeout = 0;
-        }
-
-        if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout,
-            sizeof(timeout)) < 0) {
-            int err = WSAGetLastError();
-            if (err == WSAENOPROTOOPT) {
-                isRcvTimeoutSupported = JNI_FALSE;
-            } else {
-                NET_ThrowNew(env, err, "setsockopt SO_RCVTIMEO");
-            }
-        }
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    getIntOption
- * Signature: (II)I
- */
-JNIEXPORT jint JNICALL Java_java_net_TwoStacksPlainSocketImpl_getIntOption
-  (JNIEnv *env, jclass clazz, jint fd, jint cmd)
-{
-    int level = 0, opt = 0;
-    int result=0;
-    struct linger linger = {0, 0};
-    char *arg;
-    int arglen;
-
-    if (NET_MapSocketOption(cmd, &level, &opt) < 0) {
-        JNU_ThrowByName(env, "java/net/SocketException", "Invalid option");
-        return -1;
-    }
-
-    if (opt == java_net_SocketOptions_SO_LINGER) {
-        arg = (char *)&linger;
-        arglen = sizeof(linger);
-    } else {
-        arg = (char *)&result;
-        arglen = sizeof(result);
-    }
-
-    if (NET_GetSockOpt(fd, level, opt, arg, &arglen) < 0) {
-        NET_ThrowNew(env, WSAGetLastError(), "getsockopt");
-        return -1;
-    }
-
-    if (opt == java_net_SocketOptions_SO_LINGER)
-        return linger.l_onoff ? linger.l_linger : -1;
-    else
-        return result;
-}
-
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    sendOOB
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_sendOOB
-  (JNIEnv *env, jclass clazz, jint fd, jint data) {
-    jint n;
-    unsigned char d = (unsigned char) data & 0xff;
-
-    n = send(fd, (char *)&data, 1, MSG_OOB);
-    if (n == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "send");
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    configureBlocking
- * Signature: (IZ)V
- */
-JNIEXPORT void JNICALL Java_java_net_TwoStacksPlainSocketImpl_configureBlocking
-  (JNIEnv *env, jclass clazz, jint fd, jboolean blocking) {
-    u_long arg;
-    int result;
-
-    if (blocking == JNI_TRUE) {
-        arg = SET_BLOCKING;    // 0
-    } else {
-        arg = SET_NONBLOCKING;   // 1
-    }
-
-    result = ioctlsocket(fd, FIONBIO, &arg);
-    if (result == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "configureBlocking");
-    }
-}
diff --git a/test/jdk/java/net/Socket/RejectIPv6.java b/test/jdk/java/net/Socket/RejectIPv6.java
new file mode 100644
index 00000000000..1b9f14ee612
--- /dev/null
+++ b/test/jdk/java/net/Socket/RejectIPv6.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8201510
+ * @summary Make sure IPv6 addresses are rejected when the System option
+ *          java.net.preferIPv4Stack is set to true
+ * @run main/othervm -Djava.net.preferIPv4Stack=true RejectIPv6
+ */
+
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+
+public class RejectIPv6 {
+
+    public static void main(String [] argv) throws Throwable {
+        ServerSocket serverSocket = new ServerSocket(0);
+        serverSocket.setSoTimeout(1000);
+        int serverPort = serverSocket.getLocalPort();
+        Socket clientSocket = new Socket();
+
+        test("bind", () -> clientSocket.bind(
+                new InetSocketAddress("::1", 0)));
+
+        test("connect", () -> clientSocket.connect(
+                new InetSocketAddress("::1", serverPort), 1000));
+    }
+
+    static void test(String msg, CodeToTest codeToTest) throws Throwable {
+        Thread client = new Thread(() ->
+            {
+                try {
+                    codeToTest.run();
+                    throw new RuntimeException(msg +
+                            " failed to reject IPv6 address");
+                } catch (SocketException ok) {
+                } catch (Exception exc) {
+                    throw new RuntimeException("unexpected", exc);
+                }
+            });
+        client.start();
+        client.join();
+    }
+
+    interface CodeToTest {
+        void run() throws Exception;
+    }
+}
diff --git a/test/jdk/java/net/Socket/setReuseAddress/Basic.java b/test/jdk/java/net/Socket/setReuseAddress/Basic.java
index f083cbfb97d..f92e87784ad 100644
--- a/test/jdk/java/net/Socket/setReuseAddress/Basic.java
+++ b/test/jdk/java/net/Socket/setReuseAddress/Basic.java
@@ -25,11 +25,15 @@
  * @test
  * @bug 4476378
  * @summary Check the specific behaviour of the setReuseAddress(boolean)
- * method.
+ *          method.
  * @run main Basic
  * @run main/othervm -Dsun.net.useExclusiveBind Basic
+ * @run main/othervm -Dsun.net.useExclusiveBind=true Basic
  * @run main/othervm -Djava.net.preferIPv4Stack=true Basic
- * @run main/othervm -Dsun.net.useExclusiveBind -Djava.net.preferIPv4Stack=true Basic
+ * @run main/othervm -Dsun.net.useExclusiveBind
+ *                   -Djava.net.preferIPv4Stack=true Basic
+ * @run main/othervm -Dsun.net.useExclusiveBind=true
+ *                   -Djava.net.preferIPv4Stack=true Basic
  */
 import java.net.*;
 
diff --git a/test/jdk/java/net/Socket/setReuseAddress/Restart.java b/test/jdk/java/net/Socket/setReuseAddress/Restart.java
index 49101fed085..032075b64af 100644
--- a/test/jdk/java/net/Socket/setReuseAddress/Restart.java
+++ b/test/jdk/java/net/Socket/setReuseAddress/Restart.java
@@ -28,8 +28,12 @@
  *          after a crash.
  * @run main Restart
  * @run main/othervm -Dsun.net.useExclusiveBind Restart
+ * @run main/othervm -Dsun.net.useExclusiveBind=true Restart
  * @run main/othervm -Djava.net.preferIPv4Stack=true Restart
- * @run main/othervm -Dsun.net.useExclusiveBind -Djava.net.preferIPv4Stack=true Restart
+ * @run main/othervm -Dsun.net.useExclusiveBind
+ *                   -Djava.net.preferIPv4Stack=true Restart
+ * @run main/othervm -Dsun.net.useExclusiveBind=true
+ *                   -Djava.net.preferIPv4Stack=true Restart
  */
 import java.net.*;
 

From fe12d75f25a6320b6dc64465be0f1ca5ae376e6a Mon Sep 17 00:00:00 2001
From: sherman <unknown>
Date: Thu, 19 Apr 2018 10:33:35 -0700
Subject: [PATCH 193/196] 6341887: java.util.zip: Add ByteBuffer methods to
 Inflater/Deflater Reviewed-by: alanb Contributed-by: david.lloyd@redhat.com

---
 .../share/classes/java/util/zip/Deflater.java | 472 +++++++++++++++---
 .../share/classes/java/util/zip/Inflater.java | 459 ++++++++++++++---
 .../share/classes/java/util/zip/ZipUtils.java |  23 +-
 src/java.base/share/native/libzip/Deflater.c  | 253 ++++++----
 src/java.base/share/native/libzip/Inflater.c  | 216 +++++---
 test/jdk/java/util/zip/DeInflate.java         | 167 ++++++-
 test/jdk/java/util/zip/FlaterTest.java        | 129 +++--
 7 files changed, 1378 insertions(+), 341 deletions(-)

diff --git a/src/java.base/share/classes/java/util/zip/Deflater.java b/src/java.base/share/classes/java/util/zip/Deflater.java
index c75dd4a33f0..b7a377e066b 100644
--- a/src/java.base/share/classes/java/util/zip/Deflater.java
+++ b/src/java.base/share/classes/java/util/zip/Deflater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -26,7 +26,13 @@
 package java.util.zip;
 
 import java.lang.ref.Cleaner.Cleanable;
+import java.lang.ref.Reference;
+import java.nio.ByteBuffer;
+import java.nio.ReadOnlyBufferException;
+import java.util.Objects;
+
 import jdk.internal.ref.CleanerFactory;
+import sun.nio.ch.DirectBuffer;
 
 /**
  * This class provides support for general purpose compression using the
@@ -35,8 +41,14 @@
  * protected by patents. It is fully described in the specifications at
  * the <a href="package-summary.html#package.description">java.util.zip
  * package description</a>.
- *
- * <p>The following code fragment demonstrates a trivial compression
+ * <p>
+ * This class deflates sequences of bytes into ZLIB compressed data format.
+ * The input byte sequence is provided in either byte array or byte buffer,
+ * via one of the {@code setInput()} methods. The output byte sequence is
+ * written to the output byte array or byte buffer passed to the
+ * {@code deflate()} methods.
+ * <p>
+ * The following code fragment demonstrates a trivial compression
  * and decompression of a string using {@code Deflater} and
  * {@code Inflater}.
  *
@@ -92,8 +104,9 @@
 public class Deflater {
 
     private final DeflaterZStreamRef zsRef;
-    private byte[] buf = new byte[0];
-    private int off, len;
+    private ByteBuffer input = ZipUtils.defaultBuf;
+    private byte[] inputArray;
+    private int inputPos, inputLim;
     private int level, strategy;
     private boolean setParams;
     private boolean finish, finished;
@@ -170,9 +183,14 @@ public class Deflater {
      */
     public static final int FULL_FLUSH = 3;
 
+    /**
+     * Flush mode to use at the end of output.  Can only be provided by the
+     * user by way of {@link #finish()}.
+     */
+    private static final int FINISH = 4;
+
     static {
         ZipUtils.loadLibrary();
-        initIDs();
     }
 
     /**
@@ -208,35 +226,71 @@ public Deflater() {
     }
 
     /**
-     * Sets input data for compression. This should be called whenever
-     * needsInput() returns true indicating that more input data is required.
-     * @param b the input data bytes
+     * Sets input data for compression.
+     * <p>
+     * One of the {@code setInput()} methods should be called whenever
+     * {@code needsInput()} returns true indicating that more input data
+     * is required.
+     * <p>
+     * @param input the input data bytes
      * @param off the start offset of the data
      * @param len the length of the data
      * @see Deflater#needsInput
      */
-    public void setInput(byte[] b, int off, int len) {
-        if (b== null) {
-            throw new NullPointerException();
-        }
-        if (off < 0 || len < 0 || off > b.length - len) {
+    public void setInput(byte[] input, int off, int len) {
+        if (off < 0 || len < 0 || off > input.length - len) {
             throw new ArrayIndexOutOfBoundsException();
         }
         synchronized (zsRef) {
-            this.buf = b;
-            this.off = off;
-            this.len = len;
+            this.input = null;
+            this.inputArray = input;
+            this.inputPos = off;
+            this.inputLim = off + len;
         }
     }
 
     /**
-     * Sets input data for compression. This should be called whenever
-     * needsInput() returns true indicating that more input data is required.
-     * @param b the input data bytes
+     * Sets input data for compression.
+     * <p>
+     * One of the {@code setInput()} methods should be called whenever
+     * {@code needsInput()} returns true indicating that more input data
+     * is required.
+     * <p>
+     * @param input the input data bytes
+     * @see Deflater#needsInput
+     */
+    public void setInput(byte[] input) {
+        setInput(input, 0, input.length);
+    }
+
+    /**
+     * Sets input data for compression.
+     * <p>
+     * One of the {@code setInput()} methods should be called whenever
+     * {@code needsInput()} returns true indicating that more input data
+     * is required.
+     * <p>
+     * The given buffer's position will be advanced as deflate
+     * operations are performed, up to the buffer's limit.
+     * The input buffer may be modified (refilled) between deflate
+     * operations; doing so is equivalent to creating a new buffer
+     * and setting it with this method.
+     * <p>
+     * Modifying the input buffer's contents, position, or limit
+     * concurrently with an deflate operation will result in
+     * undefined behavior, which may include incorrect operation
+     * results or operation failure.
+     *
+     * @param input the input data bytes
      * @see Deflater#needsInput
+     * @since 11
      */
-    public void setInput(byte[] b) {
-        setInput(b, 0, b.length);
+    public void setInput(ByteBuffer input) {
+        Objects.requireNonNull(input);
+        synchronized (zsRef) {
+            this.input = input;
+            this.inputArray = null;
+        }
     }
 
     /**
@@ -245,22 +299,19 @@ public void setInput(byte[] b) {
      * uncompressed with Inflater.inflate(), Inflater.getAdler() can be called
      * in order to get the Adler-32 value of the dictionary required for
      * decompression.
-     * @param b the dictionary data bytes
+     * @param dictionary the dictionary data bytes
      * @param off the start offset of the data
      * @param len the length of the data
      * @see Inflater#inflate
      * @see Inflater#getAdler
      */
-    public void setDictionary(byte[] b, int off, int len) {
-        if (b == null) {
-            throw new NullPointerException();
-        }
-        if (off < 0 || len < 0 || off > b.length - len) {
+    public void setDictionary(byte[] dictionary, int off, int len) {
+        if (off < 0 || len < 0 || off > dictionary.length - len) {
             throw new ArrayIndexOutOfBoundsException();
         }
         synchronized (zsRef) {
             ensureOpen();
-            setDictionary(zsRef.address(), b, off, len);
+            setDictionary(zsRef.address(), dictionary, off, len);
         }
     }
 
@@ -270,12 +321,47 @@ public void setDictionary(byte[] b, int off, int len) {
      * uncompressed with Inflater.inflate(), Inflater.getAdler() can be called
      * in order to get the Adler-32 value of the dictionary required for
      * decompression.
-     * @param b the dictionary data bytes
+     * @param dictionary the dictionary data bytes
+     * @see Inflater#inflate
+     * @see Inflater#getAdler
+     */
+    public void setDictionary(byte[] dictionary) {
+        setDictionary(dictionary, 0, dictionary.length);
+    }
+
+    /**
+     * Sets preset dictionary for compression. A preset dictionary is used
+     * when the history buffer can be predetermined. When the data is later
+     * uncompressed with Inflater.inflate(), Inflater.getAdler() can be called
+     * in order to get the Adler-32 value of the dictionary required for
+     * decompression.
+     * <p>
+     * The bytes in given byte buffer will be fully consumed by this method.  On
+     * return, its position will equal its limit.
+     *
+     * @param dictionary the dictionary data bytes
      * @see Inflater#inflate
      * @see Inflater#getAdler
      */
-    public void setDictionary(byte[] b) {
-        setDictionary(b, 0, b.length);
+    public void setDictionary(ByteBuffer dictionary) {
+        synchronized (zsRef) {
+            int position = dictionary.position();
+            int remaining = Math.max(dictionary.limit() - position, 0);
+            ensureOpen();
+            if (dictionary.isDirect()) {
+                long address = ((DirectBuffer) dictionary).address();
+                try {
+                    setDictionaryBuffer(zsRef.address(), address + position, remaining);
+                } finally {
+                    Reference.reachabilityFence(dictionary);
+                }
+            } else {
+                byte[] array = ZipUtils.getBufferArray(dictionary);
+                int offset = ZipUtils.getBufferOffset(dictionary);
+                setDictionary(zsRef.address(), array, offset + position, remaining);
+            }
+            dictionary.position(position + remaining);
+        }
     }
 
     /**
@@ -331,14 +417,17 @@ public void setLevel(int level) {
     }
 
     /**
-     * Returns true if the input data buffer is empty and setInput()
-     * should be called in order to provide more input.
+     * Returns true if no data remains in the input buffer. This can
+     * be used to determine if one of the {@code setInput()} methods should be
+     * called in order to provide more input.
+     *
      * @return true if the input data buffer is empty and setInput()
      * should be called in order to provide more input
      */
     public boolean needsInput() {
         synchronized (zsRef) {
-            return len <= 0;
+            ByteBuffer input = this.input;
+            return input == null ? inputLim == inputPos : ! input.hasRemaining();
         }
     }
 
@@ -375,14 +464,14 @@ public boolean finished() {
      * yields the same result as the invocation of
      * {@code deflater.deflate(b, off, len, Deflater.NO_FLUSH)}.
      *
-     * @param b the buffer for the compressed data
+     * @param output the buffer for the compressed data
      * @param off the start offset of the data
      * @param len the maximum number of bytes of compressed data
      * @return the actual number of bytes of compressed data written to the
      *         output buffer
      */
-    public int deflate(byte[] b, int off, int len) {
-        return deflate(b, off, len, NO_FLUSH);
+    public int deflate(byte[] output, int off, int len) {
+        return deflate(output, off, len, NO_FLUSH);
     }
 
     /**
@@ -396,12 +485,32 @@ public int deflate(byte[] b, int off, int len) {
      * yields the same result as the invocation of
      * {@code deflater.deflate(b, 0, b.length, Deflater.NO_FLUSH)}.
      *
-     * @param b the buffer for the compressed data
+     * @param output the buffer for the compressed data
+     * @return the actual number of bytes of compressed data written to the
+     *         output buffer
+     */
+    public int deflate(byte[] output) {
+        return deflate(output, 0, output.length, NO_FLUSH);
+    }
+
+    /**
+     * Compresses the input data and fills specified buffer with compressed
+     * data. Returns actual number of bytes of compressed data. A return value
+     * of 0 indicates that {@link #needsInput() needsInput} should be called
+     * in order to determine if more input data is required.
+     *
+     * <p>This method uses {@link #NO_FLUSH} as its compression flush mode.
+     * An invocation of this method of the form {@code deflater.deflate(output)}
+     * yields the same result as the invocation of
+     * {@code deflater.deflate(output, Deflater.NO_FLUSH)}.
+     *
+     * @param output the buffer for the compressed data
      * @return the actual number of bytes of compressed data written to the
      *         output buffer
+     * @since 11
      */
-    public int deflate(byte[] b) {
-        return deflate(b, 0, b.length, NO_FLUSH);
+    public int deflate(ByteBuffer output) {
+        return deflate(output, NO_FLUSH);
     }
 
     /**
@@ -441,7 +550,11 @@ public int deflate(byte[] b) {
      * repeatedly output to the output buffer every time this method is
      * invoked.
      *
-     * @param b the buffer for the compressed data
+     * <p>If the {@link #setInput(ByteBuffer)} method was called to provide a buffer
+     * for input, the input buffer's position will be advanced by the number of bytes
+     * consumed by this operation.
+     *
+     * @param output the buffer for the compressed data
      * @param off the start offset of the data
      * @param len the maximum number of bytes of compressed data
      * @param flush the compression flush mode
@@ -451,25 +564,248 @@ public int deflate(byte[] b) {
      * @throws IllegalArgumentException if the flush mode is invalid
      * @since 1.7
      */
-    public int deflate(byte[] b, int off, int len, int flush) {
-        if (b == null) {
-            throw new NullPointerException();
-        }
-        if (off < 0 || len < 0 || off > b.length - len) {
+    public int deflate(byte[] output, int off, int len, int flush) {
+        if (off < 0 || len < 0 || off > output.length - len) {
             throw new ArrayIndexOutOfBoundsException();
         }
+        if (flush != NO_FLUSH && flush != SYNC_FLUSH && flush != FULL_FLUSH) {
+            throw new IllegalArgumentException();
+        }
         synchronized (zsRef) {
             ensureOpen();
-            if (flush == NO_FLUSH || flush == SYNC_FLUSH ||
-                flush == FULL_FLUSH) {
-                int thisLen = this.len;
-                int n = deflateBytes(zsRef.address(), b, off, len, flush);
-                bytesWritten += n;
-                bytesRead += (thisLen - this.len);
-                return n;
+
+            ByteBuffer input = this.input;
+            if (finish) {
+                // disregard given flush mode in this case
+                flush = FINISH;
+            }
+            int params;
+            if (setParams) {
+                // bit 0: true to set params
+                // bit 1-2: strategy (0, 1, or 2)
+                // bit 3-31: level (0..9 or -1)
+                params = 1 | strategy << 1 | level << 3;
+            } else {
+                params = 0;
+            }
+            int inputPos;
+            long result;
+            if (input == null) {
+                inputPos = this.inputPos;
+                result = deflateBytesBytes(zsRef.address(),
+                    inputArray, inputPos, inputLim - inputPos,
+                    output, off, len,
+                    flush, params);
+            } else {
+                inputPos = input.position();
+                int inputRem = Math.max(input.limit() - inputPos, 0);
+                if (input.isDirect()) {
+                    try {
+                        long inputAddress = ((DirectBuffer) input).address();
+                        result = deflateBufferBytes(zsRef.address(),
+                            inputAddress + inputPos, inputRem,
+                            output, off, len,
+                            flush, params);
+                    } finally {
+                        Reference.reachabilityFence(input);
+                    }
+                } else {
+                    byte[] inputArray = ZipUtils.getBufferArray(input);
+                    int inputOffset = ZipUtils.getBufferOffset(input);
+                    result = deflateBytesBytes(zsRef.address(),
+                        inputArray, inputOffset + inputPos, inputRem,
+                        output, off, len,
+                        flush, params);
+                }
+            }
+            int read = (int) (result & 0x7fff_ffffL);
+            int written = (int) (result >>> 31 & 0x7fff_ffffL);
+            if ((result >>> 62 & 1) != 0) {
+                finished = true;
+            }
+            if (params != 0 && (result >>> 63 & 1) == 0) {
+                setParams = false;
             }
+            if (input != null) {
+                input.position(inputPos + read);
+            } else {
+                this.inputPos = inputPos + read;
+            }
+            bytesWritten += written;
+            bytesRead += read;
+            return written;
+        }
+    }
+
+    /**
+     * Compresses the input data and fills the specified buffer with compressed
+     * data. Returns actual number of bytes of data compressed.
+     *
+     * <p>Compression flush mode is one of the following three modes:
+     *
+     * <ul>
+     * <li>{@link #NO_FLUSH}: allows the deflater to decide how much data
+     * to accumulate, before producing output, in order to achieve the best
+     * compression (should be used in normal use scenario). A return value
+     * of 0 in this flush mode indicates that {@link #needsInput()} should
+     * be called in order to determine if more input data is required.
+     *
+     * <li>{@link #SYNC_FLUSH}: all pending output in the deflater is flushed,
+     * to the specified output buffer, so that an inflater that works on
+     * compressed data can get all input data available so far (In particular
+     * the {@link #needsInput()} returns {@code true} after this invocation
+     * if enough output space is provided). Flushing with {@link #SYNC_FLUSH}
+     * may degrade compression for some compression algorithms and so it
+     * should be used only when necessary.
+     *
+     * <li>{@link #FULL_FLUSH}: all pending output is flushed out as with
+     * {@link #SYNC_FLUSH}. The compression state is reset so that the inflater
+     * that works on the compressed output data can restart from this point
+     * if previous compressed data has been damaged or if random access is
+     * desired. Using {@link #FULL_FLUSH} too often can seriously degrade
+     * compression.
+     * </ul>
+     *
+     * <p>In the case of {@link #FULL_FLUSH} or {@link #SYNC_FLUSH}, if
+     * the return value is equal to the {@linkplain ByteBuffer#remaining() remaining space}
+     * of the buffer, this method should be invoked again with the same
+     * {@code flush} parameter and more output space. Make sure that
+     * the buffer has at least 6 bytes of remaining space to avoid the
+     * flush marker (5 bytes) being repeatedly output to the output buffer
+     * every time this method is invoked.
+     *
+     * <p>On success, the position of the given {@code output} byte buffer will be
+     * advanced by as many bytes as were produced by the operation, which is equal
+     * to the number returned by this method.
+     *
+     * <p>If the {@link #setInput(ByteBuffer)} method was called to provide a buffer
+     * for input, the input buffer's position will be advanced by the number of bytes
+     * consumed by this operation.
+     *
+     * @param output the buffer for the compressed data
+     * @param flush the compression flush mode
+     * @return the actual number of bytes of compressed data written to
+     *         the output buffer
+     *
+     * @throws IllegalArgumentException if the flush mode is invalid
+     * @since 11
+     */
+    public int deflate(ByteBuffer output, int flush) {
+        if (output.isReadOnly()) {
+            throw new ReadOnlyBufferException();
+        }
+        if (flush != NO_FLUSH && flush != SYNC_FLUSH && flush != FULL_FLUSH) {
             throw new IllegalArgumentException();
         }
+        synchronized (zsRef) {
+            ensureOpen();
+
+            ByteBuffer input = this.input;
+            if (finish) {
+                // disregard given flush mode in this case
+                flush = FINISH;
+            }
+            int params;
+            if (setParams) {
+                // bit 0: true to set params
+                // bit 1-2: strategy (0, 1, or 2)
+                // bit 3-31: level (0..9 or -1)
+                params = 1 | strategy << 1 | level << 3;
+            } else {
+                params = 0;
+            }
+            int outputPos = output.position();
+            int outputRem = Math.max(output.limit() - outputPos, 0);
+            int inputPos;
+            long result;
+            if (input == null) {
+                inputPos = this.inputPos;
+                if (output.isDirect()) {
+                    long outputAddress = ((DirectBuffer) output).address();
+                    try {
+                        result = deflateBytesBuffer(zsRef.address(),
+                            inputArray, inputPos, inputLim - inputPos,
+                            outputAddress + outputPos, outputRem,
+                            flush, params);
+                    } finally {
+                        Reference.reachabilityFence(output);
+                    }
+                } else {
+                    byte[] outputArray = ZipUtils.getBufferArray(output);
+                    int outputOffset = ZipUtils.getBufferOffset(output);
+                    result = deflateBytesBytes(zsRef.address(),
+                        inputArray, inputPos, inputLim - inputPos,
+                        outputArray, outputOffset + outputPos, outputRem,
+                        flush, params);
+                }
+            } else {
+                inputPos = input.position();
+                int inputRem = Math.max(input.limit() - inputPos, 0);
+                if (input.isDirect()) {
+                    long inputAddress = ((DirectBuffer) input).address();
+                    try {
+                        if (output.isDirect()) {
+                            long outputAddress = outputPos + ((DirectBuffer) output).address();
+                            try {
+                                result = deflateBufferBuffer(zsRef.address(),
+                                    inputAddress + inputPos, inputRem,
+                                    outputAddress, outputRem,
+                                    flush, params);
+                            } finally {
+                                Reference.reachabilityFence(output);
+                            }
+                        } else {
+                            byte[] outputArray = ZipUtils.getBufferArray(output);
+                            int outputOffset = ZipUtils.getBufferOffset(output);
+                            result = deflateBufferBytes(zsRef.address(),
+                                inputAddress + inputPos, inputRem,
+                                outputArray, outputOffset + outputPos, outputRem,
+                                flush, params);
+                        }
+                    } finally {
+                        Reference.reachabilityFence(input);
+                    }
+                } else {
+                    byte[] inputArray = ZipUtils.getBufferArray(input);
+                    int inputOffset = ZipUtils.getBufferOffset(input);
+                    if (output.isDirect()) {
+                        long outputAddress = ((DirectBuffer) output).address();
+                        try {
+                            result = deflateBytesBuffer(zsRef.address(),
+                                inputArray, inputOffset + inputPos, inputRem,
+                                outputAddress + outputPos, outputRem,
+                                flush, params);
+                        } finally {
+                            Reference.reachabilityFence(output);
+                        }
+                    } else {
+                        byte[] outputArray = ZipUtils.getBufferArray(output);
+                        int outputOffset = ZipUtils.getBufferOffset(output);
+                        result = deflateBytesBytes(zsRef.address(),
+                            inputArray, inputOffset + inputPos, inputRem,
+                            outputArray, outputOffset + outputPos, outputRem,
+                            flush, params);
+                    }
+                }
+            }
+            int read = (int) (result & 0x7fff_ffffL);
+            int written = (int) (result >>> 31 & 0x7fff_ffffL);
+            if ((result >>> 62 & 1) != 0) {
+                finished = true;
+            }
+            if (params != 0 && (result >>> 63 & 1) == 0) {
+                setParams = false;
+            }
+            if (input != null) {
+                input.position(inputPos + read);
+            } else {
+                this.inputPos = inputPos + read;
+            }
+            output.position(outputPos + written);
+            bytesWritten += written;
+            bytesRead += read;
+            return written;
+        }
     }
 
     /**
@@ -545,7 +881,8 @@ public void reset() {
             reset(zsRef.address());
             finish = false;
             finished = false;
-            off = len = 0;
+            input = ZipUtils.defaultBuf;
+            inputArray = null;
             bytesRead = bytesWritten = 0;
         }
     }
@@ -560,7 +897,7 @@ public void reset() {
     public void end() {
         synchronized (zsRef) {
             zsRef.clean();
-            buf = null;
+            input = ZipUtils.defaultBuf;
         }
     }
 
@@ -585,11 +922,26 @@ private void ensureOpen() {
             throw new NullPointerException("Deflater has been closed");
     }
 
-    private static native void initIDs();
     private static native long init(int level, int strategy, boolean nowrap);
-    private static native void setDictionary(long addr, byte[] b, int off, int len);
-    private native int deflateBytes(long addr, byte[] b, int off, int len,
-                                    int flush);
+    private static native void setDictionary(long addr, byte[] b, int off,
+                                             int len);
+    private static native void setDictionaryBuffer(long addr, long bufAddress, int len);
+    private native long deflateBytesBytes(long addr,
+        byte[] inputArray, int inputOff, int inputLen,
+        byte[] outputArray, int outputOff, int outputLen,
+        int flush, int params);
+    private native long deflateBytesBuffer(long addr,
+        byte[] inputArray, int inputOff, int inputLen,
+        long outputAddress, int outputLen,
+        int flush, int params);
+    private native long deflateBufferBytes(long addr,
+        long inputAddress, int inputLen,
+        byte[] outputArray, int outputOff, int outputLen,
+        int flush, int params);
+    private native long deflateBufferBuffer(long addr,
+        long inputAddress, int inputLen,
+        long outputAddress, int outputLen,
+        int flush, int params);
     private static native int getAdler(long addr);
     private static native void reset(long addr);
     private static native void end(long addr);
diff --git a/src/java.base/share/classes/java/util/zip/Inflater.java b/src/java.base/share/classes/java/util/zip/Inflater.java
index 9c6d8aa3d83..071aa9889c0 100644
--- a/src/java.base/share/classes/java/util/zip/Inflater.java
+++ b/src/java.base/share/classes/java/util/zip/Inflater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -26,7 +26,13 @@
 package java.util.zip;
 
 import java.lang.ref.Cleaner.Cleanable;
+import java.lang.ref.Reference;
+import java.nio.ByteBuffer;
+import java.nio.ReadOnlyBufferException;
+import java.util.Objects;
+
 import jdk.internal.ref.CleanerFactory;
+import sun.nio.ch.DirectBuffer;
 
 /**
  * This class provides support for general purpose decompression using the
@@ -35,8 +41,13 @@
  * protected by patents. It is fully described in the specifications at
  * the <a href="package-summary.html#package.description">java.util.zip
  * package description</a>.
- *
- * <p>The following code fragment demonstrates a trivial compression
+ * <p>
+ * This class inflates sequences of ZLIB compressed bytes. The input byte
+ * sequence is provided in either byte array or byte buffer, via one of the
+ * {@code setInput()} methods. The output byte sequence is written to the
+ * output byte array or byte buffer passed to the {@code deflate()} methods.
+ * <p>
+ * The following code fragment demonstrates a trivial compression
  * and decompression of a string using {@code Deflater} and
  * {@code Inflater}.
  *
@@ -92,14 +103,20 @@
 public class Inflater {
 
     private final InflaterZStreamRef zsRef;
-    private byte[] buf = defaultBuf;
-    private int off, len;
+    private ByteBuffer input = ZipUtils.defaultBuf;
+    private byte[] inputArray;
+    private int inputPos, inputLim;
     private boolean finished;
     private boolean needDict;
     private long bytesRead;
     private long bytesWritten;
 
-    private static final byte[] defaultBuf = new byte[0];
+    /*
+     * These fields are used as an "out" parameter from JNI when a
+     * DataFormatException is thrown during the inflate operation.
+     */
+    private int inputConsumed;
+    private int outputConsumed;
 
     static {
         ZipUtils.loadLibrary();
@@ -129,37 +146,71 @@ public Inflater() {
     }
 
     /**
-     * Sets input data for decompression. Should be called whenever
-     * needsInput() returns true indicating that more input data is
-     * required.
-     * @param b the input data bytes
+     * Sets input data for decompression.
+     * <p>
+     * One of the {@code setInput()} methods should be called whenever
+     * {@code needsInput()} returns true indicating that more input data
+     * is required.
+     *
+     * @param input the input data bytes
      * @param off the start offset of the input data
      * @param len the length of the input data
      * @see Inflater#needsInput
      */
-    public void setInput(byte[] b, int off, int len) {
-        if (b == null) {
-            throw new NullPointerException();
-        }
-        if (off < 0 || len < 0 || off > b.length - len) {
+    public void setInput(byte[] input, int off, int len) {
+        if (off < 0 || len < 0 || off > input.length - len) {
             throw new ArrayIndexOutOfBoundsException();
         }
         synchronized (zsRef) {
-            this.buf = b;
-            this.off = off;
-            this.len = len;
+            this.input = null;
+            this.inputArray = input;
+            this.inputPos = off;
+            this.inputLim = off + len;
         }
     }
 
     /**
-     * Sets input data for decompression. Should be called whenever
-     * needsInput() returns true indicating that more input data is
-     * required.
-     * @param b the input data bytes
+     * Sets input data for decompression.
+     * <p>
+     * One of the {@code setInput()} methods should be called whenever
+     * {@code needsInput()} returns true indicating that more input data
+     * is required.
+     *
+     * @param input the input data bytes
+     * @see Inflater#needsInput
+     */
+    public void setInput(byte[] input) {
+        setInput(input, 0, input.length);
+    }
+
+    /**
+     * Sets input data for decompression.
+     * <p>
+     * One of the {@code setInput()} methods should be called whenever
+     * {@code needsInput()} returns true indicating that more input data
+     * is required.
+     * <p>
+     * The given buffer's position will be advanced as inflate
+     * operations are performed, up to the buffer's limit.
+     * The input buffer may be modified (refilled) between inflate
+     * operations; doing so is equivalent to creating a new buffer
+     * and setting it with this method.
+     * <p>
+     * Modifying the input buffer's contents, position, or limit
+     * concurrently with an inflate operation will result in
+     * undefined behavior, which may include incorrect operation
+     * results or operation failure.
+     *
+     * @param input the input data bytes
      * @see Inflater#needsInput
+     * @since 11
      */
-    public void setInput(byte[] b) {
-        setInput(b, 0, b.length);
+    public void setInput(ByteBuffer input) {
+        Objects.requireNonNull(input);
+        synchronized (zsRef) {
+            this.input = input;
+            this.inputArray = null;
+        }
     }
 
     /**
@@ -167,22 +218,19 @@ public void setInput(byte[] b) {
      * called when inflate() returns 0 and needsDictionary() returns true
      * indicating that a preset dictionary is required. The method getAdler()
      * can be used to get the Adler-32 value of the dictionary needed.
-     * @param b the dictionary data bytes
+     * @param dictionary the dictionary data bytes
      * @param off the start offset of the data
      * @param len the length of the data
      * @see Inflater#needsDictionary
      * @see Inflater#getAdler
      */
-    public void setDictionary(byte[] b, int off, int len) {
-        if (b == null) {
-            throw new NullPointerException();
-        }
-        if (off < 0 || len < 0 || off > b.length - len) {
+    public void setDictionary(byte[] dictionary, int off, int len) {
+        if (off < 0 || len < 0 || off > dictionary.length - len) {
             throw new ArrayIndexOutOfBoundsException();
         }
         synchronized (zsRef) {
             ensureOpen();
-            setDictionary(zsRef.address(), b, off, len);
+            setDictionary(zsRef.address(), dictionary, off, len);
             needDict = false;
         }
     }
@@ -192,12 +240,48 @@ public void setDictionary(byte[] b, int off, int len) {
      * called when inflate() returns 0 and needsDictionary() returns true
      * indicating that a preset dictionary is required. The method getAdler()
      * can be used to get the Adler-32 value of the dictionary needed.
-     * @param b the dictionary data bytes
+     * @param dictionary the dictionary data bytes
      * @see Inflater#needsDictionary
      * @see Inflater#getAdler
      */
-    public void setDictionary(byte[] b) {
-        setDictionary(b, 0, b.length);
+    public void setDictionary(byte[] dictionary) {
+        setDictionary(dictionary, 0, dictionary.length);
+    }
+
+    /**
+     * Sets the preset dictionary to the bytes in the given buffer. Should be
+     * called when inflate() returns 0 and needsDictionary() returns true
+     * indicating that a preset dictionary is required. The method getAdler()
+     * can be used to get the Adler-32 value of the dictionary needed.
+     * <p>
+     * The bytes in given byte buffer will be fully consumed by this method.  On
+     * return, its position will equal its limit.
+     *
+     * @param dictionary the dictionary data bytes
+     * @see Inflater#needsDictionary
+     * @see Inflater#getAdler
+     * @since 11
+     */
+    public void setDictionary(ByteBuffer dictionary) {
+        synchronized (zsRef) {
+            int position = dictionary.position();
+            int remaining = Math.max(dictionary.limit() - position, 0);
+            ensureOpen();
+            if (dictionary.isDirect()) {
+                long address = ((DirectBuffer) dictionary).address();
+                try {
+                    setDictionaryBuffer(zsRef.address(), address + position, remaining);
+                } finally {
+                    Reference.reachabilityFence(dictionary);
+                }
+            } else {
+                byte[] array = ZipUtils.getBufferArray(dictionary);
+                int offset = ZipUtils.getBufferOffset(dictionary);
+                setDictionary(zsRef.address(), array, offset + position, remaining);
+            }
+            dictionary.position(position + remaining);
+            needDict = false;
+        }
     }
 
     /**
@@ -208,19 +292,22 @@ public void setDictionary(byte[] b) {
      */
     public int getRemaining() {
         synchronized (zsRef) {
-            return len;
+            ByteBuffer input = this.input;
+            return input == null ? inputLim - inputPos : input.remaining();
         }
     }
 
     /**
      * Returns true if no data remains in the input buffer. This can
-     * be used to determine if #setInput should be called in order
-     * to provide more input.
+     * be used to determine if one of the {@code setInput()} methods should be
+     * called in order to provide more input.
+     *
      * @return true if no data remains in the input buffer
      */
     public boolean needsInput() {
         synchronized (zsRef) {
-            return len <= 0;
+            ByteBuffer input = this.input;
+            return input == null ? inputLim == inputPos : ! input.hasRemaining();
         }
     }
 
@@ -254,30 +341,103 @@ public boolean finished() {
      * determine if more input data or a preset dictionary is required.
      * In the latter case, getAdler() can be used to get the Adler-32
      * value of the dictionary required.
-     * @param b the buffer for the uncompressed data
+     * <p>
+     * If the {@link #setInput(ByteBuffer)} method was called to provide a buffer
+     * for input, the input buffer's position will be advanced by the number of bytes
+     * consumed by this operation, even in the event that a {@link DataFormatException}
+     * is thrown.
+     * <p>
+     * The {@linkplain #getRemaining() remaining byte count} will be reduced by
+     * the number of consumed input bytes.  If the {@link #setInput(ByteBuffer)}
+     * method was called to provide a buffer for input, the input buffer's position
+     * will be advanced the number of consumed bytes.
+     * <p>
+     * These byte totals, as well as
+     * the {@linkplain #getBytesRead() total bytes read}
+     * and the {@linkplain #getBytesWritten() total bytes written}
+     * values, will be updated even in the event that a {@link DataFormatException}
+     * is thrown to reflect the amount of data consumed and produced before the
+     * exception occurred.
+     *
+     * @param output the buffer for the uncompressed data
      * @param off the start offset of the data
      * @param len the maximum number of uncompressed bytes
      * @return the actual number of uncompressed bytes
-     * @exception DataFormatException if the compressed data format is invalid
+     * @throws DataFormatException if the compressed data format is invalid
      * @see Inflater#needsInput
      * @see Inflater#needsDictionary
      */
-    public int inflate(byte[] b, int off, int len)
+    public int inflate(byte[] output, int off, int len)
         throws DataFormatException
     {
-        if (b == null) {
-            throw new NullPointerException();
-        }
-        if (off < 0 || len < 0 || off > b.length - len) {
+        if (off < 0 || len < 0 || off > output.length - len) {
             throw new ArrayIndexOutOfBoundsException();
         }
         synchronized (zsRef) {
             ensureOpen();
-            int thisLen = this.len;
-            int n = inflateBytes(zsRef.address(), b, off, len);
-            bytesWritten += n;
-            bytesRead += (thisLen - this.len);
-            return n;
+            ByteBuffer input = this.input;
+            long result;
+            int inputPos;
+            try {
+                if (input == null) {
+                    inputPos = this.inputPos;
+                    try {
+                        result = inflateBytesBytes(zsRef.address(),
+                            inputArray, inputPos, inputLim - inputPos,
+                            output, off, len);
+                    } catch (DataFormatException e) {
+                        this.inputPos = inputPos + inputConsumed;
+                        throw e;
+                    }
+                } else {
+                    inputPos = input.position();
+                    try {
+                        int inputRem = Math.max(input.limit() - inputPos, 0);
+                        if (input.isDirect()) {
+                            try {
+                                long inputAddress = ((DirectBuffer) input).address();
+                                result = inflateBufferBytes(zsRef.address(),
+                                    inputAddress + inputPos, inputRem,
+                                    output, off, len);
+                            } finally {
+                                Reference.reachabilityFence(input);
+                            }
+                        } else {
+                            byte[] inputArray = ZipUtils.getBufferArray(input);
+                            int inputOffset = ZipUtils.getBufferOffset(input);
+                            result = inflateBytesBytes(zsRef.address(),
+                                inputArray, inputOffset + inputPos, inputRem,
+                                output, off, len);
+                        }
+                    } catch (DataFormatException e) {
+                        input.position(inputPos + inputConsumed);
+                        throw e;
+                    }
+                }
+            } catch (DataFormatException e) {
+                bytesRead += inputConsumed;
+                inputConsumed = 0;
+                int written = outputConsumed;
+                bytesWritten += written;
+                outputConsumed = 0;
+                throw e;
+            }
+            int read = (int) (result & 0x7fff_ffffL);
+            int written = (int) (result >>> 31 & 0x7fff_ffffL);
+            if ((result >>> 62 & 1) != 0) {
+                finished = true;
+            }
+            if ((result >>> 63 & 1) != 0) {
+                needDict = true;
+            }
+            if (input != null) {
+                input.position(inputPos + read);
+            } else {
+                this.inputPos = inputPos + read;
+            }
+            bytesWritten += written;
+            bytesRead += read;
+            return written;
         }
     }
 
@@ -288,14 +448,177 @@ public int inflate(byte[] b, int off, int len)
      * determine if more input data or a preset dictionary is required.
      * In the latter case, getAdler() can be used to get the Adler-32
      * value of the dictionary required.
-     * @param b the buffer for the uncompressed data
+     * <p>
+     * The {@linkplain #getRemaining() remaining byte count} will be reduced by
+     * the number of consumed input bytes.  If the {@link #setInput(ByteBuffer)}
+     * method was called to provide a buffer for input, the input buffer's position
+     * will be advanced the number of consumed bytes.
+     * <p>
+     * These byte totals, as well as
+     * the {@linkplain #getBytesRead() total bytes read}
+     * and the {@linkplain #getBytesWritten() total bytes written}
+     * values, will be updated even in the event that a {@link DataFormatException}
+     * is thrown to reflect the amount of data consumed and produced before the
+     * exception occurred.
+     *
+     * @param output the buffer for the uncompressed data
      * @return the actual number of uncompressed bytes
-     * @exception DataFormatException if the compressed data format is invalid
+     * @throws DataFormatException if the compressed data format is invalid
      * @see Inflater#needsInput
      * @see Inflater#needsDictionary
      */
-    public int inflate(byte[] b) throws DataFormatException {
-        return inflate(b, 0, b.length);
+    public int inflate(byte[] output) throws DataFormatException {
+        return inflate(output, 0, output.length);
+    }
+
+    /**
+     * Uncompresses bytes into specified buffer. Returns actual number
+     * of bytes uncompressed. A return value of 0 indicates that
+     * needsInput() or needsDictionary() should be called in order to
+     * determine if more input data or a preset dictionary is required.
+     * In the latter case, getAdler() can be used to get the Adler-32
+     * value of the dictionary required.
+     * <p>
+     * On success, the position of the given {@code output} byte buffer will be
+     * advanced by as many bytes as were produced by the operation, which is equal
+     * to the number returned by this method.  Note that the position of the
+     * {@code output} buffer will be advanced even in the event that a
+     * {@link DataFormatException} is thrown.
+     * <p>
+     * The {@linkplain #getRemaining() remaining byte count} will be reduced by
+     * the number of consumed input bytes.  If the {@link #setInput(ByteBuffer)}
+     * method was called to provide a buffer for input, the input buffer's position
+     * will be advanced the number of consumed bytes.
+     * <p>
+     * These byte totals, as well as
+     * the {@linkplain #getBytesRead() total bytes read}
+     * and the {@linkplain #getBytesWritten() total bytes written}
+     * values, will be updated even in the event that a {@link DataFormatException}
+     * is thrown to reflect the amount of data consumed and produced before the
+     * exception occurred.
+     *
+     * @param output the buffer for the uncompressed data
+     * @return the actual number of uncompressed bytes
+     * @throws DataFormatException if the compressed data format is invalid
+     * @throws ReadOnlyBufferException if the given output buffer is read-only
+     * @see Inflater#needsInput
+     * @see Inflater#needsDictionary
+     * @since 11
+     */
+    public int inflate(ByteBuffer output) throws DataFormatException {
+        if (output.isReadOnly()) {
+            throw new ReadOnlyBufferException();
+        }
+        synchronized (zsRef) {
+            ensureOpen();
+            ByteBuffer input = this.input;
+            long result;
+            int inputPos;
+            int outputPos = output.position();
+            int outputRem = Math.max(output.limit() - outputPos, 0);
+            try {
+                if (input == null) {
+                    inputPos = this.inputPos;
+                    try {
+                        if (output.isDirect()) {
+                            long outputAddress = ((DirectBuffer) output).address();
+                            try {
+                                result = inflateBytesBuffer(zsRef.address(),
+                                    inputArray, inputPos, inputLim - inputPos,
+                                    outputAddress + outputPos, outputRem);
+                            } finally {
+                                Reference.reachabilityFence(output);
+                            }
+                        } else {
+                            byte[] outputArray = ZipUtils.getBufferArray(output);
+                            int outputOffset = ZipUtils.getBufferOffset(output);
+                            result = inflateBytesBytes(zsRef.address(),
+                                inputArray, inputPos, inputLim - inputPos,
+                                outputArray, outputOffset + outputPos, outputRem);
+                        }
+                    } catch (DataFormatException e) {
+                        this.inputPos = inputPos + inputConsumed;
+                        throw e;
+                    }
+                } else {
+                    inputPos = input.position();
+                    int inputRem = Math.max(input.limit() - inputPos, 0);
+                    try {
+                        if (input.isDirect()) {
+                            long inputAddress = ((DirectBuffer) input).address();
+                            try {
+                                if (output.isDirect()) {
+                                    long outputAddress = ((DirectBuffer) output).address();
+                                    try {
+                                        result = inflateBufferBuffer(zsRef.address(),
+                                            inputAddress + inputPos, inputRem,
+                                            outputAddress + outputPos, outputRem);
+                                    } finally {
+                                        Reference.reachabilityFence(output);
+                                    }
+                                } else {
+                                    byte[] outputArray = ZipUtils.getBufferArray(output);
+                                    int outputOffset = ZipUtils.getBufferOffset(output);
+                                    result = inflateBufferBytes(zsRef.address(),
+                                        inputAddress + inputPos, inputRem,
+                                        outputArray, outputOffset + outputPos, outputRem);
+                                }
+                            } finally {
+                                Reference.reachabilityFence(input);
+                            }
+                        } else {
+                            byte[] inputArray = ZipUtils.getBufferArray(input);
+                            int inputOffset = ZipUtils.getBufferOffset(input);
+                            if (output.isDirect()) {
+                                long outputAddress = ((DirectBuffer) output).address();
+                                try {
+                                    result = inflateBytesBuffer(zsRef.address(),
+                                        inputArray, inputOffset + inputPos, inputRem,
+                                        outputAddress + outputPos, outputRem);
+                                } finally {
+                                    Reference.reachabilityFence(output);
+                                }
+                            } else {
+                                byte[] outputArray = ZipUtils.getBufferArray(output);
+                                int outputOffset = ZipUtils.getBufferOffset(output);
+                                result = inflateBytesBytes(zsRef.address(),
+                                    inputArray, inputOffset + inputPos, inputRem,
+                                    outputArray, outputOffset + outputPos, outputRem);
+                            }
+                        }
+                    } catch (DataFormatException e) {
+                        input.position(inputPos + inputConsumed);
+                        throw e;
+                    }
+                }
+            } catch (DataFormatException e) {
+                bytesRead += inputConsumed;
+                inputConsumed = 0;
+                int written = outputConsumed;
+                output.position(outputPos + written);
+                bytesWritten += written;
+                outputConsumed = 0;
+                throw e;
+            }
+            int read = (int) (result & 0x7fff_ffffL);
+            int written = (int) (result >>> 31 & 0x7fff_ffffL);
+            if ((result >>> 62 & 1) != 0) {
+                finished = true;
+            }
+            if ((result >>> 63 & 1) != 0) {
+                needDict = true;
+            }
+            if (input != null) {
+                input.position(inputPos + read);
+            } else {
+                this.inputPos = inputPos + read;
+            }
+            // Note: this method call also serves to keep the byteBuffer ref alive
+            output.position(outputPos + written);
+            bytesWritten += written;
+            bytesRead += read;
+            return written;
+        }
     }
 
     /**
@@ -368,10 +691,10 @@ public void reset() {
         synchronized (zsRef) {
             ensureOpen();
             reset(zsRef.address());
-            buf = defaultBuf;
+            input = ZipUtils.defaultBuf;
+            inputArray = null;
             finished = false;
             needDict = false;
-            off = len = 0;
             bytesRead = bytesWritten = 0;
         }
     }
@@ -386,7 +709,8 @@ public void reset() {
     public void end() {
         synchronized (zsRef) {
             zsRef.clean();
-            buf = null;
+            input = ZipUtils.defaultBuf;
+            inputArray = null;
         }
     }
 
@@ -416,18 +740,23 @@ private void ensureOpen () {
             throw new NullPointerException("Inflater has been closed");
     }
 
-    boolean ended() {
-        synchronized (zsRef) {
-            return zsRef.address() == 0;
-        }
-    }
-
     private static native void initIDs();
     private static native long init(boolean nowrap);
     private static native void setDictionary(long addr, byte[] b, int off,
                                              int len);
-    private native int inflateBytes(long addr, byte[] b, int off, int len)
-            throws DataFormatException;
+    private static native void setDictionaryBuffer(long addr, long bufAddress, int len);
+    private native long inflateBytesBytes(long addr,
+        byte[] inputArray, int inputOff, int inputLen,
+        byte[] outputArray, int outputOff, int outputLen) throws DataFormatException;
+    private native long inflateBytesBuffer(long addr,
+        byte[] inputArray, int inputOff, int inputLen,
+        long outputAddress, int outputLen) throws DataFormatException;
+    private native long inflateBufferBytes(long addr,
+        long inputAddress, int inputLen,
+        byte[] outputArray, int outputOff, int outputLen) throws DataFormatException;
+    private native long inflateBufferBuffer(long addr,
+        long inputAddress, int inputLen,
+        long outputAddress, int outputLen) throws DataFormatException;
     private static native int getAdler(long addr);
     private static native void reset(long addr);
     private static native void end(long addr);
diff --git a/src/java.base/share/classes/java/util/zip/ZipUtils.java b/src/java.base/share/classes/java/util/zip/ZipUtils.java
index 45c5d8dbb67..18b072d6cbc 100644
--- a/src/java.base/share/classes/java/util/zip/ZipUtils.java
+++ b/src/java.base/share/classes/java/util/zip/ZipUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -25,6 +25,8 @@
 
 package java.util.zip;
 
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
 import java.nio.file.attribute.FileTime;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -37,6 +39,9 @@
 
 import static java.util.zip.ZipConstants.ENDHDR;
 
+import jdk.internal.misc.Unsafe;
+import sun.nio.ch.DirectBuffer;
+
 class ZipUtils {
 
     // used to adjust values between Windows and java epoch
@@ -45,6 +50,9 @@ class ZipUtils {
     // used to indicate the corresponding windows time is not available
     public static final long WINDOWS_TIME_NOT_AVAILABLE = Long.MIN_VALUE;
 
+    // static final ByteBuffer defaultBuf = ByteBuffer.allocateDirect(0);
+    static final ByteBuffer defaultBuf = ByteBuffer.allocate(0);
+
     /**
      * Converts Windows time (in microseconds, UTC/GMT) time to FileTime.
      */
@@ -281,4 +289,17 @@ static void loadLibrary() {
             AccessController.doPrivileged(pa);
         }
     }
+
+    private static final Unsafe unsafe = Unsafe.getUnsafe();
+
+    private static final long byteBufferArrayOffset = unsafe.objectFieldOffset(ByteBuffer.class, "hb");
+    private static final long byteBufferOffsetOffset = unsafe.objectFieldOffset(ByteBuffer.class, "offset");
+
+    static byte[] getBufferArray(ByteBuffer byteBuffer) {
+        return (byte[]) unsafe.getObject(byteBuffer, byteBufferArrayOffset);
+    }
+
+    static int getBufferOffset(ByteBuffer byteBuffer) {
+        return unsafe.getInt(byteBuffer, byteBufferOffsetOffset);
+    }
 }
diff --git a/src/java.base/share/native/libzip/Deflater.c b/src/java.base/share/native/libzip/Deflater.c
index b666a16145a..bf204f1d68e 100644
--- a/src/java.base/share/native/libzip/Deflater.c
+++ b/src/java.base/share/native/libzip/Deflater.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -38,34 +38,6 @@
 
 #define DEF_MEM_LEVEL 8
 
-static jfieldID levelID;
-static jfieldID strategyID;
-static jfieldID setParamsID;
-static jfieldID finishID;
-static jfieldID finishedID;
-static jfieldID bufID, offID, lenID;
-
-JNIEXPORT void JNICALL
-Java_java_util_zip_Deflater_initIDs(JNIEnv *env, jclass cls)
-{
-    levelID = (*env)->GetFieldID(env, cls, "level", "I");
-    CHECK_NULL(levelID);
-    strategyID = (*env)->GetFieldID(env, cls, "strategy", "I");
-    CHECK_NULL(strategyID);
-    setParamsID = (*env)->GetFieldID(env, cls, "setParams", "Z");
-    CHECK_NULL(setParamsID);
-    finishID = (*env)->GetFieldID(env, cls, "finish", "Z");
-    CHECK_NULL(finishID);
-    finishedID = (*env)->GetFieldID(env, cls, "finished", "Z");
-    CHECK_NULL(finishedID);
-    bufID = (*env)->GetFieldID(env, cls, "buf", "[B");
-    CHECK_NULL(bufID);
-    offID = (*env)->GetFieldID(env, cls, "off", "I");
-    CHECK_NULL(offID);
-    lenID = (*env)->GetFieldID(env, cls, "len", "I");
-    CHECK_NULL(lenID);
-}
-
 JNIEXPORT jlong JNICALL
 Java_java_util_zip_Deflater_init(JNIEnv *env, jclass cls, jint level,
                                  jint strategy, jboolean nowrap)
@@ -104,17 +76,9 @@ Java_java_util_zip_Deflater_init(JNIEnv *env, jclass cls, jint level,
     }
 }
 
-JNIEXPORT void JNICALL
-Java_java_util_zip_Deflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
-                                          jarray b, jint off, jint len)
+static void doSetDictionary(JNIEnv *env, jlong addr, jbyte *buf, jint len)
 {
-    Bytef *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
-    int res;
-    if (buf == 0) {/* out of memory */
-        return;
-    }
-    res = deflateSetDictionary((z_stream *)jlong_to_ptr(addr), buf + off, len);
-    (*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0);
+    int res = deflateSetDictionary(jlong_to_ptr(addr), (Bytef *) buf, len);
     switch (res) {
     case Z_OK:
         break;
@@ -127,94 +91,173 @@ Java_java_util_zip_Deflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
     }
 }
 
-JNIEXPORT jint JNICALL
-Java_java_util_zip_Deflater_deflateBytes(JNIEnv *env, jobject this, jlong addr,
-                                         jarray b, jint off, jint len, jint flush)
+JNIEXPORT void JNICALL
+Java_java_util_zip_Deflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
+                                          jbyteArray b, jint off, jint len)
+{
+    jbyte *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
+    if (buf == NULL) /* out of memory */
+        return;
+    doSetDictionary(env, addr, buf + off, len);
+    (*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0);
+}
+
+JNIEXPORT void JNICALL
+Java_java_util_zip_Deflater_setDictionaryBuffer(JNIEnv *env, jclass cls, jlong addr,
+                                          jlong bufferAddr, jint len)
+{
+    jbyte *buf = jlong_to_ptr(bufferAddr);
+    doSetDictionary(env, addr, buf, len);
+}
+
+static jlong doDeflate(JNIEnv *env, jobject this, jlong addr,
+                       jbyte *input, jint inputLen,
+                       jbyte *output, jint outputLen,
+                       jint flush, jint params)
 {
     z_stream *strm = jlong_to_ptr(addr);
+    jint inputUsed = 0, outputUsed = 0;
+    int finished = 0;
+    int setParams = params & 1;
 
-    jarray this_buf = (*env)->GetObjectField(env, this, bufID);
-    jint this_off = (*env)->GetIntField(env, this, offID);
-    jint this_len = (*env)->GetIntField(env, this, lenID);
-    jbyte *in_buf;
-    jbyte *out_buf;
-    int res;
-    if ((*env)->GetBooleanField(env, this, setParamsID)) {
-        int level = (*env)->GetIntField(env, this, levelID);
-        int strategy = (*env)->GetIntField(env, this, strategyID);
-        in_buf = (*env)->GetPrimitiveArrayCritical(env, this_buf, 0);
-        if (in_buf == NULL) {
-            // Throw OOME only when length is not zero
-            if (this_len != 0 && (*env)->ExceptionOccurred(env) == NULL)
-                JNU_ThrowOutOfMemoryError(env, 0);
-            return 0;
-        }
-        out_buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
-        if (out_buf == NULL) {
-            (*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
-            if (len != 0 && (*env)->ExceptionOccurred(env) == NULL)
-                JNU_ThrowOutOfMemoryError(env, 0);
-            return 0;
-        }
+    strm->next_in  = (Bytef *) input;
+    strm->next_out = (Bytef *) output;
+    strm->avail_in  = inputLen;
+    strm->avail_out = outputLen;
 
-        strm->next_in = (Bytef *) (in_buf + this_off);
-        strm->next_out = (Bytef *) (out_buf + off);
-        strm->avail_in = this_len;
-        strm->avail_out = len;
-        res = deflateParams(strm, level, strategy);
-        (*env)->ReleasePrimitiveArrayCritical(env, b, out_buf, 0);
-        (*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
+    if (setParams) {
+        int strategy = (params >> 1) & 3;
+        int level = params >> 3;
+        int res = deflateParams(strm, level, strategy);
         switch (res) {
         case Z_OK:
-            (*env)->SetBooleanField(env, this, setParamsID, JNI_FALSE);
+            setParams = 0;
+            /* fall through */
         case Z_BUF_ERROR:
-            this_off += this_len - strm->avail_in;
-            (*env)->SetIntField(env, this, offID, this_off);
-            (*env)->SetIntField(env, this, lenID, strm->avail_in);
-            return (jint) (len - strm->avail_out);
+            inputUsed = inputLen - strm->avail_in;
+            outputUsed = outputLen - strm->avail_out;
+            break;
         default:
             JNU_ThrowInternalError(env, strm->msg);
             return 0;
         }
     } else {
-        jboolean finish = (*env)->GetBooleanField(env, this, finishID);
-        in_buf = (*env)->GetPrimitiveArrayCritical(env, this_buf, 0);
-        if (in_buf == NULL) {
-            if (this_len != 0)
-                JNU_ThrowOutOfMemoryError(env, 0);
-            return 0;
-        }
-        out_buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
-        if (out_buf == NULL) {
-            (*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
-            if (len != 0)
-                JNU_ThrowOutOfMemoryError(env, 0);
-
-            return 0;
-        }
-
-        strm->next_in = (Bytef *) (in_buf + this_off);
-        strm->next_out = (Bytef *) (out_buf + off);
-        strm->avail_in = this_len;
-        strm->avail_out = len;
-        res = deflate(strm, finish ? Z_FINISH : flush);
-        (*env)->ReleasePrimitiveArrayCritical(env, b, out_buf, 0);
-        (*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
+        int res = deflate(strm, flush);
         switch (res) {
         case Z_STREAM_END:
-            (*env)->SetBooleanField(env, this, finishedID, JNI_TRUE);
+            finished = 1;
             /* fall through */
         case Z_OK:
         case Z_BUF_ERROR:
-            this_off += this_len - strm->avail_in;
-            (*env)->SetIntField(env, this, offID, this_off);
-            (*env)->SetIntField(env, this, lenID, strm->avail_in);
-            return len - strm->avail_out;
+            inputUsed = inputLen - strm->avail_in;
+            outputUsed = outputLen - strm->avail_out;
+            break;
         default:
             JNU_ThrowInternalError(env, strm->msg);
             return 0;
         }
     }
+    return ((jlong)inputUsed) | (((jlong)outputUsed) << 31) | (((jlong)finished) << 62) | (((jlong)setParams) << 63);
+}
+
+JNIEXPORT jlong JNICALL
+Java_java_util_zip_Deflater_deflateBytesBytes(JNIEnv *env, jobject this, jlong addr,
+                                         jbyteArray inputArray, jint inputOff, jint inputLen,
+                                         jbyteArray outputArray, jint outputOff, jint outputLen,
+                                         jint flush, jint params)
+{
+    jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
+    jbyte *output;
+    jlong retVal;
+    if (input == NULL) {
+        if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
+            JNU_ThrowOutOfMemoryError(env, 0);
+        return 0L;
+    }
+    output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
+    if (output == NULL) {
+        (*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
+        if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
+            JNU_ThrowOutOfMemoryError(env, 0);
+        return 0L;
+    }
+
+    retVal = doDeflate(env, this, addr,
+            input + inputOff, inputLen,
+            output + outputOff, outputLen,
+            flush, params);
+
+    (*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0);
+    (*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
+
+    return retVal;
+}
+
+
+JNIEXPORT jlong JNICALL
+Java_java_util_zip_Deflater_deflateBytesBuffer(JNIEnv *env, jobject this, jlong addr,
+                                         jbyteArray inputArray, jint inputOff, jint inputLen,
+                                         jlong outputBuffer, jint outputLen,
+                                         jint flush, jint params)
+{
+    jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
+    jbyte *output;
+    jlong retVal;
+    if (input == NULL) {
+        if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
+            JNU_ThrowOutOfMemoryError(env, 0);
+        return 0L;
+    }
+    output = jlong_to_ptr(outputBuffer);
+
+    retVal = doDeflate(env, this, addr,
+            input + inputOff, inputLen,
+            output, outputLen,
+            flush, params);
+
+    (*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
+
+    return retVal;
+}
+
+JNIEXPORT jlong JNICALL
+Java_java_util_zip_Deflater_deflateBufferBytes(JNIEnv *env, jobject this, jlong addr,
+                                         jlong inputBuffer, jint inputLen,
+                                         jbyteArray outputArray, jint outputOff, jint outputLen,
+                                         jint flush, jint params)
+{
+    jbyte *input = jlong_to_ptr(inputBuffer);
+    jbyte *output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
+    jlong retVal;
+    if (output == NULL) {
+        if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
+            JNU_ThrowOutOfMemoryError(env, 0);
+        return 0L;
+    }
+
+    retVal = doDeflate(env, this, addr,
+            input, inputLen,
+            output + outputOff, outputLen,
+            flush, params);
+
+    (*env)->ReleasePrimitiveArrayCritical(env, outputArray, input, 0);
+
+    return retVal;
+}
+
+JNIEXPORT jlong JNICALL
+Java_java_util_zip_Deflater_deflateBufferBuffer(JNIEnv *env, jobject this, jlong addr,
+                                         jlong inputBuffer, jint inputLen,
+                                         jlong outputBuffer, jint outputLen,
+                                         jint flush, jint params)
+{
+    jbyte *input = jlong_to_ptr(inputBuffer);
+    jbyte *output = jlong_to_ptr(outputBuffer);
+
+    return doDeflate(env, this, addr,
+            input, inputLen,
+            output, outputLen,
+            flush, params);
 }
 
 JNIEXPORT jint JNICALL
diff --git a/src/java.base/share/native/libzip/Inflater.c b/src/java.base/share/native/libzip/Inflater.c
index 2e21d084b39..1b1040bd7fb 100644
--- a/src/java.base/share/native/libzip/Inflater.c
+++ b/src/java.base/share/native/libzip/Inflater.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -42,23 +42,16 @@
 #define ThrowDataFormatException(env, msg) \
         JNU_ThrowByName(env, "java/util/zip/DataFormatException", msg)
 
-static jfieldID needDictID;
-static jfieldID finishedID;
-static jfieldID bufID, offID, lenID;
+static jfieldID inputConsumedID;
+static jfieldID outputConsumedID;
 
 JNIEXPORT void JNICALL
 Java_java_util_zip_Inflater_initIDs(JNIEnv *env, jclass cls)
 {
-    needDictID = (*env)->GetFieldID(env, cls, "needDict", "Z");
-    CHECK_NULL(needDictID);
-    finishedID = (*env)->GetFieldID(env, cls, "finished", "Z");
-    CHECK_NULL(finishedID);
-    bufID = (*env)->GetFieldID(env, cls, "buf", "[B");
-    CHECK_NULL(bufID);
-    offID = (*env)->GetFieldID(env, cls, "off", "I");
-    CHECK_NULL(offID);
-    lenID = (*env)->GetFieldID(env, cls, "len", "I");
-    CHECK_NULL(lenID);
+    inputConsumedID = (*env)->GetFieldID(env, cls, "inputConsumed", "I");
+    outputConsumedID = (*env)->GetFieldID(env, cls, "outputConsumed", "I");
+    CHECK_NULL(inputConsumedID);
+    CHECK_NULL(outputConsumedID);
 }
 
 JNIEXPORT jlong JNICALL
@@ -94,16 +87,9 @@ Java_java_util_zip_Inflater_init(JNIEnv *env, jclass cls, jboolean nowrap)
     }
 }
 
-JNIEXPORT void JNICALL
-Java_java_util_zip_Inflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
-                                          jarray b, jint off, jint len)
+static void doSetDictionary(JNIEnv *env, jlong addr, jbyte *buf, jint len)
 {
-    Bytef *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
-    int res;
-    if (buf == 0) /* out of memory */
-        return;
-    res = inflateSetDictionary(jlong_to_ptr(addr), buf + off, len);
-    (*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0);
+    int res = inflateSetDictionary(jlong_to_ptr(addr), (Bytef *) buf, len);
     switch (res) {
     case Z_OK:
         break;
@@ -117,68 +103,168 @@ Java_java_util_zip_Inflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
     }
 }
 
-JNIEXPORT jint JNICALL
-Java_java_util_zip_Inflater_inflateBytes(JNIEnv *env, jobject this, jlong addr,
-                                         jarray b, jint off, jint len)
+JNIEXPORT void JNICALL
+Java_java_util_zip_Inflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
+                                          jbyteArray b, jint off, jint len)
 {
-    z_stream *strm = jlong_to_ptr(addr);
-    jarray this_buf = (jarray)(*env)->GetObjectField(env, this, bufID);
-    jint this_off = (*env)->GetIntField(env, this, offID);
-    jint this_len = (*env)->GetIntField(env, this, lenID);
+    jbyte *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
+    if (buf == NULL) /* out of memory */
+        return;
+    doSetDictionary(env, addr, buf + off, len);
+    (*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0);
+}
+
+JNIEXPORT void JNICALL
+Java_java_util_zip_Inflater_setDictionaryBuffer(JNIEnv *env, jclass cls, jlong addr,
+                                          jlong bufferAddr, jint len)
+{
+    jbyte *buf = jlong_to_ptr(bufferAddr);
+    doSetDictionary(env, addr, buf, len);
+}
 
-    jbyte *in_buf;
-    jbyte *out_buf;
+static jlong doInflate(JNIEnv *env, jobject this, jlong addr,
+                       jbyte *input, jint inputLen,
+                       jbyte *output, jint outputLen)
+{
+    z_stream *strm = jlong_to_ptr(addr);
+    jint inputUsed = 0, outputUsed = 0;
+    int finished = 0;
+    int needDict = 0;
     int ret;
 
-    in_buf  = (*env)->GetPrimitiveArrayCritical(env, this_buf, 0);
-    if (in_buf == NULL) {
-        if (this_len != 0 && (*env)->ExceptionOccurred(env) == NULL)
-            JNU_ThrowOutOfMemoryError(env, 0);
-        return 0;
-    }
-    out_buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
-    if (out_buf == NULL) {
-        (*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
-        if (len != 0 && (*env)->ExceptionOccurred(env) == NULL)
-            JNU_ThrowOutOfMemoryError(env, 0);
-        return 0;
-    }
-    strm->next_in  = (Bytef *) (in_buf + this_off);
-    strm->next_out = (Bytef *) (out_buf + off);
-    strm->avail_in  = this_len;
-    strm->avail_out = len;
+    strm->next_in  = (Bytef *) input;
+    strm->next_out = (Bytef *) output;
+    strm->avail_in  = inputLen;
+    strm->avail_out = outputLen;
+
     ret = inflate(strm, Z_PARTIAL_FLUSH);
-    (*env)->ReleasePrimitiveArrayCritical(env, b, out_buf, 0);
-    (*env)->ReleasePrimitiveArrayCritical(env, this_buf, in_buf, 0);
 
     switch (ret) {
     case Z_STREAM_END:
-        (*env)->SetBooleanField(env, this, finishedID, JNI_TRUE);
+        finished = 1;
         /* fall through */
     case Z_OK:
-        this_off += this_len - strm->avail_in;
-        (*env)->SetIntField(env, this, offID, this_off);
-        (*env)->SetIntField(env, this, lenID, strm->avail_in);
-        return (jint) (len - strm->avail_out);
+        inputUsed = inputLen - strm->avail_in;
+        outputUsed = outputLen - strm->avail_out;
+        break;
     case Z_NEED_DICT:
-        (*env)->SetBooleanField(env, this, needDictID, JNI_TRUE);
+        needDict = 1;
         /* Might have consumed some input here! */
-        this_off += this_len - strm->avail_in;
-        (*env)->SetIntField(env, this, offID, this_off);
-        (*env)->SetIntField(env, this, lenID, strm->avail_in);
-        return 0;
+        inputUsed = inputLen - strm->avail_in;
+        /* zlib is unclear about whether output may be produced */
+        outputUsed = outputLen - strm->avail_out;
+        break;
     case Z_BUF_ERROR:
-        return 0;
+        break;
     case Z_DATA_ERROR:
+        inputUsed = inputLen - strm->avail_in;
+        (*env)->SetIntField(env, this, inputConsumedID, inputUsed);
+        outputUsed = outputLen - strm->avail_out;
+        (*env)->SetIntField(env, this, outputConsumedID, outputUsed);
         ThrowDataFormatException(env, strm->msg);
-        return 0;
+        break;
     case Z_MEM_ERROR:
         JNU_ThrowOutOfMemoryError(env, 0);
-        return 0;
+        break;
     default:
         JNU_ThrowInternalError(env, strm->msg);
-        return 0;
+        break;
     }
+    return ((jlong)inputUsed) | (((jlong)outputUsed) << 31) | (((jlong)finished) << 62) | (((jlong)needDict) << 63);
+}
+
+JNIEXPORT jlong JNICALL
+Java_java_util_zip_Inflater_inflateBytesBytes(JNIEnv *env, jobject this, jlong addr,
+                                         jbyteArray inputArray, jint inputOff, jint inputLen,
+                                         jbyteArray outputArray, jint outputOff, jint outputLen)
+{
+    jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
+    jbyte *output;
+    jlong retVal;
+
+    if (input == NULL) {
+        if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
+            JNU_ThrowOutOfMemoryError(env, 0);
+        return 0L;
+    }
+    output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
+    if (output == NULL) {
+        (*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
+        if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
+            JNU_ThrowOutOfMemoryError(env, 0);
+        return 0L;
+    }
+
+    retVal = doInflate(env, this, addr,
+            input + inputOff, inputLen,
+            output + outputOff, outputLen);
+
+    (*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0);
+    (*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
+
+    return retVal;
+}
+
+JNIEXPORT jlong JNICALL
+Java_java_util_zip_Inflater_inflateBytesBuffer(JNIEnv *env, jobject this, jlong addr,
+                                         jbyteArray inputArray, jint inputOff, jint inputLen,
+                                         jlong outputBuffer, jint outputLen)
+{
+    jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
+    jbyte *output;
+    jlong retVal;
+
+    if (input == NULL) {
+        if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
+            JNU_ThrowOutOfMemoryError(env, 0);
+        return 0L;
+    }
+    output = jlong_to_ptr(outputBuffer);
+
+    retVal = doInflate(env, this, addr,
+            input + inputOff, inputLen,
+            output, outputLen);
+
+    (*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
+
+    return retVal;
+}
+
+JNIEXPORT jlong JNICALL
+Java_java_util_zip_Inflater_inflateBufferBytes(JNIEnv *env, jobject this, jlong addr,
+                                         jlong inputBuffer, jint inputLen,
+                                         jbyteArray outputArray, jint outputOff, jint outputLen)
+{
+    jbyte *input = jlong_to_ptr(inputBuffer);
+    jbyte *output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
+    jlong retVal;
+
+    if (output == NULL) {
+        if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
+            JNU_ThrowOutOfMemoryError(env, 0);
+        return 0L;
+    }
+
+    retVal = doInflate(env, this, addr,
+            input, inputLen,
+            output + outputOff, outputLen);
+
+    (*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0);
+
+    return retVal;
+}
+
+JNIEXPORT jlong JNICALL
+Java_java_util_zip_Inflater_inflateBufferBuffer(JNIEnv *env, jobject this, jlong addr,
+                                         jlong inputBuffer, jint inputLen,
+                                         jlong outputBuffer, jint outputLen)
+{
+    jbyte *input = jlong_to_ptr(inputBuffer);
+    jbyte *output = jlong_to_ptr(outputBuffer);
+
+    return doInflate(env, this, addr,
+            input, inputLen,
+            output, outputLen);
 }
 
 JNIEXPORT jint JNICALL
diff --git a/test/jdk/java/util/zip/DeInflate.java b/test/jdk/java/util/zip/DeInflate.java
index cf207568036..ff2cb63c6e7 100644
--- a/test/jdk/java/util/zip/DeInflate.java
+++ b/test/jdk/java/util/zip/DeInflate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,23 @@
 
 /**
  * @test
- * @bug 7110149 8184306
+ * @bug 7110149 8184306 6341887
  * @summary Test basic deflater & inflater functionality
  * @key randomness
  */
 
 import java.io.*;
+import java.nio.*;
 import java.util.*;
 import java.util.zip.*;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 public class DeInflate {
 
+    private static Random rnd = new Random();
+
+
     static void checkStream(Deflater def, byte[] in, int len,
                             byte[] out1, byte[] out2, boolean nowrap)
         throws Throwable
@@ -61,6 +67,57 @@ static void checkStream(Deflater def, byte[] in, int len,
         }
     }
 
+    static void checkByteBuffer(Deflater def, Inflater inf,
+                                ByteBuffer in, ByteBuffer out1, ByteBuffer out2,
+                                byte[] expected, int len, byte[] result,
+                                boolean out1ReadOnlyWhenInflate)
+            throws Throwable {
+        def.reset();
+        inf.reset();
+
+        def.setInput(in);
+        def.finish();
+        int m = def.deflate(out1);
+
+        out1.flip();
+        if (out1ReadOnlyWhenInflate)
+            out1 = out1.asReadOnlyBuffer();
+        inf.setInput(out1);
+        int n = inf.inflate(out2);
+
+        out2.flip();
+        out2.get(result, 0, n);
+
+        if (n != len || out2.position() != len ||
+            !Arrays.equals(Arrays.copyOf(expected, len), Arrays.copyOf(result, len)) ||
+            inf.inflate(result) != 0) {
+            throw new RuntimeException("De/inflater(buffer) failed:" + def);
+        }
+    }
+
+    static void checkByteBufferReadonly(Deflater def, Inflater inf,
+                                        ByteBuffer in, ByteBuffer out1, ByteBuffer out2)
+            throws Throwable {
+        def.reset();
+        inf.reset();
+        def.setInput(in);
+        def.finish();
+        int m = -1;
+        if (!out2.isReadOnly())
+            out2 = out2.asReadOnlyBuffer();
+        try {
+            m = def.deflate(out2);
+            throw new RuntimeException("deflater: ReadOnlyBufferException: failed");
+        } catch (ReadOnlyBufferException robe) {}
+        m = def.deflate(out1);
+        out1.flip();
+        inf.setInput(out1);
+        try {
+            inf.inflate(out2);
+            throw new RuntimeException("inflater: ReadOnlyBufferException: failed");
+        } catch (ReadOnlyBufferException robe) {}
+    }
+
     static void check(Deflater def, byte[] in, int len,
                       byte[] out1, byte[] out2, boolean nowrap)
         throws Throwable
@@ -83,6 +140,107 @@ static void check(Deflater def, byte[] in, int len,
                               m, n, len, Arrays.equals(in, out2));
             throw new RuntimeException("De/inflater failed:" + def);
         }
+
+        // readable
+        Arrays.fill(out1, (byte)0);
+        Arrays.fill(out2, (byte)0);
+        ByteBuffer bbIn = ByteBuffer.wrap(in, 0, len);
+        ByteBuffer bbOut1 = ByteBuffer.wrap(out1);
+        ByteBuffer bbOut2 = ByteBuffer.wrap(out2);
+        checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, false);
+        checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
+
+        // readonly in
+        Arrays.fill(out1, (byte)0);
+        Arrays.fill(out2, (byte)0);
+        bbIn = ByteBuffer.wrap(in, 0, len).asReadOnlyBuffer();
+        bbOut1 = ByteBuffer.wrap(out1);
+        bbOut2 = ByteBuffer.wrap(out2);
+        checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, false);
+        checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
+
+        // readonly out1 when inflate
+        Arrays.fill(out1, (byte)0);
+        Arrays.fill(out2, (byte)0);
+        bbIn = ByteBuffer.wrap(in, 0, len);
+        bbOut1 = ByteBuffer.wrap(out1);
+        bbOut2 = ByteBuffer.wrap(out2);
+        checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, true);
+        checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
+
+        // direct
+        bbIn = ByteBuffer.allocateDirect(in.length);
+        bbIn.put(in, 0, n).flip();
+        bbOut1 = ByteBuffer.allocateDirect(out1.length);
+        bbOut2 = ByteBuffer.allocateDirect(out2.length);
+        checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, false);
+        checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
+    }
+
+    static void checkDict(Deflater def, Inflater inf, byte[] src,
+                          byte[] dstDef, byte[] dstInf,
+                          ByteBuffer dictDef,  ByteBuffer dictInf) throws Throwable {
+        def.reset();
+        inf.reset();
+
+        def.setDictionary(dictDef);
+        def.setInput(src);
+        def.finish();
+        int n = def.deflate(dstDef);
+
+        inf.setInput(dstDef, 0, n);
+        n = inf.inflate(dstInf);
+        if (n != 0 || !inf.needsDictionary()) {
+            throw new RuntimeException("checkDict failed: need dict to continue");
+        }
+        inf.setDictionary(dictInf);
+        n = inf.inflate(dstInf);
+        // System.out.println("result: " + new String(dstInf, 0, n));
+        if (n != src.length || !Arrays.equals(Arrays.copyOf(dstInf, n), src)) {
+            throw new RuntimeException("checkDict failed: inflate result");
+        }
+    }
+
+    static void checkDict(int level, int strategy) throws Throwable {
+
+        Deflater def = newDeflater(level, strategy, false, new byte[0]);
+        Inflater inf = new Inflater();
+
+        byte[] src = "hello world, hello world, hello sherman".getBytes();
+        byte[] dict = "hello".getBytes();
+
+        byte[] dstDef = new byte[1024];
+        byte[] dstInf = new byte[1024];
+
+        def.setDictionary(dict);
+        def.setInput(src);
+        def.finish();
+        int n = def.deflate(dstDef);
+
+        inf.setInput(dstDef, 0, n);
+        n = inf.inflate(dstInf);
+        if (n != 0 || !inf.needsDictionary()) {
+            throw new RuntimeException("checkDict failed: need dict to continue");
+        }
+        inf.setDictionary(dict);
+        n = inf.inflate(dstInf);
+        //System.out.println("result: " + new String(dstInf, 0, n));
+        if (n != src.length || !Arrays.equals(Arrays.copyOf(dstInf, n), src)) {
+            throw new RuntimeException("checkDict failed: inflate result");
+        }
+
+        ByteBuffer dictDef = ByteBuffer.wrap(dict);
+        ByteBuffer dictInf = ByteBuffer.wrap(dict);
+        checkDict(def, inf, src, dstDef, dstInf, dictDef, dictInf);
+
+        dictDef = ByteBuffer.allocateDirect(dict.length);
+        dictInf = ByteBuffer.allocateDirect(dict.length);
+        dictDef.put(dict).flip();
+        dictInf.put(dict).flip();
+        checkDict(def, inf, src, dstDef, dstInf, dictDef, dictInf);
+
+        def.end();
+        inf.end();
     }
 
     private static Deflater newDeflater(int level, int strategy, boolean dowrap, byte[] tmp) {
@@ -109,7 +267,7 @@ private static Deflater resetDeflater(Deflater def, int level, int strategy) {
     public static void main(String[] args) throws Throwable {
 
         byte[] dataIn = new byte[1024 * 512];
-        new Random().nextBytes(dataIn);
+        rnd.nextBytes(dataIn);
         byte[] dataOut1 = new byte[dataIn.length + 1024];
         byte[] dataOut2 = new byte[dataIn.length];
 
@@ -130,6 +288,7 @@ public static void main(String[] args) throws Throwable {
                         // use a new deflater
                         Deflater def = newDeflater(level, strategy, dowrap, dataOut2);
                         check(def, dataIn, len, dataOut1, dataOut2, dowrap);
+                        def.end();
 
                         // reuse the deflater (with reset) and test on stream, which
                         // uses a "smaller" buffer (smaller than the overall data)
@@ -137,6 +296,8 @@ public static void main(String[] args) throws Throwable {
                         checkStream(def, dataIn, len, dataOut1, dataOut2, dowrap);
                     }
                 }
+                // test setDictionary()
+                checkDict(level, strategy);
             }
         }
     }
diff --git a/test/jdk/java/util/zip/FlaterTest.java b/test/jdk/java/util/zip/FlaterTest.java
index 7245440d033..2d7124de42d 100644
--- a/test/jdk/java/util/zip/FlaterTest.java
+++ b/test/jdk/java/util/zip/FlaterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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,13 +23,12 @@
 
 /**
  * @test
- * @bug 6348045
+ * @bug 6348045 6341887
  * @summary GZipOutputStream/InputStream goes critical(calls JNI_Get*Critical)
  * and causes slowness.  This test uses Deflater and Inflater directly.
  * @key randomness
  */
 
-import java.io.*;
 import java.nio.*;
 import java.util.*;
 import java.util.zip.*;
@@ -41,35 +40,37 @@
  */
 public class FlaterTest extends Thread {
     private static final int DATA_LEN = 1024 * 128;
-    private static byte[] data;
+
+    private static ByteBuffer dataDirect;
+    private static ByteBuffer dataHeap;
 
     // If true, print extra info.
     private static final boolean debug = false;
 
     // Set of Flater threads running.
-    private static Set flaters =
-        Collections.synchronizedSet(new HashSet());
+    private static Set<Flater> flaters =
+        Collections.synchronizedSet(new HashSet<>());
 
     /** Fill in {@code data} with random values. */
     static void createData() {
-        ByteBuffer bb = ByteBuffer.allocate(8);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        for (int i = 0; i < DATA_LEN; i++) {
-            bb.putDouble(0, Math.random());
-            baos.write(bb.array(), 0, 8);
+        ByteBuffer bb = ByteBuffer.allocateDirect(DATA_LEN * 8);
+        for (int i = 0; i < DATA_LEN * 8; i += 8) {
+            bb.putDouble(i, Math.random());
         }
-        data = baos.toByteArray();
-        if (debug) System.out.println("data length is " + data.length);
+        dataDirect = bb;
+        final ByteBuffer hb = ByteBuffer.allocate(bb.capacity());
+        hb.duplicate().put(bb.duplicate());
+        dataHeap = hb;
+        if (debug) System.out.println("data length is " + bb.capacity());
     }
 
     /** @return the length of the deflated {@code data}. */
-    private static int getDeflatedLength() throws Throwable {
-        int rc = 0;
+    private static int getDeflatedLength() {
         Deflater deflater = new Deflater();
-        deflater.setInput(data);
+        deflater.setInput(dataDirect.duplicate());
         deflater.finish();
-        byte[] out = new byte[data.length];
-        rc = deflater.deflate(out);
+        byte[] out = new byte[dataDirect.capacity()];
+        int rc = deflater.deflate(out);
         deflater.end();
         if (debug) System.out.println("deflatedLength is " + rc);
         return rc;
@@ -78,70 +79,98 @@ private static int getDeflatedLength() throws Throwable {
     /** Compares given bytes with those in {@code data}.
      * @throws Exception if given bytes don't match {@code data}.
      */
-    private static void validate(byte[] buf, int offset, int len) throws Exception {
+    private static void validate(ByteBuffer buf, int offset, int len) throws Exception {
         for (int i = 0; i < len; i++ ) {
-            if (buf[i] != data[offset+i]) {
+            if (buf.get(i) != dataDirect.get(offset+i)) {
                 throw new Exception("mismatch at " + (offset + i));
             }
         }
     }
 
-    public static void realMain(String[] args) throws Throwable {
-        createData();
+    public static void realMain(String[] args) {
         int numThreads = args.length > 0 ? Integer.parseInt(args[0]) : 5;
-        new FlaterTest().go(numThreads);
+        createData();
+        for (int srcMode = 0; srcMode <= 2; srcMode ++) {
+            for (int dstMode = 0; dstMode <= 2; dstMode ++) {
+                new FlaterTest().go(numThreads, srcMode, dstMode);
+            }
+        }
     }
 
-    private synchronized void go(int numThreads) throws Throwable {
+    private synchronized void go(int numThreads, int srcMode, int dstMode) {
         int deflatedLength = getDeflatedLength();
 
         long time = System.currentTimeMillis();
         for (int i = 0; i < numThreads; i++) {
-            Flater f = new Flater(deflatedLength);
+            Flater f = new Flater(deflatedLength, srcMode, dstMode);
             flaters.add(f);
             f.start();
         }
-        while (flaters.size() != 0) {
-            try {
-                Thread.currentThread().sleep(10);
-            } catch (InterruptedException ex) {
-                unexpected(ex);
+        synchronized (flaters) {
+            while (flaters.size() != 0) {
+                try {
+                    flaters.wait();
+                } catch (InterruptedException ex) {
+                    unexpected(ex);
+                }
             }
         }
         time = System.currentTimeMillis() - time;
         System.out.println("Time needed for " + numThreads
-                           + " threads to deflate/inflate: " + time + " ms.");
+                           + " threads to deflate/inflate: " + time + " ms (srcMode="+srcMode+",dstMode="+dstMode+")");
     }
 
     /** Deflates and inflates data. */
     static class Flater extends Thread {
         private final int deflatedLength;
+        private final int srcMode, dstMode;
 
-        private Flater(int length) {
+        private Flater(int length, int srcMode, int dstMode) {
             this.deflatedLength = length;
+            this.srcMode = srcMode;
+            this.dstMode = dstMode;
         }
 
         /** Deflates and inflates {@code data}. */
         public void run() {
             if (debug) System.out.println(getName() + " starting run()");
             try {
-                byte[] deflated = DeflateData(deflatedLength);
+                ByteBuffer deflated = DeflateData(deflatedLength);
                 InflateData(deflated);
             } catch (Throwable t) {
                 t.printStackTrace();
                 fail(getName() + " failed");
             } finally {
-                flaters.remove(this);
+                synchronized (flaters) {
+                    flaters.remove(this);
+                    if (flaters.isEmpty()) {
+                        flaters.notifyAll();
+                    }
+                }
             }
         }
 
         /** Returns a copy of {@code data} in deflated form. */
-        private byte[] DeflateData(int length) throws Throwable {
+        private ByteBuffer DeflateData(int length) {
             Deflater deflater = new Deflater();
-            deflater.setInput(data);
+            if (srcMode == 0) {
+                deflater.setInput(dataHeap.array());
+            } else if (srcMode == 1) {
+                deflater.setInput(dataHeap.duplicate());
+            } else {
+                assert srcMode == 2;
+                deflater.setInput(dataDirect.duplicate());
+            }
             deflater.finish();
-            byte[] out = new byte[length];
-            deflater.deflate(out);
+            ByteBuffer out = dstMode == 2 ? ByteBuffer.allocateDirect(length) : ByteBuffer.allocate(length);
+            int deflated;
+            if (dstMode == 0) {
+                deflated = deflater.deflate(out.array(), 0, length);
+                out.position(deflated);
+            } else {
+                deflater.deflate(out);
+            }
+            out.flip();
             return out;
         }
 
@@ -149,14 +178,30 @@ private byte[] DeflateData(int length) throws Throwable {
          * inflation.
          * @throws Exception if inflated bytes don't match {@code data}.
          */
-        private void InflateData(byte[] bytes) throws Throwable {
+        private void InflateData(ByteBuffer bytes) throws Throwable {
             Inflater inflater = new Inflater();
-            inflater.setInput(bytes, 0, bytes.length);
+            if (dstMode == 0) {
+                inflater.setInput(bytes.array(), 0, bytes.remaining());
+            } else {
+                inflater.setInput(bytes);
+            }
+            if (inflater.getRemaining() == 0) {
+                throw new Exception("Nothing to inflate (bytes=" + bytes + ")");
+            }
             int len = 1024 * 8;
             int offset = 0;
+            ByteBuffer buf = srcMode == 2 ? ByteBuffer.allocateDirect(len) : ByteBuffer.allocate(len);
             while (inflater.getRemaining() > 0) {
-                byte[] buf = new byte[len];
-                int inflated = inflater.inflate(buf, 0, len);
+                buf.clear();
+                int inflated;
+                if (srcMode == 0) {
+                    inflated = inflater.inflate(buf.array(), 0, buf.remaining());
+                } else {
+                    inflated = inflater.inflate(buf);
+                }
+                if (inflated == 0) {
+                    throw new Exception("Nothing inflated (dst=" + buf + ",offset=" + offset + ",rem=" + inflater.getRemaining() + ",srcMode="+srcMode+",dstMode="+dstMode+")");
+                }
                 validate(buf, offset, inflated);
                 offset += inflated;
             }

From 26091a913425ae086e56bccfe23feaed53aa114d Mon Sep 17 00:00:00 2001
From: Andrew Leonard <andrew_m_leonard@uk.ibm.com>
Date: Fri, 20 Apr 2018 13:33:08 +0100
Subject: [PATCH 194/196] Remove InitializeEncoding patch...

Signed-off-by: Andrew Leonard <andrew_m_leonard@uk.ibm.com>
---
 src/java.base/share/native/libjava/jni_util.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/java.base/share/native/libjava/jni_util.c b/src/java.base/share/native/libjava/jni_util.c
index 7788342f2fe..fa4e39b8a43 100644
--- a/src/java.base/share/native/libjava/jni_util.c
+++ b/src/java.base/share/native/libjava/jni_util.c
@@ -842,15 +842,6 @@ InitializeEncoding(JNIEnv *env, const char *encname)
     String_value_ID = (*env)->GetFieldID(env, strClazz, "value", "[B");
 }
 
-/*
- * Export this method to allow OpenJ9 to initialize platform encoding explicitly.
- */
-JNIEXPORT void JNICALL
-JNU_InitializeEncoding(JNIEnv *env, const char *encname)
-{
-	InitializeEncoding(env, encname);
-}
-
 JNIEXPORT jstring
 NewStringPlatform(JNIEnv *env, const char *str)
 {

From 27b1ecf6379287c91fcaae2eb366f11ca3b47157 Mon Sep 17 00:00:00 2001
From: Jason-Yong <Jason_Yong@uk.ibm.com>
Date: Thu, 3 May 2018 09:34:56 +0100
Subject: [PATCH 195/196] Fix for merge error

Signed-off-by: Jason-Yong <Jason_Yong@uk.ibm.com>
---
 make/common/NativeCompilation.gmk | 36 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index a85f9713bcc..62296d4f6c9 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -1002,26 +1002,24 @@ define SetupNativeCompilationBody
 		  $$($1_CREATE_DEBUGINFO_CMDS)
 		  $$($1_STRIP_CMD)
           # we need mv zos static lib .x file to output dir
-          ifeq ($(OPENJDK_TARGET_OS), zos)
+          	  ifeq ($(OPENJDK_TARGET_OS), zos)
 		     $(MV) $$($1_NOSUFFIX).x $$($1_OUTPUT_DIR)
-          endif
-      endif
-
-    endif
-
-    ifeq ($(OPENJDK_TARGET_OS), windows)
-      ifneq ($$($1_MANIFEST), )
-		 $$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1
-      endif
-    endif
-    # This only works if the openjdk_codesign identity is present on the system. Let
-    # silently fail otherwise.
-    ifneq ($(CODESIGN), )
-      ifneq ($$($1_CODESIGN), )
-		$(CODESIGN) -s openjdk_codesign $$@
-      endif
-     endif
-  endif
+       		  endif
+       		endif
+
+    		ifeq ($(OPENJDK_TARGET_OS), windows)
+      		  ifneq ($$($1_MANIFEST), )
+		 	$$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1
+      		  endif
+    		endif
+    		# This only works if the openjdk_codesign identity is present on the system. Let
+    		# silently fail otherwise.
+    		ifneq ($(CODESIGN), )
+      		  ifneq ($$($1_CODESIGN), )
+		    $(CODESIGN) -s openjdk_codesign $$@
+      		  endif
+     		endif
+ 	endif
 endef
 
 endif # _NATIVE_COMPILATION_GMK

From b90a3a7c938ceeab3f6c351c45f2839cb7f08b14 Mon Sep 17 00:00:00 2001
From: Jason-Yong <Jason_Yong@uk.ibm.com>
Date: Thu, 3 May 2018 11:19:38 +0100
Subject: [PATCH 196/196] Changes to CLDRConverter to make the update work on
 z/OS

Signed-off-by: Jason-Yong <Jason_Yong@uk.ibm.com>
---
 .../classes/build/tools/cldrconverter/CLDRConverter.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
index 0fe6c077bd5..4771d1b25d1 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -987,7 +987,7 @@ private static List<Locale> applyParentLocales(String baseName, List<Locale> can
     private static void generateZoneName() throws Exception {
         Files.createDirectories(Paths.get(DESTINATION_DIR, "java", "time", "format"));
         Files.write(Paths.get(DESTINATION_DIR, "java", "time", "format", "ZoneName.java"),
-            Files.lines(Paths.get(zoneNameTempFile))
+            Files.lines(Paths.get(zoneNameTempFile), Charset.defaultCharset())
                 .flatMap(l -> {
                     if (l.equals("%%%%ZIDMAP%%%%")) {
                         return zidMapEntry();
@@ -1001,7 +1001,7 @@ private static void generateZoneName() throws Exception {
                         return Stream.of(l);
                     }
                 })
-                .collect(Collectors.toList()),
+                .collect(Collectors.toList()), Charset.defaultCharset(),
             StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
     }
 
@@ -1039,7 +1039,7 @@ private static Stream<String> tzDataLinkEntry() {
 
     private static Stream<String> extractLinks(Path tzFile) {
         try {
-            return Files.lines(tzFile)
+            return Files.lines(tzFile, Charset.defaultCharset())
                 .filter(l -> l.startsWith("Link"))
                 .map(l -> l.replaceFirst("^Link[\\s]+(\\S+)\\s+(\\S+).*",
                                          "        \"$2\", \"$1\","));