Merge

Added tag jdk7-b40 for changeset 116996236e31

Merge

Added tag jdk7-b40 for changeset 14c451a86ec1

Merge

Merge

6683213: CounterMonitor's derived Gauge badly initialized Reviewed-by: emcmanus

6745052: SLServerSocket file descriptor leak Summary: SSLServerSocketImpl.checkEnabledSuites() does not release the temporary socket properly Reviewed-by: wetmore, weijun

6728126: Parsing Extensions in Client Hello message is done in a wrong way Summary: the inputStream.read(byte[], int, 0) is not always return zero. Reviewed-by: wetmore, weijun

Merge

Merge

6755625: Add HttpURLConnection.setFixedLengthStreamingMode(long) Reviewed-by: jccollet

6765491: Krb5LoginModule a little too restrictive, and the doc is not clear. Reviewed-by: valeriep

6733095: Failure when SPNEGO request non-Mutual Reviewed-by: valeriep

Merge

6763122: ZipFile ctor does not throw exception when file is not a zip file Reviewed-by: bristor

6336968: Methods to convert AttributeList to/from Map 6750008: Add JMX.getSpecificationVersion(MBeanServerConnection) and document interop 6750472: Add a way to convert a CompositeData into a Map 6752563: Allow CompositeDataSupport to have zero items Summary: Small JMX RFEs Reviewed-by: dfuchs

5072267: A way to communicate client context such as locale to the JMX server Summary: Support for client contexts and also for localization of descriptions Reviewed-by: dfuchs

6765046: CertPathValidatorException(Throwable).getMessage() always returns null since b37 Reviewed-by: vinnie

Merge

6744888: OCSP validation code should permit some clock skew when checking validity of OCSP responses Summary: Allow for up to 10 minutes of clock skew when validating OCSP responses Reviewed-by: vinnie

Added tag jdk7-b40 for changeset eb261bd963b2

Merge

6775176: Bump HS14 build number to 08 Summary: Update the Hotspot build number to 08 Reviewed-by: jcoomes

Merge

Merge

6771742: Remove duplicate files from G1 merge Summary: Remove duplicate files and add includeDB_gc_g1 file in windows Makefile Reviewed-by: jcoomes, ysr

6770608: G1: Mutator thread can flush barrier and satb queues during safepoint 6660573: G1: BigApps Failure : guarantee(satb_mq_set.completed_buffers_num() == 0,"invariant") Summary: When exiting a mutator thread is removed from the thread list before it has a chance to flush its SATB and barrier queues. If GC happens at this moment the objects that are refererred from these queues can be moved, which will case a crash. The fix is simply to flush the buffers before removing a thread from the list. Reviewed-by: jcoomes, tonyp

6769128: failure to run generateJvmOffsets is ignored Reviewed-by: xlu

6718879: cannot build on solaris nevada Reviewed-by: xlu