/hg/icedtea6: Fixed typo in NEWS, removed unnecessary patch file.
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Mon Jul 25 04:45:02 PDT 2011
changeset a6ba1170da98 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a6ba1170da98
author: ptisnovs
date: Mon Jul 25 13:44:57 2011 +0200
Fixed typo in NEWS, removed unnecessary patch file.
diffstat:
5047314_hg.diff | 142 --------------------------------------------------------
NEWS | 2 +-
2 files changed, 1 insertions(+), 143 deletions(-)
diffs (161 lines):
diff -r 8fa33e715417 -r a6ba1170da98 5047314_hg.diff
--- a/5047314_hg.diff Mon Jul 25 13:41:45 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-diff -r 3c107fae0e9d Makefile.am
---- a/Makefile.am Fri Jul 22 10:26:38 2011 +0200
-+++ b/Makefile.am Fri Jul 22 15:15:10 2011 +0200
-@@ -368,7 +368,8 @@
- patches/jtreg-hotspot-Test7020373-fix.patch \
- patches/openjdk/4917091-javac_rejects_array_over_128_in_length.patch \
- patches/openjdk/6390045-error_cannot_access_java_lang_void.patch \
-- patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch
-+ patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch \
-+ patches/openjdk/5047314-Collator_compare_runs_indefinitely.patch
-
- if WITH_RHINO
- ICEDTEA_PATCHES += \
-diff -r 3c107fae0e9d NEWS
---- a/NEWS Fri Jul 22 10:26:38 2011 +0200
-+++ b/NEWS Fri Jul 22 15:15:10 2011 +0200
-@@ -325,6 +325,7 @@
- - S6999460: Glassfish build with JDK 6 / 7 is 5x-10x slower on Windows than on Linux
- - S6999891: DefaultFileManager incorrect
- - S7033660: Update copyright year to 2011 on any files changed in 2011
-+ - S5047314: [Col] Collator.compare() runs indefinitely for a certain set of Thai strings
- * Backports
- - S7019861: Last scanline skpped when doing AA.
- - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal
-diff -r 3c107fae0e9d patches/openjdk/5047314-Collator_compare_runs_indefinitely.patch
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/patches/openjdk/5047314-Collator_compare_runs_indefinitely.patch Fri Jul 22 15:15:10 2011 +0200
-@@ -0,0 +1,117 @@
-+# HG changeset patch
-+# User peytoia
-+# Date 1260856201 -32400
-+# Node ID de7807599a9b1aabb574bc2ccf0d84b166103aef
-+# Parent f012e2c094ffa7b58f66c7e56320580a83f7bf80
-+5047314: [Col] Collator.compare() runs indefinitely for a certain set of Thai strings
-+Reviewed-by: okutsu
-+
-+diff -r f012e2c094ff -r de7807599a9b src/share/classes/java/text/CollationElementIterator.java
-+--- openjdk.orig/jdk/src/share/classes/java/text/CollationElementIterator.java Thu Dec 10 12:08:58 2009 +0300
-++++ openjdk/jdk/src/share/classes/java/text/CollationElementIterator.java Tue Dec 15 14:50:01 2009 +0900
-+@@ -232,7 +232,7 @@
-+ buffer = makeReorderedBuffer(consonant, value, buffer, true);
-+ value = buffer[0];
-+ expIndex = 1;
-+- } else {
-++ } else if (consonant != NormalizerBase.DONE) {
-+ text.previous();
-+ }
-+ }
-+@@ -242,7 +242,7 @@
-+ buffer = makeReorderedBuffer(consonant, value, buffer, true);
-+ value = buffer[0];
-+ expIndex = 1;
-+- } else {
-++ } else if (consonant != NormalizerBase.DONE) {
-+ text.previous();
-+ }
-+ }
-+diff -r f012e2c094ff -r de7807599a9b test/java/text/Collator/Bug5047314.java
-+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-++++ openjdk/jdk/test/java/text/Collator/Bug5047314.java Tue Dec 15 14:50:01 2009 +0900
-+@@ -0,0 +1,84 @@
-++/*
-++ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
-++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-++ *
-++ * This code is free software; you can redistribute it and/or modify it
-++ * under the terms of the GNU General Public License version 2 only, as
-++ * published by the Free Software Foundation.
-++ *
-++ * This code is distributed in the hope that it will be useful, but WITHOUT
-++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-++ * version 2 for more details (a copy is included in the LICENSE file that
-++ * accompanied this code).
-++ *
-++ * You should have received a copy of the GNU General Public License version
-++ * 2 along with this work; if not, write to the Free Software Foundation,
-++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-++ *
-++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-++ * CA 95054 USA or visit www.sun.com if you need additional information or
-++ * have any questions.
-++ */
-++
-++/*
-++ * @test
-++ * @bug 5047314
-++ * @summary verify that compare() and getCollationKey() don't go into an infinite loop for unfinished Thai/Lao text.
-++ * @run main/timeout=60 Bug5047314
-++ */
-++import java.text.Collator;
-++import java.util.Locale;
-++
-++public class Bug5047314 {
-++
-++ private static Collator colLao = Collator.getInstance(new Locale("lo"));
-++ private static Collator colThai = Collator.getInstance(new Locale("th"));
-++
-++ private static String[] textLao = {
-++ "\u0ec0", "\u0ec1", "\u0ec2", "\u0ec3", "\u0ec4"
-++ };
-++ private static String[] textThai = {
-++ "\u0e40", "\u0e41", "\u0e42", "\u0e43", "\u0e44"
-++ };
-++
-++ public static void main(String[] args) {
-++ testLao1();
-++ testLao2();
-++ testThai1();
-++ testThai2();
-++ }
-++
-++ private static void testLao1() {
-++ System.out.print("Test(Lao 1) .... ");
-++ for (int i = 0; i < textLao.length; i++) {
-++ colLao.compare(textLao[i], textLao[i]);
-++ }
-++ System.out.println("Passed.");
-++ }
-++
-++ private static void testLao2() {
-++ System.out.print("Test(Lao 2) .... ");
-++ for (int i = 0; i < textLao.length; i++) {
-++ colLao.compare(textLao[i], textLao[i]);
-++ }
-++ System.out.println("Passed.");
-++ }
-++
-++ private static void testThai1() {
-++ System.out.print("Test(Thai 1) .... ");
-++ for (int i = 0; i < textThai.length; i++) {
-++ colThai.compare(textThai[i], textThai[i]);
-++ }
-++ System.out.println("Passed.");
-++ }
-++
-++ private static void testThai2() {
-++ System.out.print("Test(Thai 2) .... ");
-++ for (int i = 0; i < textThai.length; i++) {
-++ colThai.getCollationKey(textThai[i]);
-++ }
-++ System.out.println("Passed.");
-++ }
-++
-++}
diff -r 8fa33e715417 -r a6ba1170da98 NEWS
--- a/NEWS Mon Jul 25 13:41:45 2011 +0200
+++ b/NEWS Mon Jul 25 13:44:57 2011 +0200
@@ -326,7 +326,7 @@
- S6999891: DefaultFileManager incorrect
- S7033660: Update copyright year to 2011 on any files changed in 2011
* Backports
- - S7019861: Last scanline skpped when doing AA.
+ - S7019861: Last scanline skipped when doing AA.
- S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal
- S6708580: Java applications slow when EXA enabled
- S6986968: Crash on XIM server restart
More information about the distro-pkg-dev
mailing list