This is an automated email from the ASF dual-hosted git repository.

shishkovilja pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new cbb1d0cdd7e IGNITE-25533 Remove Message#onAckReceived (#12209)
cbb1d0cdd7e is described below

commit cbb1d0cdd7ed8fb55b4351c8ab09846ed359c3bc
Author: Ilya Shishkov <[email protected]>
AuthorDate: Thu Sep 11 11:06:00 2025 +0300

    IGNITE-25533 Remove Message#onAckReceived (#12209)
---
 .../query/calcite/message/CalciteMessage.java         |  5 -----
 .../apache/ignite/internal/GridJobCancelRequest.java  |  5 -----
 .../apache/ignite/internal/GridJobExecuteRequest.java |  5 -----
 .../ignite/internal/GridJobExecuteResponse.java       |  5 -----
 .../ignite/internal/GridJobSiblingsRequest.java       |  5 -----
 .../ignite/internal/GridJobSiblingsResponse.java      |  5 -----
 .../apache/ignite/internal/GridTaskCancelRequest.java |  5 -----
 .../ignite/internal/GridTaskSessionRequest.java       |  5 -----
 .../ignite/internal/IgniteDiagnosticMessage.java      |  5 -----
 .../managers/checkpoint/GridCheckpointRequest.java    |  5 -----
 .../managers/communication/GridIoMessage.java         |  5 -----
 .../managers/communication/GridIoUserMessage.java     |  5 -----
 .../managers/communication/IgniteIoTestMessage.java   |  5 -----
 .../managers/communication/SessionChannelMessage.java |  5 -----
 .../managers/deployment/GridDeploymentInfoBean.java   |  5 -----
 .../managers/deployment/GridDeploymentRequest.java    |  5 -----
 .../managers/deployment/GridDeploymentResponse.java   |  5 -----
 .../encryption/GenerateEncryptionKeyRequest.java      |  5 -----
 .../encryption/GenerateEncryptionKeyResponse.java     |  5 -----
 .../eventstorage/GridEventStorageMessage.java         |  5 -----
 .../UserAuthenticateRequestMessage.java               |  5 -----
 .../UserAuthenticateResponseMessage.java              |  5 -----
 .../UserManagementOperationFinishedMessage.java       |  5 -----
 .../processors/cache/CacheEntryInfoCollection.java    |  5 -----
 .../processors/cache/CacheEntryPredicateAdapter.java  |  5 -----
 .../cache/CacheEntrySerializablePredicate.java        |  5 -----
 .../internal/processors/cache/CacheEvictionEntry.java |  5 -----
 .../processors/cache/CacheInvokeDirectResult.java     |  5 -----
 .../internal/processors/cache/GridCacheEntryInfo.java |  5 -----
 .../internal/processors/cache/GridCacheMessage.java   |  5 -----
 .../internal/processors/cache/GridCacheReturn.java    |  5 -----
 .../internal/processors/cache/WalStateAckMessage.java |  5 -----
 .../cache/binary/MetadataRequestMessage.java          |  5 -----
 .../cache/binary/MetadataResponseMessage.java         |  5 -----
 .../dht/PartitionUpdateCountersMessage.java           |  5 -----
 .../dht/atomic/GridDhtAtomicAbstractUpdateFuture.java |  2 ++
 .../atomic/GridDhtAtomicAbstractUpdateRequest.java    |  5 -----
 .../distributed/dht/atomic/NearCacheUpdates.java      |  5 -----
 .../cache/distributed/dht/atomic/UpdateErrors.java    |  5 -----
 .../dht/preloader/CacheGroupAffinityMessage.java      |  5 -----
 .../dht/preloader/GridDhtPartitionExchangeId.java     |  5 -----
 .../dht/preloader/latch/LatchAckMessage.java          |  4 ----
 .../cache/distributed/near/CacheVersionedValue.java   |  5 -----
 .../persistence/snapshot/AbstractSnapshotMessage.java |  5 -----
 .../processors/cache/query/GridCacheSqlQuery.java     |  5 -----
 .../query/continuous/CacheContinuousQueryEntry.java   |  5 -----
 .../processors/cache/transactions/IgniteTxEntry.java  |  5 -----
 .../processors/cache/transactions/IgniteTxKey.java    |  5 -----
 .../cache/transactions/TxEntryValueHolder.java        |  5 -----
 .../processors/cache/transactions/TxLock.java         |  4 ----
 .../processors/cache/transactions/TxLockList.java     |  4 ----
 .../processors/cache/version/GridCacheVersion.java    |  5 -----
 .../cluster/ClusterMetricsUpdateMessage.java          |  5 -----
 .../ContinuousRoutineStartResultMessage.java          |  5 -----
 .../processors/continuous/GridContinuousMessage.java  |  5 -----
 .../processors/datastreamer/DataStreamerEntry.java    |  5 -----
 .../processors/datastreamer/DataStreamerRequest.java  |  5 -----
 .../processors/datastreamer/DataStreamerResponse.java |  5 -----
 .../marshaller/MissingMappingRequestMessage.java      |  5 -----
 .../marshaller/MissingMappingResponseMessage.java     |  5 -----
 .../internal/processors/odbc/ClientMessage.java       |  5 -----
 .../h2/twostep/messages/GridQueryCancelRequest.java   |  5 -----
 .../h2/twostep/messages/GridQueryFailResponse.java    |  5 -----
 .../h2/twostep/messages/GridQueryNextPageRequest.java |  5 -----
 .../twostep/messages/GridQueryNextPageResponse.java   |  5 -----
 .../query/messages/GridQueryKillRequest.java          |  5 -----
 .../query/messages/GridQueryKillResponse.java         |  5 -----
 .../schema/message/SchemaOperationStatusMessage.java  |  5 -----
 .../query/stat/messages/StatisticsColumnData.java     |  4 ----
 .../query/stat/messages/StatisticsDecimalMessage.java |  5 -----
 .../query/stat/messages/StatisticsKeyMessage.java     |  5 -----
 .../query/stat/messages/StatisticsObjectData.java     |  4 ----
 .../query/stat/messages/StatisticsRequest.java        |  4 ----
 .../query/stat/messages/StatisticsResponse.java       |  4 ----
 .../rest/handlers/task/GridTaskResultRequest.java     |  5 -----
 .../rest/handlers/task/GridTaskResultResponse.java    |  5 -----
 .../service/ServiceDeploymentProcessId.java           |  5 -----
 .../service/ServiceSingleNodeDeploymentResult.java    |  5 -----
 .../ServiceSingleNodeDeploymentResultBatch.java       |  5 -----
 .../ignite/internal/util/GridByteArrayList.java       |  5 -----
 .../org/apache/ignite/internal/util/GridIntList.java  |  5 -----
 .../org/apache/ignite/internal/util/GridLongList.java |  5 -----
 .../ignite/internal/util/UUIDCollectionMessage.java   |  5 -----
 .../internal/util/distributed/SingleNodeMessage.java  |  5 -----
 .../internal/util/nio/GridNioRecoveryDescriptor.java  |  2 --
 .../ignite/internal/util/nio/GridNioServer.java       | 19 -------------------
 .../ignite/internal/util/nio/SessionWriteRequest.java |  5 -----
 .../plugin/extensions/communication/Message.java      |  5 -----
 .../spi/collision/jobstealing/JobStealingRequest.java |  5 -----
 .../internal/TcpInverseConnectionResponseMessage.java |  5 -----
 .../communication/tcp/messages/HandshakeMessage.java  |  5 -----
 .../tcp/messages/HandshakeWaitMessage.java            |  5 -----
 .../spi/communication/tcp/messages/NodeIdMessage.java |  5 -----
 .../tcp/messages/RecoveryLastReceivedMessage.java     |  5 -----
 .../GridCommunicationSendMessageSelfTest.java         | 10 ----------
 .../managers/communication/GridIoManagerSelfTest.java |  4 ----
 .../communication/IgniteMessageFactoryImplTest.java   | 12 ------------
 .../MessageDirectTypeIdConflictTest.java              |  4 ----
 .../loadtests/communication/GridTestMessage.java      |  5 -----
 .../ignite/spi/communication/GridTestMessage.java     |  5 -----
 .../spi/communication/TestVolatilePayloadMessage.java |  5 -----
 .../src/test/resources/codegen/AbstractMessage.java   |  4 ----
 .../core/src/test/resources/codegen/EmptyMessage.java |  4 ----
 .../test/resources/codegen/MatrixMessageMessage.java  |  6 +-----
 .../src/test/resources/codegen/PojoFieldMessage.java  |  6 +-----
 .../src/test/resources/codegen/StaticFieldOrder.java  |  4 ----
 .../resources/codegen/TestCollectionsMessage.java     |  4 ----
 .../src/test/resources/codegen/TestMapMessage.java    |  4 ----
 .../core/src/test/resources/codegen/TestMessage.java  |  4 ----
 .../test/resources/codegen/WrongOrderEnumeration.java |  4 ----
 .../internal/processors/query/h2/QueryTable.java      |  5 -----
 .../query/h2/twostep/msg/GridH2DmlRequest.java        |  5 -----
 .../query/h2/twostep/msg/GridH2DmlResponse.java       |  4 ----
 .../query/h2/twostep/msg/GridH2IndexRangeRequest.java |  5 -----
 .../h2/twostep/msg/GridH2IndexRangeResponse.java      |  5 -----
 .../query/h2/twostep/msg/GridH2QueryRequest.java      |  5 -----
 .../query/h2/twostep/msg/GridH2RowMessage.java        |  5 -----
 .../query/h2/twostep/msg/GridH2RowRange.java          |  5 -----
 .../query/h2/twostep/msg/GridH2RowRangeBounds.java    |  5 -----
 .../query/h2/twostep/msg/GridH2ValueMessage.java      |  5 -----
 120 files changed, 4 insertions(+), 601 deletions(-)

