Merge

7042979: Rename StandardSocketOption and StandardWatchEventKind Reviewed-by: forax, chegar

7043104: disable test java/lang/invoke/InvokeDynamicPrintArgs.java Reviewed-by: alanb

Merge

7041612: Rename StandardCharset to StandardCharsets Reviewed-by: alanb, mr, darcy

7042673: LockSupport.getBlocker(null) crashes Reviewed-by: chegar

6987652: VM crashed in sun.security.mscapi.RSAKeyPairGenerator.generateRSAKeyPair(...) Reviewed-by: alanb

Merge

Merge

7011326: Add informative example to @SafeVarargs type or language discussion Reviewed-by: mcimadamore, mduigou

Merge

Merge

7041232: IllegalArgumentException in sun.text.bidi.BidiBase.setLine starting from JDK 7 b64 Reviewed-by: okutsu

7034619: Scrollable Tabs don't appear with JDK7 Synth based LaF, different from Java 5/6 Reviewed-by: alexp

6894541: javax/swing/JTable/6788484/bug6788484.java fails w/ compilation errors. Reviewed-by: alexp

7031551: Generics: JComboBox Reviewed-by: alexp, malenkov

Merge

7010721: Frame#setMaximizedbounds not working properly on dual screen environment Reviewed-by: art, anthony

Merge

7042537: When press the 'Print' button,the NullPointerException is thrown and printdialog is not pop up. Reviewed-by: dcherepanov, art

7043455: Taking a screenshot may fail on X11 after 6903034 Summary: Backout 6903034 Reviewed-by: art, dcherepanov

7042429: jdk 7 b140: crashes in awt.dll+0xb85fb] Java_sun_awt_Win32GraphicsEnvironment_isVistaOS+0xfdf Reviewed-by: bae, dcherepanov

7041387: Introduce new boolean system property java.awt.smartInvalidate Summary: The behavior introduced with 6852592 is now enabled by the new system property only Reviewed-by: dcherepanov

7035053: java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java fails against jdk7 b134 Reviewed-by: art, denis, ant, dcherepanov

7040577: Default implementation of Toolkit.loadSystemColors(int[]) and many others doesn't throw HE in hl env Reviewed-by: dcherepanov, denis

7044682: Image I/O JPEG Metadata spec. should document that PhotoYCC ColorSpace interpretation is optional. Reviewed-by: flar

Merge

7043054: REGRESSION: JDK 7 b126 : Wrong userBounds in Paint.createContext() Reviewed-by: prr

7040717: Test case for 6522514 was not included in bug fix Reviewed-by: prr

Merge

Merge

Merge

7043921: generate java-rmi.cgi on 64 bit platform Reviewed-by: omajid, katleman

Merge

6939861: JVM should handle more conversion operations Summary: Integrate JDK code with JVM-supplied ricochet frames. Reviewed-by: never, twisti

7034977: JSR 292 MethodHandle.invokeGeneric should be renamed MethodHandle.invoke Summary: rename invokeGeneric to invoke Reviewed-by: never, twisti

Added tag jdk7-b142 for changeset f09a2b7a4eeb

Merge

7040780: Bump the HS21 build number to 13 Summary: Update the HS21 build number to 13 Reviewed-by: jcoomes

Merge

Merge

Merge

6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW Reviewed-by: jrose, kvn, never

Merge

7043461: VM crashes in void LinkResolver::runtime_resolve_virtual_method Reviewed-by: kvn, coleenp

7043040: JSR292: JRuby bench/shootout/binarytrees.ruby-2.ruby SEGV: constantPoolKlass::oop_follow_contents Reviewed-by: kvn, ysr

7043552: regression after 7042327 Summary: Generate Opaque2 node only during first unroll. Reviewed-by: never

7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters Reviewed-by: jrose, never, kvn

7043301: assert(locals < caller->fp() || locals > (caller->fp() + 16)) failed: locals in save area Reviewed-by: kvn

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

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

7038807: [CCJK] OK button on message dialog of JOptionpane is not translated Reviewed-by: yhuang

7042475: [ja,zh_CN] extra mnemonic key in jconsole Reviewed-by: yhuang

7028447: security-related resources Chinese translation errors Reviewed-by: weijun

7042323: [sv, de, es, it] Print dialog has duplicate mnemonic key Reviewed-by: yhuang

7043580: integrate man page translation drop 2 into jdk7 Reviewed-by: yhuang

7021691: Most log level words are not translated in java logging Reviewed-by: yhuang

Merge

Merge

Merge

Merge