Hi Phil/Kevin, Please review the below fix - Webrev : http://cr.openjdk.java.net/~mbilla/8198354/webrev.00/ JBS : https://bugs.openjdk.java.net/browse/JDK-8198354 Details about the fix has been updated in JBS. Thanks, Dipak