6626257: Update SWAN-specific webcaching to Oracle environment in the regression tests. Reviewed-by: valeriep

7032960: API files in java.awt need to be updated for references to JVM Spec with editions/hyperlinks 7032965: API files in java.io need to updated for references to JVM Spec with editions/hyperlinks 7032958: API files in java.lang need to updated for references to JLS with editions/hyperlinks 7032961: API files in java.lang need to updated for references to JVM with editions/hyperlinks 7032976: API files in javax.lang need to be updated for references to JLS with editions/hyperlinks 7032959: API files in java.util need to updated for references to JLS with editions/hyperlinks 7032962: API files in java.util need to updated for references to JVM Spec with editions/hyperlinks 7032967: API files in java.security need to updated for references to JVM Spec with editions/hyperlinks 7032955: API files in java.math need to updated for references to JLS with editions/hyperlinks Summary: Removed URLs and 'edition' references Reviewed-by: darcy

7031343: Provide API changes to support future GCM AEAD ciphers Reviewed-by: valeriep, xuelei

6914617: JCE framework code signing certificate is expiring at the end of 2010. Reviewed-by: valeriep, weijun, mullan

6597112: referential integrity loophole during remote object export Reviewed-by: peterjones Contributed-by: Neil Richards <neil.richards@ngmr.net>

7036251: Correct SQLPermission constructor javadocs for permission target names Reviewed-by: alanb

6986789: Sun pkcs11 provider fails to parse path name containing "+" Summary: Modified to accept '+' as valid character. Reviewed-by: weijun

7001094: Can't initialize SunPKCS11 more times than PKCS11 driver maxSessionCount Summary: Changed SessionManager to keep track of session count for each instance Reviewed-by: mullan

7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin Summary: Test needs to properly detect missing AgentInitializationException. Clarify when exceptions are expected. Another Cygwin tweak. Reviewed-by: dsamersoff, ohair

7007772: Address typos in javadoc for ResultSet Reviewed-by: ohair, smarks

7035615: Address lint warnings for javax.sql.rowset & com.sun.rowset Reviewed-by: alanb, darcy

6882437: CertPath/X509CertPathDiscovery/Test fails on jdk7/pit/b62 Summary: Pass trust anchors to CRL certification path building, support CRLs without AKID extension. Reviewed-by: mullan

7026304: Fork-Join sample Summary: Implement a merge-sort sample using Fork-Join Reviewed-by: hosterda, chegar, dholmes

7026287: Asynchronous API sample Summary: Implement a chat server using the new asynchronous networking API Reviewed-by: hosterda, alanb

7035834: Bad @param tags in LayerUI.java Reviewed-by: rupashka

Merge

7034532: (fs) AssertionError when working directory is UNC Reviewed-by: forax, mduigou

7033561: Missing Unicode Script aliases Summary: added 6.0 aliases Reviewed-by: okutsu, peytoia, alanb

7030180: AES 128/256 decrypt exception Reviewed-by: valeriep

7012160: read SF file in signed jar in streaming mode Reviewed-by: mullan

7035020: ForkJoinPool.invoke may deadlock if parallelism = 1 Reviewed-by: chegar

6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled Summary: Reorg the SSLContext implementation Reviewed-by: weijun

7034700: (unpack200) build fails with fastdebug builds Reviewed-by: ohair

7029048: (launcher) fence the launcher against LD_LIBRARY_PATH Reviewed-by: mchung, ohair

7034656: Address lint warnings for DriverManager Reviewed-by: alanb, forax, ohair

7034657: Update Creative Commons license URL in legal notices Reviewed-by: chegar

7033954: (launcher) Launchers not built with mapfiles Reviewed-by: ohair

7032354: no-addresses should not be used on acceptor side Reviewed-by: valeriep

7034471: Wrap registeredDrivers in DriverManager Reviewed-by: alanb, briangoetz

Merge

