/hg/icedtea6: S6752638: java.awt.GraphicsEnvironment.preferLocal...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Jul 22 01:26:46 PDT 2011
changeset 3c107fae0e9d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3c107fae0e9d
author: ptisnovs
date: Fri Jul 22 10:26:38 2011 +0200
S6752638: java.awt.GraphicsEnvironment.preferLocaleFonts() throws
NPE on Linux
diffstat:
ChangeLog | 7 +
Makefile.am | 3 +-
NEWS | 1 +
patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch | 95 ++++++++++++++
4 files changed, 105 insertions(+), 1 deletions(-)
diffs (139 lines):
diff -r c2a1c2cf027e -r 3c107fae0e9d ChangeLog
--- a/ChangeLog Thu Jul 21 09:42:07 2011 +0200
+++ b/ChangeLog Fri Jul 22 10:26:38 2011 +0200
@@ -1,3 +1,10 @@
+2011-07-22 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * NEWS: updated with backport
+ * patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch:
+ Backport of 6752638.
+
2011-07-21 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: added new patch
diff -r c2a1c2cf027e -r 3c107fae0e9d Makefile.am
--- a/Makefile.am Thu Jul 21 09:42:07 2011 +0200
+++ b/Makefile.am Fri Jul 22 10:26:38 2011 +0200
@@ -367,7 +367,8 @@
patches/openjdk/7049339-anyblit-broken.patch \
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/6390045-error_cannot_access_java_lang_void.patch \
+ patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r c2a1c2cf027e -r 3c107fae0e9d NEWS
--- a/NEWS Thu Jul 21 09:42:07 2011 +0200
+++ b/NEWS Fri Jul 22 10:26:38 2011 +0200
@@ -360,6 +360,7 @@
- S6613904: javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg
- S4917091: javac rejects array over 128 in length
- S6390045: Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5
+ - S6752638: java.awt.GraphicsEnvironment.preferLocaleFonts() throws NPE on Linux
* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
* CACAO
- Threadlist & threadobject improvements.
diff -r c2a1c2cf027e -r 3c107fae0e9d patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch Fri Jul 22 10:26:38 2011 +0200
@@ -0,0 +1,97 @@
+# HG changeset patch
+# User prr
+# Date 1230141468 28800
+# Node ID 40ec164889bd9ec1955e36864593bc222474ba43
+# Parent f68864fe53d39a994f53ee8dd5c8e9875076e95f
+6752638: java.awt.GraphicsEnvironment.preferLocaleFonts() throws NPE on Linux
+Reviewed-by: bae, igor
+
+diff -r f68864fe53d3 -r 40ec164889bd src/share/classes/java/awt/GraphicsEnvironment.java
+--- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java Wed Dec 24 09:53:52 2008 -0800
++++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java Wed Dec 24 09:57:48 2008 -0800
+@@ -356,6 +356,9 @@
+ * @since 1.5
+ */
+ public void preferLocaleFonts() {
++ if (!(this instanceof SunGraphicsEnvironment)) {
++ return;
++ }
+ sun.font.FontManager.preferLocaleFonts();
+ }
+
+@@ -376,6 +379,9 @@
+ * @since 1.5
+ */
+ public void preferProportionalFonts() {
++ if (!(this instanceof SunGraphicsEnvironment)) {
++ return;
++ }
+ sun.font.FontManager.preferProportionalFonts();
+ }
+
+diff -r f68864fe53d3 -r 40ec164889bd test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java Wed Dec 24 09:57:48 2008 -0800
+@@ -0,0 +1,62 @@
++/*
++ * Copyright (c) 2008 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 6752638
++ * @summary Test no NPE calling preferLocaleFonts() on custom GE.
++ * @run main PreferLocaleFonts
++ */
++
++import java.util.*;
++import java.awt.*;
++import java.awt.image.*;
++
++public class PreferLocaleFonts extends GraphicsEnvironment {
++
++ public static void main(String args[]) {
++(new PreferLocaleFonts()).preferLocaleFonts();
++ }
++ public PreferLocaleFonts() {
++ super();
++ }
++ public Graphics2D createGraphics(BufferedImage image) {
++ return null;
++ }
++ public String[] getAvailableFontFamilyNames(Locale locale) {
++ return null;
++ }
++ public String[] getAvailableFontFamilyNames() {
++ return null;
++ }
++ public Font[] getAllFonts() {
++ return null;
++ }
++ public GraphicsDevice getDefaultScreenDevice() throws HeadlessException {
++ return null;
++ }
++ public GraphicsDevice[] getScreenDevices() throws HeadlessException {
++ return null;
++ }
++}
++
More information about the distro-pkg-dev
mailing list