diff --git 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessage.java
 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessage.java
index 811f6f9fb0d..14ff0747242 100644
--- 
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessage.java
+++ 
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessage.java
@@ -32,9 +32,4 @@ public interface CalciteMessage extends Message {
     @Override default short directType() {
         return type().directType();
     }
-
-    /** {@inheritDoc} */
-    @Override default void onAckReceived() {
-        // No-op.
-    }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
index e9967977ae6..cf31e9694ee 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
@@ -126,11 +126,6 @@ public class GridJobCancelRequest implements Message {
         this.system = system;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 0;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
index 701dcdb3317..5c0739e0065 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
@@ -487,11 +487,6 @@ public class GridJobExecuteRequest implements 
ExecutorAwareMessage {
         return topVer;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
index 89f90be83ae..be468be29a1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
@@ -223,11 +223,6 @@ public class GridJobExecuteResponse implements Message {
         return retry != null ? retry : AffinityTopologyVersion.NONE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
index 33a55e450b1..483b2f19ce0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
@@ -79,11 +79,6 @@ public class GridJobSiblingsRequest implements Message {
         this.topicId = topicId;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 3;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
index c2b34c4b4af..314e00d4b9c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
@@ -74,11 +74,6 @@ public class GridJobSiblingsResponse implements Message {
             siblings = U.unmarshal(marsh, siblingsBytes, null);
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
index 4c0e994927d..dad45acbef7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
@@ -61,11 +61,6 @@ public class GridTaskCancelRequest implements Message {
         this.sesId = sesId;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 5;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
index 40c5af3d178..bfe1d84a131 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
@@ -94,11 +94,6 @@ public class GridTaskSessionRequest implements Message {
         return jobId;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
index 3c8da0aea54..9468005d8e5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
@@ -211,11 +211,6 @@ public class IgniteDiagnosticMessage implements Message {
         return -61;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /**
      *
      */
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
index f113714d2f4..73d679b5eee 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
@@ -104,11 +104,6 @@ public class GridCheckpointRequest implements Message {
         this.cpSpi = cpSpi;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 7;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
index b1d728ee0ab..fe967f62b0a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
@@ -174,11 +174,6 @@ public class GridIoMessage implements Message, 
SpanTransport {
         return ordered;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        msg.onAckReceived();
-    }
-
     /** {@inheritDoc} */
     @Override public boolean equals(Object obj) {
         throw new AssertionError();
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
index d1aef369670..89cca69737d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
@@ -203,11 +203,6 @@ public class GridIoUserMessage implements Message {
         return dep;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
index 9baf1404808..9fd6a00ddca 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
@@ -573,11 +573,6 @@ public class IgniteIoTestMessage implements Message {
         return -43;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(IgniteIoTestMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
index aa66368473b..6e680ee87b7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java
@@ -63,11 +63,6 @@ public class SessionChannelMessage implements Message {
         this.sesId = sesId;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return TYPE_CODE;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
index 42805570c4e..e16d44dae24 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
@@ -125,11 +125,6 @@ public class GridDeploymentInfoBean implements Message, 
GridDeploymentInfo, Exte
         return participants;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public int hashCode() {
         return clsLdrId.hashCode();
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
index 94fb495511c..ab5ea22f41c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
@@ -154,11 +154,6 @@ public class GridDeploymentRequest implements Message {
         this.nodeIds = nodeIds;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
index bf55a75db78..a1156d41e6d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
@@ -101,11 +101,6 @@ public class GridDeploymentResponse implements Message {
         this.errMsg = errMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java
index 9031d4f49d0..c76967c4d08 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java
@@ -79,11 +79,6 @@ public class GenerateEncryptionKeyRequest implements Message 
{
         return 162;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GenerateEncryptionKeyRequest.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
index 4a6f6f3644d..61c0aed95a3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java
@@ -147,11 +147,6 @@ public class GenerateEncryptionKeyResponse implements 
Message {
         return 163;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        //No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GenerateEncryptionKeyResponse.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
index 5d0c425fd52..937f4381a9d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
@@ -263,11 +263,6 @@ public class GridEventStorageMessage implements Message {
         this.exBytes = exBytes;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java
index 2b1347eb189..360f672b1b1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java
@@ -101,11 +101,6 @@ public class UserAuthenticateRequestMessage implements 
Message {
         return 131;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(UserAuthenticateRequestMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
index f570005cc5f..e1452242577 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
@@ -90,11 +90,6 @@ public class UserAuthenticateResponseMessage implements 
Message {
         return 132;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(UserAuthenticateResponseMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
index 1add3488e49..079a7832241 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java
@@ -91,11 +91,6 @@ public class UserManagementOperationFinishedMessage 
implements Message {
         return 130;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(UserManagementOperationFinishedMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
index 55b21e11ccb..2770bf27d2c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
@@ -60,11 +60,6 @@ public class CacheEntryInfoCollection implements Message {
         infos.add(info);
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
index 4eb724e15bc..89c39e2eef7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
@@ -83,9 +83,4 @@ public abstract class CacheEntryPredicateAdapter implements 
CacheEntryPredicate
     @Nullable protected CacheObject peekVisibleValue(GridCacheEntryEx entry) {
         return locked ? entry.rawGet() : entry.peekVisibleValue();
     }
-
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
index 9e59a056a5e..b9ad7a62c7d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
@@ -63,11 +63,6 @@ public class CacheEntrySerializablePredicate implements 
CacheEntryPredicate {
         return p;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public void entryLocked(boolean locked) {
         assert p != null;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
index a59de3f4ec2..10571113922 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
@@ -122,9 +122,4 @@ public class CacheEvictionEntry implements Message {
     public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws 
IgniteCheckedException {
         key.finishUnmarshal(ctx.cacheObjectContext(), ldr);
     }
-
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
index d26382b762c..b5026bee234 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
@@ -177,11 +177,6 @@ public class CacheInvokeDirectResult implements Message, 
Serializable {
             res.finishUnmarshal(ctx.cacheObjectContext(), ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 93;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
index 7d725e0e493..e827304dda3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java
@@ -175,11 +175,6 @@ public class GridCacheEntryInfo implements Message {
         this.deleted = deleted;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 91;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index f17fbd1ba4b..d5566f5917b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -626,11 +626,6 @@ public abstract class GridCacheMessage implements Message {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /**
      * @param byteCol Collection to unmarshal.
      * @param ctx Context.
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
index b1b7574a2e4..ee08ea18673 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
@@ -386,11 +386,6 @@ public class GridCacheReturn implements Externalizable, 
Message {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 88;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
index 2206378fb50..86c96ce9a4f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
@@ -143,11 +143,6 @@ public class WalStateAckMessage implements Message {
         return 129;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(WalStateAckMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java
index 8efc14ce7c2..8d21d50d29e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java
@@ -54,11 +54,6 @@ public class MetadataRequestMessage implements Message {
         return 80;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        //No-op.
-    }
-
     /**
      * @return Type ID.
      */
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java
index b53cab603df..ec3b1d9a331 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java
@@ -125,11 +125,6 @@ public class MetadataResponseMessage implements Message {
         return 81;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /**
      * @param bytes Binary metadata bytes.
      */
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
index e04f3d7ae9b..8911359032f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
@@ -233,11 +233,6 @@ public class PartitionUpdateCountersMessage implements 
Message {
         return 157;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         StringBuilder sb = new StringBuilder();
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
index 9a46ecd9782..4034878c6e0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
@@ -351,6 +351,8 @@ public abstract class GridDhtAtomicAbstractUpdateFuture 
extends GridCacheFutureA
                     return false;
             }
 
+            req.cleanup();
+
             if (resCnt0 == mappings.size())
                 onDone();
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
index ed527560bf2..1447a8a49ed 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
@@ -271,11 +271,6 @@ public abstract class GridDhtAtomicAbstractUpdateRequest 
extends GridCacheIdMess
         return ctx.atomicMessageLogger();
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        cleanup();
-    }
-
     /**
      * @param key Key to add.
      * @param val Value, {@code null} if should be removed.
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
index fc8b2cb8c08..650cd6c153d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java
@@ -248,11 +248,6 @@ public class NearCacheUpdates implements Message {
         return -51;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(NearCacheUpdates.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
index c3e228b7ad5..204d7f89fec 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java
@@ -199,11 +199,6 @@ public class UpdateErrors implements Message {
         return -49;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(UpdateErrors.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
index 26b1105aa5e..0b5750b8cae 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
@@ -281,11 +281,6 @@ public class CacheGroupAffinityMessage implements Message {
         return 128;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(CacheGroupAffinityMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
index 039a9caf3de..d23f5ae40d8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
@@ -192,11 +192,6 @@ public class GridDhtPartitionExchangeId implements 
Message, Comparable<GridDhtPa
         return evt == EVT_NODE_LEFT || evt == EVT_NODE_FAILED;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         U.writeUuid(out, nodeId);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
index 1088629fd21..26e35e12ba3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
@@ -102,8 +102,4 @@ public class LatchAckMessage implements Message {
         return 135;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
index 79c85d42eb2..4318c0cc698 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
@@ -108,11 +108,6 @@ public class CacheVersionedValue implements Message {
             val.finishUnmarshal(ctx.cacheObjectContext(), ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 102;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java
index 3c10a9eb74a..bb2e66e1c1d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java
@@ -61,11 +61,6 @@ abstract class AbstractSnapshotMessage implements Message {
         this.id = id;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(AbstractSnapshotMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
index 7f9c27bc2cb..e81e1d62117 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
@@ -152,11 +152,6 @@ public class GridCacheSqlQuery implements Message, 
Serializable {
         return this;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridCacheSqlQuery.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
index 5f72a0e6a6f..f478fa364c6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
@@ -360,11 +360,6 @@ public class CacheContinuousQueryEntry implements 
GridCacheDeployable, Message {
         return oldVal;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public void prepare(GridDeploymentInfo depInfo) {
         this.depInfo = depInfo;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index ca0a664c697..37ad1ff8466 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -1084,11 +1084,6 @@ public class IgniteTxEntry implements 
GridPeerDeployAware, Message {
         serReadVer = null;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
index f02f8355601..2a7e8d31deb 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
@@ -102,11 +102,6 @@ public class IgniteTxKey implements Message {
         key.finishUnmarshal(ctx.cacheObjectContext(), ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
         if (this == o)
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 7b846ca9005..c26840181d6 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
@@ -153,11 +153,6 @@ public class TxEntryValueHolder implements Message {
             val.finishUnmarshal(ctx, ldr);
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(TxEntryValueHolder.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
index e4404ca65ca..09003388365 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
@@ -163,8 +163,4 @@ public class TxLock implements Message {
         return -25;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
index d6edc6bbd28..1a3db893456 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
@@ -116,8 +116,4 @@ public class TxLockList implements Message {
         return -26;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
 }
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 4e84f901d62..1b6394e6ca1 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
@@ -209,11 +209,6 @@ public class GridCacheVersion implements Message, 
Externalizable, CacheEntryVers
         return new IgniteUuid(new UUID(topVer, nodeOrderDrId), order);
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(topVer);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
index 48972f1bb8d..25fb088c92d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java
@@ -137,11 +137,6 @@ public class ClusterMetricsUpdateMessage implements 
Message {
         return 133;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(ClusterMetricsUpdateMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java
index 2df83731f31..ad0a47c770b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java
@@ -183,11 +183,6 @@ public class ContinuousRoutineStartResultMessage 
implements Message {
         return 134;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(ContinuousRoutineStartResultMessage.class, this);
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 72eb97f964c..03227406708 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
@@ -139,11 +139,6 @@ public class GridContinuousMessage implements Message {
         this.dataBytes = dataBytes;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /**
      * @return Future ID for synchronous event notification.
      */
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 e6654cfb202..8a8c54603dc 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
@@ -95,11 +95,6 @@ public class DataStreamerEntry implements 
Map.Entry<KeyCacheObject, CacheObject>
         };
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
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 167f1233097..577dc470caf 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
@@ -267,11 +267,6 @@ public class DataStreamerRequest implements Message {
         return partId;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(DataStreamerRequest.class, this);
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 e3b1e1dccfc..20ac080bca0 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
@@ -75,11 +75,6 @@ public class DataStreamerResponse implements Message {
         return forceLocDep;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(DataStreamerResponse.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
index b18569912b0..bd6f677fd70 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
@@ -62,11 +62,6 @@ public class MissingMappingRequestMessage implements Message 
{
         return 78;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** */
     public byte platformId() {
         return platformId;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
index a7d6935eb3a..e617ca6f40a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
@@ -60,11 +60,6 @@ public class MissingMappingResponseMessage implements 
Message {
         return 79;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /**
      *
      */
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
index 42c2ad2bb51..a8745148b8e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientMessage.java
@@ -215,11 +215,6 @@ public class ClientMessage implements Message, 
Externalizable {
         return Short.MIN_VALUE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op
-    }
-
     /**
      * @return Message payload.
      */
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 28e75f1d003..203b4eaf4fa 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
@@ -51,11 +51,6 @@ public class GridQueryCancelRequest implements Message {
         return qryReqId;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridQueryCancelRequest.class, this);
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 d168f1c0c7a..0e0635588a2 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
@@ -113,11 +113,6 @@ public class GridQueryFailResponse implements Message {
         this.failCode = failCode;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridQueryFailResponse.class, this);
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 3ecf14ec145..5882f366da4 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
@@ -140,11 +140,6 @@ public class GridQueryNextPageRequest implements Message {
         return S.toString(GridQueryNextPageRequest.class, this);
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 108;
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 24ef33701a3..5658f1af2eb 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
@@ -213,11 +213,6 @@ public class GridQueryNextPageResponse implements Message {
         return plainRows;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 109;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
index 7723312c939..162629c7773 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java
@@ -101,11 +101,6 @@ public class GridQueryKillRequest implements Message {
         this.asyncRes = asyncRes;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return TYPE_CODE;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
index 41198f3f145..b0588dd290a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java
@@ -81,11 +81,6 @@ public class GridQueryKillResponse implements Message {
         this.errMsg = errMsg;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return TYPE_CODE;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java
index 5eab237e33f..f49553c503e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java
@@ -143,11 +143,6 @@ public class SchemaOperationStatusMessage implements 
Message {
         return -53;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(SchemaOperationStatusMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
index 38f296c038e..2fb728eb6c9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsColumnData.java
@@ -323,8 +323,4 @@ public class StatisticsColumnData implements Message, 
Serializable {
         return TYPE_CODE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-
-    }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
index 5ec808280e9..23ee3d6fa22 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsDecimalMessage.java
@@ -131,11 +131,6 @@ public class StatisticsDecimalMessage implements Message, 
Serializable {
         return TYPE_CODE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return Objects.toString(value());
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
index 9adc245f04f..57c7a12a43a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsKeyMessage.java
@@ -163,11 +163,6 @@ public class StatisticsKeyMessage implements Message, 
Serializable {
         return TYPE_CODE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(StatisticsKeyMessage.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
index 5d8fdfd016a..0e77bd4b83e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsObjectData.java
@@ -251,8 +251,4 @@ public class StatisticsObjectData implements Message, 
Serializable {
         return TYPE_CODE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-
-    }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
index e9be3155017..aec9fa8500c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsRequest.java
@@ -225,8 +225,4 @@ public class StatisticsRequest implements Message {
         return TYPE_CODE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-
-    }
 }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
index 68a239e3ccb..a96bf0fa2a8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/messages/StatisticsResponse.java
@@ -136,8 +136,4 @@ public class StatisticsResponse implements Message {
         return TYPE_CODE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-
-    }
 }
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 000ef8a37ff..fa4a70889fd 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
@@ -79,11 +79,6 @@ public class GridTaskResultRequest implements Message {
         this.topicId = topicId;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 76;
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 5ecc451955e..ac8d83f9b86 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
@@ -114,11 +114,6 @@ public class GridTaskResultResponse implements Message {
         this.err = err;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java
index 6e488fb91f5..848188a0fe2 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java
@@ -134,11 +134,6 @@ public class ServiceDeploymentProcessId implements 
Message, Serializable {
         return 167;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean equals(Object o) {
         if (this == o)
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java
index 831f1bda42c..dda36cdb139 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java
@@ -143,11 +143,6 @@ public class ServiceSingleNodeDeploymentResult implements 
Message, Serializable
         return 169;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(ServiceSingleNodeDeploymentResult.class, this);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
index ade730ee753..c1622db92e3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java
@@ -132,11 +132,6 @@ public class ServiceSingleNodeDeploymentResultBatch 
implements Message {
         return 168;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(ServiceSingleNodeDeploymentResultBatch.class, this);
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 d3d536db8b1..00fcba242ca 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
@@ -398,11 +398,6 @@ public class GridByteArrayList implements Message, 
Externalizable {
         return in;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(size);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridIntList.java 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridIntList.java
index c03f99d65e7..39494ade8a9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridIntList.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridIntList.java
@@ -356,11 +356,6 @@ public class GridIntList implements Message, 
Externalizable {
         return this;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return -52;
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 47778765fea..20551186e6a 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
@@ -383,11 +383,6 @@ public class GridLongList implements Message, 
Externalizable {
         return this;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
index bebc4db4fe8..7a115fd0232 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
@@ -72,11 +72,6 @@ public class UUIDCollectionMessage implements Message {
         return uuids;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
index 4fae5473da2..862b2279a9b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/distributed/SingleNodeMessage.java
@@ -157,11 +157,6 @@ public class SingleNodeMessage<R extends Serializable> 
implements Message {
         return TYPE_CODE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** @return Process id. */
     public UUID processId() {
         return processId;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
index 04d05e93cb9..1cedb7d800e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
@@ -226,8 +226,6 @@ public class GridNioRecoveryDescriptor {
             if (req.ackClosure() != null)
                 req.ackClosure().apply(null);
 
-            req.onAckReceived();
-
             acked++;
         }
     }
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 00e29d0ccf5..52c3fb053e2 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -3264,11 +3264,6 @@ public class GridNioServer<T> {
             return true;
         }
 
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            throw new UnsupportedOperationException();
-        }
-
         /** {@inheritDoc} */
         @Override public IgniteInClosure<IgniteException> ackClosure() {
             return null;
@@ -3369,13 +3364,6 @@ public class GridNioServer<T> {
             return skipRecovery;
         }
 
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            assert msg instanceof Message;
-
-            ((Message)msg).onAckReceived();
-        }
-
         /** {@inheritDoc} */
         @Override public IgniteInClosure<IgniteException> ackClosure() {
             return ackC;
@@ -3605,13 +3593,6 @@ public class GridNioServer<T> {
             onDone(e);
         }
 
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            assert msg instanceof Message : msg;
-
-            ((Message)msg).onAckReceived();
-        }
-
         /** {@inheritDoc} */
         @Override public void onMessageWritten() {
             onDone();
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/SessionWriteRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/SessionWriteRequest.java
index f9af37bee03..8f86dc02c22 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/SessionWriteRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/SessionWriteRequest.java
@@ -42,11 +42,6 @@ public interface SessionWriteRequest {
      */
     public boolean skipRecovery();
 
-    /**
-     * The method will be called when ack received.
-     */
-    public void onAckReceived();
-
     /**
      * @return Ack closure.
      */
diff --git 
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
 
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
index ea2d0ca2bbb..3f9bcdce402 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
@@ -58,9 +58,4 @@ public interface Message {
      * @return Message type.
      */
     public short directType();
-
-    /**
-     * Method called when ack message received.
-     */
-    public void onAckReceived();
 }
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 5ac290efad2..daa491113c2 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
@@ -57,11 +57,6 @@ public class JobStealingRequest implements Message {
         this.delta = delta;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 82;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java
index aa90e5caacf..40c8e7216b3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java
@@ -53,11 +53,6 @@ public class TcpInverseConnectionResponseMessage implements 
TcpConnectionIndexAw
         this.connIdx = connIdx;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public short directType() {
         return 177;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java
index 18f921f3184..1cdfde15e46 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java
@@ -108,11 +108,6 @@ public class HandshakeMessage implements Message {
         return MESSAGE_FULL_SIZE;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         if (buf.remaining() < MESSAGE_FULL_SIZE)
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java
index a1ff33ab72c..4c4f052e76d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java
@@ -40,11 +40,6 @@ public class HandshakeWaitMessage implements Message {
         // No-op.
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         if (buf.remaining() < MESSAGE_FULL_SIZE)
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java
index 113695499c0..ac935a8375b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java
@@ -64,11 +64,6 @@ public class NodeIdMessage implements Message {
         return nodeIdBytes;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         assert nodeIdBytes.length == MESSAGE_SIZE;
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java
index a57ba1e4abe..3df65ddb57d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java
@@ -72,11 +72,6 @@ public class RecoveryLastReceivedMessage implements Message {
         return rcvCnt;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         if (buf.remaining() < MESSAGE_FULL_SIZE)
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
index e23d0ca31c0..c813901fd5f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -159,11 +159,6 @@ public class GridCommunicationSendMessageSelfTest extends 
GridCommonAbstractTest
             return true;
         }
 
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            // No-op.
-        }
-
         /** {@inheritDoc} */
         @Override public boolean readFrom(ByteBuffer buf, MessageReader 
reader) {
             return true;
@@ -187,11 +182,6 @@ public class GridCommunicationSendMessageSelfTest extends 
GridCommonAbstractTest
             return true;
         }
 
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            // No-op.
-        }
-
         /** {@inheritDoc} */
         @Override public boolean readFrom(ByteBuffer buf, MessageReader 
reader) {
             return true;
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index 193d78c8221..593d2b305a8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -227,10 +227,6 @@ public class GridIoManagerSelfTest extends 
GridCommonAbstractTest {
 
     /** */
     private static class TestMessage implements Message {
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            // No-op.
-        }
 
         /** {@inheritDoc} */
         @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) 
{
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImplTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImplTest.java
index 9ec5ce6ecf1..85ad6567d5e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImplTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImplTest.java
@@ -158,10 +158,6 @@ public class IgniteMessageFactoryImplTest {
             return TEST_MSG_1_TYPE;
         }
 
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            // No-op.
-        }
     }
 
     /** Test message. */
@@ -181,10 +177,6 @@ public class IgniteMessageFactoryImplTest {
             return TEST_MSG_2_TYPE;
         }
 
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            // No-op.
-        }
     }
 
     /** Test message. */
@@ -204,9 +196,5 @@ public class IgniteMessageFactoryImplTest {
             return TEST_MSG_42_TYPE;
         }
 
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            // No-op.
-        }
     }
 }
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/MessageDirectTypeIdConflictTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/MessageDirectTypeIdConflictTest.java
index 8989272d175..7746e22f4a9 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/MessageDirectTypeIdConflictTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/MessageDirectTypeIdConflictTest.java
@@ -111,9 +111,5 @@ public class MessageDirectTypeIdConflictTest extends 
GridCommonAbstractTest {
             return MSG_DIRECT_TYPE;
         }
 
-        /** {@inheritDoc} */
-        @Override public void onAckReceived() {
-            // No-op.
-        }
     }
 }
diff --git 
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
 
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
index 94cd40bd7f5..33e4a69cefe 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
@@ -93,11 +93,6 @@ class GridTestMessage implements Message, Externalizable {
         this.bytes = bytes;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         U.writeIgniteUuid(out, id);
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
index 230fc469d03..ca1efba8e77 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
@@ -94,11 +94,6 @@ public class GridTestMessage implements Message {
         return payload;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/communication/TestVolatilePayloadMessage.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/communication/TestVolatilePayloadMessage.java
index 7493cf74401..16aa598c222 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/communication/TestVolatilePayloadMessage.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/communication/TestVolatilePayloadMessage.java
@@ -60,11 +60,6 @@ public class TestVolatilePayloadMessage implements Message {
         return payload;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
diff --git a/modules/core/src/test/resources/codegen/AbstractMessage.java 
b/modules/core/src/test/resources/codegen/AbstractMessage.java
index 5188ec9c331..93b630d2f48 100644
--- a/modules/core/src/test/resources/codegen/AbstractMessage.java
+++ b/modules/core/src/test/resources/codegen/AbstractMessage.java
@@ -37,8 +37,4 @@ public abstract class AbstractMessage implements Message {
     public short directType() {
         return 0;
     }
-
-    public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git a/modules/core/src/test/resources/codegen/EmptyMessage.java 
b/modules/core/src/test/resources/codegen/EmptyMessage.java
index 140906267e7..4a4eb4760df 100644
--- a/modules/core/src/test/resources/codegen/EmptyMessage.java
+++ b/modules/core/src/test/resources/codegen/EmptyMessage.java
@@ -26,8 +26,4 @@ public class EmptyMessage implements Message {
     public short directType() {
         return 0;
     }
-
-    public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git a/modules/core/src/test/resources/codegen/MatrixMessageMessage.java 
b/modules/core/src/test/resources/codegen/MatrixMessageMessage.java
index 0bcca4c29b4..87c505391fe 100644
--- a/modules/core/src/test/resources/codegen/MatrixMessageMessage.java
+++ b/modules/core/src/test/resources/codegen/MatrixMessageMessage.java
@@ -38,8 +38,4 @@ public class MatrixMessageMessage implements Message {
     public short directType() {
         return 0;
     }
-
-    public void onAckReceived() {
-        // No-op.
-    }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/test/resources/codegen/PojoFieldMessage.java 
b/modules/core/src/test/resources/codegen/PojoFieldMessage.java
index bd003ffb62e..f87503420b7 100644
--- a/modules/core/src/test/resources/codegen/PojoFieldMessage.java
+++ b/modules/core/src/test/resources/codegen/PojoFieldMessage.java
@@ -38,8 +38,4 @@ public class MatrixMessageMessage implements Message {
     public short directType() {
         return 0;
     }
-
-    public void onAckReceived() {
-        // No-op.
-    }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/test/resources/codegen/StaticFieldOrder.java 
b/modules/core/src/test/resources/codegen/StaticFieldOrder.java
index 2b6b1faf9ab..8b01153038d 100644
--- a/modules/core/src/test/resources/codegen/StaticFieldOrder.java
+++ b/modules/core/src/test/resources/codegen/StaticFieldOrder.java
@@ -37,8 +37,4 @@ public class StaticFieldOrder implements Message {
     public short directType() {
         return 0;
     }
-
-    public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git 
a/modules/core/src/test/resources/codegen/TestCollectionsMessage.java 
b/modules/core/src/test/resources/codegen/TestCollectionsMessage.java
index fa3738dab82..597e61b0f02 100644
--- a/modules/core/src/test/resources/codegen/TestCollectionsMessage.java
+++ b/modules/core/src/test/resources/codegen/TestCollectionsMessage.java
@@ -271,8 +271,4 @@ public class TestCollectionsMessage implements Message {
     public short directType() {
         return 0;
     }
-
-    public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git a/modules/core/src/test/resources/codegen/TestMapMessage.java 
b/modules/core/src/test/resources/codegen/TestMapMessage.java
index 3d81c27f297..6b45de7e3fb 100644
--- a/modules/core/src/test/resources/codegen/TestMapMessage.java
+++ b/modules/core/src/test/resources/codegen/TestMapMessage.java
@@ -271,8 +271,4 @@ public class TestMapMessage implements Message {
     public short directType() {
         return 0;
     }
-
-    public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git a/modules/core/src/test/resources/codegen/TestMessage.java 
b/modules/core/src/test/resources/codegen/TestMessage.java
index 4e19fe0809c..ab501772c77 100644
--- a/modules/core/src/test/resources/codegen/TestMessage.java
+++ b/modules/core/src/test/resources/codegen/TestMessage.java
@@ -188,8 +188,4 @@ public class TestMessage implements Message {
     public short directType() {
         return 0;
     }
-
-    public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git a/modules/core/src/test/resources/codegen/WrongOrderEnumeration.java 
b/modules/core/src/test/resources/codegen/WrongOrderEnumeration.java
index ba6b36a3188..34df0cebd42 100644
--- a/modules/core/src/test/resources/codegen/WrongOrderEnumeration.java
+++ b/modules/core/src/test/resources/codegen/WrongOrderEnumeration.java
@@ -48,8 +48,4 @@ public class WrongOrderEnumeration implements Message {
     public short directType() {
         return 0;
     }
-
-    public void onAckReceived() {
-        // No-op.
-    }
 }
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryTable.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryTable.java
index 19901d20426..7b69e0c8243 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryTable.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/QueryTable.java
@@ -126,11 +126,6 @@ public class QueryTable implements Message {
         return -54;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public int hashCode() {
         return 31 * (schema != null ? schema.hashCode() : 0) + (tbl != null ? 
tbl.hashCode() : 0);
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java
index 4e8deeed397..f8a1be9047e 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java
@@ -529,11 +529,6 @@ public class GridH2DmlRequest implements Message, 
GridCacheQueryMarshallable {
         return -55;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridH2DmlRequest.class, this);
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
index a8c5ab1d744..9caeb49e0b9 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlResponse.java
@@ -224,9 +224,5 @@ public class GridH2DmlResponse implements Message, 
GridCacheQueryMarshallable {
         return -56;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op
-    }
 }
 
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
index b08adada74f..163f58ac1af 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
@@ -250,11 +250,6 @@ public class GridH2IndexRangeRequest implements Message {
         return -30;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridH2IndexRangeRequest.class, this, "boundsSize", 
bounds == null ? null : bounds.size());
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
index 803280b19bd..5058827c514 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
@@ -321,11 +321,6 @@ public class GridH2IndexRangeResponse implements Message {
         return -31;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridH2IndexRangeResponse.class, this, "rangesSize", 
ranges == null ? null : ranges.size());
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
index 73e4c743f5c..9b6fc078746 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
@@ -763,11 +763,6 @@ public class GridH2QueryRequest implements Message, 
GridCacheQueryMarshallable {
         return -33;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridH2QueryRequest.class, this);
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
index 5bf84c07dda..67654c0df70 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
@@ -96,11 +96,6 @@ public class GridH2RowMessage implements Message {
         return -32;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridH2RowMessage.class, this);
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
index 941e0dac805..b870f9b5920 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
@@ -161,11 +161,6 @@ public class GridH2RowRange implements Message {
         return -34;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /**
      * @return Number of rows.
      */
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
index 9806105355d..1f85aa1a179 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
@@ -168,11 +168,6 @@ public class GridH2RowRangeBounds implements Message {
         return -35;
     }
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridH2RowRangeBounds.class, this);
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessage.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessage.java
index fd5b5243a7b..38c4ac254bc 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessage.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessage.java
@@ -40,11 +40,6 @@ public abstract class GridH2ValueMessage implements Message {
      */
     public abstract Value value(GridKernalContext ctx) throws 
IgniteCheckedException;
 
-    /** {@inheritDoc} */
-    @Override public void onAckReceived() {
-        // No-op.
-    }
-
     /** {@inheritDoc} */
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         return true;

Reply via email to