Repository: ignite Updated Branches: refs/heads/ignite-1281 d1501915c -> 86e3b27f3
http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java index b5dfd67..5845ebd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java @@ -222,7 +222,7 @@ public class TxEntryValueHolder implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java index 8e6f91b..9a14d9b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java @@ -307,7 +307,7 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen assert key != null; assert !(val != null && valBytes != null); - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java index da32289..602bded 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java @@ -326,7 +326,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>, } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java index ff3fe6f..901b7d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java @@ -137,7 +137,7 @@ public class GridCacheVersionEx extends GridCacheVersion { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java index d741059..0364cb0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java @@ -126,7 +126,7 @@ public class GridClockDeltaSnapshotMessage implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java index cc25fc8..c14214b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java @@ -165,7 +165,7 @@ public class GridClockDeltaVersion implements Message, Comparable<GridClockDelta } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java index 396fd62..966f5a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java @@ -248,7 +248,7 @@ public class GridContinuousMessage implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java index c34877c..95ad316 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java @@ -150,7 +150,7 @@ public class DataStreamerEntry implements Map.Entry<KeyCacheObject, CacheObject> } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java index 250bdd6..0f2fa09 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java @@ -466,7 +466,7 @@ public class DataStreamerRequest implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java index 2659c5c..f557bfb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java @@ -151,7 +151,7 @@ public class DataStreamerResponse implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java index d00158b..0023e73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java @@ -177,7 +177,7 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java index a8f9984..fe487b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java @@ -240,7 +240,7 @@ public final class IgfsBlockKey implements Message, Externalizable, Comparable<I } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java index 1245088..4343170 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java @@ -158,7 +158,7 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java index 01dcc7d..309daf1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java @@ -69,7 +69,7 @@ public abstract class IgfsCommunicationMessage implements Message { if (!reader.beforeMessageRead()) return false; - return reader.afterMessageRead(); + return true; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java index 4ece304..c1d1ee2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java @@ -167,7 +167,7 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java index 7311ee7..9ca363d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java @@ -344,7 +344,7 @@ public class IgfsFileAffinityRange implements Message, Externalizable { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java index 9273ed0..1d3974d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java @@ -139,7 +139,7 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java index 490e7d1..b65e1c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java @@ -101,7 +101,7 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java index 836f3c7..e0bb267 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java @@ -132,7 +132,7 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java index 2196871..fb5d0ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java @@ -99,7 +99,7 @@ public class GridQueryCancelRequest implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java index ac0e59a..d8aa319 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java @@ -125,7 +125,7 @@ public class GridQueryFailResponse implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java index bfc270a..fff3173 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java @@ -152,7 +152,7 @@ public class GridQueryNextPageRequest implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java index e6160ba..48ae011 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java @@ -268,7 +268,7 @@ public class GridQueryNextPageResponse implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java index 426be0c..d8f8da3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java @@ -294,7 +294,7 @@ public class GridQueryRequest implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java index 638d62c..e37e7bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java @@ -153,7 +153,7 @@ public class GridTaskResultRequest implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java index c9e6c20..4be06ed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java @@ -199,7 +199,7 @@ public class GridTaskResultResponse implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java index a9bca2c..d026c5b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java @@ -461,7 +461,7 @@ public class GridByteArrayList implements Message, Externalizable { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java index f174844..c8bd588 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java @@ -559,7 +559,7 @@ public class GridLongList implements Message, Externalizable { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java index d632cac..939ad0a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java @@ -62,7 +62,7 @@ public class GridDirectParser implements GridNioParser { if (msg == null && buf.hasRemaining()) { msg = msgFactory.create(buf.get()); - ses.addMeta(READER_META_KEY, reader = formatter.reader(msgFactory)); + ses.addMeta(READER_META_KEY, reader = formatter.reader(msgFactory, msg.getClass())); } boolean finished = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java index 6176561..85f6045 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFormatter.java @@ -41,7 +41,8 @@ public interface MessageFormatter extends Extension { * Creates new message reader instance. * * @param factory Message factory. + * @param msgCls Message class to read. * @return Message reader. */ - public MessageReader reader(MessageFactory factory); + public MessageReader reader(MessageFactory factory, Class<? extends Message> msgCls); } http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java index 41fc479..11ea97d 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java @@ -45,9 +45,10 @@ public interface MessageReader { /** * Callback that must be invoked by a message implementation after message body finished decoding. * + * @param msgCls Message class finishing read stage. * @return {@code True} if reading can proceed, {@code false} otherwise. */ - public boolean afterMessageRead(); + public boolean afterMessageRead(Class<? extends Message> msgCls); /** * Reads {@code byte} value. http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java index f809d82..0d08171 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java @@ -684,7 +684,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement throw new IgniteException("Failed to write message, node is not started."); } - @Override public MessageReader reader(MessageFactory factory) { + @Override public MessageReader reader(MessageFactory factory, Class<? extends Message> msgCls) { throw new IgniteException("Failed to read message, node is not started."); } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java index 2d9cc63..a93b4de 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java @@ -95,7 +95,7 @@ public class JobStealingRequest implements Message { } - return reader.afterMessageRead(); + return reader.afterMessageRead(null); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index b706edf..4022cf6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -1510,13 +1510,13 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter return impl.writer(); } - @Override public MessageReader reader(MessageFactory factory) { + @Override public MessageReader reader(MessageFactory factory, Class<? extends Message> msgCls) { if (impl == null) impl = getSpiContext().messageFormatter(); assert impl != null; - return impl.reader(factory); + return impl.reader(factory, msgCls); } }; @@ -2845,13 +2845,13 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter return impl.writer(); } - @Override public MessageReader reader(MessageFactory factory) { + @Override public MessageReader reader(MessageFactory factory, Class<? extends Message> msgCls) { if (impl == null) impl = getSpiContext().messageFormatter(); assert impl != null; - return impl.reader(factory); + return impl.reader(factory, msgCls); } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/37538fce/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java index 08268af..038af02 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java @@ -474,7 +474,7 @@ public class GridSpiTestContext implements IgniteSpiContext { return new DirectMessageWriter(); } - @Override public MessageReader reader(MessageFactory factory) { + @Override public MessageReader reader(MessageFactory factory, Class<? extends Message> msgCls) { return new DirectMessageReader(factory, this); } };
