Fix for EE8 execution under JDK17 - hopefully does not break JDK8 and JDK11
3 files changed