[X2Go-Commits] [python-x2go] 02/02: Fix session lock release in various methods of the X2GoSession class.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 457dcb64f5a0e0aa313d45aded6a1cd5cd6b34ba
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 7 14:13:02 2014 +0200

    Fix session lock release in various methods of the X2GoSession class.
---
 debian/changelog |    1 +
 x2go/session.py  |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c44f64e..2364043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -103,6 +103,7 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low
     - Don't choke on non-initialized SSH transport objects when initializing
       SFTP client.
     - Fix transport lock release in X2GoControlSession._x2go_sftp_put().
+    - Fix session lock release in various methods of the X2GoSession class.
   * debian/control:
     + Add dependencies: python-requests, python-simplejson.
   * python-x2go.spec:
diff --git a/x2go/session.py b/x2go/session.py
index 88fc35e..0c7248e 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1789,6 +1789,7 @@ class X2GoSession(object):
         try:
             _retval = self._resume(session_name=session_name, session_list=session_list, cmd=cmd, progress_event=progress_event)
         except:
+            self._lock.release()
             raise
         finally:
             self._lock.release()
@@ -2074,6 +2075,7 @@ class X2GoSession(object):
         try:
             _retval = self._share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, check_desktop_list=check_desktop_list, progress_event=progress_event)
         except:
+            self._lock.release()
             raise
         finally:
             self._lock.release()
@@ -2267,10 +2269,10 @@ class X2GoSession(object):
         try:
             _retval = self._suspend()
         except:
+            self._lock.release()
             raise
         finally:
             self._lock.release()
-
         return _retval
 
     def _suspend(self):
@@ -2338,10 +2340,10 @@ class X2GoSession(object):
         try:
             _retval = self._terminate()
         except:
+            self._lock.release()
             raise
         finally:
             self._lock.release()
-
         return _retval
 
     def _terminate(self):

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git