Merge pull request #469 from minrk/asyncresult-cancel

avoid setting result on cancelled AsyncResults

Author: minrk

ipyparallel/client/asyncresult.py

@@ -269,6 +269,8 @@ def wait(self, timeout=-1):
         return self._ready
 
     def _resolve_result(self, f=None):
+        if self.done():
+            return
         try:
             if f:
                 results = f.result()