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/03/16 10:06:36 UTC
[47/50] [abbrv] git commit: [OLINGO-203] fix
[OLINGO-203] fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/e772690f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/e772690f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/e772690f
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: e772690f4ea76cfd9ca87fdf42a03a8f81a444d6
Parents: 572f69a
Author: Stephan Klevenz <sk...@apache.org>
Authored: Wed Mar 12 09:38:57 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Wed Mar 12 09:38:57 2014 +0100
----------------------------------------------------------------------
.../org/apache/olingo/odata2/core/rest/ODataSubLocator.java | 6 ++++--
.../org/apache/olingo/odata2/core/servlet/ODataServlet.java | 4 +++-
.../olingo/odata2/testutil/fit/FitStaticServiceFactory.java | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e772690f/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
index 13f05c7..96c3b93 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
@@ -143,10 +143,12 @@ public final class ODataSubLocator {
request = ODataRequest.fromRequest(request).method(method).build();
ODataContextImpl context = new ODataContextImpl(request, serviceFactory);
- ODataService service = serviceFactory.createService(context);
- context.setService(service);
context.setParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT, httpRequest);
+
+ ODataService service = serviceFactory.createService(context);
+
service.getProcessor().setContext(context);
+ context.setService(service);
ODataRequestHandler requestHandler = new ODataRequestHandler(serviceFactory, service, context);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e772690f/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 3e4a57e..8c1852e 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
@@ -171,10 +171,12 @@ public class ODataServlet extends HttpServlet {
.body(req.getInputStream())
.build();
ODataContextImpl context = new ODataContextImpl(odataRequest, serviceFactory);
+ context.setParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT, req);
+
ODataService service = serviceFactory.createService(context);
context.setService(service);
- context.setParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT, req);
service.getProcessor().setContext(context);
+
ODataRequestHandler requestHandler = new ODataRequestHandler(serviceFactory, service, context);
final ODataResponse odataResponse = requestHandler.handle(odataRequest);
createResponse(resp, odataResponse);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/e772690f/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
index aa02bfe..4d1bd6f 100644
--- a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
+++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
@@ -72,7 +72,8 @@ public class FitStaticServiceFactory extends ODataServiceFactory {
assertNotNull(ctx);
assertNotNull(ctx.getAcceptableLanguages());
-
+ assertNotNull(ctx.getParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT));
+
final Map<String, List<String>> requestHeaders = ctx.getRequestHeaders();
final String host = requestHeaders.get("Host").get(0);