hg: lambda/lambda/jdk: Fix bug in ConcurrentSkipListMap.merge, where if a thread loses a put-race, the merge function is not consulted

[brian.goetz at oracle.com]

Changeset: 7181498889ad
Author:    briangoetz
Date:      2013-06-13 17:48 -0400
URL:       http://hg.openjdk.java.net/lambda/lambda/jdk/rev/7181498889ad

Fix bug in ConcurrentSkipListMap.merge, where if a thread loses a put-race, the merge function is not consulted

! src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java