Merge

Merge

6940894: G1: assert(new_obj != 0 || ... "should be forwarded") for compaction tests Summary: Humongous regions may contain multiple objects as a result of being retained as to-space from a previous GC and then re-used as to-space after being tagged as humongous. These changes include a check that causes retained to-space regions that are now tagged as humongous to be disregarded and a new to-space region allocated. Reviewed-by: tonyp, iveresov

6909756: G1: guarantee(G1CollectedHeap::heap()->mark_in_progress(),"Precondition.") Summary: Make sure that two marking cycles do not overlap, i.e., a new one can only start after the concurrent marking thread finishes all its work. In the fix I piggy-back a couple of minor extra fixes: some general code reformatting for consistency (only around the code I modified), the removal of a field (G1CollectorPolicy::_should_initiate_conc_mark) which doesn't seem to be used at all (it's only set but never read), as well as moving the "is GC locker active" test earlier into the G1 pause / Full GC and using a more appropriate method for it. Reviewed-by: johnc, jmasa, jcoomes, ysr

6940310: G1: MT-unsafe calls to CM::region_stack_push() / CM::region_stack_pop() Summary: Calling the methods region_stack_push() and region_stack_pop() concurrent is not MT-safe. The assumption is that we will only call region_stack_push() during a GC pause and region_stack_pop() during marking. Unfortunately, we also call region_stack_push() during marking which seems to be introducing subtle marking failures. This change introduces lock-based methods for pushing / popping to be called during marking. Reviewed-by: iveresov, johnc

6677708: G1: re-enable parallel RSet updating and scanning Summary: Enable parallel RSet updating and scanning. Reviewed-by: iveresov, jmasa

6937160: G1: should observe GCTimeRatio Summary: Remove the G1GCPercent parameter, that specifies the desired GC overhead percentage in G1, and observe the GCTimeRatio parameter instead. Reviewed-by: jmasa, johnc

Merge

Merge

6938627: Make temporary directory use property java.io.tmpdir when specified Summary: Get java.io.tmpdir property in os::get_temp_directory() and call this instead of harcoding "/tmp". Don't assume trailing file_separator either. Reviewed-by: dholmes, kamg

Merge

Merge

6939804: ciConstant::print() prints incorrect bool value Summary: Fix typo. Reviewed-by: never

6936709: AsyncGetCallTrace doesn't handle inexact stack walking properly Reviewed-by: kvn

Merge

6939845: zero needs fallback path in C++ interpreter for platform dependent fast bytecodes Reviewed-by: never Contributed-by: ed@camswl.com

6939731: JSR 292 Zero build fix after 6934494 Summary: The changes of 6934494 have broken the Zero build. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6939180: Zero locking fix Summary: When Zero is running with Shark enabled threads can be left with their _do_not_unlock_if_synchronized flag incorrectly set. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6926979: should simplify catch_inline_exception Reviewed-by: twisti

6944398: Bump the HS18 build number to 03 Summary: Update the HS18 build number to 03 Reviewed-by: jcoomes

Added tag jdk7-b89 for changeset 750e57985f1e

Added tag jdk7-b89 for changeset e996369c787b

Added tag jdk7-b89 for changeset 44158f6d3b94

Merge

Merge

Merge

Merge

6938326: Use of "ant -diagnostics" a problem with ant 1.8.0, exit code 1 now Reviewed-by: jjg

6937417: javac -Xprint returns IndexOutOfBoundsException Reviewed-by: jjg

6937318: jdk7 b86: javah and javah -help is no output for these commands Reviewed-by: darcy

6937244: sqe ws7 tools javap/javap_t10a fail jdk7 b80 used output of javap is changed Reviewed-by: darcy

Merge

6934224: update langtools/test/Makefile Reviewed-by: ohair

6933914: fix missing newlines Reviewed-by: ohair

Added tag jdk7-b88 for changeset 27beb127f317

Merge

Added tag jdk7-b88 for changeset 349fc36a6694

Merge

Added tag jdk7-b88 for changeset d929b243d1f3

Merge

Added tag jdk7-b88 for changeset ad4ae3f4ca67

Merge

Merge

Merge

6941130: Semaphore should throw if number of permits overflows or underflows Summary: Check if release could make number of permits negative Reviewed-by: dl, dholmes

6717164: FilterInputStream.skip incorrectly inherits wording specifying how the InputStream.skip works Summary: restoring the javadoc Reviewed-by: alanb

6921111: NullPointerException in PlainDatagramSocketImpl.socketSetOption Reviewed-by: alanb

6648001: Cancelling HTTP authentication causes subsequent deadlocks Reviewed-by: michaelm

Merge

Merge

Merge

Merge

Merge

6932659: JTreg test files were missed in push of 6887703 Reviewed-by: uta

6887703: Unsigned applet can retrieve the dragged information before drop action occur Reviewed-by: uta

6902299: Java JAR "unpack200" must verify input parameters Summary: Added several checks for addition of values before memory allocation Reviewed-by: asaha

6899653: Sun Java Runtime CMM readMabCurveData Buffer Overflow Vulnerability Reviewed-by: prr, hawtin

6909597: Sun Java Runtime Environment JPEGImageReader stepX Integer Overflow Vulnerability Reviewed-by: igor

6914823: Java AWT Library Invalid Index Vulnerability Reviewed-by: flar, hawtin

6914866: Sun JRE ImagingLib arbitrary code execution vulnerability Reviewed-by: prr, hawtin