From dev-return-70619-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Fri Jun 15 17:31:28 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 AFA0B180636 for ; Fri, 15 Jun 2018 17:31:27 +0200 (CEST) Received: (qmail 58267 invoked by uid 500); 15 Jun 2018 15:31:26 -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 58256 invoked by uid 99); 15 Jun 2018 15:31:26 -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, 15 Jun 2018 15:31:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 940A3E1116; Fri, 15 Jun 2018 15:31:25 +0000 (UTC) From: anmolnar To: dev@zookeeper.apache.org Reply-To: dev@zookeeper.apache.org Message-ID: Subject: [GitHub] zookeeper pull request #545: ZOOKEEPER-2261 When only secureClientPort is co... Content-Type: text/plain Date: Fri, 15 Jun 2018 15:31:25 +0000 (UTC) GitHub user anmolnar opened a pull request: https://github.com/apache/zookeeper/pull/545 ZOOKEEPER-2261 When only secureClientPort is configured connections, configuration, connection_stat_reset, and stats admin commands throw NullPointerException Root cause of the issue is that property getter returns the non-secure ServerCnxnFactory instance always. When Quorum SSL is enabled, we set a separate field which is the secure instance. Property getter should detect the scenario and return the proper instance. First commit contains some refactoring: shuffling the existing ZooKeeperServer tests to relevant places. Second commit is the actual fix + new unit tests. Sorry about indentation changes, but `FileTxnLogTest.java` was indented by 2 spaces instead of 4. You can merge this pull request into a Git repository by running: $ git pull https://github.com/anmolnar/zookeeper ZOOKEEPER-2261 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zookeeper/pull/545.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #545 ---- commit 1fc048f96db7ac9485508a4179cbe8a1e0ef06d8 Author: Andor Molnar Date: 2018-06-15T15:26:17Z ZOOKEEPER-2261. Refactor ZooKeeperServerTest class and move existing tests to proper places commit b34ba0768bef08a8734b89ba5a872151dc98fd49 Author: Andor Molnar Date: 2018-06-15T15:27:55Z ZOOKEEPER-2261. Return secure factory instance if present + unit tests ---- ---