Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-metrics Commit: 9dacd471f7af745bc89307e78f1e9d3859c064e4 https://github.com/hawkular/hawkular-metrics/commit/9dacd471f7af745bc8930... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M api/diff-pre-commit-hook.sh M api/diff.txt M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/ApiError.java M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/HawkularMetricsRestApp.java A api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ApplicationExceptionMapper.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/HawkularMetricsRestApp.java A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ApplicationExceptionMapper.java Log Message: ----------- HWKMETRICS-243 Catch RestEasy ApplicationException When handler code throws an exception which we don't catch (a NPE for example), RestEasy converts it to org.jboss.resteasy.spi.ApplicationException. Added an ApplicationExceptionMapper for both JAX-RS implementations. Also, set a default message for ApiError, otherwise NPE ends with an empty object response. Changed pre-commit-hook permissions. Commit: 047bf0aac4c7fe69c99896f2bbdb1e07a0b07443 https://github.com/hawkular/hawkular-metrics/commit/047bf0aac4c7fe69c9989... Author: Michael Burman <yak(a)iki.fi&gt; Date: 2015-09-04 (Fri, 04 Sep 2015) Changed paths: M api/diff-pre-commit-hook.sh M api/diff.txt M api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/ApiError.java M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/HawkularMetricsRestApp.java A api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ApplicationExceptionMapper.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/HawkularMetricsRestApp.java A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ApplicationExceptionMapper.java Log Message: ----------- Merge pull request #334 from tsegismont/jira/HWKMETRICS-243 HWKMETRICS-243 Catch RestEasy ApplicationException Compare: https://github.com/hawkular/hawkular-metrics/compare/111dfc117294...047bf...