March 2008 - core-libs-dev

hg: jdk7/tl/jdk: 3 new changesets
by martin＠xemacs.org 10 Mar '08

10 Mar '08

Changeset: 1be19881457e Author: martin Date: 2008-03-09 21:56 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/1be19881457e 4499288: (cs spec) Charset terminology problems Reviewed-by: mr, iris ! src/share/classes/java/nio/charset/Charset.java Changeset: b5da6145b050 Author: martin Date: 2008-03-09 21:56 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/b5da6145b050 6671834: (str) Eliminate StringCoding.java compile warnings Reviewed-by: iris ! src/share/classes/java/lang/StringCoding.java Changeset: 7fb2ca1b52c8 Author: martin Date: 2008-03-09 21:56 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/7fb2ca1b52c8 6633613: (str) StringCoding optimizations to avoid unnecessary array copies with Charset arg Reviewed-by: iris ! src/share/classes/java/lang/StringCoding.java

1 0

6633613: (str) StringCoding optimizations to avoid unnecessary array copies with Charset arg
by Martin Buchholz 09 Mar '08

09 Mar '08

I propose to partially fix 6633613: (str) StringCoding optimizations to avoid unnecessary array copies with Charset arg with the patches below (a more ambitious patch will hopefully follow later): Iris, please review. Martin First, warning suppression: diff --git a/src/share/classes/java/lang/StringCoding.java b/src/share/classes/java/lang/StringCoding.java --- a/src/share/classes/java/lang/StringCoding.java +++ b/src/share/classes/java/lang/StringCoding.java @@ -53,22 +53,23 @@ class StringCoding { private StringCoding() { } - /* The cached coders for each thread - */ - private static ThreadLocal decoder = new ThreadLocal(); - private static ThreadLocal encoder = new ThreadLocal(); + /** The cached coders for each thread */ + private final static ThreadLocal<SoftReference<StringDecoder>> decoder = + new ThreadLocal<SoftReference<StringDecoder>>(); + private final static ThreadLocal<SoftReference<StringEncoder>> encoder = + new ThreadLocal<SoftReference<StringEncoder>>(); private static boolean warnUnsupportedCharset = true; - private static Object deref(ThreadLocal tl) { - SoftReference sr = (SoftReference)tl.get(); + private static <T> T deref(ThreadLocal<SoftReference<T>> tl) { + SoftReference<T> sr = tl.get(); if (sr == null) return null; return sr.get(); } - private static void set(ThreadLocal tl, Object ob) { - tl.set(new SoftReference(ob)); + private static <T> void set(ThreadLocal<SoftReference<T>> tl, T ob) { + tl.set(new SoftReference<T>(ob)); } // Trim the given byte array to the given length @@ -174,7 +175,7 @@ class StringCoding { static char[] decode(String charsetName, byte[] ba, int off, int len) throws UnsupportedEncodingException { - StringDecoder sd = (StringDecoder)deref(decoder); + StringDecoder sd = deref(decoder); String csn = (charsetName == null) ? "ISO-8859-1" : charsetName; if ((sd == null) || !(csn.equals(sd.requestedCharsetName()) || csn.equals(sd.charsetName()))) { @@ -273,7 +274,7 @@ class StringCoding { static byte[] encode(String charsetName, char[] ca, int off, int len) throws UnsupportedEncodingException { - StringEncoder se = (StringEncoder)deref(encoder); + StringEncoder se = deref(encoder); String csn = (charsetName == null) ? "ISO-8859-1" : charsetName; if ((se == null) || !(csn.equals(se.requestedCharsetName()) || csn.equals(se.charsetName()))) { second, actual fix: diff --git a/src/share/classes/java/lang/StringCoding.java b/src/share/classes/java/lang/StringCoding.java --- a/src/share/classes/java/lang/StringCoding.java +++ b/src/share/classes/java/lang/StringCoding.java @@ -194,8 +194,7 @@ class StringCoding { static char[] decode(Charset cs, byte[] ba, int off, int len) { StringDecoder sd = new StringDecoder(cs, cs.name()); - byte[] b = Arrays.copyOf(ba, ba.length); - return sd.decode(b, off, len); + return sd.decode(Arrays.copyOfRange(ba, off, off + len), 0, len); } static char[] decode(byte[] ba, int off, int len) { @@ -293,8 +292,7 @@ class StringCoding { static byte[] encode(Charset cs, char[] ca, int off, int len) { StringEncoder se = new StringEncoder(cs, cs.name()); - char[] c = Arrays.copyOf(ca, ca.length); - return se.encode(c, off, len); + return se.encode(Arrays.copyOfRange(ca, off, off + len), 0, len); } static byte[] encode(char[] ca, int off, int len) {

2 2

hg: jdk7/tl/jdk: 6596475: (launcher) javaw should call InitCommonControls
by kumar.srinivasan＠sun.com 06 Mar '08

06 Mar '08

Changeset: 5aaa9902102b Author: ksrini Date: 2008-03-06 07:51 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/5aaa9902102b 6596475: (launcher) javaw should call InitCommonControls Summary: javaw does not show error window after manifest changes. Reviewed-by: darcy ! make/java/jli/Makefile ! make/java/main/java/Makefile ! make/java/main/javaw/Makefile ! src/share/bin/java.c ! src/share/bin/java.h ! src/share/bin/main.c ! src/solaris/bin/java_md.c ! src/windows/bin/java_md.c

1 0

hg: jdk7/tl/langtools: 6668802: javac handles diagnostics for last line badly, if line not terminated by newline
by jonathan.gibbons＠sun.com 06 Mar '08

06 Mar '08

Changeset: 508c01999047 Author: jjg Date: 2008-03-06 10:25 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/508c01999047 6668802: javac handles diagnostics for last line badly, if line not terminated by newline Summary: use CharBuffer.limit(), not the length of the backing array Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/util/Log.java + test/tools/javac/T6668802.java

1 0

hg: jdk7/tl/langtools: 4741726: allow Object += String
by jonathan.gibbons＠sun.com 06 Mar '08

06 Mar '08

Changeset: f09d6a3521b1 Author: jjg Date: 2008-03-06 10:07 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/f09d6a3521b1 4741726: allow Object += String Summary: remove code in line with restriction removed from JLS Reviewed-by: mcimadamore Contributed-by: michaelbailey0(a)gmail.com ! src/share/classes/com/sun/tools/javac/comp/Attr.java + test/tools/javac/StringConversion2.java - test/tools/javac/expression/ObjectAppend.java

1 0

Early version of striding Deflater
by Clemens Eisserer 06 Mar '08

06 Mar '08

Hello again, I've finished an early version of the java.util.zip.Deflater implementation that uses striding. Its in an early stage and quite likely will be buggy. It passes FlaterTest and a simple test written by myself, but maybe acts differently in corner-cases. I would be happy to receive some comments as well as criticism ;) lg Clemens PS: Sorry for the traffic lately.

2 5

hg: jdk7/tl/langtools: 6663588: Compiler goes into infinite loop for Cyclic Inheritance test case
by mcimadamore＠hg.openjdk.java.net 04 Mar '08

04 Mar '08

Changeset: 38bd6375f37d Author: mcimadamore Date: 2008-03-04 15:45 +0000 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/38bd6375f37d 6663588: Compiler goes into infinite loop for Cyclic Inheritance test case Summary: interplay between cyclic inheritance and tvar bounds hangs javac Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java + test/tools/javac/T6663588.java

1 0

hg: jdk7/tl/langtools: 6608214: Exception throw while analysing a file with error
by mcimadamore＠hg.openjdk.java.net 04 Mar '08

04 Mar '08

Changeset: d472e2fbcc39 Author: mcimadamore Date: 2008-03-04 15:19 +0000 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d472e2fbcc39 6608214: Exception throw while analysing a file with error Summary: bad error-recovery after bad type-variable bound is detected Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Attr.java + test/tools/javac/api/6608214/T6608214.java

1 0

hg: jdk7/tl/langtools: 6660289: declared bound in inner class referring a type variable of the outer class
by mcimadamore＠hg.openjdk.java.net 04 Mar '08

04 Mar '08

Changeset: 40813968849e Author: mcimadamore Date: 2008-03-04 13:00 +0000 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/40813968849e 6660289: declared bound in inner class referring a type variable of the outer class Summary: NPE caused by a defect in type-variable attribution Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/comp/Attr.java + test/tools/javac/generics/T6660289.java

1 0

hg: jdk7/tl/langtools: 6611449: Internal Error thrown during generic method/constructor invocation
by mcimadamore＠hg.openjdk.java.net 04 Mar '08

04 Mar '08

Changeset: b45f8d4794b7 Author: mcimadamore Date: 2008-03-04 12:14 +0000 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/b45f8d4794b7 6611449: Internal Error thrown during generic method/constructor invocation Summary: type-inference should fail since lub is not defined for primitive types Reviewed-by: jjg ! src/share/classes/com/sun/tools/javac/code/Types.java ! src/share/classes/com/sun/tools/javac/comp/Infer.java + test/tools/javac/generics/inference/6611449/T6611449.java + test/tools/javac/generics/inference/6611449/T6611449.out

1 0