Merge

7020047: Project Coin: generate null-check around try-with-resources close call Reviewed-by: jjg

7020626: diamond: add diagnostic test for diamond and non-generic classes Summary: Fix failure in regression test CheckExamples Reviewed-by: jjg

7018859: javac turn off the Zip optimization by default Reviewed-by: jjg

7020043: Project Coin: diamond allowed on non-generic type Summary: Diamond oerator should be disallowed on non-generic class types (i.e. String) Reviewed-by: jjg

6990136: Cleanup use of Type.clone() Summary: Introduced factory methods in class Types which can be used rather than clone(). Reviewed-by: jjg, mcimadamore

Merge

7017104: improve error reporting for uncaught/undeclared exceptions from try-with-resources Summary: twr should generate better error message when uncaught exceptions are thrown by implicit call of close() method Reviewed-by: jjg

7017664: Add listeners infrastracture to javac scopes Summary: Add listeners to javac scopes, added CompoundScope and correct invalidation logic for ImplementationCache Reviewed-by: jjg

7008433: Minor copyright changes Reviewed-by: jjg Contributed-by: kelly.ohair@oracle.com

6505047: javax.lang.model.element.Element.getEnclosingElement() doesn't return null for type parameter Reviewed-by: darcy

6485027: javac incorrectly handles relative paths in manifest classpath Reviewed-by: mcimadamore

7018452: langtools not buildable on Mac Reviewed-by: ohair

7018098: CacheFSInfo persists too long Reviewed-by: mcimadamore

7018447: langtools launcher template fails if tools run from their own directory Reviewed-by: jjg Contributed-by: daniel.smith@oracle.com

7010792: remove bad debugging method from javac Reviewed-by: mcimadamore

7016750: tools/javac/nio/CompileTest failing in nightly test Reviewed-by: mcimadamore

Added tag jdk7-b131 for changeset 4de608132976

Merge

Added tag jdk7-b131 for changeset a13a950d71df

Merge

Added tag jdk7-b131 for changeset df8969303f96

Merge

Added tag jdk7-b131 for changeset 590b6cc6f974

Merge

Merge

Merge

7022228: JPRT failure: RuntimeException in SupportedMedia regression test Reviewed-by: igor, prr

Merge

7001685: Renable EnumSetBash Test Reviewed-by: alanb, ohair, darcy

7018385: update javax.sql classes to use try-with-resources Reviewed-by: alanb, lancea, darcy

7018459: javax.script code comments have issues with HTML4 validation and Accessibility compliance Reviewed-by: jjh

Merge

6526860: (fc) FileChannel.position returns 0 when FileOutputStream opened in append mode Reviewed-by: forax

7017901: OOME in java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java Summary: Unbounded queues should be disabled in the test Reviewed-by: alanb

7018392: update URLJarFile.java to use try-with-resources Reviewed-by: alanb, chegar, hawtin

6999337: java.exe fails to start if some directory names in path to java binaries contain Russian characters Summary: updated to make sure the system properties are accessable by vm during initialization Reviewed-by: alanb, mchung

6562203: Thread doesn't terminate immediately if it was stopped before start Reviewed-by: dholmes, alanb

Merge

7018928: test failure: sun/security/krb5/auto/SSL.java Reviewed-by: valeriep

7018897: CertPath validation cannot handle self-signed cert with bad KeyUsage Summary: Remove KeyUsage checking for trust anchors Reviewed-by: mullan

6927486: Hashtable writeObject() may deadlock Summary: Do not synchronize on self while writing hash table elements Reviewed-by: alanb, mduigou Contributed-by: Neil Richards <neil.richards@ngmr.net>

Merge

6934356: Vector.writeObject() serialization may deadlock Summary: No longer synchronize on self while writing other objects. Reviewed-by: alanb, forax, mduigou, peterjones Contributed-by: Neil Richards <neil.richards@ngmr.net>

7016704: TEST_BUG: java/nio/file/Files/walk_file_tree.sh fails with new version of find (lnx) Reviewed-by: forax

6637230: 2/3 jps doesn't work for application waiting for direct attach Summary: Properly handle exceptions thrown when querying a monitored VM. Reviewed-by: dsamersoff, swamyv

6996192: Console.readPassword race: input echo off must be prior to writing prompt Summary: To turn off echo before prompt Reviewed-by: alanb

7016698: test sun/security/krb5/runNameEquals.sh failed on Ubuntu Reviewed-by: valeriep