Replaced finally block with else and generalized the except block for…

… non-EOFError to release lock---fixes test_affinity.Test_Affinity locally

rpyc/core/protocol.py

@@ -389,18 +389,24 @@ def serve(self, timeout=1, wait_for_lock=True):  # serving
                     return False
         # Assume the receive rlock is acquired and incremented
         try:
+            data = None  # Ensure data is initialized
             data = self._channel.poll(timeout) and self._channel.recv()
-            if not data:
-                return False
-        except EOFError:
-            self.close()  # sends close async request
+        except Exception as exc:
+            if isinstance(exc, EOFError):
+                self.close()  # sends close async request
+            self._recvlock.release()
+            with self._recv_event:
+                self._recv_event.notify_all()
             raise
-        finally:
+        else:
             self._recvlock.release()
             with self._recv_event:
                 self._recv_event.notify_all()
-        self._dispatch(data)
-        return True
+        if not data:
+            return False
+        else:
+            self._dispatch(data)
+            return True
 
     def poll(self, timeout=0):  # serving
         """Serves a single transaction, should one arrives in the given