7034155: (ch) NullPointerException in sun.io.ch.IOUtil when OOM is thrown Reviewed-by: forax

7031546: test/java/util/ResourceBundle/Bug4168625Test.java fails on solaris10u9 sparc. Reviewed-by: okutsu

6312706: Map entrySet iterators should return different entries on each call to next() Reviewed-by: mduigou, alanb Contributed-by: Neil Richards <neil.richards@ngmr.net>

Merge

7034614: The insets of TitledBorder vary, will be modified by another method, in JDK7 Reviewed-by: rupashka

Merge

7036148: NullPointerException with null JMenu name Reviewed-by: rupashka

6985329: 9 classes in swing.plaf contains words inappropriate for public spec - about some compiler bug Reviewed-by: rupashka

Merge

7032903: javax/swing/JComponent/6989617/bug6989617.java test fails against jdk7 Reviewed-by: rupashka

7035446: some regression tests take too long Reviewed-by: peytoia

7036842: HTML tag mismatch in API doc for ChoiceFormat Reviewed-by: okutsu

7032911: javax/swing/JLabel/7004134/bug7004134.java test fails against jdk7 Reviewed-by: malenkov

7028818: (lc) Lazily initialize locale extension 7029740: (lc) New Locale class implementation doesn't follow the Java coding conventions 7032820: (lc) sun.util.locale.InternalLocaleBuilder.CaseInsensitiveChar.equals problems 7033503: (lc) Restore optimization code for Locale class initialization 7033504: (lc) incompatible behavior change for ja_JP_JP and th_TH_TH locales Reviewed-by: naoto

7030774: javax/swing/text/CSSBorder/6796710/bug6796710.java test fails against jdk7 b134 Reviewed-by: malenkov

7032376: A type parameter isn't seen by using an web browser Reviewed-by: malenkov

7034231: Default font appears twice in fallback font list Reviewed-by: okutsu, prr

7035073: Add missing timezones to TimeZoneNames_pt_BR.java Reviewed-by: okutsu

7025525: CSS property list in javax.swing.text.html.CSS is incomplete Reviewed-by: alexp

7030623: closed/javax/accessibility/4864610/bug4864610.java test fails just against jdk7 b134 Reviewed-by: peterz

6596966: Some JFileChooser mnemonics do not work with sticky keys Reviewed-by: alexp

6849232: closed/javax/swing/text/GlyphPainter2/6427244/bug6427244.java fails on RHEL5 Reviewed-by: peterz

6992523: FindBugs scan - Malicious code vulnerability Warnings in com.sun.media.sound.* Reviewed-by: alexp

7009127: [Spec clarification request] Wrapping the devices retrieved from MidiDeviceProvider Reviewed-by: alexp

7003777: Nonexistent html entities not parsed properly. Reviewed-by: peterz

6973777: JCK manual case JEditorPaneTests.html#JEditorPane fails in jdk7 b100 Reviewed-by: peterz

Merge

Merge

6983562: Two java/awt tests failing just on jdk7b108 Reviewed-by: art, denis, dcherepanov

7032566: Toolkit.areExtraMouseButtonsEnabled() not alws correspnd "sun.awt.enableExtraMouseButtons" sys prop Reviewed-by: art, dcherepanov

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

7036540: A change for 7021001 and some makefile changes have been pushed as a part of 7030062 Reviewed-by: dcherepanov

7030062: duplicate free Reviewed-by: dcherepanov

7008513: Case TranslucentJAppletTest.jtr automatically failed due to java.lang.RuntimeException Summary: Set transparent background to the applet Reviewed-by: art, dcherepanov

7029832: Buffer overrun at awt_LoadLibrary.c (and java_props_md.c) Reviewed-by: anthony, art

7027013: Regression: JComponent.revalidate() has no effect on invisible components Summary: Dialog.conditionalShow() should call validateUnconditionally() instead of simple validate() Reviewed-by: art, dcherepanov

