diff options
| -rw-r--r-- | java/src/IceInternal/BasicStream.java | 6 | ||||
| -rw-r--r-- | java/test/Ice/exceptions/AllTests.java | 2 | ||||
| -rw-r--r-- | java/test/Ice/slicing/objects/csrc/AllTests.java | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java index 67e9820b481..40c9a360140 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/IceInternal/BasicStream.java @@ -396,13 +396,11 @@ public class BasicStream { throw new Ice.NegativeSizeException(); } -// TODO: How to implement this check in Java? -/* - if(sz - 4 > _buf.length()) + + if(sz - 4 > _buf.limit()) { throw new Ice.UnmarshalOutOfBoundsException(); } -*/ _readEncapsStack.sz = sz; byte eMajor = readByte(); diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java index b507b2d7f5c..a182c19a8c2 100644 --- a/java/test/Ice/exceptions/AllTests.java +++ b/java/test/Ice/exceptions/AllTests.java @@ -1184,7 +1184,7 @@ public class AllTests System.out.println("ok"); - System.out.print("catching derived types... "); + System.out.print("catching derived types with AMI... "); System.out.flush(); { diff --git a/java/test/Ice/slicing/objects/csrc/AllTests.java b/java/test/Ice/slicing/objects/csrc/AllTests.java index 0e6dc83e685..9e30bb28d90 100644 --- a/java/test/Ice/slicing/objects/csrc/AllTests.java +++ b/java/test/Ice/slicing/objects/csrc/AllTests.java @@ -665,8 +665,6 @@ public class AllTests } private Callback callback = new Callback(); - - public B r; } private static class AMI_Test_paramTest4I extends AMI_Test_paramTest4 @@ -705,8 +703,6 @@ public class AllTests } private Callback callback = new Callback(); - - public B r; } private static class AMI_Test_sequenceTestI extends AMI_Test_sequenceTest |