From ecc1547faf2a419a1f3b336545d88f1f020fd693 Mon Sep 17 00:00:00 2001
From: rupashka <unknown>
Date: Thu, 28 Jul 2011 18:13:17 +0400
Subject: [PATCH] 6995769: occasion NPE thrown from
 SwingUtilities.computeIntersection() Reviewed-by: alexp

---
 src/share/classes/javax/swing/RepaintManager.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/share/classes/javax/swing/RepaintManager.java b/src/share/classes/javax/swing/RepaintManager.java
index 5a6e15e57..59749fcad 100644
--- a/src/share/classes/javax/swing/RepaintManager.java
+++ b/src/share/classes/javax/swing/RepaintManager.java
@@ -758,6 +758,11 @@ public class RepaintManager
             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();
 
-- 
GitLab