You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/05/28 15:44:20 UTC
git commit: [OLINGO-298] Fixed response status
Repository: olingo-odata2
Updated Branches:
refs/heads/Olingo-298_Fix 82f2fbc7b -> f047bfad4
[OLINGO-298] Fixed response status
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/f047bfad
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/f047bfad
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/f047bfad
Branch: refs/heads/Olingo-298_Fix
Commit: f047bfad4ee424284c97b355b2920d156112f3c6
Parents: 82f2fbc
Author: Michael Bolz <mi...@apache.org>
Authored: Wed May 28 15:31:49 2014 +0200
Committer: Michael Bolz <mi...@apache.org>
Committed: Wed May 28 15:39:48 2014 +0200
----------------------------------------------------------------------
.../org/apache/olingo/odata2/core/servlet/ODataServlet.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/f047bfad/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
index dbe2935..ef5be4f 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
@@ -128,7 +128,7 @@ public class ODataServlet extends HttpServlet {
} else if (HTTP_METHOD_HEAD.equals(method) || HTTP_METHOD_OPTIONS.equals(method)) {
createNotImplementedResponse(req, ODataNotImplementedException.COMMON, resp);
} else {
- createMethodNotAllowedResponse(req, ODataHttpException.COMMON, resp);
+ createNotImplementedResponse(req, ODataHttpException.COMMON, resp);
}
}
@@ -149,7 +149,7 @@ public class ODataServlet extends HttpServlet {
} else if (HTTP_METHOD_HEAD.equals(xHttpMethod) || HTTP_METHOD_OPTIONS.equals(xHttpMethod)) {
createNotImplementedResponse(req, ODataNotImplementedException.COMMON, resp);
} else {
- return false;
+ createNotImplementedResponse(req, ODataNotImplementedException.COMMON, resp);
}
return true;
}
@@ -201,7 +201,7 @@ public class ODataServlet extends HttpServlet {
.build();
createResponse(resp, odataResponse);
} else {
- createMethodNotAllowedResponse(req, ODataHttpException.COMMON, resp);
+ createNotImplementedResponse(req, ODataHttpException.COMMON, resp);
}
}
@@ -239,6 +239,7 @@ public class ODataServlet extends HttpServlet {
ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(req);
ODataResponse response =
exceptionWrapper.wrapInExceptionResponse(new ODataNotImplementedException(messageReference));
+// resp.setStatus(HttpStatusCodes.NOT_IMPLEMENTED.getStatusCode());
createResponse(resp, response);
}