--- a/jdk/src/share/classes/javax/swing/AncestorNotifier.java Tue Oct 23 14:30:41 2012 +0400
+++ b/jdk/src/share/classes/javax/swing/AncestorNotifier.java Wed Oct 24 18:27:14 2012 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -45,7 +45,7 @@
@SuppressWarnings("serial")
class AncestorNotifier implements ComponentListener, PropertyChangeListener, Serializable
{
- Component firstInvisibleAncestor;
+ transient Component firstInvisibleAncestor;
EventListenerList listenerList = new EventListenerList();
JComponent root;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java Wed Oct 24 18:27:14 2012 +0400
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2012, 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 7193219
+ @summary JComboBox serialization fails in JDK 1.7
+ @author Anton Litvinov
+*/
+
+import java.io.*;
+
+import javax.swing.*;
+
+public class bug7193219 {
+ private static byte[] serializeGUI() {
+ // Create and set up the window.
+ JFrame frame = new JFrame("Serialization");
+ JPanel mainPanel = new JPanel();
+
+ /**
+ * If JComboBox is replaced with other component like JLabel
+ * The issue does not happen.
+ */
+ JComboBox status = new JComboBox();
+ status.addItem("123");
+ mainPanel.add(status);
+ frame.getContentPane().add(mainPanel);
+ frame.pack();
+
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(mainPanel);
+ oos.flush();
+ frame.dispose();
+ return baos.toByteArray();
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
+ }
+
+ private static void deserializeGUI(byte[] serializedData) {
+ try {
+ ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(serializedData));
+ JPanel mainPanel = (JPanel)ois.readObject();
+ JFrame frame = new JFrame("Deserialization");
+ frame.getContentPane().add(mainPanel);
+ frame.pack();
+ frame.dispose();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ deserializeGUI(serializeGUI());
+ }
+ });
+ }
+}