hg: jdk8/tl/jdk: 2 new changesets
Changeset: 57b5025548d6 Author:mullan Date: 2012-08-10 09:12 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/57b5025548d6 7187962: sun.security.pkcs11.P11DSAKeyFactory.implTranslatePublicKey doesn't check if params is null Reviewed-by: valeriep ! src/share/classes/sun/security/provider/certpath/BasicChecker.java Changeset: 629f357fc17b Author:mullan Date: 2012-08-10 09:17 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/629f357fc17b Merge
Re: PING: [PATCH FOR REVIEW] System Zlib Support
Hi Andrew Alan mentioned the other day that the build (with your latest patch, with zlib-dev) failed at pack200 when he tried to turn it on on linux. Can your double check on your system? -Sherman On 08/09/2012 06:31 AM, Andrew Hughes wrote: Just checking on the status of this. Am I ok to push: http://cr.openjdk.java.net/~andrew/syslibs/zlib/webrev.02/ as #7110151 to tl? Once that's in and system zlib support is working, we can decide whether to turn it on by default. Thanks,
Review request 7190657 Modify getDriver() to call Thread.currentThread().getContextClassLoader();
Looking for a reviewer for the following change:
- add a call to Thread.currentThread().getContextClassLoader() to
DriverManager.getDriver()
- Remove the synchronized block for the same call in getConnection()
Thank you.
Best
Lance
localhost:sql lanceandersen$ hg diff DriverManager.java
diff -r 629f357fc17b src/share/classes/java/sql/DriverManager.java
--- a/src/share/classes/java/sql/DriverManager.java Fri Aug 10 09:17:14
2012 -0400
+++ b/src/share/classes/java/sql/DriverManager.java Fri Aug 10 13:05:00
2012 -0400
@@ -264,6 +264,10 @@
// be null.
ClassLoader callerCL = DriverManager.getCallerClassLoader();
+if(callerCL == null) {
+callerCL = Thread.currentThread().getContextClassLoader();
+}
+
// Walk through the loaded registeredDrivers attempting to locate
someone
// who understands the given URL.
for (DriverInfo aDriver : registeredDrivers) {
@@ -563,11 +567,8 @@
* classloader, so that the JDBC driver class outside rt.jar
* can be loaded from here.
*/
-synchronized(DriverManager.class) {
- // synchronize loading of the correct classloader.
- if(callerCL == null) {
- callerCL = Thread.currentThread().getContextClassLoader();
- }
+if(callerCL == null) {
+callerCL = Thread.currentThread().getContextClassLoader();
}
if(url == null) {
localhost:sql lanceandersen$
Lance Andersen| Principal Member of Technical Staff | +1.781.442.2037
Oracle Java Engineering
1 Network Drive
Burlington, MA 01803
lance.ander...@oracle.com
Re: PING: [PATCH FOR REVIEW] System Zlib Support
- Original Message - > Hi Andrew > > Alan mentioned the other day that the build (with your latest patch, > with zlib-dev) failed at pack200 > when he tried to turn it on on linux. Can your double check on your > system? > What kind of failure? All webrevs I've posted pass a complete build here, and we've been using system zlib for years as previously mentioned, so I'm surprised by this. > -Sherman > > > On 08/09/2012 06:31 AM, Andrew Hughes wrote: > > Just checking on the status of this. > > > > Am I ok to push: > > > > http://cr.openjdk.java.net/~andrew/syslibs/zlib/webrev.02/ > > > > as #7110151 to tl? > > > > Once that's in and system zlib support is working, we can decide > > whether to turn it > > on by default. > > > > Thanks, > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07
Re: PING: [PATCH FOR REVIEW] System Zlib Support
On 10/08/2012 18:40, Andrew Hughes wrote: - Original Message - Hi Andrew Alan mentioned the other day that the build (with your latest patch, with zlib-dev) failed at pack200 when he tried to turn it on on linux. Can your double check on your system? What kind of failure? All webrevs I've posted pass a complete build here, and we've been using system zlib for years as previously mentioned, so I'm surprised by this. I grabbed your patch a few days ago and did a build+test job on all platforms (Linux/Solaris/Mac/Windows) and didn't see any issues. This was of course using the defaults, I didn't set SYSTEM_ZLIB explicitly. However I did see an issue on Ubuntu 12.0.4 (32-bit) with SYSTEM_ZLIB=true. Attached is the tail of the log. I haven't had time to look at it but I do see that libzip.so is built as expected (ldd shows it is linked to libz). The build failure is with unpack200 as it uses the the zlib functions. Building with SYSTEM_ZLIB=false is fine on this system. -Alan rm -f ../../../../../build/linux-i586/bin/unpack200 rm -f ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack/mapfile-vers /bin/cp mapfile-vers-unpack200 ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack/mapfile-vers /usr/bin/gcc -O2 -DPRODUCT -fPIC -DCC_NOEX -W -Wall -Wno-unused -Wno-parentheses -fno-omit-frame-pointer -D_LITTLE_ENDIAN -DFULL -DSYSTEM_ZLIB -DNDEBUG -DARCH='"i586"' -Di586 -DLINUX -DRELEASE='"1.8.0-internal"' -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -I. -I../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack/CClassHeaders -I../../../../../src/closed/share/javavm/export -I../../../../../src/solaris/javavm/export -I../../../../../src/share/javavm/export -I../../../../../src/share/native/common -I../../../../../src/solaris/native/common -I../../../../../src/share/native/com/sun/java/util/jar/pack -I../../../../../src/solaris/native/com/sun/java/util/jar/pack -Xlinker -O1 -Xlinker -version-script=mapfile-vers -Wl,--hash-style=both -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$ORIGIN -Xlinker -z -Xlinker defs -L../../../../../build/linux-i586/lib/i386 -Wl,-soname=libunpack.so -lz -lc ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/bands.o ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/bytes.o ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/coding.o ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/unpack.o ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/utils.o ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/zip.o ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/main.o -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic -o ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack/unpack200 ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/zip.o: In function `jar::deflate_bytes(bytes&, bytes&)': zip.cpp:(.text+0x79b): undefined reference to `deflateInit2_' zip.cpp:(.text+0x828): undefined reference to `deflate' zip.cpp:(.text+0x842): undefined reference to `deflateEnd' zip.cpp:(.text+0x854): undefined reference to `deflateEnd' zip.cpp:(.text+0x87c): undefined reference to `deflate' ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/zip.o: In function `jar::addJarEntry(char const*, bool, int, bytes&, bytes&)': zip.cpp:(.text+0x8d2): undefined reference to `crc32' zip.cpp:(.text+0x9d1): undefined reference to `crc32' zip.cpp:(.text+0x9ee): undefined reference to `crc32' ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/zip.o: In function `gunzip::free()': zip.cpp:(.text+0xb33): undefined reference to `inflateEnd' ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/zip.o: In function `read_input_via_gzip(unpacker*, void*, long long, long long)': zip.cpp:(.text+0xbfe): undefined reference to `inflate' ../../../../../build/linux-i586/tmp/sun/com.sun.java.util.jar.pack/unpack-cmd/obj/zip.o: In function `gunzip::start(int)': zip.cpp:(.text+0xf35): undefined reference to `inflateInit2_' collect2: ld returned 1 exit status
hg: jdk8/tl/jdk: 3 new changesets
Changeset: 114fbbeb8f75 Author:valeriep Date: 2012-08-10 13:08 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/114fbbeb8f75 7107613: scalability bloker in javax.crypto.CryptoPermissions Summary: Changed the type of field "perms" from Hashtable to ConcurrentHashMap. Reviewed-by: weijun, xuelei ! src/share/classes/javax/crypto/CryptoPermissions.java Changeset: 175036ada2e3 Author:valeriep Date: 2012-08-10 13:08 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/175036ada2e3 7107616: scalability bloker in javax.crypto.JceSecurityManager Summary: Changed the type of field "exemptCache" from HashMap to ConcurrentHashMap. Reviewed-by: weijun, xuelei ! src/share/classes/javax/crypto/JceSecurityManager.java Changeset: 9e97dacbfd35 Author:valeriep Date: 2012-08-10 13:10 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/9e97dacbfd35 7185471: Avoid key expansion when AES cipher is re-init w/ the same key Summary: Saved the last cipher key value and skip key expansion if key value is the same. Reviewed-by: weijun, xuelei ! src/share/classes/com/sun/crypto/provider/AESCrypt.java
hg: jdk8/tl/corba: Added tag jdk8-b51 for changeset 9b0f841ca9f7
Changeset: 80689ff9cb49 Author:katleman Date: 2012-08-09 18:00 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/corba/rev/80689ff9cb49 Added tag jdk8-b51 for changeset 9b0f841ca9f7 ! .hgtags
hg: jdk8/tl: Added tag jdk8-b51 for changeset 57c0aee73090
Changeset: 8d24def5ceb3 Author:katleman Date: 2012-08-09 18:00 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/rev/8d24def5ceb3 Added tag jdk8-b51 for changeset 57c0aee73090 ! .hgtags
hg: jdk8/tl/jaxws: Added tag jdk8-b51 for changeset 1a70b6333ebe
Changeset: f62bc618122e Author:katleman Date: 2012-08-09 18:01 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jaxws/rev/f62bc618122e Added tag jdk8-b51 for changeset 1a70b6333ebe ! .hgtags
hg: jdk8/tl/langtools: 2 new changesets
Changeset: 23032c78b2d1 Author:katleman Date: 2012-08-09 18:02 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/langtools/rev/23032c78b2d1 Added tag jdk8-b51 for changeset c4cd4cab2220 ! .hgtags Changeset: 1d2db0e5eabc Author:lana Date: 2012-08-10 10:14 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/langtools/rev/1d2db0e5eabc Merge
hg: jdk8/tl/jaxp: Added tag jdk8-b51 for changeset dc1ea77ed9d9
Changeset: bd3c00d57614 Author:katleman Date: 2012-08-09 18:01 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jaxp/rev/bd3c00d57614 Added tag jdk8-b51 for changeset dc1ea77ed9d9 ! .hgtags
hg: jdk8/tl/hotspot: 15 new changesets
Changeset: 86a687be3f02 Author:amurillo Date: 2012-07-27 16:51 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/86a687be3f02 7187463: new hotspot build - hs24-b19 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 594dff5e3c2e Author:johnc Date: 2012-07-17 11:52 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/594dff5e3c2e 7173712: G1: Duplicated code in G1UpdateRSOrPushRefOopClosure::do_oop_nv() Summary: Duplicated code from G1RemSet::par_write_ref() inlined into G1UpdateRSOrPushRefOopClosure::do_oop_nv() was showing up in profiles with a fairly high amount of CPU time. Manually inline the main part of G1RemSet::par_write_ref() to eliminate the code duplication. Reviewed-by: azeemj, brutisso ! src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Changeset: d42fe3c3001d Author:johnc Date: 2012-07-17 14:57 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/d42fe3c3001d 7184772: G1: Incorrect assert in HeapRegionLinkedList::add_as_head() Summary: Assertion incorrectly checks that _head is NULL and should be checking that _tail is NULL instead. Reviewed-by: johnc Contributed-by: Brandon Mitchell ! src/share/vm/gc_implementation/g1/heapRegionSet.cpp Changeset: db823a892a55 Author:johnc Date: 2012-07-17 12:24 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/db823a892a55 7182260: G1: Fine grain RSet freeing bottleneck Summary: Chain the fine grain PerRegionTables in an individual RSet together and free them in bulk using a single operation. Reviewed-by: johnc, brutisso Contributed-by: Thomas Schatzl ! src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp ! src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp Changeset: a2f7274eb6ef Author:tonyp Date: 2012-07-19 15:15 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/a2f7274eb6ef 7114678: G1: various small fixes, code cleanup, and refactoring Summary: Various cleanups as a prelude to introducing iterators for HeapRegions. Reviewed-by: johnc, brutisso ! src/share/vm/gc_implementation/g1/collectionSetChooser.hpp ! src/share/vm/gc_implementation/g1/concurrentMark.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp ! src/share/vm/gc_implementation/g1/g1MarkSweep.cpp ! src/share/vm/gc_implementation/g1/g1OopClosures.hpp ! src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp ! src/share/vm/gc_implementation/g1/g1RemSet.cpp ! src/share/vm/gc_implementation/g1/heapRegion.cpp ! src/share/vm/gc_implementation/g1/heapRegion.hpp ! src/share/vm/gc_implementation/g1/heapRegionSet.cpp ! src/share/vm/gc_implementation/g1/heapRegionSet.hpp ! src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp Changeset: 113f4c73df61 Author:jmasa Date: 2012-07-24 14:48 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/113f4c73df61 Merge Changeset: 3080f4743cf2 Author:jmasa Date: 2012-07-26 23:43 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/3080f4743cf2 Merge Changeset: ff58dfd5b977 Author:jmasa Date: 2012-07-27 21:41 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/ff58dfd5b977 Merge Changeset: 3b01d0321dfa Author:zgu Date: 2012-07-30 10:25 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/3b01d0321dfa 7186778: MachO decoder implementation for MacOSX Summary: Implementation of decoder for Apple's MacOSX. The implementation is based on the patch provided by Kevin Walls. Reviewed-by: coleenp, kamg, kevinw ! src/os/bsd/vm/decoder_machO.cpp ! src/os/bsd/vm/decoder_machO.hpp ! src/os/bsd/vm/os_bsd.cpp ! src/os/windows/vm/decoder_windows.cpp ! src/os/windows/vm/decoder_windows.hpp ! src/share/vm/utilities/decoder.cpp ! src/share/vm/utilities/decoder.hpp ! src/share/vm/utilities/decoder_elf.hpp Changeset: 4bfef6df8881 Author:zgu Date: 2012-07-30 07:21 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/4bfef6df8881 Merge Changeset: 5e2dc722e70d Author:andrew Date: 2012-07-31 16:01 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/5e2dc722e70d 7186278: Build error after CR#6995781 / 7151532 with GCC 4.7.0 Summary: Templates need this object if not using template parameter in call Reviewed-by: coleenp, kamg, dholmes ! src/share/vm/utilities/hashtable.cpp ! src/share/vm/utilities/hashtable.hpp Changeset: e37a5219e297 Author:dcubed Date: 2012-07-31 18:37 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/e37a5219e297 Merge Changeset: 3b3ad1642970 Author:amurillo Date: 2012-08-03 13:13 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/3b3ad1642970 Merge Changeset: 663fc23da8d5 Author:amurillo Date: 2012-08-03 13:13 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/663fc23da8d5 Added tag hs24-b19
hg: jdk8/tl/jdk: 4 new changesets
Changeset: b3b0d75cb117 Author:katleman Date: 2012-08-09 18:02 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/b3b0d75cb117 Added tag jdk8-b51 for changeset e865efbc7105 ! .hgtags Changeset: da8649489aff Author:lana Date: 2012-08-10 10:15 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/da8649489aff Merge Changeset: 449c17c7a63a Author:lana Date: 2012-08-10 12:48 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/449c17c7a63a Merge Changeset: e8b14276d434 Author:lana Date: 2012-08-10 14:00 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/e8b14276d434 Merge
Re: Review request 7190657 Modify getDriver() to call Thread.currentThread().getContextClassLoader();
Lance,
There are a couple of other uses of
DriverManager.getCallerClassLoader() that do no fall back to
Thread.currentThread().getContextClassLoader() if the caller class
loader is null (bootstrap loader). Should these be updated as well?
>From
>http://hg.openjdk.java.net/jdk8/jdk8/jdk/file/tip/src/share/classes/java/sql/DriverManager.java:
Line 334 in deregisterDriver(Driver driver)
Line 365 in getDrivers()
Thanks,
Dave
On Fri, Aug 10, 2012 at 1:19 PM, Lance Andersen - Oracle
wrote:
> Looking for a reviewer for the following change:
>
> - add a call to Thread.currentThread().getContextClassLoader() to
> DriverManager.getDriver()
> - Remove the synchronized block for the same call in getConnection()
>
> Thank you.
>
> Best
> Lance
>
> localhost:sql lanceandersen$ hg diff DriverManager.java
> diff -r 629f357fc17b src/share/classes/java/sql/DriverManager.java
> --- a/src/share/classes/java/sql/DriverManager.java Fri Aug 10 09:17:14
> 2012 -0400
> +++ b/src/share/classes/java/sql/DriverManager.java Fri Aug 10 13:05:00
> 2012 -0400
> @@ -264,6 +264,10 @@
> // be null.
> ClassLoader callerCL = DriverManager.getCallerClassLoader();
>
> +if(callerCL == null) {
> +callerCL = Thread.currentThread().getContextClassLoader();
> +}
> +
> // Walk through the loaded registeredDrivers attempting to locate
> someone
> // who understands the given URL.
> for (DriverInfo aDriver : registeredDrivers) {
> @@ -563,11 +567,8 @@
> * classloader, so that the JDBC driver class outside rt.jar
> * can be loaded from here.
> */
> -synchronized(DriverManager.class) {
> - // synchronize loading of the correct classloader.
> - if(callerCL == null) {
> - callerCL = Thread.currentThread().getContextClassLoader();
> - }
> +if(callerCL == null) {
> +callerCL = Thread.currentThread().getContextClassLoader();
> }
>
> if(url == null) {
> localhost:sql lanceandersen$
>
> Lance Andersen| Principal Member of Technical Staff | +1.781.442.2037
> Oracle Java Engineering
> 1 Network Drive
> Burlington, MA 01803
> lance.ander...@oracle.com
>
