summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/BasicStream.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2011-03-28 18:34:25 -0400
committerBernard Normier <bernard@zeroc.com>2011-03-28 18:34:25 -0400
commit23325dbc2c4da28835ae23a86b5da9e1404a5572 (patch)
tree4b6a839cc954584ac3a1137d4a8dd6f7fb4fe0d1 /java/src/IceInternal/BasicStream.java
parentFixed NPE when loading bad XML file (bug #4859) (diff)
parentadding message to MarshalException in BasicStream.typeToClass (diff)
downloadice-23325dbc2c4da28835ae23a86b5da9e1404a5572.tar.bz2
ice-23325dbc2c4da28835ae23a86b5da9e1404a5572.tar.xz
ice-23325dbc2c4da28835ae23a86b5da9e1404a5572.zip
Merge branch 'master' of ssh://git/home/git/ice
Diffstat (limited to 'java/src/IceInternal/BasicStream.java')
-rw-r--r--java/src/IceInternal/BasicStream.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index e07585bbdd7..a840476f657 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -2317,7 +2317,7 @@ public class BasicStream
{
if(!id.startsWith("::"))
{
- throw new Ice.MarshalException();
+ throw new Ice.MarshalException("expected type id but received `" + id + "'");
}
StringBuilder buf = new StringBuilder(id.length());