Merge

Added tag jdk7-b125 for changeset ad6f4daff46b

Merge

Merge

Merge

Merge

7010537: javah no longer depends on javadoc Reviewed-by: ohair

Merge

7009618: regression test failed caused by the fix for 7003462 Summary: avoid caching the "ended" Inflater in ZipFile class Reviewed-by: alanb

7010192: InetAddress.isReachable hits ShouldNotReachHere with hs20-b04 (win) Reviewed-by: chegar

Merge

6924489: sun.security.pkcs11.wrapper.PKCS11Exception: CKR_OPERATION_NOT_INITIALIZED Summary: Reset cipher state to un-initialized wherever necessary. Reviewed-by: weijun

7005984: 3/3 Incorrect values of S0C and S0CMX appear with -gcnewcapacity in jstat Summary: Swap S0C and S0CMX column values. Reviewed-by: ohair, dholmes, poonam

7002386: (launcher) fix XshowSettings Reviewed-by: darcy, mchung, naoto

Merge

6581254: pkcs11 provider fails to parse configuration file contains windows short path Summary: Modified configuration parsing code to support "~". Reviewed-by: weijun

6996365: Evaluate the priorities of cipher suites Reviewed-by: wetmore

6560348: PIT : java/awt/xembed/server/RunTestXEmbed.java fails Summary: Testcase correction. Reviewed-by: anthony

6968933: Clip loop() deadlock in DirectAudioDevice$DirectClip.run Reviewed-by: amenkov

6996367: improve HandshakeHash Reviewed-by: xuelei

6880112: Project Coin: Port JDK core library code to use diamond operator Reviewed-by: darcy, lancea, alanb, briangoetz, mduigou, mchung

7007157: (pack200) stripping attributes causes a NPE Reviewed-by: jrose, mduigou, dholmes

6975866: api/org_ietf/jgss/GSSContext/index.html#wrapUnwrapIOTest started to fail since jdk7 b102 Reviewed-by: valeriep

6980447: Rhino JavaScript engine code in jdk-7 has to updated with the latest code from Rhino 1.7R3. Summary: Updating Rhino javascript engine with version 1.7R3. Issue 6427783 (E4X support is missing from Sun's Mozilla JavaScript implementation) is also fixed as a side-effect. Reviewed-by: alanb, jjh

7006265: Javadoc warnings Reviewed-by: weijun

6927816: Demo crash in heaptracker with Non-Sun JDK due to possible violation of JNI spec Reviewed-by: ohair, alanb Contributed-by: spoole@uk.ibm.com

7006454: Typo in javadocs typo for Statement.executeBatch @since Reviewed-by: alanb

7006704: (pack200) add missing file for 6990106 Reviewed-by: mduigou, briangoetz

6990106: FindBugs scan - Malicious code vulnerability Warnings in com.sun.java.util.jar.pack.* Reviewed-by: mduigou, briangoetz

Merge

Merge

6989702: sound native code compiler warnings Reviewed-by: bae

7006997: A typo in MidiSystem.getTransmitter() implementation code Reviewed-by: dav

6842956: Assertion error in javax_sound on 64-bit RHEL 5.3 with 32-bit JDK Reviewed-by: bae

6532833: PIT: Metal LAF - The right side border is not shown for the Spinner after the removing the buttons Reviewed-by: alexp

6959584: closed/javax/swing/JFileChooser/4847375/bug4847375.java : compilation failed Reviewed-by: alexp

7003643: [Fmt-Me] MessageFormat.toPattern produces wrong quoted string and subformat modifiers 7008195: [Fmt-Me] Improve MessageFormat.applyPattern performance Reviewed-by: naoto, peytoia

7007708: TEST: javax/swing/JScrollBar/6542335/bug6542335.java failes agaisnt jdk7 on solaris/linux Reviewed-by: alexp

6973773: JCK manual case JSliderTests.html#JSlider fails in jdk7 b100 Reviewed-by: alexp

Merge

4940539: Constructor of java.util.Locale should handle ISO 639-2 Language Codes Reviewed-by: okutsu

7007905: javazic produces wrong line numbers Reviewed-by: peytoia

6943959: NumericShaper API doc doesn't describe ARABIC/EASTERN_ARABIC precedence Reviewed-by: peytoia

6983207: API: MessageFormat quote handling discrepancy Reviewed-by: peytoia

6644493: [Fmt-Da] SimpleDateFormat parsing RFC822 time offset is slow Reviewed-by: peytoia

7007583: (tz) Windows-only: update tzmappings for KB2443685 Reviewed-by: peytoia

6990037: font warnings in the build, missing fonts Reviewed-by: peytoia

Merge