[ovs-dev] [PATCH] python: Call 'wait' methods correctly in jsonrpc and stream code.

Ben Pfaff blp at nicira.com
Mon Jul 2 17:35:56 UTC 2012


Bug #12301.
Reported-by: Mike Kruze <mkruze at nicira.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>
---
 python/ovs/jsonrpc.py |    2 +-
 python/ovs/stream.py  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
index cf08131..a054401 100644
--- a/python/ovs/jsonrpc.py
+++ b/python/ovs/jsonrpc.py
@@ -210,7 +210,7 @@ class Connection(object):
         if not self.status:
             self.stream.run_wait(poller)
             if len(self.output):
-                self.stream.send_wait()
+                self.stream.send_wait(poller)
 
     def get_status(self):
         return self.status
diff --git a/python/ovs/stream.py b/python/ovs/stream.py
index 82ea0c1..aa512f6 100644
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -113,7 +113,7 @@ class Stream(object):
                     break
                 stream.run()
                 poller = ovs.poller.Poller()
-                stream.run_wait()
+                stream.run_wait(poller)
                 stream.connect_wait(poller)
                 poller.block()
             assert error != errno.EINPROGRESS
-- 
1.7.2.5




More information about the dev mailing list