check master connection is not None before trying to send message

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

neo/client/handler.py

@@ -84,16 +84,17 @@ class ClientEventHandler(EventHandler):
             if isinstance(node, StorageNode):
                 # Notify primary master node that a storage node is temporarily down
                 conn = app.master_conn
-                conn.lock()
-                try:
-                    p = Packet()
-                    ip_address, port = node.getServer()
-                    node_list = [(STORAGE_NODE_TYPE, ip_address, port, node.getUUID(),
-                                 TEMPORARILY_DOWN_STATE),]
-                    p.notifyNodeInformation(msg_id, node_list)
-                    conn.addPacket(p)
-                finally:
-                    conn.unlock()
+                if conn is not None:
+                    conn.lock()
+                    try:
+                        p = Packet()
+                        ip_address, port = node.getServer()
+                        node_list = [(STORAGE_NODE_TYPE, ip_address, port, node.getUUID(),
+                                     TEMPORARILY_DOWN_STATE),]
+                        p.notifyNodeInformation(msg_id, node_list)
+                        conn.addPacket(p)
+                    finally:
+                        conn.unlock()
                 # Remove from pool connection
                 app.cp.removeConnection(node)
             EventHandler.connectionClosed(self, conn)
@@ -111,16 +112,17 @@ class ClientEventHandler(EventHandler):
             if isinstance(node, StorageNode):
                 # Notify primary master node that a storage node is temporarily down
                 conn = app.master_conn
-                conn.lock()
-                try:
-                    p = Packet()
-                    ip_address, port =  node.getServer()
-                    node_list = [(STORAGE_NODE_TYPE, ip_address, port, node.getUUID(),
-                                 TEMPORARILY_DOWN_STATE),]
-                    p.notifyNodeInformation(msg_id, node_list)
-                    conn.addPacket(p)
-                finally:
-                    conn.unlock()
+                if conn is not None:
+                    conn.lock()
+                    try:
+                        p = Packet()
+                        ip_address, port =  node.getServer()
+                        node_list = [(STORAGE_NODE_TYPE, ip_address, port, node.getUUID(),
+                                     TEMPORARILY_DOWN_STATE),]
+                        p.notifyNodeInformation(msg_id, node_list)
+                        conn.addPacket(p)
+                    finally:
+                        conn.unlock()
                 # Remove from pool connection
                 app.cp.removeConnection(node)
         EventHandler.timeoutExpired(self, conn)
@@ -138,16 +140,17 @@ class ClientEventHandler(EventHandler):
             if isinstance(node, StorageNode):
                 # Notify primary master node that a storage node is broken
                 conn = app.master_conn
-                conn.lock()
-                try:
-                    p = Packet()
-                    ip_address, port =  node.getServer()
-                    node_list = [(STORAGE_NODE_TYPE, ip_address, port, node.getUUID(),
-                                 BROKEN_STATE),]
-                    p.notifyNodeInformation(msg_id, node_list)
-                    conn.addPacket(p)
-                finally:
-                    conn.unlock()
+                if conn is not None:
+                    conn.lock()
+                    try:
+                        p = Packet()
+                        ip_address, port =  node.getServer()
+                        node_list = [(STORAGE_NODE_TYPE, ip_address, port, node.getUUID(),
+                                     BROKEN_STATE),]
+                        p.notifyNodeInformation(msg_id, node_list)
+                        conn.addPacket(p)
+                    finally:
+                        conn.unlock()
                 # Remove from pool connection
                 app.cp.removeConnection(node)
         EventHandler.peerBroken(self, conn)