Revert commit 252: connection is sent to dispatcher via registration, so it's safer to lock it.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@290 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/client/app.py

@@ -72,19 +72,23 @@ class ConnectionPool(object):
             app.local_var.node_not_ready = 0
             conn = MTClientConnection(app.em, handler, addr,
                                       connector_handler=self.app.connector_handler)
-            if conn.getConnector() is None:
-                # This happens, if a connection could not be established.
-                logging.error('Connection to storage node %s failed', addr)
-                return None
+            conn.lock()
+            try:
+                if conn.getConnector() is None:
+                    # This happens, if a connection could not be established.
+                    logging.error('Connection to storage node %s failed', addr)
+                    return None
 
-            msg_id = conn.getNextId()
-            p = Packet()
-            p.requestNodeIdentification(msg_id, CLIENT_NODE_TYPE,
-                                        app.uuid, addr[0],
-                                        addr[1], app.name)
-            conn.addPacket(p)
-            conn.expectMessage(msg_id)
-            app.dispatcher.register(conn, msg_id, app.getQueue())
+                msg_id = conn.getNextId()
+                p = Packet()
+                p.requestNodeIdentification(msg_id, CLIENT_NODE_TYPE,
+                                            app.uuid, addr[0],
+                                            addr[1], app.name)
+                conn.addPacket(p)
+                conn.expectMessage(msg_id)
+                app.dispatcher.register(conn, msg_id, app.getQueue())
+            finally:
+                conn.unlock()
 
             try:
                 app._waitMessage(conn, msg_id)