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

7004021: docs should not assume -source 1.5 Reviewed-by: ohair

6992964: FindBugs warnings in com.sun.security.auth.module.UnixSystem.java Reviewed-by: mullan

6943352: SSL regression: RSAClientKeyExchange fails to pass securerandom arg to KeyGen Reviewed-by: wetmore, xuelei

6896700: Validation of signatures succeed when it should fail Reviewed-by: wetmore

7004168: jarsigner -verify checks for KeyUsage codesigning ext on all certs instead of just signing cert Reviewed-by: mullan

7004035: signed jar with only META-INF/* inside is not verifiable Reviewed-by: mullan

Merge

Merge

7004721: ktarg.sh fails when there's no default realm Reviewed-by: xuelei

6979376: to have ldap filters tolerate underscore character in object identifier Reviewed-by: weijun

6402006: FileInputStream.available() returns negative values when reading a large file Reviewed-by: alanb

7003745: Code style cleanups (sync from Dougs CVS) Reviewed-by: chegar, dholmes

7002594: Math.max and Math.min should use floatToRawIntBits() to check for -0.0 Reviewed-by: mduigou, lancea, alanb

Merge

6709457: (fc) lock/tryLock() throws IOException "Access is denied" when file opened for append [win] Reviewed-by: chegar

Merge

7002320: Locale.forLanguageTag()/toLanguageTag() not working properly with ja_JP_JP locale Reviewed-by: dougfelt

Merge

6515695: [Col] java.text.RuleBasedCollator - JavaDoc "Examples" - Two bugs in sample code Reviewed-by: okutsu

Merge

6486695: [Col] Doc: CollationElementIterator example assumes Collator.getInstance return type Reviewed-by: okutsu

7000507: javadoc warnings in java.util.Locale 7004335: Javadoc for Locale.toLangaugeTag() is unclear 7005320: (lc) doc: missing " in Locale.forLanguageTag code samples Reviewed-by: okutsu

6911839: Sles/SuSE 11 needs CJK support Reviewed-by: peytoia

6647615: Sample code in ListResourceBundle is not correct and causes a compile error. Reviewed-by: peytoia

6457726: Character.isWhitespace JavaDoc has nonexistent char literals Reviewed-by: peytoia

6653944: (cal) BuddhistCalendar yearOffset erased when deserialized Reviewed-by: peytoia

6203034: [AC] AttributedCharacterIterator methods works wrong (run with respect differs from spec) Reviewed-by: peytoia

4396385: [Fmt-Da] SimpleDateFormat too lenient when parsing 1-based hours Reviewed-by: peytoia

6988205: Test failed due to compilation failed, JTextComponent doesn't create drop locations with null bias. Reviewed-by: alexp

6639507: Title of javax.swing.JDialog is null while spec says it's empty Reviewed-by: alexp

Merge

6984049: applet browser vendor rebranding changes (jdk7 only) Reviewed-by: art