Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 64BCC200CD6 for ; Mon, 31 Jul 2017 19:08:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6364416589B; Mon, 31 Jul 2017 17:08:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A99B5165873 for ; Mon, 31 Jul 2017 19:08:39 +0200 (CEST) Received: (qmail 62959 invoked by uid 500); 31 Jul 2017 17:08:33 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 62879 invoked by uid 99); 31 Jul 2017 17:08:33 -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; Mon, 31 Jul 2017 17:08:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E4C69E964E; Mon, 31 Jul 2017 17:08:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bschuchardt@apache.org To: commits@geode.apache.org Date: Mon, 31 Jul 2017 17:08:33 -0000 Message-Id: <58d034abde564d50a7b18b78de9d80de@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/4] geode git commit: GEODE-3286: incorporating review feedback archived-at: Mon, 31 Jul 2017 17:08:40 -0000 GEODE-3286: incorporating review feedback Signed-off-by: Brian Rowe Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/4ee96cf7 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/4ee96cf7 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/4ee96cf7 Branch: refs/heads/develop Commit: 4ee96cf7f2a4678c019aaf36cac2fb9c832699f2 Parents: 8aed268 Author: Hitesh Khamesra Authored: Wed Jul 26 13:20:55 2017 -0700 Committer: Brian Rowe Committed: Wed Jul 26 13:20:55 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/geode/internal/tcp/Connection.java | 4 ++-- .../main/java/org/apache/geode/internal/tcp/ConnectionTable.java | 2 +- .../org/apache/geode/internal/tcp/PeerConnectionFactory.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/4ee96cf7/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java index 9b1a10a..c3ad596 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java @@ -568,7 +568,7 @@ public class Connection implements Runnable { } } - protected void initRecevier() { + protected void initReceiver() { this.startReader(owner); this.waitForHandshake(); this.finishedConnecting = true; @@ -1328,7 +1328,7 @@ public class Connection implements Runnable { this.batchFlusher.start(); } - public void onIdleCancel() { + public void cleanUpOnIdleTaskCancel() { // Make sure receivers are removed from the connection table, this should always be a noop, but // is done here as a failsafe. if (isReceiver) { http://git-wip-us.apache.org/repos/asf/geode/blob/4ee96cf7/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java index affe5cd..0be5f28 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java +++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ConnectionTable.java @@ -1315,7 +1315,7 @@ public class ConnectionTable { public boolean cancel() { Connection con = this.c; if (con != null) { - con.onIdleCancel(); + con.cleanUpOnIdleTaskCancel(); } this.c = null; return super.cancel(); http://git-wip-us.apache.org/repos/asf/geode/blob/4ee96cf7/geode-core/src/main/java/org/apache/geode/internal/tcp/PeerConnectionFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/PeerConnectionFactory.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/PeerConnectionFactory.java index 7bf9638..148c27a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/tcp/PeerConnectionFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/PeerConnectionFactory.java @@ -26,7 +26,7 @@ public class PeerConnectionFactory { public Connection createReceiver(ConnectionTable table, Socket socket) throws IOException, ConnectionException { Connection connection = new Connection(table, socket); - connection.initRecevier(); + connection.initReceiver(); return connection; } }