From 7a593ea8955194943cab02b9d4ea9d859e0bdb6d Mon Sep 17 00:00:00 2001
From: Anthony Petrov <anthony@openjdk.org>
Date: Tue, 3 Mar 2009 13:54:47 +0300
Subject: [PATCH] 6811674: Container.setComponentZOrder throws NPE

Reviewed-by: art, dcherepanov
---
 jdk/src/share/classes/java/awt/Container.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/java/awt/Container.java b/jdk/src/share/classes/java/awt/Container.java
index fb520547e1e..2a4050880de 100644
--- a/jdk/src/share/classes/java/awt/Container.java
+++ b/jdk/src/share/classes/java/awt/Container.java
@@ -506,7 +506,9 @@ public class Container extends Component {
             adjustDescendants(-(comp.countHierarchyMembers()));
 
             comp.parent = null;
-            comp.setGraphicsConfiguration(null);
+            if (needRemoveNotify) {
+                comp.setGraphicsConfiguration(null);
+            }
             component.remove(index);
 
             invalidateIfValid();