- 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, 2 insertions, 2 deletions

diff --git a/java/src/Ice/ObjectWriter.java b/java/src/Ice/ObjectWriter.java
index fc5afeca4f4..1d8e57fa2d4 100644
--- a/java/src/Ice/ObjectWriter.java
+++ b/java/src/Ice/ObjectWriter.java
@@ -16,8 +16,8 @@ public abstract class ObjectWriter extends ObjectImpl
     public void
     __write(IceInternal.BasicStream os)
     {
-        IceInternal.BasicOutputStream bos = (IceInternal.BasicOutputStream)os;
-        write(bos._out);
+        OutputStream stream = (OutputStream)os.closure();
+        write(stream);
     }
 
     public void