[STORM-537] A change after code review
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1d251e99 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1d251e99 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1d251e99 Branch: refs/heads/security Commit: 1d251e99850eb8969ac69021f1f78f8e40434305 Parents: 1aacccf Author: Sergey Tryuber <[email protected]> Authored: Fri Oct 31 17:55:14 2014 +0300 Committer: Sergey Tryuber <[email protected]> Committed: Fri Oct 31 17:55:14 2014 +0300 ---------------------------------------------------------------------- storm-core/src/jvm/backtype/storm/messaging/netty/Client.java | 2 +- storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/1d251e99/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java index 3e4c2f6..b7db4a3 100644 --- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java +++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java @@ -142,6 +142,7 @@ public class Client implements IConnection { } int tried = 0; + channel = null; while (tried <= max_retries) { LOG.info("Reconnect started for {}... [{}]", name(), tried); @@ -153,7 +154,6 @@ public class Client implements IConnection { if (!future.isSuccess()) { if (null != current) { current.close(); - channel = null; } } else { channel = current; http://git-wip-us.apache.org/repos/asf/storm/blob/1d251e99/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj ---------------------------------------------------------------------- diff --git a/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj b/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj index b2269ad..687c3d5 100644 --- a/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj +++ b/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj @@ -215,8 +215,6 @@ STORM-MESSAGING-NETTY-MAX-SLEEP-MS 5000 STORM-MESSAGING-NETTY-SERVER-WORKER-THREADS 1 STORM-MESSAGING-NETTY-CLIENT-WORKER-THREADS 1 - ;critical for this test - ; STORM-NETTY-MESSAGE-BATCH-SIZE 1 } context (TransportFactory/makeContext storm-conf) client (.connect context nil "localhost" port)
