6998583 Code review request

[Seán Coffey]

Brad, Vinnie,

This is a forward port of 6998583 to JDK 7. Can you review ?

http://cr.openjdk.java.net/~coffeys/6998583/webrev.6998583.0/

Thanks,
Sean.