diff -r fd16c54261b3 -r 90ce3da70b43 jdk/test/java/io/Serializable/unshared/Write.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/io/Serializable/unshared/Write.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2000 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 4311991
+ *
+ * @clean Write Read Foo Bar
+ * @compile Write.java
+ * @run main Write
+ * @clean Write Read Foo Bar
+ * @compile Read.java
+ * @run main Read
+ *
+ * @summary Test ObjectOutputStream.writeUnshared/readUnshared functionality.
+ */
+
+import java.io.*;
+
+class Foo implements Serializable {
+    private static final ObjectStreamField[] serialPersistentFields =
+        new ObjectStreamField[] {
+            new ObjectStreamField("shared1", String.class),
+            new ObjectStreamField("shared2", String.class, false),
+            new ObjectStreamField("unshared1", String.class, true),
+            new ObjectStreamField("unshared2", String.class, true)
+        };
+
+    String shared1, shared2, unshared1, unshared2;
+
+    Foo() {
+        shared1 = shared2 = unshared1 = unshared2 = "foo";
+    }
+}
+
+class Bar implements Serializable {
+    private static final long serialVersionUID = 0L;
+    Object obj;
+
+    Bar(Object obj) {
+        this.obj = obj;
+    }
+}
+
+public class Write {
+    public static void main(String[] args) throws Exception {
+        String str1 = "foo";
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        ObjectOutputStream oout = new ObjectOutputStream(bout);
+
+        oout.writeObject(str1);
+        oout.writeObject(str1);
+        oout.writeUnshared(str1);
+        oout.writeUnshared(str1);
+        oout.writeObject(new Foo());
+        oout.close();
+
+        ByteArrayInputStream bin =
+            new ByteArrayInputStream(bout.toByteArray());
+        ObjectInputStream oin = new ObjectInputStream(bin);
+        str1 = (String) oin.readObject();
+        if (oin.readObject() != str1) {
+            throw new Error();
+        }
+        String str2 = (String) oin.readObject();
+        String str3 = (String) oin.readObject();
+        if (str2 == str1 || str3 == str1 || str2 == str3) {
+            throw new Error();
+        }
+        if (! (str1.equals(str2) && str1.equals(str3))) {
+            throw new Error();
+        }
+
+        Foo foo = (Foo) oin.readObject();
+        if ((foo.shared1 != foo.shared2) ||
+            (foo.shared1 == foo.unshared1) ||
+            (foo.shared1 == foo.unshared2) ||
+            (foo.shared2 == foo.unshared1) ||
+            (foo.shared2 == foo.unshared2) ||
+            (foo.unshared1 == foo.unshared2))
+        {
+            throw new Error();
+        }
+
+        // write out object to be read by Read.main()
+        oout = new ObjectOutputStream(new FileOutputStream("tmp.ser"));
+        oout.writeObject(new Bar(str1));
+        oout.writeObject(str1);
+        oout.close();
+    }
+}