Change "if" into "elif": it is obviously wrong to call...

Change "if" into "elif": it is obviously wrong to call app.master_conn.getUUID() on None, so this test should only be executed in "not None" case.


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

neo/client/handler.py

@@ -105,7 +105,7 @@ class ClientEventHandler(EventHandler):
         if app.primary_master_node is None:
             # Failed to connect to a master node
             app.primary_master_node = -1
-        if app.master_conn is not None and uuid == app.master_conn.getUUID():
+        elif app.master_conn is not None and uuid == app.master_conn.getUUID():
             logging.critical("connection to primary master node closed")
             # Close connection
             app.master_conn.close()
@@ -128,7 +128,7 @@ class ClientEventHandler(EventHandler):
         if app.primary_master_node is None:
             # Failed to connect to a master node
             app.primary_master_node = -1
-        if app.master_conn is not None and uuid == app.primary_master_node.getUUID():
+        elif app.master_conn is not None and uuid == app.primary_master_node.getUUID():
             logging.critical("connection timeout to primary master node expired")
             self.dispatcher.connectToPrimaryMasterNode(app, conn)
         else:
@@ -146,7 +146,7 @@ class ClientEventHandler(EventHandler):
         if app.primary_master_node is None:
             # Failed to connect to a master node
             app.primary_master_node = -1
-        if app.master_conn is not None and uuid == app.primary_master_node.getUUID():
+        elif app.master_conn is not None and uuid == app.primary_master_node.getUUID():
             logging.critical("primary master node is broken")
             self.dispatcher.connectToPrimaryMasterNode(app, conn)
         else: