Return-Path: X-Original-To: apmail-drill-commits-archive@www.apache.org Delivered-To: apmail-drill-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 58AA410152 for ; Thu, 18 Dec 2014 00:51:33 +0000 (UTC) Received: (qmail 16305 invoked by uid 500); 18 Dec 2014 00:51:33 -0000 Delivered-To: apmail-drill-commits-archive@drill.apache.org Received: (qmail 16263 invoked by uid 500); 18 Dec 2014 00:51:33 -0000 Mailing-List: contact commits-help@drill.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@drill.apache.org Delivered-To: mailing list commits@drill.apache.org Received: (qmail 16249 invoked by uid 99); 18 Dec 2014 00:51:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2014 00:51:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E9FBC8C47EF; Thu, 18 Dec 2014 00:51:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: adi@apache.org To: commits@drill.apache.org Date: Thu, 18 Dec 2014 00:51:32 -0000 Message-Id: <0434934737554ca1ab589db39bade82c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] drill git commit: DRILL-1881 - Test o.a.d.TestBugFixes#testVersionTable fails while building from source tarball Repository: drill Updated Branches: refs/heads/0.7.0 c7b6cc575 -> e3ab2c176 DRILL-1881 - Test o.a.d.TestBugFixes#testVersionTable fails while building from source tarball Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e3ab2c17 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e3ab2c17 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e3ab2c17 Branch: refs/heads/0.7.0 Commit: e3ab2c1760ad34bda80141e2c3108f7eda7c9104 Parents: 9360e25 Author: Aditya Kishore Authored: Tue Dec 16 19:32:53 2014 -0800 Committer: Aditya Kishore Committed: Wed Dec 17 16:47:45 2014 -0800 ---------------------------------------------------------------------- .../org/apache/drill/exec/store/sys/VersionIterator.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/e3ab2c17/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java index ffc740a..7deb14b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java @@ -37,9 +37,9 @@ public class VersionIterator implements Iterator{ public String build_time = ""; public VersionInfo(){ - URL u = Resources.getResource("git.properties"); - if(u != null){ - try { + try { + URL u = Resources.getResource("git.properties"); + if(u != null){ Properties p = new Properties(); p.load(Resources.newInputStreamSupplier(u).getInput()); commit_id = p.getProperty("git.commit.id"); @@ -48,11 +48,10 @@ public class VersionIterator implements Iterator{ build_time = p.getProperty("git.build.time"); commit_message = p.getProperty("git.commit.message.short"); - } catch (IOException e) { - logger.warn("Failure while trying to load \"git.properties\" file.", e); } + } catch (IOException | IllegalArgumentException e) { + logger.warn("Failure while trying to load \"git.properties\" file.", e); } - } } @Override