Please OK this back port, It is identical to the 9 fix http://cr.openjdk.java.net/~prr/8043508.8u/ http://hg.openjdk.java.net/jdk9/client/jdk/rev/8a7fdbaea99b https://bugs.openjdk.java.net/browse/JDK-8043508