Code review request for 7024697

[Seán Coffey]

This is a forward port of http://bugs.sun.com/view_bug.do?bug_id=7024697
to jdk 7 & 8 releases.

Code change is identical to that made in jdk6.

http://cr.openjdk.java.net/~coffeys/webrev.7024697/

regards,
Sean.