diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java index b166aee3bf..13192476a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java @@ -1359,7 +1359,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina @Nullable @Override public Object[] readObjectArray() throws BinaryObjectException { switch (checkFlag(OBJ_ARR)) { case NORMAL: - return BinaryUtils.doReadObjectArray(in, ctx, ldr, this, false, true); + return BinaryUtils.doReadObjectArray(in, ctx, ldr, this, true); case HANDLE: return readHandleField(); @@ -1532,7 +1532,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina throws BinaryObjectException { switch (checkFlag(COL)) { case NORMAL: - return (Collection)BinaryUtils.doReadCollection(in, ctx, ldr, this, false, true, factory); + return (Collection)BinaryUtils.doReadCollection(in, ctx, ldr, this, true, factory); case HANDLE: { int handlePos = BinaryUtils.positionForHandle(in) - in.readInt(); @@ -1610,7 +1610,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina private Map readMap0(@Nullable BinaryMapFactory factory) throws BinaryObjectException { switch (checkFlag(MAP)) { case NORMAL: - return (Map)BinaryUtils.doReadMap(in, ctx, ldr, this, false, true, factory); + return (Map)BinaryUtils.doReadMap(in, ctx, ldr, this, true, factory); case HANDLE: { int handlePos = BinaryUtils.positionForHandle(in) - in.readInt(); @@ -1908,17 +1908,17 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina break; case OBJ_ARR: - obj = BinaryUtils.doReadObjectArray(in, ctx, ldr, this, false, true); + obj = BinaryUtils.doReadObjectArray(in, ctx, ldr, this, true); break; case COL: - obj = BinaryUtils.doReadCollection(in, ctx, ldr, this, false, true, null); + obj = BinaryUtils.doReadCollection(in, ctx, ldr, this, true, null); break; case MAP: - obj = BinaryUtils.doReadMap(in, ctx, ldr, this, false, true, null); + obj = BinaryUtils.doReadMap(in, ctx, ldr, this, true, null); break; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java index 920bb1737c..7139b8a02e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java @@ -1963,13 +1963,13 @@ public class BinaryUtils { return doReadTimeArray(in); case GridBinaryMarshaller.OBJ_ARR: - return doReadObjectArray(in, ctx, ldr, handles, detach, false); + return doReadObjectArray(in, ctx, ldr, handles, false); case GridBinaryMarshaller.COL: - return doReadCollection(in, ctx, ldr, handles, detach, false, null); + return doReadCollection(in, ctx, ldr, handles, false, null); case GridBinaryMarshaller.MAP: - return doReadMap(in, ctx, ldr, handles, detach, false, null); + return doReadMap(in, ctx, ldr, handles, false, null); case GridBinaryMarshaller.BINARY_OBJ: return doReadBinaryObject(in, ctx, detach); @@ -2002,13 +2002,12 @@ public class BinaryUtils { * @param ctx Binary context. * @param ldr Class loader. * @param handles Holder for handles. - * @param detach Detach array elements flag. * @param deserialize Deep flag. * @return Value. * @throws BinaryObjectException In case of error. */ public static Object[] doReadObjectArray(BinaryInputStream in, BinaryContext ctx, ClassLoader ldr, - BinaryReaderHandlesHolder handles, boolean detach, boolean deserialize) throws BinaryObjectException { + BinaryReaderHandlesHolder handles, boolean deserialize) throws BinaryObjectException { int hPos = positionForHandle(in); Class compType = doReadClass(in, ctx, ldr, deserialize); @@ -2020,7 +2019,7 @@ public class BinaryUtils { handles.setHandle(arr, hPos); for (int i = 0; i < len; i++) - arr[i] = deserializeOrUnmarshal(in, ctx, ldr, handles, detach, deserialize); + arr[i] = deserializeOrUnmarshal(in, ctx, ldr, handles, deserialize); return arr; } @@ -2033,7 +2032,7 @@ public class BinaryUtils { */ @SuppressWarnings("unchecked") public static Collection doReadCollection(BinaryInputStream in, BinaryContext ctx, ClassLoader ldr, - BinaryReaderHandlesHolder handles, boolean deserialize, boolean detach, BinaryCollectionFactory factory) + BinaryReaderHandlesHolder handles, boolean deserialize, BinaryCollectionFactory factory) throws BinaryObjectException { int hPos = positionForHandle(in); @@ -2092,7 +2091,7 @@ public class BinaryUtils { handles.setHandle(col, hPos); for (int i = 0; i < size; i++) - col.add(deserializeOrUnmarshal(in, ctx, ldr, handles, detach, deserialize)); + col.add(deserializeOrUnmarshal(in, ctx, ldr, handles, deserialize)); return colType == GridBinaryMarshaller.SINGLETON_LIST ? U.convertToSingletonList(col) : col; } @@ -2105,7 +2104,7 @@ public class BinaryUtils { */ @SuppressWarnings("unchecked") public static Map doReadMap(BinaryInputStream in, BinaryContext ctx, ClassLoader ldr, - BinaryReaderHandlesHolder handles, boolean detach, boolean deserialize, BinaryMapFactory factory) + BinaryReaderHandlesHolder handles, boolean deserialize, BinaryMapFactory factory) throws BinaryObjectException { int hPos = positionForHandle(in); @@ -2144,8 +2143,8 @@ public class BinaryUtils { handles.setHandle(map, hPos); for (int i = 0; i < size; i++) { - Object key = deserializeOrUnmarshal(in, ctx, ldr, handles, detach, deserialize); - Object val = deserializeOrUnmarshal(in, ctx, ldr, handles, detach, deserialize); + Object key = deserializeOrUnmarshal(in, ctx, ldr, handles, deserialize); + Object val = deserializeOrUnmarshal(in, ctx, ldr, handles, deserialize); map.put(key, val); } @@ -2160,8 +2159,8 @@ public class BinaryUtils { * @return Result. */ private static Object deserializeOrUnmarshal(BinaryInputStream in, BinaryContext ctx, ClassLoader ldr, - BinaryReaderHandlesHolder handles, boolean detach, boolean deserialize) { - return deserialize ? doReadObject(in, ctx, ldr, handles) : unmarshal(in, ctx, ldr, handles, detach); + BinaryReaderHandlesHolder handles, boolean deserialize) { + return deserialize ? doReadObject(in, ctx, ldr, handles) : unmarshal(in, ctx, ldr, handles); } /**