storage: safely change connection peer id temporarily

95fecbfb · Julien Muchembled · 192b2ba8 · 95fecbfb
Commit 95fecbfb authored Aug 14, 2012 by Julien Muchembled
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

neo/storage/app.py neo/storage/app.py +5 -3

No files found.
--- a/neo/storage/app.py
+++ b/neo/storage/app.py
@@ -363,9 +363,11 @@ class Application(object):
            if conn.isClosed():
                continue
            orig_msg_id = conn.getPeerId()
-            conn.setPeerId(msg_id)
-            some_callable(conn, *args)
-            conn.setPeerId(orig_msg_id)
+            try:
+                conn.setPeerId(msg_id)
+                some_callable(conn, *args)
+            finally:
+                conn.setPeerId(orig_msg_id)

    def logQueuedEvents(self):
        if self.event_queue is None: