Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2E0D318B25 for ; Mon, 28 Sep 2015 19:10:22 +0000 (UTC) Received: (qmail 97643 invoked by uid 500); 28 Sep 2015 19:10:04 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 97430 invoked by uid 500); 28 Sep 2015 19:10:04 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 96541 invoked by uid 99); 28 Sep 2015 19:10:04 -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; Mon, 28 Sep 2015 19:10:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A3B7BE0568; Mon, 28 Sep 2015 19:10:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sershe@apache.org To: commits@hive.apache.org Date: Mon, 28 Sep 2015 19:10:19 -0000 Message-Id: <51ed846222ff447c9cf533ce14fa316c@git.apache.org> In-Reply-To: <533decb8e0e44ab9b9c45957ea71aceb@git.apache.org> References: <533decb8e0e44ab9b9c45957ea71aceb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/43] hive git commit: HIVE-11352: Avoid the double connections with 'e' option[beeline-cli branch](Ferdinand Xu via Xuefu Zhang) HIVE-11352: Avoid the double connections with 'e' option[beeline-cli branch](Ferdinand Xu via Xuefu Zhang) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/edbd8db0 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/edbd8db0 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/edbd8db0 Branch: refs/heads/llap Commit: edbd8db0cdda22b8ecbd8bf723c86f2f38fd3bae Parents: 804f20a Author: Ferdinand Xu Authored: Sun Jul 26 22:32:59 2015 -0400 Committer: Ferdinand Xu Committed: Sun Jul 26 22:32:59 2015 -0400 ---------------------------------------------------------------------- beeline/src/java/org/apache/hive/beeline/BeeLine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/edbd8db0/beeline/src/java/org/apache/hive/beeline/BeeLine.java ---------------------------------------------------------------------- diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLine.java b/beeline/src/java/org/apache/hive/beeline/BeeLine.java index c47b9fe..d4beefc 100644 --- a/beeline/src/java/org/apache/hive/beeline/BeeLine.java +++ b/beeline/src/java/org/apache/hive/beeline/BeeLine.java @@ -827,10 +827,10 @@ public class BeeLine implements Closeable { } } else { int code = initArgsFromCliVars(args); - defaultConnect(false); - if (code != 0){ + if (code != 0 || exit) { return code; } + defaultConnect(false); getOpts().updateBeeLineOptsFromConf(); getOpts().setShowHeader(false); getOpts().setOutputFormat("dsv");