Review same comments from the JDK 6 version