master: do not regenerate UUID if it was unused

6a695c33 · Julien Muchembled · f8cce9b0 · 6a695c33
Commit 6a695c33 authored Jun 21, 2012 by Julien Muchembled
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

neo/master/app.py neo/master/app.py +4 -3

No files found.
--- a/neo/master/app.py
+++ b/neo/master/app.py
@@ -433,8 +433,9 @@ class Application(object):
        self.cluster_state = state
    def getNewUUID(self, uuid, address, node_type):
-        if None != uuid != self.uuid and \
+        if None != uuid != self.uuid:
-                self.nm.getByAddress(address) is self.nm.getByUUID(uuid):
+            node = self.nm.getByUUID(uuid)
+            if node is None or node.getAddress() == address:
                return uuid
        while True:
            uuid = UUID_NAMESPACES[node_type] + os.urandom(15)