[tuxdroid-svn] r6004 - software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/execut
Status: Beta
Brought to you by:
ks156
From: jerome <c2m...@c2...> - 2009-12-22 10:41:35
|
Author: jerome Date: 2009-12-22 11:41:15 +0100 (Tue, 22 Dec 2009) New Revision: 6004 Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py Log: * Added try , except statements for sensitive operations. Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py =================================================================== --- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py 2009-12-22 10:40:00 UTC (rev 6003) +++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNClient.py 2009-12-22 10:41:15 UTC (rev 6004) @@ -219,7 +219,7 @@ if not t.join(0.1): # Otherwise, kill it t._Thread__stop() - except AssertionError: + except ( AssertionError, RuntimeError ): t._Thread__stop() self.__ntlMutex.release() Modified: software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py =================================================================== --- software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py 2009-12-22 10:40:00 UTC (rev 6003) +++ software_suite_v3/software/plugin/plugin-skype/branches/in_out_plugin/executables/IPN/IPNServer.py 2009-12-22 10:41:15 UTC (rev 6004) @@ -127,7 +127,11 @@ '''Check if there have at least one connected client. ''' self.__cliMutex.acquire() - hasClient = len(self.__cliLst) > 0 + hasClient = 0 + try: + hasClient = len(self.__cliLst) > 0 + except: + pass self.__cliMutex.release() return hasClient |