SHDP-318 Fix Java 1.6 compile issue