Merge

7172551: Remove Native calls from DriverManager for jigsaw Reviewed-by: alanb, chegar, darcy, mchung

7175413: Typo in comments of JVM_SupportsCX8 in jvm.h Reviewed-by: chegar Contributed-by: Krystal Mok <sajia@taobao.com>

7174736: JCK test api/java_util/HashMap/index_EntrySet failing Summary: Corrects a problem with HashMap.removeEntry() that caused a JCK test to fail Reviewed-by: mduigou Contributed-by: alan.bateman@oracle.com

7174723: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing [win] Reviewed-by: mduigou

7175041: HttpTimestamper should accept https URI Reviewed-by: mullan

7163471: Licensee source bundle failed around 7u4 Reviewed-by: dholmes, sla, brutisso, erikj

7164256: EnumMap clone doesn't clear the entrySet keeping a reference to the original Map Reviewed-by: alanb, chegar, forax, mduigou Contributed-by: dbelfer@gmail.com

7175011: ProblemList.txt updates (6/2012) Reviewed-by: mduigou, chegar

Merge

7174861: all/OPT jdk build on Solaris with FDS enabled sets wrong options Summary: Use CFLAGS_COMMON instead of CC_OPT and CXXFLAGS_COMMON instead of CXX_OPT for setting FDS options. FDS should also set OPTIMIZATION_LEVEL. Reviewed-by: ihse, dholmes, ohair, dcubed

7172149: ArrayIndexOutOfBoundsException from Signature.verify Summary: take care of integer addition overflow Reviewed-by: xuelei, wetmore Contributed-by: Jonathan Lu <luchsh@linux.vnet.ibm.com>

7174244: NPE in Krb5ProxyImpl.getServerKeys() Reviewed-by: weijun

7173645: (props) System.getProperty("os.name") should return "Windows Server 2012" for Windows Server 2012 Summary: Enable Windows Server 2012 to be recognized as "os.name" Reviewed-by: alanb, dholmes, chegar

7172826: (se) Selector based on the Solaris event port mechanism Reviewed-by: coffeys, chegar

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