Merge

Merge

6831313: update jaxws in OpenJDK7 to 2.1 plus bug fixes from OpenJDK 6 6672868: Package javax.xml.ws.wsaddressing not included in make/docs/CORE_PKGS.gmk Reviewed-by: darcy

6278014: java.util.logging.LogRecord.getThreadID() should provide real thread id Summary: Make j.u.l. thread id a copy of Thread's id, for small values of thread id. Reviewed-by: alanb

6716076: test UTIL_REGRESSION/test/java/util/logging/LoggingDeadlock2.java failed with exit code 1 Reviewed-by: swamyv, mchung

6830220: Logging issues due to regression from bug fix 6797480 Reviewed-by: swamyv Contributed-by: jeremymanson@google.com

6831461: (sample) Copy -r fails with IllegalArgumentexception: 'maxDepth' is negative Reviewed-by: chegar

6830721: (fc) test/java/nio/channels/AsynchronousFileChannel/Basic.java intermittent failure Reviewed-by: sherman

Merge

Merge

Merge

Merge

6737315: LDAP serialized data vulnerability Reviewed-by: alanb

Merge

6721651: Security problem with out-of-the-box management Reviewed-by: emcmanus, lmalvent

Merge

6610896: JMX Monitor handles thread groups incorrectly Reviewed-by: emcmanus

Merge

6610888: Potential use of cleared of incorrect acc in JMX Monitor Reviewed-by: emcmanus

Merge

6691246: Thread context class loader can be set using JMX remote ClientNotifForwarded Reviewed-by: emcmanus

Merge

6656633: getNotificationInfo methods static mutable Reviewed-by: emcmanus, jfdenise

6630639: lightweight HttpServer leaks file descriptors on no-data connections Summary: not cleaning up no-data connections properly Reviewed-by: chegar

6804997: JWS GIF Decoding Heap Corruption [V-r687oxuocp] Reviewed-by: prr

6804998: JRE GIF Decoding Heap Corruption [V-y6g5jlm8e1] Reviewed-by: prr

2163516: Font.createFont can be persuaded to leak temporary files Reviewed-by: igor

6804996: JWS PNG Decoding Integer Overflow [V-flrhat2ln8] Reviewed-by: prr

6792554: Java JAR Pack200 header checks are insufficent Summary: Added several checks to ensure that the values read from the headers are consistent Reviewed-by: jrose

6632886: Font.createFont can be persuaded to leak temporary files 6522586: Enforce limits on Font creation 6652929: Font.createFont(int,File) trusts File.getPath Reviewed-by: igor

6717680: LdapCtx does not close the connection if initialization fails Reviewed-by: vinnie, xuelei

6652463: MediaSize constructors allow to redefine the mapping of standard MediaSizeName values Reviewed-by: igor, jgodinez

6766136: corrupted gif image may cause crash in java splashscreen library. Reviewed-by: prr, art

6755943: Java JAR Pack200 Decompression should enforce stricter header checks Summary: Fixes a core dump when fed with a faulty pack file and related malicious take over Reviewed-by: jrose

6721753: File.createTempFile produces guessable file names Reviewed-by: sherman

6726779: ConvolveOp on USHORT raster can cause the JVM crash. Reviewed-by: igor, prr

6734167: Calendar.readObject allows elevation of privileges Reviewed-by: peytoia

6733959: Insufficient checks for "Main-Class" manifest entry in JAR files Summary: Fixes a buffer overrun problem with a very long Main-Class attribute. Reviewed-by: darcy

6588160: jaas krb5 client leaks OS-level UDP sockets (all platforms) Reviewed-by: jccollet, chegar

6497740: Limit the size of RSA public keys Reviewed-by: andreas, valeriep, vinnie

Merge

6543863: (fc) FileLock.release can deadlock with FileChannel.close 6429910: (fc) FileChannel.lock() IOException: Bad file number, not AsynchronousCloseException 6814948: (fc) test/java/nio/channels/AsynchronousFileChannel/Lock.java failed intermittently 6822643: (fc) AsynchronousFileChannel.close does not invalidate FileLocks Reviewed-by: sherman

6795561: (bf) CharBuffer.subSequence() uses wrong capacity value for new buffer Reviewed-by: sherman, iris

4244499: ZipEntry() does not convert filenames from Unicode to platform 4532049: IllegalArgumentException in ZipInputStream while reading unicode file 5030283: Incorrect implementation of UTF-8 in zip package 4700978: ZipFile can't treat Japanese name in a zipfile properly 4980042: Cannot use Surrogates in zip file metadata like filenames 4820807: java.util.zip.ZipInputStream cannot extract files with Chinese chars in name Summary: Add new constructors for zip classes to support non-UTF-8 encoded names/comments in ZIP file Reviewed-by: alanb, martin

6830658: Changeset ec64fd74aa69 breaks the fastdebug build in NativeCreds.c Reviewed-by: tbell

6829098: Regression test java/security/Security/ClassLoaderDeadlock/Deadlock2.java error - missing ";" Summary: Added back the missing ";" Reviewed-by: weijun

6827153: Miscellaneous typos in javadoc Reviewed-by: alanb

6587676: Krb5LoginModule failure if useTicketCache=true on Vista Reviewed-by: valeriep