Merge

6939861: JVM should handle more conversion operations Reviewed-by: twisti, jrose

7042153: guarantee(x_compare_res != Constant::not_comparable) failed: incomparable constants in IfOp Summary: Handle IfOps folding properly in case of unloaded constant oop arguments Reviewed-by: kvn, never

Merge

Merge

7043891: CMS: assert(_whole_heap.contains(p)) failed: out of bounds access to card marking array Summary: Fixed assertion checking code that was attempting to translate addresses past end of space for card-table slot. Also elaborated some assertion checking messages. Reviewed-by: iveresov, jmasa, tonyp

7043564: compile warning and copyright fixes Summary: Fixed the warning, also fixed copyrights in a bunch of files. Reviewed-by: johnc, kvn

6883834: ParNew: assert(!_g->to()->is_in_reserved(obj),"Scanning field twice?") with LargeObjects tests Summary: Fixed process_chunk_boundaries(), used for parallel card scanning when using ParNew/CMS, so as to prevent double-scanning, or worse, non-scanning of imprecisely marked objects exceeding parallel chunk size. Made some sizing parameters for parallel card scanning diagnostic, disabled ParallelGCRetainPLAB, and elaborated and clarified some comments. Reviewed-by: stefank, johnc

7036199: Adding a notification to the implementation of GarbageCollectorMXBeans Summary: Add a notification to the GarbageCollectorMXBeans Reviewed-by: acorn, mchung

Merge

7043298: 4/4 fix for 7028172 causes "Label too long: ..." error message Summary: Use '-e' version of sed expressions. Clarify and fix comments Reviewed-by: never, acorn

Added tag hs21-b12 for changeset 19acba38f929

Added tag jdk7-b142 for changeset 19acba38f929

7043700: Regression for IcedTea builds Reviewed-by: dholmes, omajid

Added tag jdk7-b142 for changeset 70e694b33e64

Added tag jdk7-b142 for changeset 92bf0655022d

Merge

Merge

Merge

7043548: message drop 3 translation integration Reviewed-by: yhuang

7022005: [ja,zh_CN] javadoc, part of navigation bar in generated html are not translated. Reviewed-by: yhuang

Merge

Merge

6553182: Need to modify javadoc doclet for GPL Reviewed-by: jjg

7040883: Compilation error: "length in Array is defined in an inaccessible class or interface" Summary: Fix of 7034511 (now backed out) is causing spurious accessibility errors Reviewed-by: jjg

6492694: @deprecated tag doesn't work in package-info files. Reviewed-by: jjg

Merge

7039931: Project Coin: diamond inference fail with generic constructor explicit type-arguments Summary: diamond should be disallowed in cases where explicit generic constructor parameters are specified Reviewed-by: jjg

6550655: com.sun.tools.javac.code.Symbol$CompletionFailure Summary: Accessing a non-existing enum constant from an annotation whose class is available results in an internal error Reviewed-by: jjg

7034495: Javac asserts on usage of wildcards in bounds Summary: Problem with intersection types and wildcards causing javac to crash Reviewed-by: jjg

7039937: Improved catch analysis fails to handle a common idiom in the libraries Summary: Disable generation of 'unreachable catch' warnings for catch statements catching Exception/Throwable Reviewed-by: jjg

7040104: javac NPE on Object a[]; Object o = (a=null)[0]; Summary: When a null literal is found on top of stack, if expected type is 1-dimension array no checkcast is emitted Reviewed-by: jjg

7029150: Project Coin: present union types from the tree API through to javax.lang.model Reviewed-by: mcimadamore

7037081: Remove com.sun.tracing from NON_CORE_PKGS Reviewed-by: ohair, jjg, jmasa

7028815: Missing styles for some bulleted items in the new stylesheet Reviewed-by: jjg

7039822: Project Coin: add explicit tests for the lub of an exception parameter Reviewed-by: mcimadamore, jjg

7038363: cast from object to primitive should be for source >= 1.7 Reviewed-by: mcimadamore

7039019: test cannot run standalone Reviewed-by: dlsmith

7036906: Scope: CompoundScope.getElements() doesn't pass scope filter to subscopes Summary: CompoundScope.getElements() is not filtering elements according to the ScopeFilter argument Reviewed-by: jjg

6758050: javadoc handles nested generic types incorrectly Reviewed-by: jjg

Added tag jdk7-b141 for changeset af4b2168b0f9

Merge

Added tag jdk7-b141 for changeset 76bb81c6327c

Merge

Merge

Merge

Merge

7040147: jaxp 1.4.5 jdk7 integration Reviewed-by: joehw

Added tag jdk7-b141 for changeset cb7a3284b15b

Merge

Merge

7043548: message drop 3 translation integration Reviewed-by: yhuang

Added tag jdk7-b141 for changeset b24cc3620ee4

Merge

Merge

7044019: LocaleEnhanceTest.java needs to be updated for 7004603 Reviewed-by: naoto

Merge

7004603: L10n needed for newly added codes in LocaleNames Reviewed-by: naoto

7043684: Update man pages for JDK 7 tools Reviewed-by: skannan

Merge