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/07/09 10:36:17 UTC

git commit: [OLINGO-317] Store DataProvider per HttpSession

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 9fa6773d7 -> cbd2b3c99


[OLINGO-317] Store DataProvider per HttpSession


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/cbd2b3c9
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/cbd2b3c9
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/cbd2b3c9

Branch: refs/heads/master
Commit: cbd2b3c991322499d9e4f4cee2f02b6a3ae4df4c
Parents: 9fa6773
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Jul 8 15:41:00 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Wed Jul 9 09:19:52 2014 +0200

----------------------------------------------------------------------
 .../apache/olingo/server/tecsvc/TechnicalServlet.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cbd2b3c9/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java
index ddddca8..1a5c3b9 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java
@@ -32,6 +32,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.IOException;
 
 public class TechnicalServlet extends HttpServlet {
@@ -39,20 +40,22 @@ public class TechnicalServlet extends HttpServlet {
   private static final long serialVersionUID = 1L;
 
   private static final Logger LOG = LoggerFactory.getLogger(TechnicalServlet.class);
-  private DataProvider dataProvider;
+//  private DataProvider dataProvider;
 
   @Override
-  protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException,
-      IOException {
+  protected void service(final HttpServletRequest req, final HttpServletResponse resp)
+          throws ServletException, IOException {
     try {
       OData odata = OData.newInstance();
       Edm edm = odata.createEdm(new EdmTechProvider());
 
+      HttpSession session = req.getSession(true);
+      DataProvider dataProvider = (DataProvider) session.getAttribute(DataProvider.class.getName());
       if (dataProvider == null) {
         dataProvider = new JefDataProvider(edm);
+        session.setAttribute(DataProvider.class.getName(), dataProvider);
+        LOG.info("Created new data provider.");
       }
-      dataProvider.reset();
-
 
       ODataHttpHandler handler = odata.createHandler(edm);