You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/07/13 18:09:59 UTC

[2/3] incubator-slider git commit: JDK7 exception handling

JDK7 exception handling


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/cd535c8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/cd535c8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/cd535c8d

Branch: refs/heads/develop
Commit: cd535c8d2777dc29465c1bb2ffafb1f0a66f12c2
Parents: b8e2711
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jul 13 16:53:46 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Jul 13 16:53:46 2015 +0100

----------------------------------------------------------------------
 .../web/rest/management/TestAMManagementWebServices.java    | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cd535c8d/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
index 90d40c6..7cb9395 100644
--- a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
+++ b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
@@ -177,14 +177,7 @@ public class TestAMManagementWebServices extends JerseyTest {
               fs,
               historyPath,
               null, null, new SimpleReleaseSelector());
-// JDK7        } catch (IOException | BadClusterStateException | URISyntaxException | BadConfigException e) {
-        } catch (IOException e) {
-          log.error("{}", e, e);
-        } catch (BadClusterStateException e) {
-          log.error("{}", e, e);
-        } catch (URISyntaxException e) {
-          log.error("{}", e, e);
-        } catch (BadConfigException e) {
+        } catch (IOException | BadClusterStateException | URISyntaxException | BadConfigException e) {
           log.error("{}", e, e);
         }
         ProviderAppState providerAppState = new ProviderAppState("undefined",