Apache/olingo-odata4
1
0
Fork 0
mirror of https://github.com/apache/olingo-odata4.git synced 2025-02-06 01:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4

Browse Source
This commit is contained in:
Francesco Chicchiriccò 2014-07-31 11:08:27 +02:00
commit 101266e86c
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java
View File

@ -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;