Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C457718F82 for ; Fri, 20 Nov 2015 13:33:31 +0000 (UTC) Received: (qmail 5099 invoked by uid 500); 20 Nov 2015 13:33:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 5018 invoked by uid 500); 20 Nov 2015 13:33:31 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 4113 invoked by uid 99); 20 Nov 2015 13:33:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Nov 2015 13:33:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CADB2E0991; Fri, 20 Nov 2015 13:33:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 20 Nov 2015 13:33:45 -0000 Message-Id: <66086db7e6ba420dab9b6b749cd88ade@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/24] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-single-op-get Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-single-op-get Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f9b79c81 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f9b79c81 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f9b79c81 Branch: refs/heads/ignite-single-op-get Commit: f9b79c81043152afa19f31d6afb336750d7d19aa Parents: a432c70 Author: sboikov Authored: Fri Nov 20 15:26:53 2015 +0300 Committer: sboikov Committed: Fri Nov 20 15:26:53 2015 +0300 ---------------------------------------------------------------------- .../managers/communication/GridIoMessageFactory.java | 10 ---------- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 7 ------- 2 files changed, 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f9b79c81/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 90c275d..c671582 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -709,16 +709,6 @@ public class GridIoMessageFactory implements MessageFactory { break; - case 116: - msg = new GridNearSingleGetRequest(); - - break; - - case 117: - msg = new GridNearSingleGetResponse(); - - break; - case 118: msg = new CacheContinuousQueryBatchAck(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f9b79c81/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 54814c8..72a60d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -615,13 +615,6 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid } /** - * @return {@code True} if on response flag changed. - */ - public boolean onResponse() { - return !onRes && (onRes = true); - } - - /** * @return Optional arguments for entry processor. */ @Nullable public Object[] invokeArguments() {