Fix Bug 1203413 Exception with TreeSet caused by JDK7