Repository: olingo-odata4 Updated Branches: refs/heads/master 82a73c577 -> 795af6e38
[OLINGO-348] Exception handling refactoring Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/795af6e3 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/795af6e3 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/795af6e3 Branch: refs/heads/master Commit: 795af6e38fa0847f8026a268ef26d2222ff605c7 Parents: 82a73c5 Author: Christian Amend <[email protected]> Authored: Wed Jul 30 14:56:55 2014 +0200 Committer: Christian Amend <[email protected]> Committed: Thu Jul 31 11:06:46 2014 +0200 ---------------------------------------------------------------------- .../apache/olingo/server/core/ODataHandler.java | 25 ++++---------------- 1 file changed, 5 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/795af6e3/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java index bdd77f8..9c6bf3e 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java @@ -126,33 +126,18 @@ public class ODataHandler { private void handleException(ODataRequest request, ODataResponse response, ODataServerError serverError, ContentType requestedContentType) { + ExceptionProcessor exceptionProcessor; try { - ExceptionProcessor exceptionProcessor = selectProcessor(ExceptionProcessor.class, response); + exceptionProcessor = selectProcessor(ExceptionProcessor.class, response); + } catch (ODataTranslatedException e) { + exceptionProcessor = new DefaultProcessor(); + } if (requestedContentType == null) { requestedContentType = ODataFormat.JSON.getContentType(ODataServiceVersion.V40); } exceptionProcessor.processException(request, response, serverError, requestedContentType); - } catch (ODataTranslatedException e) { - throw new ODataRuntimeException("Could not instantiate ExceptionProcessor"); - } } -// private void handleException(ODataRequest request, ODataResponse response, ODataTranslatedException e, -// ContentType requestedContentType) { -// try { -// ExceptionProcessor exceptionProcessor = selectProcessor(ExceptionProcessor.class, response); -// Locale requestedLocale = null; -// ODataServerError serverError = -// ODataExceptionHelper.createServerErrorObject(e, response.getStatusCode(), requestedLocale); -// if (requestedContentType == null) { -// requestedContentType = ODataFormat.JSON.getContentType(ODataServiceVersion.V40); -// } -// exceptionProcessor.processException(request, response, serverError, requestedContentType); -// } catch (ODataTranslatedException e1) { -// throw new ODataRuntimeException("Could not instanciate ExceptionProcessor", e); -// } -// } - private void handleResourceDispatching(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo) throws ODataTranslatedException { int lastPathSegmentIndex = uriInfo.getUriResourceParts().size() - 1;
