Merge

7001423: JSR 292 bytecode enhancements need unit tests Reviewed-by: twisti

7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute Reviewed-by: twisti

6979327: method handle invocation should use casts instead of type parameters to specify return type Summary: Change result type parameters to result type casts. (Also, replace private placeholder class InvokeDynamic.) Reviewed-by: twisti

6981777: implement JSR 292 EG adjustments from summer 2010 Reviewed-by: twisti

6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions Summary: JDK changes which run atop the corresponding JVM hook Reviewed-by: never, twisti

Merge

Merge

7006129: Project Coin: Annotation type to reduce varargs warnings Reviewed-by: jjg, mcimadamore

7003462: cannot read InputStream returned by java.util.ZipFile.getInputStream(ZipEntry) Summary: The returned InflatedInputStream object should be kept in map streams Reviewed-by: alanb

Merge

6799854: CodeSigner.hashCode() does not work with serialization Reviewed-by: mullan

Merge

6998583: NativeSeedGenerator is making 8192 byte read requests from entropy pool on each init. Reviewed-by: wetmore, andrew, vinnie

7004439: SCTP_SET_PEER_PRIMARY_ADDR throws SocketException on Linux Summary: IPv4 addrs passed to SCTP_SET_PEER_PRIMARY_ADDR should not be converted to IPv4-mapped addrs Reviewed-by: michaelm

6659234: Incorrect check in SerialBlob.getBytes Reviewed-by: darcy

5076980: (fmt) FormattableFlags specifies unsupported '^' format flag Summary: replaced '^' with 'S' in spec Reviewed-by: darcy

6415373: (cs) UnicodeEncoder emits BOM when there are no bytes to encode Summary: no BOM output if no byte to encode Reviewed-by: alanb

6527572: (cs) Charset.forName can throw NullPointerException when testing bug level Summary: fixed the race condition Reviewed-by: alanb

6977034: Thread.getState() very slow Summary: Directly map the threadStatus value to Thread.State Reviewed-by: emcmanus, dholmes

6998860: Signed jar file verification is currently creating many extra new Sun providers. Reviewed-by: mchung

Merge

7005016: sqe test jhttp/HttpServer150013/HttpServer150013.java Reviewed-by: chegar

6990370: FindBugs scan - Malicious code vulnerability Warnings in com.sun.jndi.ldap.* Reviewed-by: xuelei

6990094: ObjectInputStream cloneArray doesn't handle short[] Reviewed-by: alanb, smarks, peterjones

Merge

7004205: fixes handling of sane-gcc-compiler on 32-bit linux and solaris. Previously committed as 6998016 and 6998012 Reviewed-by: ohair, dholmes

6986825: policytool can not save file. Reviewed-by: wetmore

6989148: (fs) zip provider should be available "out of the box" Summary: zip filesystem provider update, add zipfs.jar into ext dir Reviewed-by: alanb

6557615: Method toString() of java.security.Timestamp throws IndexOutOfBoundsException if CertPath has empty Reviewed-by: mullan