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