GEODE-3286: incorporating review feedback Signed-off-by: Brian Rowe <br...@pivotal.io>
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 <hitesh...@yahoo.com> Authored: Wed Jul 26 13:20:55 2017 -0700 Committer: Brian Rowe <br...@pivotal.io> 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; } }
