diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-25 08:27:30 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-25 08:27:30 +0100 |
| commit | 85eb74ccd16898b513f14aa7aad10e9158efab47 (patch) | |
| tree | eaee024e1a82cc6b5f0bd438e88866e114fe2092 /java-compat | |
| parent | Fixed ICE-7521 - Windows tries to run Objective-C tests (diff) | |
| download | ice-85eb74ccd16898b513f14aa7aad10e9158efab47.tar.bz2 ice-85eb74ccd16898b513f14aa7aad10e9158efab47.tar.xz ice-85eb74ccd16898b513f14aa7aad10e9158efab47.zip | |
Fixed ICE-7281 - skipEmptyEncapsulation now checks for the encoding version
Diffstat (limited to 'java-compat')
| -rw-r--r-- | java-compat/src/Ice/src/main/java/Ice/InputStream.java | 2 |
1 files changed, 2 insertions, 0 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 eab7649730f..d3f1c597205 100644 --- a/java-compat/src/Ice/src/main/java/Ice/InputStream.java +++ b/java-compat/src/Ice/src/main/java/Ice/InputStream.java @@ -651,6 +651,8 @@ public class InputStream } EncodingVersion encoding = EncodingVersion.ice_read(this, null); + IceInternal.Protocol.checkSupportedEncoding(encoding); // Make sure the encoding is supported. + if(encoding.equals(Ice.Util.Encoding_1_0)) { if(sz != 6) |