diff options
author | Mark Spruiell <mes@zeroc.com> | 2007-11-05 12:19:49 -0800 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2007-11-05 12:19:49 -0800 |
commit | 3c8924663df8629b33c2ddd38907c4bf2eeb83cd (patch) | |
tree | 83b63f2396201019163d140555e42d79f82e46d3 /java/src/Ice/ObjectReader.java | |
parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
download | ice-3c8924663df8629b33c2ddd38907c4bf2eeb83cd.tar.bz2 ice-3c8924663df8629b33c2ddd38907c4bf2eeb83cd.tar.xz ice-3c8924663df8629b33c2ddd38907c4bf2eeb83cd.zip |
- 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.
Diffstat (limited to 'java/src/Ice/ObjectReader.java')
-rw-r--r-- | java/src/Ice/ObjectReader.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/Ice/ObjectReader.java b/java/src/Ice/ObjectReader.java index f63570f138c..a3c564260e1 100644 --- a/java/src/Ice/ObjectReader.java +++ b/java/src/Ice/ObjectReader.java @@ -22,7 +22,7 @@ public abstract class ObjectReader extends ObjectImpl public void __read(IceInternal.BasicStream is, boolean rid) { - IceInternal.BasicInputStream bis = (IceInternal.BasicInputStream)is; - read(bis._in, rid); + InputStream stream = (InputStream)is.closure(); + read(stream, rid); } } |