/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sun Nov 8 18:17:39 PST 2009
changeset 4f0b3652adee in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4f0b3652adee
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 00:20:07 2009 +0000
Fix security patches that fail to apply.
2009-11-08 Andrew John Hughes <ahughes at redhat.com>
* patches/security/icedtea-6657138.patch,
* patches/security/icedtea-6824265.patch: Fix security patches
which don't apply.
changeset 1b34da20e2d1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1b34da20e2d1
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 01:02:53 2009 +0000
Add missing security patch from OpenJDK repository.
2009-11-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add missing security patch.
* NEWS: List new security fixes with CVEs.
* patches/security/icedtea-6664512.patch: Missing security
patch from OpenJDK6 repository.
changeset 4073d444623d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4073d444623d
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 02:20:58 2009 +0000
List all mandatory patches together. Include bug ID for XShm patch.
2009-11-08 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-xshm.patch: Renamed to...
* Makefile.am: List all mandatory patches together. Rename
xshm patch to include bug ID.
* patches/icedtea-6897844-xshm.patch: ...include bug ID.
diffstat:
8 files changed, 1937 insertions(+), 679 deletions(-)
ChangeLog | 22
Makefile.am | 112 +-
NEWS | 16
patches/icedtea-6897844-xshm.patch | 13
patches/icedtea-xshm.patch | 13
patches/security/icedtea-6657138.patch | 1164 ++++++++++++++----------------
patches/security/icedtea-6664512.patch | 1227 ++++++++++++++++++++++++++++++++
patches/security/icedtea-6824265.patch | 49 -
diffs (truncated from 2850 to 500 lines):
diff -r 0ab9e9de339b -r 4073d444623d ChangeLog
--- a/ChangeLog Fri Nov 06 15:03:12 2009 +0100
+++ b/ChangeLog Mon Nov 09 02:20:58 2009 +0000
@@ -1,3 +1,25 @@ 2009-11-06 Matthias Klose <doko at ubuntu
+2009-11-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-xshm.patch: Renamed to...
+ * Makefile.am:
+ List all mandatory patches together. Rename
+ xshm patch to include bug ID.
+ * patches/icedtea-6897844-xshm.patch:
+ ...include bug ID.
+
+2009-11-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add missing security patch.
+ * NEWS: List new security fixes with CVEs.
+ * patches/security/icedtea-6664512.patch:
+ Missing security patch from OpenJDK6 repository.
+
+2009-11-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/security/icedtea-6657138.patch,
+ * patches/security/icedtea-6824265.patch:
+ Fix security patches which don't apply.
+
2009-11-06 Matthias Klose <doko at ubuntu.com>
* patches/security/icedtea-6657026.patch: Add missing context line.
diff -r 0ab9e9de339b -r 4073d444623d Makefile.am
--- a/Makefile.am Fri Nov 06 15:03:12 2009 +0100
+++ b/Makefile.am Mon Nov 09 02:20:58 2009 +0000
@@ -603,60 +603,8 @@ ICEDTEA_PATCHES = \
patches/security/icedtea-6822057.patch \
patches/security/icedtea-6824265.patch \
patches/security/icedtea-6861062.patch \
- patches/security/icedtea-6872358.patch
-
-if WITH_RHINO
-ICEDTEA_PATCHES += \
- patches/icedtea-rhino.patch
-endif
-
-if BUILD_CACAO
-ICEDTEA_PATCHES += \
- patches/icedtea-cacao.patch \
- patches/icedtea-cacao-no-mmap-first-page.patch \
- patches/cacao/no-strict-aliasing.patch
-endif
-if WITH_CACAO
-ICEDTEA_PATCHES += \
- patches/icedtea-cacao-ignore-jdi-tests.patch \
- patches/icedtea-cacao-ignore-tests.patch
-endif
-
-if ENABLE_PULSE_JAVA
-ICEDTEA_PATCHES += \
- patches/icedtea-pulse-soundproperties.patch
-endif
-
-if ENABLE_XRENDER
-XRENDER_PATCHES = patches/xrender/icedtea-???.patch
-XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES)))
-ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES)))
-endif
-
-if ENABLE_NIO2
-ICEDTEA_PATCHES += patches/icedtea-nio2.patch
-endif
-
-if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
-endif
-
-if ENABLE_NSS
-ICEDTEA_PATCHES += patches/icedtea-nss-config.patch \
- patches/icedtea-nss-6763530.patch
-endif
-
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
- patches/hotspot/$(HSBUILD)/zero.patch
-else
-ICEDTEA_PATCHES += patches/hotspot/original/icedtea-6778662-lib64.patch \
- patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
- patches/hotspot/original/icedtea-6791168.patch \
- patches/hotspot/original/icedtea-6793825-includedb.patch
-endif
-
-ICEDTEA_PATCHES += \
+ patches/security/icedtea-6872358.patch \
+ patches/security/icedtea-6664512.patch \
patches/icedtea-demo-swingapplet.patch \
patches/icedtea-awt-window-size.patch \
patches/icedtea-java2d-dasher.patch \
@@ -678,8 +626,60 @@ ICEDTEA_PATCHES += \
patches/icedtea-s390-serialize.patch \
patches/openjdk/6879689-hotspot_warning_fix.patch \
patches/icedtea-no-precompiled.patch \
- patches/icedtea-xshm.patch \
- $(DISTRIBUTION_PATCHES)
+ patches/icedtea-6897844-xshm.patch
+
+if WITH_RHINO
+ICEDTEA_PATCHES += \
+ patches/icedtea-rhino.patch
+endif
+
+if BUILD_CACAO
+ICEDTEA_PATCHES += \
+ patches/icedtea-cacao.patch \
+ patches/icedtea-cacao-no-mmap-first-page.patch \
+ patches/cacao/no-strict-aliasing.patch
+endif
+if WITH_CACAO
+ICEDTEA_PATCHES += \
+ patches/icedtea-cacao-ignore-jdi-tests.patch \
+ patches/icedtea-cacao-ignore-tests.patch
+endif
+
+if ENABLE_PULSE_JAVA
+ICEDTEA_PATCHES += \
+ patches/icedtea-pulse-soundproperties.patch
+endif
+
+if ENABLE_XRENDER
+XRENDER_PATCHES = patches/xrender/icedtea-???.patch
+XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES)))
+ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES)))
+endif
+
+if ENABLE_NIO2
+ICEDTEA_PATCHES += patches/icedtea-nio2.patch
+endif
+
+if ENABLE_SYSTEMTAP
+ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
+endif
+
+if ENABLE_NSS
+ICEDTEA_PATCHES += patches/icedtea-nss-config.patch \
+ patches/icedtea-nss-6763530.patch
+endif
+
+if WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
+ patches/hotspot/$(HSBUILD)/zero.patch
+else
+ICEDTEA_PATCHES += patches/hotspot/original/icedtea-6778662-lib64.patch \
+ patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
+ patches/hotspot/original/icedtea-6791168.patch \
+ patches/hotspot/original/icedtea-6793825-includedb.patch
+endif
+
+ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
stamps/extract.stamp: stamps/download.stamp
if OPENJDK_SRC_DIR_FOUND
diff -r 0ab9e9de339b -r 4073d444623d NEWS
--- a/NEWS Fri Nov 06 15:03:12 2009 +0100
+++ b/NEWS Mon Nov 09 02:20:58 2009 +0000
@@ -8,6 +8,22 @@ New in release 1.7 (XXXX-XX-XX):
- libjpeg7 supported.
- Added JNI call tracing using systemtap version 1.0+ when
configuring with --enable-systemtap. See tapset/hotspot_jni.stp.
+- Latest security updates:
+ - (CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
+ - (CVE-2009-3885) BMP parsing DoS with UNC ICC links (6632445)
+ - (CVE-2009-3881) resurrected classloaders can still have children (6636650)
+ - (CVE-2009-3882) Numerous static security flaws in Swing (findbugs) (6657026)
+ - (CVE-2009-3883) Mutable statics in Windows PL&F (findbugs) (6657138)
+ - (CVE-2009-3880) UI logging information leakage (6664512)
+ - (CVE-2009-3879) GraphicsConfiguration information leak (6822057)
+ - (CVE-2009-3884) zoneinfo file existence information leak (6824265)
+ - (CVE-2009-2409) deprecate MD2 in SSL cert validation (Kaminsky) (6861062)
+ - (CVE-2009-3873) JPEG Image Writer quantization problem (6862968)
+ - (CVE-2009-3875) MessageDigest.isEqual introduces timing attack vulnerabilities (6863503)
+ - (CVE-2009-3876, CVE-2009-3877) OpenJDK ASN.1/DER input stream parser denial of service (6864911)
+ - (CVE-2009-3869) JRE AWT setDifflCM stack overflow (6872357)
+ - (CVE-2009-3874) ImageI/O JPEG heap overflow (6874643
+ - (CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)
New in release 1.6 (2009-09-10):
diff -r 0ab9e9de339b -r 4073d444623d patches/icedtea-6897844-xshm.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6897844-xshm.patch Mon Nov 09 02:20:58 2009 +0000
@@ -0,0 +1,13 @@
+--- old/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2009-07-17 10:36:09.000000000 -0400
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2009-07-30 13:25:52.000000000 -0400
+@@ -42,6 +42,10 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
++#ifndef X_ShmAttach
++#include <X11/Xmd.h>
++#include <X11/extensions/shmproto.h>
++#endif
+
+ extern int XShmQueryExtension();
+
diff -r 0ab9e9de339b -r 4073d444623d patches/icedtea-xshm.patch
--- a/patches/icedtea-xshm.patch Fri Nov 06 15:03:12 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- old/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2009-07-17 10:36:09.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2009-07-30 13:25:52.000000000 -0400
-@@ -42,6 +42,10 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <X11/extensions/XShm.h>
-+#ifndef X_ShmAttach
-+#include <X11/Xmd.h>
-+#include <X11/extensions/shmproto.h>
-+#endif
-
- extern int XShmQueryExtension();
-
diff -r 0ab9e9de339b -r 4073d444623d patches/security/icedtea-6657138.patch
--- a/patches/security/icedtea-6657138.patch Fri Nov 06 15:03:12 2009 +0100
+++ b/patches/security/icedtea-6657138.patch Mon Nov 09 02:20:58 2009 +0000
@@ -1,6 +1,377 @@
---- old/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java Tue Jul 14 16:21:58 2009
-+++ openjdk/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java Tue Jul 14 16:21:58 2009
-@@ -8,6 +8,8 @@
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java 2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java 2009-11-08 22:51:56.000000000 +0000
+@@ -25,6 +25,8 @@
+
+ package com.sun.java.swing.plaf.motif;
+
++import sun.awt.AppContext;
++
+ import javax.swing.*;
+ import javax.swing.border.*;
+ import javax.swing.plaf.basic.*;
+@@ -46,16 +48,23 @@
+ */
+ public class MotifButtonUI extends BasicButtonUI {
+
+- private final static MotifButtonUI motifButtonUI = new MotifButtonUI();
+-
+ protected Color selectColor;
+
+ private boolean defaults_initialized = false;
+
++ private static final Object MOTIF_BUTTON_UI_KEY = new Object();
++
+ // ********************************
+ // Create PLAF
+ // ********************************
+ public static ComponentUI createUI(JComponent c){
++ AppContext appContext = AppContext.getAppContext();
++ MotifButtonUI motifButtonUI =
++ (MotifButtonUI) appContext.get(MOTIF_BUTTON_UI_KEY);
++ if (motifButtonUI == null) {
++ motifButtonUI = new MotifButtonUI();
++ appContext.put(MOTIF_BUTTON_UI_KEY, motifButtonUI);
++ }
+ return motifButtonUI;
+ }
+
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java 2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java 2009-11-08 22:53:23.000000000 +0000
+@@ -25,6 +25,8 @@
+
+ package com.sun.java.swing.plaf.motif;
+
++import sun.awt.AppContext;
++
+ import javax.swing.*;
+
+ import javax.swing.plaf.*;
+@@ -45,7 +47,7 @@
+ */
+ public class MotifCheckBoxUI extends MotifRadioButtonUI {
+
+- private static final MotifCheckBoxUI motifCheckBoxUI = new MotifCheckBoxUI();
++ private static final Object MOTIF_CHECK_BOX_UI_KEY = new Object();
+
+ private final static String propertyPrefix = "CheckBox" + ".";
+
+@@ -56,6 +58,13 @@
+ // Create PLAF
+ // ********************************
+ public static ComponentUI createUI(JComponent c){
++ AppContext appContext = AppContext.getAppContext();
++ MotifCheckBoxUI motifCheckBoxUI =
++ (MotifCheckBoxUI) appContext.get(MOTIF_CHECK_BOX_UI_KEY);
++ if (motifCheckBoxUI == null) {
++ motifCheckBoxUI = new MotifCheckBoxUI();
++ appContext.put(MOTIF_CHECK_BOX_UI_KEY, motifCheckBoxUI);
++ }
+ return motifCheckBoxUI;
+ }
+
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java 2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java 2009-11-08 22:46:58.000000000 +0000
+@@ -25,6 +25,8 @@
+
+ package com.sun.java.swing.plaf.motif;
+
++import sun.awt.AppContext;
++
+ import javax.swing.*;
+ import javax.swing.plaf.basic.BasicLabelUI;
+ import javax.swing.plaf.ComponentUI;
+@@ -44,9 +46,16 @@
+ */
+ public class MotifLabelUI extends BasicLabelUI
+ {
+- static MotifLabelUI sharedInstance = new MotifLabelUI();
++ private static final Object MOTIF_LABEL_UI_KEY = new Object();
+
+ public static ComponentUI createUI(JComponent c) {
+- return sharedInstance;
++ AppContext appContext = AppContext.getAppContext();
++ MotifLabelUI motifLabelUI =
++ (MotifLabelUI) appContext.get(MOTIF_LABEL_UI_KEY);
++ if (motifLabelUI == null) {
++ motifLabelUI = new MotifLabelUI();
++ appContext.put(MOTIF_LABEL_UI_KEY, motifLabelUI);
++ }
++ return motifLabelUI;
+ }
+ }
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java 2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java 2009-11-08 22:53:03.000000000 +0000
+@@ -25,6 +25,8 @@
+
+ package com.sun.java.swing.plaf.motif;
+
++import sun.awt.AppContext;
++
+ import javax.swing.*;
+ import javax.swing.border.*;
+ import javax.swing.plaf.basic.BasicRadioButtonUI;
+@@ -47,7 +49,7 @@
+ */
+ public class MotifRadioButtonUI extends BasicRadioButtonUI {
+
+- private static final MotifRadioButtonUI motifRadioButtonUI = new MotifRadioButtonUI();
++ private static final Object MOTIF_RADIO_BUTTON_UI_KEY = new Object();
+
+ protected Color focusColor;
+
+@@ -57,6 +59,13 @@
+ // Create PLAF
+ // ********************************
+ public static ComponentUI createUI(JComponent c) {
++ AppContext appContext = AppContext.getAppContext();
++ MotifRadioButtonUI motifRadioButtonUI =
++ (MotifRadioButtonUI) appContext.get(MOTIF_RADIO_BUTTON_UI_KEY);
++ if (motifRadioButtonUI == null) {
++ motifRadioButtonUI = new MotifRadioButtonUI();
++ appContext.put(MOTIF_RADIO_BUTTON_UI_KEY, motifRadioButtonUI);
++ }
+ return motifRadioButtonUI;
+ }
+
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java 2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java 2009-11-08 22:52:35.000000000 +0000
+@@ -25,6 +25,8 @@
+
+ package com.sun.java.swing.plaf.motif;
+
++import sun.awt.AppContext;
++
+ import java.awt.*;
+ import java.awt.event.*;
+
+@@ -48,7 +50,7 @@
+ */
+ public class MotifToggleButtonUI extends BasicToggleButtonUI
+ {
+- private final static MotifToggleButtonUI motifToggleButtonUI = new MotifToggleButtonUI();
++ private static final Object MOTIF_TOGGLE_BUTTON_UI_KEY = new Object();
+
+ protected Color selectColor;
+
+@@ -58,6 +60,13 @@
+ // Create PLAF
+ // ********************************
+ public static ComponentUI createUI(JComponent b) {
++ AppContext appContext = AppContext.getAppContext();
++ MotifToggleButtonUI motifToggleButtonUI =
++ (MotifToggleButtonUI) appContext.get(MOTIF_TOGGLE_BUTTON_UI_KEY);
++ if (motifToggleButtonUI == null) {
++ motifToggleButtonUI = new MotifToggleButtonUI();
++ appContext.put(MOTIF_TOGGLE_BUTTON_UI_KEY, motifToggleButtonUI);
++ }
+ return motifToggleButtonUI;
+ }
+
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java 2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java 2009-11-08 22:54:23.000000000 +0000
+@@ -35,6 +35,7 @@
+ import static com.sun.java.swing.plaf.windows.TMSchema.*;
+ import static com.sun.java.swing.plaf.windows.TMSchema.Part.*;
+ import static com.sun.java.swing.plaf.windows.XPStyle.Skin;
++import sun.awt.AppContext;
+
+
+ /**
+@@ -52,8 +53,6 @@
+ */
+ public class WindowsButtonUI extends BasicButtonUI
+ {
+- private final static WindowsButtonUI windowsButtonUI = new WindowsButtonUI();
+-
+ protected int dashedRectGapX;
+ protected int dashedRectGapY;
+ protected int dashedRectGapWidth;
+@@ -63,11 +62,19 @@
+
+ private boolean defaults_initialized = false;
+
++ private static final Object WINDOWS_BUTTON_UI_KEY = new Object();
+
+ // ********************************
+ // Create PLAF
+ // ********************************
+ public static ComponentUI createUI(JComponent c){
++ AppContext appContext = AppContext.getAppContext();
++ WindowsButtonUI windowsButtonUI =
++ (WindowsButtonUI) appContext.get(WINDOWS_BUTTON_UI_KEY);
++ if (windowsButtonUI == null) {
++ windowsButtonUI = new WindowsButtonUI();
++ appContext.put(WINDOWS_BUTTON_UI_KEY, windowsButtonUI);
++ }
+ return windowsButtonUI;
+ }
+
+@@ -151,7 +158,7 @@
+ * allocating them in each paint call substantially reduced the time
+ * it took paint to run. Obviously, this method can't be re-entered.
+ */
+- private static Rectangle viewRect = new Rectangle();
++ private Rectangle viewRect = new Rectangle();
+
+ public void paint(Graphics g, JComponent c) {
+ if (XPStyle.getXP() != null) {
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java 2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java 2009-11-08 22:53:46.000000000 +0000
+@@ -25,6 +25,8 @@
+
+ package com.sun.java.swing.plaf.windows;
+
++import sun.awt.AppContext;
++
+ import javax.swing.plaf.basic.*;
+ import javax.swing.*;
+ import javax.swing.plaf.*;
+@@ -49,7 +51,7 @@
+ // of BasicCheckBoxUI because we want to pick up all the
+ // painting changes made in MetalRadioButtonUI.
+
+- private static final WindowsCheckBoxUI windowsCheckBoxUI = new WindowsCheckBoxUI();
++ private static final Object WINDOWS_CHECK_BOX_UI_KEY = new Object();
+
+ private final static String propertyPrefix = "CheckBox" + ".";
+
+@@ -59,6 +61,13 @@
+ // Create PLAF
+ // ********************************
+ public static ComponentUI createUI(JComponent c) {
++ AppContext appContext = AppContext.getAppContext();
++ WindowsCheckBoxUI windowsCheckBoxUI =
++ (WindowsCheckBoxUI) appContext.get(WINDOWS_CHECK_BOX_UI_KEY);
++ if (windowsCheckBoxUI == null) {
++ windowsCheckBoxUI = new WindowsCheckBoxUI();
++ appContext.put(WINDOWS_CHECK_BOX_UI_KEY, windowsCheckBoxUI);
++ }
+ return windowsCheckBoxUI;
+ }
+
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java 2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java 2009-11-08 22:56:38.000000000 +0000
+@@ -26,6 +26,8 @@
+ package com.sun.java.swing.plaf.windows;
+
+ import sun.swing.SwingUtilities2;
++import sun.awt.AppContext;
++
+ import java.awt.Color;
+ import java.awt.Graphics;
+
+@@ -51,12 +53,19 @@
+ */
+ public class WindowsLabelUI extends BasicLabelUI {
+
+- private final static WindowsLabelUI windowsLabelUI = new WindowsLabelUI();
More information about the distro-pkg-dev
mailing list