7031854: JCK 7 test FileDialogTest0001 fails on Windows with Russian locale Reviewed-by: uta, dcherepanov

7016889: GraphicsDevice.setFullScreenWindow() spec for simulated full-screen mode is not always correct Reviewed-by: art, anthony

7002839: Static initialization deadlock between sun.awt.Win32GraphicsEnvironment and sun.awt.windows.WToolkit Reviewed-by: art, dcherepanov, denis

6998877: After double-click on the folder names , FileNameOverrideTest FAILED Reviewed-by: art, dcherepanov, anthony

Merge

6942504: test/javax/imageio/metadata/DOML3Node.java fails Reviewed-by: bae, jgodinez

7036275: EUDC character is not displayed on Swing if ClearType is enabled Reviewed-by: igor, jgodinez

7004984: Features.h was renamed to ICUFeatures.h and should be removed Reviewed-by: srl

7033534: Two tests fail just against jdk7 b136 Reviewed-by: jgodinez, prr

6983666: Typo in JavaDoc comments within FileCacheImageOutputStream Reviewed-by: jgodinez

Added tag jdk7-b139 for changeset 9d9c9b8d0e5c

Merge

7039044: Bump the HS21 build number to 10 Summary: Update the HS21 build number to 10 Reviewed-by: jcoomes

Merge

Merge

7036706: G1: Use LIR_OprDesc::as_pointer_register in code changes for 7035117 Summary: Use LIR_OprDesc::as_pointer_register() instead as_register/as_register_lo combination in the code changes for 7035117. Reviewed-by: iveresov

7036021: G1: build failure on win64 and linux with hs21 in jdk6 build environment Summary: Missing parentheses around a casted expression and some missing casts were causing build failures with the jdk6 build tools. Reviewed-by: kvn, brutisso

Merge

7036482: clear argument is redundant and unused in cardtable methods Summary: Removed the unused clear argument to various cardtbale methods and unused mod_oop_in_space_iterate method. Unrelated to synopsis, added a pair of clarifying parens in AllocationStats constructor. Reviewed-by: brutisso, jcoomes

Merge

7035117: G1: nsk/stress/jni/jnistress002 fails with assertion failure Summary: Allow long type for offset in G1 code in compiler implementations of Unsafe.getObject Reviewed-by: never, iveresov

Merge

Merge

6841742: par compact - remove unused/unsupported options Summary: ignore UseParallel{OldGCDensePrefix,OldGCCompacting,DensePrefixUpdate} Reviewed-by: jwilhelm, brutisso

7034133: cleanup obsolete option handling Reviewed-by: ysr, johnc, poonam

7009266: G1: assert(obj->is_oop_or_null(true )) failed: Error Summary: A referent object that is only weakly reachable at the start of concurrent marking but is re-attached to the strongly reachable object graph during marking may not be marked as live. This can cause the reference object to be processed prematurely and leave dangling pointers to the referent object. Implement a read barrier for the java.lang.ref.Reference::referent field by intrinsifying the Reference.get() method, and intercepting accesses though JNI, reflection, and Unsafe, so that when a non-null referent object is read it is also logged in an SATB buffer. Reviewed-by: kvn, iveresov, never, tonyp, dholmes

7032963: StoreCM shouldn't participate in store elimination Reviewed-by: kvn

Merge

7007254: NullPointerException occurs with jvisualvm placed under a dir. including Japanese chars Summary: use java_lang_String::create_from_platform_dependent_str() instead of java_lang_String::create_from_str() in JvmtiEnv::AddToSystemClassLoaderSearch() Reviewed-by: dcubed

7032407: Crash in LinkResolver::runtime_resolve_virtual_method() Summary: Make CDS reorder vtables so that dump time vtables match run time order, so when redefine classes reinitializes them, they aren't in the wrong order. Reviewed-by: dcubed, acorn