Please review this 2nd version of the fix taking into account your feedback.
Bug : https://bugs.openjdk.java.net/browse/JDK-8039915webrev : http://cr.openjdk.java.net/~olagneau/8039915/webrev.00 <http://cr.openjdk.java.net/%7Eolagneau/8039915/webrev.01 <http://cr.openjdk.java.net/%7Eolagneau/8039915/webrev.00%20%3Chttp://cr.openjdk.java.net/%7Eolagneau/8039915/webrev.01>