bug 1593 - adding proxy serialization and test

1 files changed, 34 insertions, 0 deletions

diff --git a/java/src/Ice/ObjectInputStream.java b/java/src/Ice/ObjectInputStream.java
new file mode 100644
index 00000000000..f8e5ce11762
--- /dev/null
+++ b/java/src/Ice/ObjectInputStream.java
@@ -0,0 +1,34 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package Ice;
+
+//
+// If you are attempting to deserialize a Slice type that includes a
+// proxy, you must instantiate (or subclass) Ice.ObjectInputStream and
+// supply a communicator for use in reconstructing the proxy.
+//
+public class ObjectInputStream extends java.io.ObjectInputStream
+{
+    public
+    ObjectInputStream(Communicator communicator, java.io.InputStream stream)
+        throws java.io.IOException
+    {
+        super(stream);
+        _communicator = communicator;
+    }
+
+    public Communicator
+    getCommunicator()
+    {
+        return _communicator;
+    }
+
+    private Communicator _communicator;
+}