Merge

6971706: sun/nio/cs/ext/* classes are duplicated between rt.jar, charsets.jar, and localedata.jar Reviewed-by: ohair

6982510: Updated SQLException subclasses from the outback for 6861385 so that the copyrights only have 2 years Reviewed-by: alanb

6680198: UnmarshalException caused by incompatible serialVersionUID Reviewed-by: sherman

6843995: RowSet 1.1 updates Reviewed-by: darcy, valeriep

6861385: Updated SQLException subclasses to clarify that they may be thrown for vendor specific conditions Reviewed-by: alanb

4881419: The type of X[].clone() should be X[] Reviewed-by: martin

Merge

6965072: Need API to create SDP sockets Reviewed-by: michaelm

Merge

Merge

6981001: (launcher) EnsureJREInstallation is not being called in order Reviewed-by: darcy

6977887: (doc) Java 6 API missing info about encoding parameter in storeToXML method Reviewed-by: sherman

6981145: (se) Eliminate JNI*Critical when creating pipes and other cleanups Summary: Avoid *Critical; fix compile warnings; improve readability Reviewed-by: alanb

6977548: Broken link in ClassLoader.defineClass javadoc Reviewed-by: valeriep

6981005: TEST BUG: java/lang/ClassLoader/TestCrossDelegate.sh timeout on windows Summary: Increase timeout value Reviewed-by: alanb

6911951: NTLM should be a supported Java SASL mechanism Reviewed-by: vinnie, michaelm

6980747: Runtime.exec can fail due to SecurityException (lnx) Summary: Add missing doPrivileged to UNIXProcess.java.linux Reviewed-by: alanb

6980019: Finish rename of ARM -> try-with-resources in jdk repository Reviewed-by: jjg

Merge

6741392: libmawt.so crash at Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeFinishPainting+0x4f Reviewed-by: peterz

6977726: JColorChooser.getPreviewPanel() returnes null starting from jdk7 b105. Reviewed-by: alexp

6635395: javax.swing.JDialog constructors should specify IAE throwing if invalid owners passed Reviewed-by: alexp

6978482: MetalBorders.ToolBarBorder should specify that its getBorderInsets impl accepts only JToolBar inst Reviewed-by: alexp

6979979: Rounding error in font sizes selected by the GTK Look and Feel Summary: Use floating point font sizes Reviewed-by: prr

4933700: RFE: Add way to get device from Receiver and Transmitter Reviewed-by: art

Merge

4937708: AudioFormat.matches should allow NOT_SPECIFY in all fields Reviewed-by: denis

6944033: RFE: add PCM_FLOAT support Reviewed-by: dav

6984418: (cal) GregorianCalendar.setWeekDate doesn't check parameter consistency in non-lenient Reviewed-by: peytoia

6943053: Gervill: failures on invalid ranges and 14-bit banks Summary: ModelStandardIndexedDirector fails on invalid ranges. Program changes with 14-bit banks where handled incorectly as 7-bit banks. Reviewed-by: amenkov

6941027: Gervill update, April 2010 Reviewed-by: amenkov

6875847: Java Locale Enhancement Reviewed-by: srl Contributed-by: Yoshito Umaoka <y.umaoka@gmail.com>, Doug Felt <dougfelt@google.com>, Mark Davis <markdavis@google.com>

6915566: Closed swing tests failing with assert errors when run with -ea -esa Reviewed-by: art, peterz

6912560: Timezone is not set correctly on Win Vista when Security manager is present. 6941137: DST broken in 6u18 when jre/lib/zi is moved elsewhere and replaced with symlink. Reviewed-by: peytoia

6983724: redundant @exception description for Character.Subset(String name) Reviewed-by: okutsu

4919632: RFE: SimpleDateFormat should fully support ISO8601 standard for timezone Reviewed-by: peytoia

6930062: Need to remove or build as part of the test file jdk/test/java/util/Locale/data/deflocale.exe Reviewed-by: okutsu

6981759: copyright header fix for test/java/util/Locale/LocaleCategory.java Reviewed-by: okutsu

Merge

Merge

Merge

4267450: (cal) API: Need public API to calculate, format and parse "year of week" 6549953: (cal) WEEK_OF_YEAR and DAY_OF_YEAR calculation problems around Gregorian cutover Reviewed-by: peytoia

6981466: Adding missing test LocaleCategory.java Reviewed-by: okutsu

4700857: RFE: separating user locale and user interface locale Reviewed-by: okutsu

Merge

6867293: switching TAB in a browser doesn't deactivate EmbeddedFrame Reviewed-by: dcherepanov, art

Merge

6480547: REG: bug 4118621 which got Integrated in 1.1.8 fails in mustang from b25 onwards. 6808185: test/closed/java/awt/Menu/NullMenuLabelTest crashes Reviewed-by: dcherepanov

6949936: Provide API for running nested events loops, similar to what modal dialogs do Reviewed-by: ant, anthony

Merge

6523398: OSS CMM: Need to implement writing ICC profile tags in new lcms library Reviewed-by: igor, prr

6972495: javax/imageio/CachePremissionsTest/CachePermissionsTest.java failed Reviewed-by: prr

Added tag jdk7-b111 for changeset 6daafb1093c6

Merge

6988779: c1_LIRAssembler_x86.cpp crashes VS2010 compiler Summary: The workaround changes the scope of the variable Reviewed-by: phh, ysr, kvn

6987149: Fix incorrect Oracle copyright header in make/templates files Summary: Minor fix to first line of template copyright files Reviewed-by: ohair

Merge

Merge

6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time Summary: Refine fix for 6561870 to only rebuild sa-jdi.jar when needed Reviewed-by: never, ohair, coleenp

6975210: java.lang.VerifyError in some of JCK tests Summary: Naked oop in verificationType::is_reference_assignable_from() Reviewed-by: never, kvn, coleenp

Merge

Merge

6981753: Rebrand vm vendor property settings Summary: Uses JDK_Version to determinate to set vm vendor to "Oracle Corporation" for JDK7 and later. Reviewed-by: kamg, ohair, coleenp

6974813: JVM needs to use demand loading for its DTrace probes Summary: Pass -xlazyload to the 'dtrace -G' invocation Reviewed-by: phh, ysr

Merge

6942092: Loader-constraint test is failing Summary: Fix test string compare to match source update Reviewed-by: dcubed, phh

Merge

6984368: Large default heap size does not allow to use zero based compressed oops Summary: take into account HeapBaseMinAddress and round down MaxPermSize Reviewed-by: never

6982370: SIGBUS in jbyte_fill Reviewed-by: kvn

6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions Reviewed-by: never

6984346: Remove development code in type.hpp Summary: Remove code which use UseNewCode in type.hpp Reviewed-by: never

6919069: client compiler needs to capture more profile information for tiered work Summary: Added profiling of instanceof and aastore. Reviewed-by: kvn, jrose, never

6984056: C1: incorrect code for integer constant addition on x64 Summary: Fix add/sub of constants to ints on x64 Reviewed-by: kvn

6934483: GCC 4.5 errors "suggest parentheses around something..." when compiling with -Werror and -Wall Summary: These are minor changes fixing compile failure when -Wall -Werror flags are used under gcc 4.5. Reviewed-by: twisti, kvn, rasbold Contributed-by: Pavel Tisnovsky <ptisnovs@redhat.com>

Merge

6983073: fix compiler error with GCC 4.4 or newer on SPARC Reviewed-by: twisti Contributed-by: Matthias Klose <doko@ubuntu.com>

6965815: OptimizeStringConcat: assert(!q->is_MergeMem()) failed with specjbb2000 Reviewed-by: kvn

6982533: Crash in ~StubRoutines::jbyte_fill with AggressiveOpts enabled Reviewed-by: kvn

6982921: assert(_entry_bci != InvocationEntryBci) failed: wrong kind of nmethod Summary: Assertion fails during print compilation because nmethod::print_on() calls osr_entry_bci() without checking that the method is an osr method. The fix adds an appropriate check. Reviewed-by: never, twisti

6953144: Tiered compilation Summary: Infrastructure for tiered compilation support (interpreter + c1 + c2) for 32 and 64 bit. Simple tiered policy implementation. Reviewed-by: kvn, never, phh, twisti

6981773: incorrect fill value with OptimizeFill Reviewed-by: kvn, twisti

Merge

6985022: update make/jprt.properties for new jdk7 tools Reviewed-by: ohair, kvn

6981746: G1: SEGV with -XX:+TraceGen0Time Summary: Pass correct value for length to NumberSeq constructor. Guard dereferences of "body_summary" pointer with a NULL check. Reviewed-by: tonyp, ysr

Merge

6983930: CMS: Various small cleanups ca September 2010 Summary: Fixed comment/documentation typos; converted some guarantee()s to assert()s. Reviewed-by: jmasa

Merge

6765718: Indicate which thread throwing OOME when generating the heap dump at OOME Summary: Emit a fake frame that makes it look like the thread is in the OutOfMemoryError zero-parameter constructor Reviewed-by: dcubed

6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?) Summary: Use javac's @filename construct to avoid long compile lines Reviewed-by: ohair, twisti, never Contributed-by: doko@ubuntu.com

6983320: Fork HS19 to HS20 - renumber Major and build numbers of JVM Summary: Update the Major and Build numbers for HS20 Reviewed-by: jcoomes

Merge

6982851: Add b107 machine classifications to jprt.properties file. Summary: See synopsis Reviewed-by: ohair

Merge

6870851: Bad frame_chop in StackMapTable crashes JVM Summary: Must check locals for null when processing chop frame Reviewed-by: dholmes, dcubed

6979444: add command line option to print command line flags descriptions Summary: Implementation of a nonproduct boolean flag XX:PrintFlagsWithComments Reviewed-by: kamg, dholmes, dsamersoff