This is a code cleanup based on attached patch from Christian Thalinger. Bug: https://bugs.openjdk.java.net/browse/JDK-8041415 Webrev: http://cr.openjdk.java.net/~zgu/8041415/webrev.00/ <http://cr.openjdk.java.net/%7Ezgu/8041415/webrev.00/> Test: JPRT Thanks,