6908299: Missed changes for 6664512 during the merge with 6879044 Reviewed-by: mchung, art

Merge

6904882: java.awt.Font.createFont() causes AccessControlException if executed with "-Djava.security.manager" Summary: Perform FontUtilities initialization in privileged block Reviewed-by: igor, prr

6896335: GraphicsEnvironment.getDefaultScreenDevice() throws UnsatisfiedLinkError in headless mode Summary: Use local ge variable instead of localEnv field in GE. Reviewed-by: igor, prr

6888734: PIT: regression test fails when java.security.manager is enabled Summary: Load FontManager instance in privileged block to avoid AccessControlException Reviewed-by: igor, tdv

Merge

6923692: java/classes_util TEST_BUG:ReadZip.java fails when Summary: to create the test file at test.dir Reviewed-by: alanb

6923976: TestProviderLeak.java is using too small of an initial heap under newer Hotspot (b79+) Reviewed-by: ohair

6919132: Regex \P{Lu} selects half of a surrogate pari Summary: To use StartS for complement category/block class Reviewed-by: martin, okutsu

6922482: keytool's help on -file always shows 'output file' Reviewed-by: wetmore

6921740: Eliminate warnings from sun.io converters and allow compiling with JAVAC_MAX_WARNINGS=true Summary: Fix sun.io converters unchecked and cast warnings produced by -Xlint:all Reviewed-by: alanb, sherman

6920732: opensource test/java/nio/charset Summary: move the test cases to openjdk Reviewed-by: martin

Merge

6920143: test/java/awt/TestArea/UsingWithMouse.java needs realSync() Summary: Added small delay to make sure that TextArea animation have finished Reviewed-by: anthony

6905552: libnet/nio portability issues Reviewed-by: alanb

6919185: test/closed/sun/net/ftp/FtpTests fails to compile Summary: Fixed a couple of regressions in FtpClient and updated the test. Reviewed-by: chegar

6919610: KeyTabInputStream uses static field for per-instance value Reviewed-by: mullan

6707289: InterfaceAddress.getNetworkPrefixLength() does not conform to Javadoc Reviewed-by: michaelm

Merge

6763530: Cannot decode PublicKey (Proider SunPKCS11, curve prime256v1) Reviewed-by: andrew

6580131: 3/4 CompiledMethodLoad events don't produce the expected extra notifications to describe inlining Summary: Add support for additional implementation specific info to the JVM/TI CompiledMethodLoad event via the compile_info parameter. Reviewed-by: never, ohair, tbell, tdeneau Contributed-by: Vasanth Venkatachalam <vasanth.venkatachalam@amd.com>

6862064: incorrect implementation of PKIXParameters.clone() Reviewed-by: weijun, mullan

Added tag jdk7-b83 for changeset 063470ff633d

Merge

Added tag jdk7-b83 for changeset 36d525db29a0

Added tag jdk7-b83 for changeset 109f388bca57

Added tag jdk7-b83 for changeset 34c8199936a1

Merge

Merge

Added tag jdk7-b82 for changeset 737d10f28a89

Merge

Added tag jdk7-b82 for changeset d512637fe883

Merge

Added tag jdk7-b82 for changeset 735cf3731da4

Merge

Added tag jdk7-b82 for changeset 5960e50c8713

Merge

Added tag jdk7-b82 for changeset ca4ba6dd55c0

Merge

Added tag hs15-b05 for changeset c77d20908054

Added tag hs15-b04 for changeset 0ea2576e714b

Added tag hs15-b03 for changeset c5c3e5f4accc

Added tag hs15-b02 for changeset ccfb5ba09cb6

Added tag hs15-b01 for changeset a128eac78670

Added tag hs16-b08 for changeset d716bbc29dcc

Added tag hs16-b07 for changeset 699915c095af

Added tag hs16-b06 for changeset 60611616dba4

Added tag hs16-b05 for changeset 06171649948f

Added tag hs16-b04 for changeset 28ccf5edf0ec

Added tag hs16-b03 for changeset 10154d4b4b4b

Added tag hs16-b02 for changeset 86c4409e49f6

Added tag hs16-b01 for changeset 1ecc4413e7e7

Added tag hs17-b09 for changeset 246521c00249

Added tag hs17-b08 for changeset 4197a09e1259

Added tag hs17-b07 for changeset 8f15a8afca28

Added tag hs17-b06 for changeset 9b63533d5895

Added tag hs17-b05 for changeset 02d36709a16f

Added tag hs17-b04 for changeset ac997bc87110

Added tag hs17-b03 for changeset b95ea007fe67

Added tag hs17-b02 for changeset 2248859f89d4