Made two changes, since AmazonclientException is a runtime exception it gets caught without needing the other catch. Also removed other 500 catch in tests and verified that they pass locally.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e7d2d925 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e7d2d925 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e7d2d925 Branch: refs/heads/master Commit: e7d2d9257888d634e794d2cfdffa7a70561ab0ca Parents: 31df16e Author: George Reyes <g...@apache.org> Authored: Mon Jan 25 13:17:44 2016 -0800 Committer: George Reyes <g...@apache.org> Committed: Mon Jan 25 13:17:44 2016 -0800 ---------------------------------------------------------------------- .../org/apache/usergrid/rest/applications/ServiceResource.java | 3 --- .../usergrid/rest/applications/assets/AwsAssetResourceIT.java | 3 --- 2 files changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/e7d2d925/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java index 014a410..2678687 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java @@ -833,9 +833,6 @@ public class ServiceResource extends AbstractContextResource { logger.error(ase.getMessage()); return Response.status(ase.getStatusCode()).build(); } - catch(AmazonClientException ace){ - logger.error(ace.getMessage()); - } catch(RuntimeException re){ logger.error(re.getMessage()); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); http://git-wip-us.apache.org/repos/asf/usergrid/blob/e7d2d925/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java index 914d253..2a8b00d 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java @@ -198,9 +198,6 @@ public class AwsAssetResourceIT extends AbstractRestIT { catch(ForbiddenException fe){ assertEquals( 403, fe.getResponse().getStatus() ); } - catch( InternalServerErrorException uie){ - assertEquals( 500, uie.getResponse().getStatus() ); - } finally{ setTestProperties( errorTestProperties ); }
