fix the compatibility JDK1.6 to core/main