Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 E4557CD7D for ; Sat, 29 Jun 2013 18:37:33 +0000 (UTC) Received: (qmail 22941 invoked by uid 500); 29 Jun 2013 18:37:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 22919 invoked by uid 500); 29 Jun 2013 18:37:33 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 22901 invoked by uid 99); 29 Jun 2013 18:37: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; Sat, 29 Jun 2013 18:37:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6A3F53CA5D; Sat, 29 Jun 2013 18:37:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Sat, 29 Jun 2013 18:37:34 -0000 Message-Id: <1292d649051d400db0362ae80c14c308@git.apache.org> In-Reply-To: <575f6eb92b174e94bdfb270ecf1c3815@git.apache.org> References: <575f6eb92b174e94bdfb270ecf1c3815@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: exit(1) on IOException trying to read from a file patch by Steve Peters; reviewed by jbellis for CASSANDRA-5247 exit(1) on IOException trying to read from a file patch by Steve Peters; reviewed by jbellis for CASSANDRA-5247 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c2a2805 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c2a2805 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c2a2805 Branch: refs/heads/trunk Commit: 8c2a28050f67dbd9949d28a9e68a256d0658d036 Parents: d265fde Author: Jonathan Ellis Authored: Sat Jun 29 11:36:41 2013 -0700 Committer: Jonathan Ellis Committed: Sat Jun 29 11:36:47 2013 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliMain.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c2a2805/src/java/org/apache/cassandra/cli/CliMain.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cli/CliMain.java b/src/java/org/apache/cassandra/cli/CliMain.java index a347747..547f642 100644 --- a/src/java/org/apache/cassandra/cli/CliMain.java +++ b/src/java/org/apache/cassandra/cli/CliMain.java @@ -266,14 +266,14 @@ public class CliMain try { fileReader = new FileReader(sessionState.filename); + evaluateFileStatements(new BufferedReader(fileReader)); } catch (IOException e) { sessionState.err.println(e.getMessage()); - return; + System.exit(1); } - evaluateFileStatements(new BufferedReader(fileReader)); return; }