- Fixing bug 2522 for Python. This involved adding the C++ class

  UserExceptionWriter so that the Python extension can wrap a native
  Python user exception into something that the C++ run time can
  marshal. Also ported the changes to the servantLocator test.

- Implementing UserExceptionWriter in Java and C#.

- Consolidating the source files for the C# streaming API.

1 files changed, 57 insertions, 0 deletions

diff --git a/java/src/Ice/UserExceptionWriter.java b/java/src/Ice/UserExceptionWriter.java
new file mode 100644
index 00000000000..a1d57e59573
--- /dev/null
+++ b/java/src/Ice/UserExceptionWriter.java
@@ -0,0 +1,57 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 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;
+
+public abstract class UserExceptionWriter extends UserException
+{
+    public UserExceptionWriter(Communicator communicator)
+    {
+        _communicator = communicator;
+    }
+
+    public abstract void
+    write(Ice.OutputStream os);
+
+    public abstract boolean
+    usesClasses();
+
+    public void
+    __write(IceInternal.BasicStream os)
+    {
+        OutputStream stream = new OutputStreamI(_communicator, os);
+        write(stream);
+    }
+
+    public void
+    __read(IceInternal.BasicStream is, boolean rid)
+    {
+        assert(false);
+    }
+
+    public void
+    __write(Ice.OutputStream os)
+    {
+        write(os);
+    }
+
+    public void
+    __read(Ice.InputStream is, boolean rid)
+    {
+        assert(false);
+    }
+
+    public boolean
+    __usesClasses()
+    {
+        return usesClasses();
+    }
+
+    protected Communicator _communicator;
+}