[svn] commit: r1447 - in /trunk/src: bin/cmdctl/cmdctl.py.in lib/python/isc/cc/session.py

[BIND 10 source code commits]

Author: jelte
Date: Tue Mar 16 13:59:54 2010
New Revision: 1447

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

Modified:
    trunk/src/bin/cmdctl/cmdctl.py.in
    trunk/src/lib/python/isc/cc/session.py

Modified: trunk/src/bin/cmdctl/cmdctl.py.in
==============================================================================
--- trunk/src/bin/cmdctl/cmdctl.py.in (original)
+++ trunk/src/bin/cmdctl/cmdctl.py.in Tue Mar 16 13:59:54 2010
@@ -299,8 +299,6 @@
             seq = self.cc.group_sendmsg(msg, module_name)
             #TODO, it may be blocked, msqg need to add a new interface waiting in timeout.
             answer, env = self.cc.group_recvmsg(False, seq)
-            while answer == None:
-                answer, env = self.cc.group_recvmsg(False, seq)
             if answer:
                 try:
                     rcode, arg = isc.config.ccsession.parse_answer(answer)

Modified: trunk/src/lib/python/isc/cc/session.py
==============================================================================
--- trunk/src/lib/python/isc/cc/session.py (original)
+++ trunk/src/lib/python/isc/cc/session.py Tue Mar 16 13:59:54 2010
@@ -101,7 +101,7 @@
                     return env, msg
                 else:
                     self._queue.append((env,msg))
-                    self.recvmsg(nonblock, seq)
+                    return self.recvmsg(nonblock, seq)
             else:
                 return isc.cc.message.from_wire(data[2:header_length+2]), None
         return None, None