Browse Source

ok i see why the nonnonblock didn't work, broke it yesterday, missed a return statement
removed while loop again and fixed nonnonblock


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1447 e5f2f494-b856-4b98-b285-d166d9295462

Jelte Jansen 15 years ago
parent
commit
939eedf98d
2 changed files with 1 additions and 3 deletions
  1. 0 2
      src/bin/cmdctl/cmdctl.py.in
  2. 1 1
      src/lib/python/isc/cc/session.py

+ 0 - 2
src/bin/cmdctl/cmdctl.py.in

@@ -299,8 +299,6 @@ class CommandControl():
             seq = self.cc.group_sendmsg(msg, module_name)
             seq = self.cc.group_sendmsg(msg, module_name)
             #TODO, it may be blocked, msqg need to add a new interface waiting in timeout.
             #TODO, it may be blocked, msqg need to add a new interface waiting in timeout.
             answer, env = self.cc.group_recvmsg(False, seq)
             answer, env = self.cc.group_recvmsg(False, seq)
-            while answer == None:
-                answer, env = self.cc.group_recvmsg(False, seq)
             if answer:
             if answer:
                 try:
                 try:
                     rcode, arg = isc.config.ccsession.parse_answer(answer)
                     rcode, arg = isc.config.ccsession.parse_answer(answer)

+ 1 - 1
src/lib/python/isc/cc/session.py

@@ -101,7 +101,7 @@ class Session:
                     return env, msg
                     return env, msg
                 else:
                 else:
                     self._queue.append((env,msg))
                     self._queue.append((env,msg))
-                    self.recvmsg(nonblock, seq)
+                    return self.recvmsg(nonblock, seq)
             else:
             else:
                 return isc.cc.message.from_wire(data[2:header_length+2]), None
                 return isc.cc.message.from_wire(data[2:header_length+2]), None
         return None, None
         return None, None