diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/IceInternal/BasicStream.java | 12 | ||||
| -rw-r--r-- | java/test/IceBox/admin/AllTests.java | 1 |
2 files changed, 11 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) diff --git a/java/test/IceBox/admin/AllTests.java b/java/test/IceBox/admin/AllTests.java index 946ca6bce3b..b78a3420a1d 100644 --- a/java/test/IceBox/admin/AllTests.java +++ b/java/test/IceBox/admin/AllTests.java @@ -112,6 +112,7 @@ public class AllTests setProps.put("IceMX.Metrics.All.GroupBy", "none"); setProps.put("IceMX.Metrics.Parent.GroupBy", "parent"); pa.setProperties(setProps); + pa.setProperties(new java.util.HashMap<String, String>()); views = ma.getMetricsViewNames(); test(views.length == 3); |