Merge

Merge

Merge

Merge

Merge

6954901: langtools/test/Makefile should check for bin/javac(.exe) instead of lib/tools.jar Reviewed-by: ohair

6951833: latest diamond implementation generates spurious raw type warnings Summary: Raw warning checks should be disabled in the presence of a diamond AST node Reviewed-by: jjg

6948381: javac Null Pointer Exception in Types.makeCompoundType Summary: Race condition between symbol completion and attribution of import statements causes NPE when creating intersection type Reviewed-by: jjg

6946618: sqe test fails: javac/generics/NewOnTypeParm in pit jdk7 b91 in all platforms. Summary: Bad cast to ClassType in the new diamond implementation fails if the target type of the instance creation expression is a type-variable Reviewed-by: jjg

6880344: Recursive type parameters do not compile Summary: Issue in type-variable substitution causes valid code to be rejected Reviewed-by: jjg

6952188: update timeout for langtools jtreg tests on JPRT Reviewed-by: ohair

Added tag jdk7-b96 for changeset 766529b3422f

Merge

Added tag jdk7-b96 for changeset 28ba1ea472b9

Merge

Added tag jdk7-b96 for changeset 4d5b1beafffc

Merge

Merge

6958257: Add support for alpha Summary: Allow the Zero port to be built on alpha architectures Reviewed-by: ohair

Merge

6955873: CORBA resources bundles and javax.activity missing from b94 Reviewed-by: ohair

Added tag jdk7-b96 for changeset 43de3ab7df33

Merge

Merge

6959116: Fix regression in make/jdk_generic_profile.sh (PROCESSOR_IDENTIFIER) Reviewed-by: alanb

6958257: Add support for alpha Summary: Allow the Zero port to be built on alpha architectures Reviewed-by: ohair

Merge

6888130: SwingSet2: Demo is not launching and throwing NPE. Reviewed-by: prr

Merge

6950931: test fails on windows sun/security/tools/jarsigner/crl.sh Reviewed-by: wetmore, xuelei

Merge

Merge

6956840: (ch) Rawtype warning when compiling sun.nio.ch.CompletedFuture Summary: Add missing generic type to CompletedFuture construction and remove unneeded SuppressWarnings annotations. Reviewed-by: alanb

6955783: ServiceUnavailableException caught even the secondary DNS is available Reviewed-by: vinnie

6934615: Relative classpaths in jarfile manifests are handled inefficiently by rmic Reviewed-by: darcy

6948287: KDC test strange knvo Reviewed-by: xuelei

Merge

4690407: JAR tool: option -i can't be combined with other options Summary: -i can't combined with cxut, do sanity check on options Reviewed-by: martin

Merge

4691425: GZIPInputStream fails to read concatenated .gz files Summary: to support concatenated .gz streams Reviewed-by: martin

6932525: Incorrect encryption types of KDC_REQ_BODY of AS-REQ with pre-authentication Reviewed-by: valeriep

6948781: CertificateFactory.generateCertificate doesn't throw CertificateException for malformed certificate Reviewed-by: mullan

6882687: KerberosTime too imprecise Reviewed-by: valeriep

6954621: small error in 6948909 Reviewed-by: xuelei

6948803: CertPath validation regression caused by SHA1 replacement root and MD2 disable feature Reviewed-by: xuelei, mullan

6773270: java.net.URI fails to escape \u0000 Summary: check for \u0000 Reviewed-by: alanb

6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile Reviewed-by: wetmore

6945564: Unicode script support in Character class 6948903: Make Unicode scripts available for use in regular expressions Summary: added Unicode script suport Reviewed-by: martin

6951599: Rename package of security tools for modularization Summary: Move PolicyTool to sun.security.tools.policytool package Reviewed-by: weijun

4853493: GZIPOutputStream passes a reference to a private array into an untrusted method Summary: create a new header byte array for each header writeout Reviewed-by: martin

4813885: RFE: GZIPOutputStream should implement flush using Z_SYNC_FLUSH Summary: Added new constructors to allow flush() work in Z_SYNC_FLUSH mode Reviewed-by: martin

4465490: Suspicious about double-check locking idiom being used in the code Summary: to use volatile for the double-checked object Reviewed-by: weijun

4263582: RFE: GZIPInputStream throws IOException on non-gzipped data Summary: throw ZipException instead of IOException Reviewed-by: martin

6952701: Use http://www.ietf.org/rfc for rfc references in jdk public APIs Summary: replace www.isi.edu/in-notes with www.ietf.org/rfc Reviewed-by: martin

6952330: Fix for 6933217 broke contract of StringBuffer.ensureCapacity Summary: make sure to grow with size => size * 2 + 2 Reviewed-by: dholmes, chegar, ohair

6951064: Typo in javadoc for ZipException ctors Summary: fixed the doc typo Reviewed-by: martin

6951887: Wrong redirection useage in test sun/nio/cs/Test4200310.sh Summary: Testcase correction. Reviewed-by: sherman

6943915: Adjust jdk/test/Makefile to deal with .dll and .so libraries needing execute permissions Summary: And adjustments to test problem list. Reviewed-by: jjg

6951661: Eliminate jvmstat dependency on sun.management.counter Summary: jvmstat keeps its own copy of Units and Variability class Reviewed-by: alanb

Merge

Merge

6670274: Incorrect tab titles for JTabbedPane if using HTML (BasicTabbedPanelUI problem) Reviewed-by: rupashka

6889007: No resize cursor during hovering mouse over JTable Reviewed-by: rupashka

6954231: SynthTextPaneUI.installUI() doesn't set component to opaque even if prop was not set by client progr Reviewed-by: alexp