fix some bugs

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

neo/master/service.py

@@ -125,7 +125,7 @@ class ServiceEventHandler(MasterEventHandler):
                 if node_type == MASTER_NODE_TYPE:
                     node = MasterNode(server = addr, uuid = uuid)
                 elif node_type == CLIENT_NODE_TYPE:
-                    node = ClientNode(uuid = uuid)
+                    node = ClientNode(server = addr, uuid = uuid)
                 else:
                     node = StorageNode(server = addr, uuid = uuid)
                 app.nm.add(node)
@@ -253,7 +253,7 @@ class ServiceEventHandler(MasterEventHandler):
             for offset in xrange(app.num_partitions):
                 row_list.append((offset, app.pt.getRow(offset)))
                 if len(row_list) == 1000:
-                    p.sendPartitionTable(app.lptid, row_list)
+                    p.sendPartitionTable(conn.getNextId(), app.lptid, row_list)
                     conn.addPacket(p)
                     del row_list[:]
             if len(row_list) != 0: