Merge

6686215: Some mutables not defensively copied when deserializing java.security.CodeSource & Timestamp objects Reviewed-by: mullan

7027288: (launcher) remove jkernel test from MiscTests Reviewed-by: mchung, herrick

7009794: misleading text in SSLHandshakeException exception message Summary: update the warning message Reviewed-by: weijun

6990848: JGSS/windows security code native code compiler warnings Reviewed-by: valeriep

7023613: (lc) Incorrect string returned by Locale.toString() with non-empty script field Reviewed-by: srl

7023416: (pack200) fix parfait issues Reviewed-by: jrose

7023363: URI("ftp", "[www.abc.com]", "/dir1/dir2", "query", "frag") should throw URISyntaxException Reviewed-by: alanb, michaelm

Merge

6986477: sun/security/mscapi/AccessKeyStore.sh test is failing on jdk7 Reviewed-by: valeriep

7026346: URLConnection.guessContentTypeFromStream does not support UTF-8 and UTF-32 xml streams with BOM Reviewed-by: alanb Contributed-by: Charles Lee <littlee@linux.vnet.ibm.com>

7024560: InetAddress.getLocalHost().getHostName() returns localhost for hostnames of length HOST_NAME_MAX Reviewed-by: alanb, michaelm

7016078: javax.net.ssl.SSLException: Received fatal alert: internal_error starting JDK 7 b126 Reviewed-by: valeriep

6960211: JavaScript engine allows creation of interface although methods not available Reviewed-by: jjh

Merge

6635776: Regression in jaxb tests with JDk6 U4 6741058: Move org/relaxng/datatype sources from jdk to jaxws workspace Reviewed-by: ohair, alanb

7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security Reviewed-by: ohair, alanb

7022370: Launcher ergonomics should provide simple default implementation Summary: Use a common, platform independent, implementation unless an architecture specific implementation exists Reviewed-by: ksrini, mchung, ohair, gbenson

Merge

6611830: UUID thread-safety and performance improvements Reviewed-by: mduigou, jjb, alanb, briangoetz, dholmes, peterjones Contributed-by: Daniel Aioanei <danielaioanei@google.com>

7023006: Reduce unnecessary thread activity in ForkJoinPool Reviewed-by: chegar, dholmes

6495521: (doc) ConcurrentSkipListMap links to web page NOT describing SkipList Summary: update link, and minor implementation comment in Exchanger Reviewed-by: chegar, mduigou

Merge

Merge

7027387: (tz) Support tzdata2011d Reviewed-by: okutsu

7021517: java.beans code comments have issues with HTML4 compliance Reviewed-by: rupashka

7027043: (doc) Confusing typo at java/beans/VetoableChangeSupport.java Reviewed-by: rupashka

7016150: 6246816 refers to the Laffy demo which is not present in the JDK 7 demo/jfc directory Reviewed-by: peterz

6464022: Memory leak in JOptionPane.createDialog Reviewed-by: alexp

Merge

Merge

7016131: JDK 7 b127: 8 crashes in native frame:awt_DrawingSurface_FreeDrawingSurfaceInfo+0xc on linux amd64 Reviewed-by: dcherepanov, art

7022931: GradientPaint class spec clarification: 7022931, 7016391, 7017246, 7019386 Reviewed-by: flar

7023019: Constructor of class java.awt.Component.FlipBufferStrategy throws unspecified IAE Reviewed-by: dcherepanov, art

Merge

7014528: ColorModel and SampleModel gotten from the same ImageTypeSpecifier instance can be not compatible Reviewed-by: jgodinez, prr

6989760: cmm native compiler warnings Reviewed-by: prr, ohair

7019861: Last scanline is skipped in pisces.Renderer. Summary: not skipping it anymore. Reviewed-by: flar

7027667: clipped aa rectangles are not drawn properly. Summary: Already fixed. This is just a regression test for it. Reviewed-by: prr

6710434: PIT: Reg test java/awt/Graphics2D/ClipPrimitivesTest.java fails in pit build 6u10_b26 Reviewed-by: flar, prr

7022280: Parfait reports Format string argument mismatch in /jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Reviewed-by: jgodinez, prr

7020528: closed/java/awt/print/PageFormat/PageFormatFromAttributes.java failed Reviewed-by: igor, prr

6962082: merge back in lines from bad merge in CR 6501644 and open up a test Reviewed-by: igor, prr

7017324: Kerning crash in JDK 7 since ICU layout update Reviewed-by: igor, prr

Added tag jdk7-b135 for changeset 81eebf5a4f77

Merge

7031227: Bump the HS21 build number to 06 Summary: Update the HS21 build number to 06 Reviewed-by: jcoomes

Merge

Merge

7025628: Remove the temporary hack added for jdk modularization in hotspot Summary: Removed Reviewed-by: ohair, coleenp

6535709: interrupt of wait()ing thread isn't triggerring InterruptedException - test intwait3 Summary: only clear the interrupt state if we will report that it was set Reviewed-by: dcubed, alanb, phh, coleenp, dice

Merge

7029805: JSR 292 compiler/6991596/Test6991596.java fails in nightly Summary: Both JSR 292 compiler tests were moved with 6839872 to the jdk repository Reviewed-by: never

7008866: Missing loop predicate for loop with multiple entries Summary: Add predicates when loop head bytecode is parsed instead of when back branch bytecode is parsed. Reviewed-by: never

7027232: JSR 292: wrong numeric value returned by MH on solaris-sparc Reviewed-by: kvn, never

Merge

7030300: more nightly failures after statics in Class changes Reviewed-by: iveresov, jcoomes, dcubed

6962931: move interned strings out of the perm gen Reviewed-by: never, coleenp, ysr, jwilhelm

6962930: make the string table size configurable Reviewed-by: never, phh, stefank, kamg, dholmes, coleenp

7029509: nightly failures after static fields in Class Reviewed-by: kvn