My fix for 8079248 was broken, so here is a new attempt. I intend to push this directly to jdk9/hs since that is where 8079248 was pushed.
bug: https://bugs.openjdk.java.net/browse/JDK-8079345#comment-13638237 webrev: http://cr.openjdk.java.net/~sla/8079345/webrev.00 <http://cr.openjdk.java.net/~sla/8079345/webrev.00> Thanks, /Staffan