From commits-return-8621-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Thu Dec 24 17:13:54 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-he-de.apache.org (mxout1-he-de.apache.org [95.216.194.37]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id B0B97180633 for ; Thu, 24 Dec 2020 18:13:54 +0100 (CET) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-he-de.apache.org (ASF Mail Server at mxout1-he-de.apache.org) with SMTP id 1CA3665359 for ; Thu, 24 Dec 2020 17:13:53 +0000 (UTC) Received: (qmail 13085 invoked by uid 500); 24 Dec 2020 17:13:53 -0000 Mailing-List: contact commits-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 commits@zookeeper.apache.org Received: (qmail 13073 invoked by uid 99); 24 Dec 2020 17:13:53 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Dec 2020 17:13:53 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id D6557817B6; Thu, 24 Dec 2020 17:13:52 +0000 (UTC) Date: Thu, 24 Dec 2020 17:13:52 +0000 To: "commits@zookeeper.apache.org" Subject: [zookeeper] branch master updated: ZOOKEEPER-4033: Remove unnecessary judgment of null MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <160883003253.15312.9639868285053885219@gitbox.apache.org> From: ddiederen@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: zookeeper X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 59c87413ddc6774a22b98ba8aabb5855e049efe9 X-Git-Newrev: a67272a0ad8b1138c61306a02563fc39a0c79101 X-Git-Rev: a67272a0ad8b1138c61306a02563fc39a0c79101 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ddiederen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/zookeeper.git The following commit(s) were added to refs/heads/master by this push: new a67272a ZOOKEEPER-4033: Remove unnecessary judgment of null a67272a is described below commit a67272a0ad8b1138c61306a02563fc39a0c79101 Author: lan <1728209643@qq.com> AuthorDate: Thu Dec 24 17:12:37 2020 +0000 ZOOKEEPER-4033: Remove unnecessary judgment of null Author: lan <1728209643@qq.com> Reviewers: Enrico Olivelli , Damien Diederen Closes #1562 from lanicc/ZOOKEEPER-4033 --- .../org/apache/zookeeper/server/quorum/QuorumPeerMain.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java index 6e8f7b9..5ed2d42 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java @@ -150,7 +150,7 @@ public class QuorumPeerMain { } LOG.info("Starting quorum peer, myid=" + config.getServerId()); - MetricsProvider metricsProvider; + final MetricsProvider metricsProvider; try { metricsProvider = MetricsProviderBootstrap.startMetricsProvider( config.getMetricsProviderClassName(), @@ -233,12 +233,10 @@ public class QuorumPeerMain { // warn, but generally this is ok LOG.warn("Quorum Peer interrupted", e); } finally { - if (metricsProvider != null) { - try { - metricsProvider.stop(); - } catch (Throwable error) { - LOG.warn("Error while stopping metrics", error); - } + try { + metricsProvider.stop(); + } catch (Throwable error) { + LOG.warn("Error while stopping metrics", error); } } }