PR libgcj/21785:

	* java/io/natObjectInputStream.cc (currentClassLoader): Removed.
	(currentLoader): New method.
	* java/io/ObjectInputStream.java (resolveProxyClass): Use
	currentLoader.
	(currentLoader): Now native.
	(currentClassLoader): Removed.
	* testsuite/libjava.lang/pr21785.java: New file.
	* testsuite/libjava.lang/pr21785.out: New file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100462 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 21 insertions, 0 deletions

diff --git a/libjava/testsuite/libjava.lang/pr21785.java b/libjava/testsuite/libjava.lang/pr21785.java
new file mode 100644
index 00000000000..7869754977a
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/pr21785.java
@@ -0,0 +1,21 @@
+import java.io.*;
+
+public class pr21785 implements Serializable
+{
+  public static void main(String[] args)
+  {
+    try {
+      ByteArrayOutputStream outb = new ByteArrayOutputStream();
+      ObjectOutputStream outs = new ObjectOutputStream(outb);
+      outs.writeObject(new pr21785());
+      byte[] store = outb.toByteArray();
+
+      ByteArrayInputStream inb = new ByteArrayInputStream(store);
+      ObjectInputStream ins = new ObjectInputStream(inb);
+      ins.readObject();
+    }
+    catch (Throwable e) {
+      throw new Error(e);
+    }
+  }
+}
diff --git a/libjava/testsuite/libjava.lang/pr21785.out b/libjava/testsuite/libjava.lang/pr21785.out
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/pr21785.out