bug: https://bugs.openjdk.java.net/browse/JDK-8145516 webrev: http://cr.openjdk.java.net/~flar/JDK-8145516/webrev.00/
Information on the fix is in the bug report comments. I need to repair my 8u-dev repos to check, but I believe this can be ported directly to an 8u release... ...jim