From dev-return-71856-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Fri Jul 27 06:11:12 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 899C7180677 for ; Fri, 27 Jul 2018 06:11:11 +0200 (CEST) Received: (qmail 57851 invoked by uid 500); 27 Jul 2018 04:11:09 -0000 Mailing-List: contact dev-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list dev@zookeeper.apache.org Received: (qmail 57239 invoked by uid 99); 27 Jul 2018 04:11:09 -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, 27 Jul 2018 04:11:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A65D9DFCBA; Fri, 27 Jul 2018 04:11:08 +0000 (UTC) From: breed To: dev@zookeeper.apache.org Reply-To: dev@zookeeper.apache.org References: In-Reply-To: Subject: [GitHub] zookeeper pull request #545: ZOOKEEPER-2261 When only secureClientPort is co... Content-Type: text/plain Message-Id: <20180727041108.A65D9DFCBA@git1-us-west.apache.org> Date: Fri, 27 Jul 2018 04:11:08 +0000 (UTC) Github user breed commented on a diff in the pull request: https://github.com/apache/zookeeper/pull/545#discussion_r205663822 --- Diff: src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java --- @@ -866,6 +866,9 @@ public void setServerCnxnFactory(ServerCnxnFactory factory) { } public ServerCnxnFactory getServerCnxnFactory() { + if (secureServerCnxnFactory != null) { + return secureServerCnxnFactory; + } return serverCnxnFactory; } --- End diff -- i don't feel strongly about it, but i like @hanm 's idea. ---