Merge

6988037: fileClose prints debug message is close fails Reviewed-by: kevinw, forax

6987461: Handle leak when enabling java.net.useSystemProxies Summary: Release the registry key handle if ProxyEnable is 0 Reviewed-by: michaelm

6988163: sun.security.util.Resources dup and a keytool doc typo Reviewed-by: xuelei

6987927: can't use -Dfile.encoding=Cp037 in net test Reviewed-by: chegar

Merge

6550798: Using InputStream.skip with ResponseCache will cause partial data to be cached Reviewed-by: chegar

6987638: javadoc update to RowSetProvider and Statement Reviewed-by: darcy, alanb

Merge

6986868: TEST failure: sun/security/tools/jarsigner/crl.sh Reviewed-by: ohair

6987114: Fix top level "test" Makefile logic, add jdk/make/Makefile test target 6987113: Remove SCCS logic from makefiles Reviewed-by: mchung

6987117: Add jprt test sets Reviewed-by: mchung

6984036: servicetag vendor rebranding issues Summary: Update product_vendor field to use java.vendor system property Reviewed-by: ohair

6982971: TEST failure: com/sun/security/sasl/ntlm/NTLMTest.java Reviewed-by: wetmore

Merge

6946527: rebranding system properties per Oracle Requirements (vendor) Summary: Changes from "Sun Microsystems, Inc." to "Oracle Corporation" in the java.vendor, java.specification.vendor and java.vendor.url Java system properties. Also change of Windows COMPANY file property from "Oracle" to "Oracle Corporation". Reviewed-by: lancea, flar

6949710: 3/3 the GC'able nature of Logging objects needs to be made brutally clear Summary: Add words in more places to make it clear that Logger objects are GC'able unless there is a strong reference. Reviewed-by: dholmes, andrew

6986050: Small clarifications and fixes for ForkJoin Summary: Clarify FJ.get on throw InterruptedException, propagate ThreadFactory, shutdown transition Reviewed-by: chegar

6672144: HttpURLConnection.getInputStream sends POST request after failed chunked Reviewed-by: michaelm

6981113: Add ConcurrentLinkedDeque Summary: Extend techniques developed for ConcurrentLinkedQueue and LinkedTransferQueue to implement a non-blocking concurrent Deque with interior removes. Reviewed-by: martin, dholmes, chegar

6984044: RowSet source needs to rebrand vendor references Reviewed-by: darcy, ohair

6981157: Improve UnknownHostException with EAI error details and other cleanups Summary: generify; remove compiler warnings, typos, casts; return status information via gai_strerror when getaddrinfo fails; show full stack of native failures Reviewed-by: michaelm, alanb

6981138: (process) Process.waitFor() may hang if subprocess has live descendants (lnx) Summary: Do exit status handling before trying to close streams Reviewed-by: alanb, dholmes

6888546: restore System.initializeSystemClasses Summary: restore System.initializeSystemClasses prior to fix for 6797688 Reviewed-by: alanb

6985725: RowSetProvider has typo for the property javax.sql.rowset.RowSetFactory in the javadoc Reviewed-by: darcy, ohair

6985400: DatabaseMetaData.generatedKeyAlwaysReturned, "indexe(s)" should be "index(es)" Reviewed-by: darcy, ohair

6984864: Exception when running acceptChanges with custom SyncProvider Reviewed-by: darcy, ohair

6983452: SyncProvider issue for JoinRowSet implementation Reviewed-by: darcy, ohair

Merge

6955776: (tz) Windows-only: tzmappings needs update for KB981793 6929185: (tz) Windows-only: tzmappings needs update for KB979306 Reviewed-by: peytoia

6982753: javax/swing/JTextArea/6940863/bug6940863.java should be modified Reviewed-by: alexp

6915621: (rb) ResourceBundle.getBundle() deadlock when called inside a synchronized thread Reviewed-by: okutsu