diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-10-29 12:21:53 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-29 12:21:53 +0100 |
commit | 881f18ef1ef829511f2002c08ed855f032184e6a (patch) | |
tree | c0a33e16c0df239e5af85ff489caa00e0eb82daa /java/src | |
parent | More UMR fixes (diff) | |
download | ice-881f18ef1ef829511f2002c08ed855f032184e6a.tar.bz2 ice-881f18ef1ef829511f2002c08ed855f032184e6a.tar.xz ice-881f18ef1ef829511f2002c08ed855f032184e6a.zip |
Minor core, test and demo fixes
- Fixed C# value demo to use sliced format
- Fixed Ice core to throw NoObjectFactoryException/UnknownUserException instead
or MarshalException when compact format is used an no factory is found.
- Fixed minor unitialized memory reads.
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/IceInternal/BasicStream.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java index 9701cc41933..fdde15868ae 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/IceInternal/BasicStream.java @@ -3156,8 +3156,16 @@ public class BasicStream } else { - throw new Ice.MarshalException( - "compact format prevents slicing (the sender should use the sliced format instead)"); + if(_sliceType == SliceType.ObjectSlice) + { + throw new Ice.NoObjectFactoryException( + "compact format prevents slicing (the sender should use the sliced format instead)", + _typeId); + } + else + { + throw new Ice.UnknownUserException(_typeId.substring(2)); + } } if(!_encaps.encoding_1_0) |