Merge

Added tag jdk7-b119 for changeset d45d466d6759

Added tag jdk7-b120 for changeset a3c4c326e934

Merge

Merge

Merge

6992226: Missing windows COMPANY file property settings Reviewed-by: ohair

Merge

Merge

Merge

Merge

Merge

7003544: backout of openjdk changeset 6a391a0ed0da Reviewed-by: ohair

Merge

6998016: Incorrect ifdef nesting in sane-gcc-compiler rule 6998014: Use /etc/lsb-release, when available, to detect linux variant and version Reviewed-by: dholmes, ohair

7002986: (pack200) intermittent failures compiling pack200 Reviewed-by: jjg

6878369: (ch) AsynchronousSocketChannel read/write methods that specify timeouts should not throw IAE Reviewed-by: forax

6452854: Provide a flag to print the java configuration Reviewed-by: darcy, mchung, sherman, dholmes, mduigou

7002036: ktab return code changes on a error case Reviewed-by: valeriep

7001434: charset name for Cp833 should be x-IBM833. Summary: changed the name to x-IBM833 in extsbcs Reviewed-by: alanb

6858865: Fix for 6728376 causes regression if the size of "data" is 0 and malloc returns Null for 0-length Summary: don't throw OOME when in or out buffer size is 0 length Reviewed-by: alanb

Merge

Merge

6995424: Eliminate dependency to a deprecated API com.sun.security.auth.PolicyFile Reviewed-by: mchung

Merge

6984182: Setting SO_RCVBUF/SO_SNDBUF to larger than tcp_max_buf fails on Solaris 11 if kernel params changed Reviewed-by: alanb, chegar

6979329: CCacheInputStream fails to read ticket cache files from Kerberos 1.8.1 Reviewed-by: valeriep

6903584: Legal notice repair: Three files under jdk/src/share/classes/sun/security/ssl/ Reviewed-by: weijun

6720456: New 4150 may have larger blowfish keysizes Summary: Changed to use TBD value instead of FAIL Reviewed-by: weijun

6203816: Can not run test/java/security/Security/ClassLoaderDeadlock.sh from the command line Summary: Fixed the script to not delete the provider sub-directory Reviewed-by: weijun

7001669: Typo in javadocs for SQLPermission Reviewed-by: alanb

7000752: Duplicate entry in RowSetResourceBundles.properties Reviewed-by: alanb

6957230: CharsetEncoder.maxBytesPerChar() reports 4 for UTF-8; should be 3 Summary: changged utf-8's CharsetEncoder.maxBytesPerChar to 3 Reviewed-by: alanb

6989471: compiler warnings building java/zip native code Summary: remvoed the warning Reviewed-by: ohair, alanb

6631046: BufferedInputStream.available() reports negative int on very large inputstream Reviewed-by: dholmes, alanb, mduigou

Merge

7001301: com/sun/net/httpserver/bugs/6725892/Test.java failing Reviewed-by: alanb

6712185: java/util/concurrent/Executors/AutoShutdown.java fails on slow or busy systems Reviewed-by: chegar, alanb

Merge

7000913: (bf) CharBuffer.wrap, slice, position, slice leads to CharBuffer with incorrect offser Reviewed-by: forax

6217210: RFE: Support for Cp833 in 1.4.2 Summary: Forward port the Cp833 charset Reviewed-by: poonam

6615506: (fmt spec) Date/Time conversion table missing column for 'Z' Summary: added the column entry back in Reviewed-by: alanb

Merge

6725892: Http server stability issues Reviewed-by: chegar

Merge

6687725: Internal PKCS5Padding impl should throw IllegalBlockSizeException and not BadPaddingException Summary: Changed to throw IllegalBlockSizeException when the data length isn't multiples of block size Reviewed-by: wetmore

6848930: JSN security test jce/Global/Cipher/PKCS5Padding cannot thrown expected BadPaddingException Summary: Disabled CKM_DES_CBC_PAD, CKM_DES3_CBC_PAD, CKM_AES_CBC_PAD mechs by default and use our own internal padding impl. Reviewed-by: wetmore

6613829: (docs) Readable.read() ReadOnlyBufferException is not linked Reviewed-by: chegar, lancea

Merge

6988188: The test failed due to Applet thread threw exception Reviewed-by: alexp

Merge

6981576: TitledBorder.getBorder() returns null in java build 1.7.0-ea-b107 Reviewed-by: alexp

6999033: Methods BorderFactory.createSoftBevelBorder() don't return SoftBevelBorder instances Reviewed-by: alexp

6939227: Nimbus: 6597895 for JCheckBox, JButton and JToggleButton JCK tests Reviewed-by: rupashka

6939001: Nimbus: JTabbedPane setBackgroundAt and setForegroundAt have no effect Reviewed-by: rupashka

6559589: Memory leak in JScrollPane.updateUI() Reviewed-by: rupashka

7002176: JLayer docs build produces warnings Reviewed-by: dav

6992847: javax/swing/JLayer/SerializationTest/SerializationTest.java failed in jdk7 just against b114 Reviewed-by: rupashka

6999872: java.awt.Window instantiation leads to JVM CRASH on Windows, JDK7b118+ fastdebug Reviewed-by: igor, dcherepanov

6807534: CurrencyNameProvider.getDisplayName(String, Locale) doesn't throw IllegalArgumentException Reviewed-by: okutsu

7002398: Apply Corrigendum #8 for Unicode 6.0.0 Reviewed-by: okutsu

6930106: Testcases with legal notice problems Reviewed-by: ohair

7000136: Backward compatibility problem in LocaleNameProvider Reviewed-by: srl Contributed-by: y.umaoka@gmail.com

6997170: Spec for javax.swing.plaf.LayerUI.installUI/uninstallUI() methods contradict behavior of the RI Reviewed-by: rupashka