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

diff --git a/java/src/Ice/OutputStreamI.java b/java/src/Ice/OutputStreamI.java
index 188080d4f9c..2a0884014ef 100644
--- a/java/src/Ice/OutputStreamI.java
+++ b/java/src/Ice/OutputStreamI.java
@@ -14,8 +14,15 @@ public class OutputStreamI implements OutputStream
     public
     OutputStreamI(Communicator communicator)
     {
+        this(communicator, new IceInternal.BasicStream(Util.getInstance(communicator)));
+    }
+
+    public
+    OutputStreamI(Communicator communicator, IceInternal.BasicStream os)
+    {
         _communicator = communicator;
-        _os = new IceInternal.BasicOutputStream(Util.getInstance(communicator), this);
+        _os = os;
+        _os.closure(this);
     }
 
     public Communicator
@@ -200,5 +207,5 @@ public class OutputStreamI implements OutputStream
     }
 
     private Communicator _communicator;
-    private IceInternal.BasicOutputStream _os;
+    private IceInternal.BasicStream _os;
 }