fix compilation error on jdk8: ensure the compiler doesn't complain
"Merge pull request #1124 from mping/jdk8\n\nfix compilation error on jdk8: ensure the compiler doesn't complain"
update es/upstream to be jkd8 compatible