Improved readValue/readProxy methods and streaming helpers

3 files changed, 8 insertions, 8 deletions

diff --git a/java-compat/src/Ice/src/main/java/Ice/InputStream.java b/java-compat/src/Ice/src/main/java/Ice/InputStream.java
index d3f1c597205..0a37c82e08d 100644
--- a/java-compat/src/Ice/src/main/java/Ice/InputStream.java
+++ b/java-compat/src/Ice/src/main/java/Ice/InputStream.java
@@ -650,7 +650,7 @@ public class InputStream
             throw new Ice.UnmarshalOutOfBoundsException();
         }
 
-        EncodingVersion encoding = EncodingVersion.ice_read(this, null);
+        EncodingVersion encoding = EncodingVersion.ice_read(this);
         IceInternal.Protocol.checkSupportedEncoding(encoding); // Make sure the encoding is supported.
 
         if(encoding.equals(Ice.Util.Encoding_1_0))
diff --git a/java-compat/test/src/main/java/test/Ice/optional/AllTests.java b/java-compat/test/src/main/java/test/Ice/optional/AllTests.java
index 0e66fb1c8fb..ed5c23495a3 100644
--- a/java-compat/test/src/main/java/test/Ice/optional/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/optional/AllTests.java
@@ -1061,11 +1061,11 @@ public class AllTests
                 in.startEncapsulation();
                 test(in.readOptional(1, Ice.OptionalFormat.VSize));
                 in.skipSize();
-                SmallStruct f = SmallStruct.ice_read(in, null);
+                SmallStruct f = SmallStruct.ice_read(in);
                 test(f.m == (byte)56);
                 test(in.readOptional(3, Ice.OptionalFormat.VSize));
                 in.skipSize();
-                SmallStruct.ice_read(in, f);
+                f = SmallStruct.ice_read(in);
                 test(f.m == (byte)56);
                 in.endEncapsulation();
 
@@ -1110,11 +1110,11 @@ public class AllTests
                 in.startEncapsulation();
                 test(in.readOptional(1, Ice.OptionalFormat.VSize));
                 in.skipSize();
-                FixedStruct f = FixedStruct.ice_read(in, null);
+                FixedStruct f = FixedStruct.ice_read(in);
                 test(f.m == 56);
                 test(in.readOptional(3, Ice.OptionalFormat.VSize));
                 in.skipSize();
-                FixedStruct.ice_read(in, f);
+                f = FixedStruct.ice_read(in);
                 test(f.m == 56);
                 in.endEncapsulation();
 
@@ -1160,11 +1160,11 @@ public class AllTests
                 in.startEncapsulation();
                 test(in.readOptional(1, Ice.OptionalFormat.FSize));
                 in.skip(4);
-                VarStruct v = VarStruct.ice_read(in, null);
+                VarStruct v = VarStruct.ice_read(in);
                 test(v.m.equals("test"));
                 test(in.readOptional(3, Ice.OptionalFormat.FSize));
                 in.skip(4);
-                VarStruct.ice_read(in, v);
+                v = VarStruct.ice_read(in);
                 test(v.m.equals("test"));
                 in.endEncapsulation();
 
diff --git a/java-compat/test/src/main/java/test/Ice/stream/Client.java b/java-compat/test/src/main/java/test/Ice/stream/Client.java
index 56ab0cb8d57..3f1ebd43b9a 100644
--- a/java-compat/test/src/main/java/test/Ice/stream/Client.java
+++ b/java-compat/test/src/main/java/test/Ice/stream/Client.java
@@ -273,7 +273,7 @@ public class Client extends test.Util.Application
             SmallStruct.ice_write(out, s);
             byte[] data = out.finished();
             in = new Ice.InputStream(comm, data);
-            SmallStruct s2 = SmallStruct.ice_read(in, null);
+            SmallStruct s2 = SmallStruct.ice_read(in);
             test(s2.equals(s));
         }