Merge

7071826: Avoid benign race condition in initialization of UUID Summary: Avoids mostly benign but sometimes expensive race condition on initialization of UUID.numberGenerator which is used by UUID.randomUUID() Reviewed-by: alanb, chegar

7167359: (tz) SEGV on solaris if TZ variable not set Reviewed-by: okutsu

7163874: InetAddress.isReachable should support pinging 0.0.0.0 Reviewed-by: alanb, chegar

Merge

Merge

4963723: Implement SHA-224 Summary: Add support for SHA-224, SHA224withRSA, SHA224withECDSA, HmacSHA224 and OAEPwithSHA-224AndMGF1Padding. Reviewed-by: vinnie

7163470: Build fails if javax.crypto src files not present Reviewed-by: valeriep

7096436: (sc) SocketChannel.connect fails on Windows 8 when channel configured non-blocking Summary: Set localAddress only when connection is established Reviewed-by: alanb

7167362: SecureRandom.init should be converted, amendment to 7084245 Reviewed-by: sherman

7165118: (prefs) AbstractPreferences.remove(null) does not throw NPE Summary: Insert null argument check in AbstractPreferences.remove() Reviewed-by: dholmes, chegar, alanb

7166955: (pack200) JNI_GetCreatedJavaVMs needs additional checking Reviewed-by: alanb, dholmes, ksrini Contributed-by: youdwei@linux.vnet.ibm.com

7165722: Invalid path in MemoryMonitor demo's README.txt Reviewed-by: alanb, sla

7166570: JSSE certificate validation has started to fail for certificate chains Reviewed-by: wetmore

7167092: Need to put the return clause in the synchronized block Summary: a regression fix for bug 7153184 Reviewed-by: wetmore

7157656: (zipfs) SeekableByteChannel to entry in zip file always reports its position as 0 Summary: updated SeekableByteChannel.read() to count the bytes read correctly Reviewed-by: sherman Contributed-by: paul.sandoz@oracle.com

7014640: To add a metachar \R for line ending and character classes for vertical/horizontal ws \v \V \h \H Summary: added propsoed constructs Reviewed-by: alanb

7103570: AtomicIntegerFieldUpdater does not work when SecurityManager is installed Summary: Perform class.getField inside a doPrivileged block Reviewed-by: chegar, psandoz

7166687: InetAddress.getLocalHost().getHostName() returns FQDN Reviewed-by: chegar

7166048: Remove the embeded epoll data structure. Reviewed-by: alanb

7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites Reviewed-by: weijun

7166598: FilteredRowSetImpl can result in Invalid Cursor Position Reviewed-by: lancea Contributed-by: Knut Anders Hatlen <knut.hatlen@oracle.com>

7160714: Strange or obsolete @see tags in some exception java.util javadoc Reviewed-by: mduigou, dholmes, alanb

7165102: Only run assertion on Integer autoboxing cache size once Reviewed-by: darcy, alanb

Merge

7170427: setGlobalCurrentFocusCycleRoot unexpectedly throws SecurityException Reviewed-by: art

7168144: No appropriate CCC request for changes introduced by 7154030 Reviewed-by: alexsch

7156191: [macosx] Can't type into applet demos in Pivot Reviewed-by: art

7145827: [macosx] JCK failure in b11: FocusableWindow3 Summary: forward posrt from 7u4 Reviewed-by: art

7145768: [macosx] Regression: failure in b11 of ModalDialogInFocusEventTest Summary: forward port from 7u4 Reviewed-by: art

7125044: [macosx] Test failure because Component.transferFocus() works differently in applet and application. Summary: forward port from 7u4 Reviewed-by: art

7154072: [macosx] swallowing key events Summary: forward posrt from 7u4 Reviewed-by: anthony