accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/8] accumulo git commit: ACCUMULO-3973 Switch to java7 multi-catch.
Date Tue, 25 Aug 2015 19:34:24 GMT
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 <elserj@apache.org>
Authored: Tue Aug 25 14:46:41 2015 -0400
Committer: Josh Elser <elserj@apache.org>
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);
       }
     }


Mime
View raw message