commit 6abadbf15ac04099cdbe66983ce5d2416f2e90ea
author Pavel Porvatov <rupashka@openjdk.org> Thu Jul 28 18:13:17 2011 +0400
committer Pavel Porvatov <rupashka@openjdk.org> Thu Jul 28 18:13:17 2011 +0400
tree bdb41f0cd67bad6cb54ccde559f742df7e465bf6
parent d8fd6d70de02558686886c165dba9383d6deb17e

6995769: occasion NPE thrown from SwingUtilities.computeIntersection()

Reviewed-by: alexp

jdk/src/share/classes/javax/swing/RepaintManager.java

diff --git a/jdk/src/share/classes/javax/swing/RepaintManager.java b/jdk/src/share/classes/javax/swing/RepaintManager.java
index 5a6e15e..59749fc 100644
--- a/jdk/src/share/classes/javax/swing/RepaintManager.java
+++ b/jdk/src/share/classes/javax/swing/RepaintManager.java
@@ -758,6 +758,11 @@
             for(i=0 ; i < count ; i++) {
                 dirtyComponent = roots.get(i);
                 rect = tmpDirtyComponents.get(dirtyComponent);
+                // Sometimes when RepaintManager is changed during the painting
+                // we may get null here, see #6995769 for details
+                if (rect == null) {
+                    continue;
+                }
                 localBoundsH = dirtyComponent.getHeight();
                 localBoundsW = dirtyComponent.getWidth();