2005-11-15 Roman Kennke <kennke@aicas.com>

	* javax/swing/JComponent.java
	(paintDoubleBuffered): Put paint() call inside a try-finally
	block to correctly recover the double-buffering flag when
	an exception is thrown inside the paint() call.

2 files changed, 16 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b804f2bc6..7de0a061b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-15  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/JComponent.java
+	(paintDoubleBuffered): Put paint() call inside a try-finally
+	block to correctly recover the double-buffering flag when
+	an exception is thrown inside the paint() call.
+
 2005-11-15  Lillian Angel  <langel@redhat.com>
 
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index 37cf51835..deb08c5db 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -1918,9 +1918,15 @@ public abstract class JComponent extends Container implements Serializable
     g2 = getComponentGraphics(g2);
     g2.setClip(r.x, r.y, r.width, r.height);
     isPaintingDoubleBuffered = true;
-    paint(g2);
-    isPaintingDoubleBuffered = false;
-    g2.dispose();
+    try
+      {
+        paint(g2);
+      }
+    finally
+      {
+        isPaintingDoubleBuffered = false;
+        g2.dispose();
+      }
     
     // Paint the buffer contents on screen.
     g.drawImage(buffer, 0, 0, this);