Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 63F6D200B54 for ; Thu, 14 Jul 2016 03:17:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 62898160A6E; Thu, 14 Jul 2016 01:17:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D1613160A6A for ; Thu, 14 Jul 2016 03:17:45 +0200 (CEST) Received: (qmail 51598 invoked by uid 500); 14 Jul 2016 01:17:45 -0000 Mailing-List: contact commits-help@flume.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flume.apache.org Delivered-To: mailing list commits@flume.apache.org Received: (qmail 51589 invoked by uid 99); 14 Jul 2016 01:17:45 -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; Thu, 14 Jul 2016 01:17:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E77B7E04BE; Thu, 14 Jul 2016 01:17:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mpercy@apache.org To: commits@flume.apache.org Message-Id: <6b7fb4eee9d444818daf96cd8401e80e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: flume git commit: FLUME-2952. SyslogAgent: Avoid NPE on stop() Date: Thu, 14 Jul 2016 01:17:44 +0000 (UTC) archived-at: Thu, 14 Jul 2016 01:17:46 -0000 Repository: flume Updated Branches: refs/heads/trunk ec28b6624 -> c7de4ba5c FLUME-2952. SyslogAgent: Avoid NPE on stop() Minor test bug fix Reviewed by Hari. Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/c7de4ba5 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/c7de4ba5 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/c7de4ba5 Branch: refs/heads/trunk Commit: c7de4ba5ca70c42099a2f9bf4ad2de3fdcbb7d30 Parents: ec28b66 Author: Mike Percy Authored: Mon Jul 11 19:53:50 2016 -0700 Committer: Mike Percy Committed: Wed Jul 13 18:17:13 2016 -0700 ---------------------------------------------------------------------- .../src/test/java/org/apache/flume/test/util/SyslogAgent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/c7de4ba5/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java ---------------------------------------------------------------------- diff --git a/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java b/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java index c908fc1..a2b0f3b 100644 --- a/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java +++ b/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java @@ -156,7 +156,9 @@ public class SyslogAgent { } public void stop() throws Exception { - client.close(); + if (client != null) { + client.close(); + } client = null; StagedInstall.getInstance().stopAgent();