- 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, 0 insertions, 22 deletions

diff --git a/java/src/IceInternal/BasicInputStream.java b/java/src/IceInternal/BasicInputStream.java
deleted file mode 100644
index 188f321fa90..00000000000
--- a/java/src/IceInternal/BasicInputStream.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// **********************************************************************
-//
-// 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 IceInternal;
-
-public class BasicInputStream extends BasicStream
-{
-    public
-    BasicInputStream(Instance instance, Ice.InputStream in)
-    {
-        super(instance);
-        _in = in;
-    }
-
-    public Ice.InputStream _in;
-}