Please review the fix for CRs: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=8008941 http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=8012028 Webrev: http://cr.openjdk.java.net/~rfield/8008941and8012028/