Merge

Merge

7034918: Integrate JAX-WS 2.2.4-b01 in to JDK 7 Reviewed-by: ramap

Added tag jdk7-b139 for changeset abe0fef42da3

Merge

Added tag jdk7-b139 for changeset 190a0cc8ef93

Merge

Added tag jdk7-b139 for changeset 01cb01fa8690

Merge

Merge

Merge

6994753: Optional tracking of JRE usage. Reviewed-by: mchung, ksrini, ohair

Merge

Merge

Merge

7035160: Disable broken test cases for test/java/lang/reflect/Generics/Probe.java Reviewed-by: alanb

7031076: Retained ZipFile InputStreams increase heap demand Summary: Allow unreferenced ZipFile InputStreams to be finalized, GC'd Reviewed-by: sherman, dholmes Contributed-by: neil.richards@ngmr.net

7037085: Add hashCode() to Timestamp to address Findbugs warning Reviewed-by: darcy, alanb, emcmanus

7036559: ConcurrentHashMap footprint and contention improvements Reviewed-by: chegar

7037436: CR 7035020 fails to check shutdown Reviewed-by: chegar

7030649: URL.equals() fails to compare jar urls Reviewed-by: michaelm

7021568: Double.parseDouble() returns architecture dependent results Reviewed-by: alanb

Merge

Merge

7036048: Bring the Java DB in JDK7 to the same level as JDK 6 (Java DB v10.6.2.1) Summary: Replace the existing Java DB bundles with newer ones, and move demo dir into JDK's demo dir as db Reviewed-by: ohair

7036582: Improve test coverage of java.math.BigDecimal Reviewed-by: darcy Contributed-by: sergey.kuksenko@oracle.com

7032589: FileHandler leaking file descriptor of the file lock Reviewed-by: forax, dcubed

7035115: sun/security/pkcs11/Provider/ConfigShortPath.java compilation failed Summary: Updated the test to use reflection and skip when SunPKCS11 provider not present. Reviewed-by: weijun

6430675: Math.round has surprising behavior for 0x1.fffffffffffffp-2 Reviewed-by: alanb

7036157: TCP connection does not use kdc_timeout Reviewed-by: valeriep

6626257: Update SWAN-specific webcaching to Oracle environment in the regression tests. Reviewed-by: valeriep

7032960: API files in java.awt need to be updated for references to JVM Spec with editions/hyperlinks 7032965: API files in java.io need to updated for references to JVM Spec with editions/hyperlinks 7032958: API files in java.lang need to updated for references to JLS with editions/hyperlinks 7032961: API files in java.lang need to updated for references to JVM with editions/hyperlinks 7032976: API files in javax.lang need to be updated for references to JLS with editions/hyperlinks 7032959: API files in java.util need to updated for references to JLS with editions/hyperlinks 7032962: API files in java.util need to updated for references to JVM Spec with editions/hyperlinks 7032967: API files in java.security need to updated for references to JVM Spec with editions/hyperlinks 7032955: API files in java.math need to updated for references to JLS with editions/hyperlinks Summary: Removed URLs and 'edition' references Reviewed-by: darcy

7031343: Provide API changes to support future GCM AEAD ciphers Reviewed-by: valeriep, xuelei

6914617: JCE framework code signing certificate is expiring at the end of 2010. Reviewed-by: valeriep, weijun, mullan

6597112: referential integrity loophole during remote object export Reviewed-by: peterjones Contributed-by: Neil Richards <neil.richards@ngmr.net>

7036251: Correct SQLPermission constructor javadocs for permission target names Reviewed-by: alanb

6986789: Sun pkcs11 provider fails to parse path name containing "+" Summary: Modified to accept '+' as valid character. Reviewed-by: weijun

7001094: Can't initialize SunPKCS11 more times than PKCS11 driver maxSessionCount Summary: Changed SessionManager to keep track of session count for each instance Reviewed-by: mullan

7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin Summary: Test needs to properly detect missing AgentInitializationException. Clarify when exceptions are expected. Another Cygwin tweak. Reviewed-by: dsamersoff, ohair

7007772: Address typos in javadoc for ResultSet Reviewed-by: ohair, smarks

7035615: Address lint warnings for javax.sql.rowset & com.sun.rowset Reviewed-by: alanb, darcy

6882437: CertPath/X509CertPathDiscovery/Test fails on jdk7/pit/b62 Summary: Pass trust anchors to CRL certification path building, support CRLs without AKID extension. Reviewed-by: mullan

7026304: Fork-Join sample Summary: Implement a merge-sort sample using Fork-Join Reviewed-by: hosterda, chegar, dholmes

7026287: Asynchronous API sample Summary: Implement a chat server using the new asynchronous networking API Reviewed-by: hosterda, alanb

7035834: Bad @param tags in LayerUI.java Reviewed-by: rupashka

Merge

7034532: (fs) AssertionError when working directory is UNC Reviewed-by: forax, mduigou

7033561: Missing Unicode Script aliases Summary: added 6.0 aliases Reviewed-by: okutsu, peytoia, alanb

7030180: AES 128/256 decrypt exception Reviewed-by: valeriep

7012160: read SF file in signed jar in streaming mode Reviewed-by: mullan

7035020: ForkJoinPool.invoke may deadlock if parallelism = 1 Reviewed-by: chegar

6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled Summary: Reorg the SSLContext implementation Reviewed-by: weijun

7034700: (unpack200) build fails with fastdebug builds Reviewed-by: ohair

7029048: (launcher) fence the launcher against LD_LIBRARY_PATH Reviewed-by: mchung, ohair

7034656: Address lint warnings for DriverManager Reviewed-by: alanb, forax, ohair

7034657: Update Creative Commons license URL in legal notices Reviewed-by: chegar

7033954: (launcher) Launchers not built with mapfiles Reviewed-by: ohair

7032354: no-addresses should not be used on acceptor side Reviewed-by: valeriep

7034471: Wrap registeredDrivers in DriverManager Reviewed-by: alanb, briangoetz

Merge