* corrected a null issue after bug report.
* corrected OpenJDK issue