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

diff --git a/java/src/Ice/InputStreamI.java b/java/src/Ice/InputStreamI.java
index b1b1975811a..4cd30cbd4aa 100644
--- a/java/src/Ice/InputStreamI.java
+++ b/java/src/Ice/InputStreamI.java
@@ -16,7 +16,8 @@ public class InputStreamI implements InputStream
     {
         _communicator = communicator;
 
-        _is = new IceInternal.BasicInputStream(Util.getInstance(communicator), this);
+        _is = new IceInternal.BasicStream(Util.getInstance(communicator));
+        _is.closure(this);
         _is.resize(data.length, true);
         java.nio.ByteBuffer buf = _is.prepareRead();
         buf.position(0);
@@ -231,5 +232,5 @@ public class InputStreamI implements InputStream
     }
 
     private Communicator _communicator;
-    private IceInternal.BasicInputStream _is;
+    private IceInternal.BasicStream _is;
 }