Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 7D11018608 for ; Tue, 25 Aug 2015 19:34:20 +0000 (UTC) Received: (qmail 86334 invoked by uid 500); 25 Aug 2015 19:34:20 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 86209 invoked by uid 500); 25 Aug 2015 19:34:20 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 86049 invoked by uid 99); 25 Aug 2015 19:34:20 -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; Tue, 25 Aug 2015 19:34:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DE4DCE3612; Tue, 25 Aug 2015 19:34:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Tue, 25 Aug 2015 19:34:24 -0000 Message-Id: <674d3b9c9ed446cc93e0dff1e313d420@git.apache.org> In-Reply-To: <443d41192dd84d699d1fd64f03624203@git.apache.org> References: <443d41192dd84d699d1fd64f03624203@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/8] accumulo git commit: ACCUMULO-3973 Switch to java7 multi-catch. ACCUMULO-3973 Switch to java7 multi-catch. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/388e48c4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/388e48c4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/388e48c4 Branch: refs/heads/master Commit: 388e48c4c8d1e6add6a2f889a89c5f31d6228302 Parents: 96e00e0 Author: Josh Elser Authored: Tue Aug 25 14:46:41 2015 -0400 Committer: Josh Elser Committed: Tue Aug 25 14:46:41 2015 -0400 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/388e48c4/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index bcd91d9..8c15dc4 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@ -703,9 +703,7 @@ public class ShellServerIT extends SharedMiniClusterIT { ts.exec("getauths", true, "foo", true); ts.exec("getauths", true, "bar", true); passed = true; - } catch (Exception e) { - UtilWaitThread.sleep(300); - } catch (AssertionError e) { + } catch (AssertionError | Exception e) { UtilWaitThread.sleep(300); } }