Please review this patch to fix Bug #7129285. This fix addresses comments made by Jason Mehrens to the commit of the fix for bug #4533691, including adding a Collections.emptyNavigableSet method. Tests are included. Webrev, can be found here: http://cr.openjdk.java.net/~dmocek/7129285/webrev.00 Thanks, Darryl