7174351: test/sun/security/tools/keytool/standard.sh failed after new Hashtable Reviewed-by: xuelei

Merge

6183404: Many eudc characters are incorrectly mapped in MS936 and GBK converter Summary: updated MS936 and GBK mappings Reviewed-by: alanb

7173515: (se) Selector.open fails with OOME on Solaris when unlimited file descriptors Reviewed-by: coffeys, chegar

7172701: KDC tests cleanup Reviewed-by: xuelei

7173044: MemoryMonitor hangs if getMax method in MemoryUsage object returns -1 Reviewed-by: dholmes, sspitsyn

7173036: test/com/sun/jdi/ConnectedVMs.java does not run as expected Reviewed-by: alanb

7166055: Javadoc for WeakHashMap contains misleading advice Reviewed-by: dholmes, mduigou

7173432: Handle null key at HashMap resize Summary: If the key to be inserted into a HashMap is null and the table needs to be resized as part of the insertion then addEntry will try to recalculate the hash of a null key. This will fail with an NPE. Reviewed-by: darcy

Merge

Merge

6854712: Revocation checking enhancements (JEP-124) 6637288: Add OCSP support to PKIX CertPathBuilder implementation 7126011: ReverseBuilder.getMatchingCACerts may throws NPE Reviewed-by: xuelei

7126277: Alternative String hashing implementation Summary: All of the hashing based Map implementations: HashMap, Hashtable, LinkedHashMap, WeakHashMap and ConcurrentHashMap are modified to use an enhanced hashing algorithm for string keys when the capacity of the hash table has ever grown beyond 512 entries. The enhanced hashing implementation uses the murmur3 hashing algorithm along with random hash seeds and index masks. These enhancements mitigate cases where colliding String hash values could result in a performance bottleneck. Reviewed-by: alanb, forax, dl

6924259: Remove offset and count fields from java.lang.String Summary: Removes the use of shared character array buffers by String along with the two fields needed to support the use of shared buffers. Reviewed-by: alanb, mduigou, forax, briangoetz Contributed-by: brian.doherty@oracle.com

7168401: pack200 does not produce a compatible pack file for JDK7 classes if indy is not present Reviewed-by: jrose

7171591: getDefaultScopeID() in src/solaris/native/java/net/net_util_md.c should return a value Summary: Use CHECK_NULL_RETURN instead of CHECK_NULL Reviewed-by: alanb

7172177: test/java/util/TimeZone/DstTzTest.java failing on all platforms Reviewed-by: alanb, okutsu

Merge

7170449: Management is completely broken at least on Solaris 11 X86 Summary: Work around 'gobjcopy' failures on Solaris by adding temporary tools to add the '.gnu_debuglink' section and remove the SHF_ALLOC flag from "empty" section headers. Reviewed-by: sspitsyn, acorn

7171474: Incorrect @see tags in java.lang.NumberFormatException javadoc Summary: update javadoc for NumberFormatException Reviewed-by: alanb

7017818: NLS: JConsoleResources.java cannot be handled by translation team Reviewed-by: mchung, mfang

7171028: dots are missed in the datetime for Slovanian Reviewed-by: yhuang

7094176: (tz) Incorrect TimeZone display name when DST not applicable / disabled Reviewed-by: okutsu

7117230: clean up warnings in java.text Reviewed-by: jrose, smarks

Merge

7143353: -Xrunhprof fails in Java 7 due to bad switch Reviewed-by: jrose, sspitsyn

7160725: Strange or obsolete @see tags in some exception java.lang javadoc Summary: update javadoc for IllegalArgumentException and NumberFormatException Reviewed-by: alanb

7169050: (se) Selector.select slow on Solaris due to insertion of POLLREMOVE and 0 events Reviewed-by: chegar, coffeys