jcoomes [Fri, 14 Oct 2011 18:17:01 -0700] rev 10684
Merge
johnc [Wed, 12 Oct 2011 10:25:51 -0700] rev 10683
7098282: G1: assert(interval >= 0) failed: Sanity check, referencePolicy.cpp: 76
Summary: There is a race between one thread successfully forwarding and copying the klass mirror for the SoftReference class (including the static master clock) and another thread attempting to use the master clock while attempting to discover a soft reference object. Maintain a shadow copy of the soft reference master clock and use the shadow during reference discovery and reference processing.
Reviewed-by: tonyp, brutisso, ysr
brutisso [Tue, 11 Oct 2011 10:21:36 +0200] rev 10682
7099454: /bin/sh does not support syntax used in the src/os/posix/launcher/launcher.script shell script
Summary: Also reviewed by mikael.gerdin@oracle.com; Changed to the `` syntax instead. Also changed "source" to ".".
Reviewed-by: never, stefank, dsamersoff, rottenha