server/repository.py
changeset 9033 614bf73cc126
parent 9020 cb87e831c183
child 9034 cc3442054e48
--- a/server/repository.py	Mon Jun 24 12:00:03 2013 +0200
+++ b/server/repository.py	Mon Jun 24 11:59:45 2013 +0200
@@ -890,33 +890,22 @@
         del self._sessions[sessionid]
         self.info('closed session %s for user %s', sessionid, session.user.login)
 
-    def call_service(self, sessionid, regid, async, **kwargs):
+    def call_service(self, sessionid, regid, **kwargs):
         """
         See :class:`cubicweb.dbapi.Connection.call_service`
         and :class:`cubicweb.server.Service`
         """
         session = self._get_session(sessionid)
-        return self._call_service_with_session(session, regid, async, **kwargs)
+        return self._call_service_with_session(session, regid, **kwargs)
 
-    def _call_service_with_session(self, session, regid, async, **kwargs):
-        if async:
-            self.info('calling service %s asynchronously', regid)
-            def task():
-                session.set_cnxset()
-                try:
-                    service = session.vreg['services'].select(regid, session, **kwargs)
-                    return service.call(**kwargs)
-                finally:
-                    session.rollback() # free cnxset
-            self.threaded_task(task)
-        else:
-            self.info('calling service %s synchronously', regid)
-            session.set_cnxset()
-            try:
-                service = session.vreg['services'].select(regid, session, **kwargs)
-                return service.call(**kwargs)
-            finally:
-                session.free_cnxset()
+    def _call_service_with_session(self, session, regid, **kwargs):
+        self.info('calling service %s synchronously', regid)
+        session.set_cnxset()
+        try:
+            service = session.vreg['services'].select(regid, session, **kwargs)
+            return service.call(**kwargs)
+        finally:
+            session.free_cnxset()
 
     def user_info(self, sessionid, props=None):
         """this method should be used by client to: