summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2006-03-03 10:06:10 +0000
committerRoman Kennke <roman@kennke.org>2006-03-03 10:06:10 +0000
commit11d1c93cefccde00ba936efaffca213d79817310 (patch)
treeaeafc8cebd1f37b37f388c2b4b0ba7c080a141b8
parentb08924dea2b4cb116f7792a893c9369d82f8f691 (diff)
downloadclasspath-11d1c93cefccde00ba936efaffca213d79817310.tar.gz
2006-03-03 Roman Kennke <kennke@aicas.com>
* javax/swing/RepaintManager.java (commitBuffer): Added null check for clip.
-rw-r--r--ChangeLog5
-rw-r--r--javax/swing/RepaintManager.java7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index edf398e23..c4b7085bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-03 Roman Kennke <kennke@aicas.com>
+
+ * javax/swing/RepaintManager.java
+ (commitBuffer): Added null check for clip.
+
2006-03-02 Lillian Angel <langel@redhat.com>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
diff --git a/javax/swing/RepaintManager.java b/javax/swing/RepaintManager.java
index a79052f9d..ed0500992 100644
--- a/javax/swing/RepaintManager.java
+++ b/javax/swing/RepaintManager.java
@@ -636,9 +636,10 @@ public class RepaintManager
Graphics g = root.getGraphics();
Image buffer = (Image) offscreenBuffers.get(root);
Rectangle clip = g.getClipBounds();
- area = SwingUtilities.computeIntersection(clip.x, clip.y,
- clip.width, clip.height,
- area);
+ if (clip != null)
+ area = SwingUtilities.computeIntersection(clip.x, clip.y,
+ clip.width, clip.height,
+ area);
int dx1 = area.x;
int dy1 = area.y;
int dx2 = area.x + area.width;