On Mon, Feb 8, 2016 at 2:09 AM, Paul Sandoz <paul.san...@oracle.com> wrote: > >> On 1 Feb 2016, at 19:45, Martin Buchholz <marti...@google.com> wrote: >> >> After much debate on what to do when CompleteableFuture.whenComplete >> encounters an exception in both the source and the action, we chose >> what was acceptable to the most people - add the action's exception to >> the source exception as a suppressed exception. And added usage >> guidelines. And gave handle "top billing" over whenComplete. >> >> http://cr.openjdk.java.net/~martin/webrevs/openjdk9/jsr166-jdk9-integration/ >> >> and the usual miscellaneous improvements. > > > +1 > > Looks like the diffs got swapped for EmptyNavigableSet.java in the misc patch:
Thanks, fixed. This is a result of having bidirectional changes flowing between different source code control systems and no merge bridging tool. (I don't think I've regressed an upstream change yet, but I'm careful before doing any hg push. I've modified my upstreaming script to warn me about such conflicts in the future)
