addWatch is not mandatory, so do not assume a watcher is enabled

4a01afec · Sebastien Robin · 3110a3df · 4a01afec
Commit 4a01afec authored Feb 11, 2013 by Sebastien Robin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

erp5/util/taskdistribution/__init__.py erp5/util/taskdistribution/__init__.py +2 -1

No files found.
--- a/erp5/util/taskdistribution/__init__.py
+++ b/erp5/util/taskdistribution/__init__.py
@@ -347,7 +347,8 @@ class TestResultProxy(RPCRetry):
        with cond:
            self._watcher_can_run = False
            cond.notify()
-        self._watcher_thread.join()
+        if self._watcher_thread is not None:
+          self._watcher_thread.join()

 class ServerProxy(xmlrpclib.ServerProxy):