From 9dd486a80b07a45a1a0e3c69ad18d976d687e32f Mon Sep 17 00:00:00 2001
From: alexp <unknown>
Date: Thu, 18 Nov 2010 13:53:02 +0300
Subject: [PATCH] 6994419: JLayer.removeAll() behavior doesn't correspond to
 JLayer.remove() behavior. Reviewed-by: rupashka

---
 src/share/classes/javax/swing/JLayer.java     |  8 ++-
 .../swing/JLayer/6994419/bug6994419.java      | 55 +++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 test/javax/swing/JLayer/6994419/bug6994419.java

diff --git a/src/share/classes/javax/swing/JLayer.java b/src/share/classes/javax/swing/JLayer.java
index 8da354103..598456c56 100644
--- a/src/share/classes/javax/swing/JLayer.java
+++ b/src/share/classes/javax/swing/JLayer.java
@@ -373,8 +373,12 @@ public final class JLayer<V extends Component>
      * {@inheritDoc}
      */
     public void removeAll() {
-        setView(null);
-        setGlassPane(null);
+        if (view != null) {
+            setView(null);
+        }
+        if (glassPane != null) {
+            setGlassPane(null);
+        }
     }
 
     /**
diff --git a/test/javax/swing/JLayer/6994419/bug6994419.java b/test/javax/swing/JLayer/6994419/bug6994419.java
new file mode 100644
index 000000000..bc77c6787
--- /dev/null
+++ b/test/javax/swing/JLayer/6994419/bug6994419.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 6994419
+ * @summary JLayer.removeAll() behavior doesn't correspond to JLayer.remove() behavior.
+ * @author Alexander Potochkin
+ */
+
+import javax.swing.*;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeEvent;
+
+public class bug6994419 {
+
+    public static void main(String... args) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+
+                JLayer<JComponent> l = new JLayer<JComponent>(new JButton());
+
+                l.removeAll();
+
+                l.addPropertyChangeListener(new PropertyChangeListener() {
+
+                    public void propertyChange(PropertyChangeEvent evt) {
+                        throw new RuntimeException("Property change event was unexpectedly fired");
+                    }
+                });
+
+                l.removeAll();
+            }
+        });
+    }
+}
-- 
GitLab