aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-07-02 10:34:32 -0700
committerBen Pfaff <blp@nicira.com>2012-07-02 15:23:36 -0700
commit5830e9c484d4d6a3a6e099da1871570911670ab5 (patch)
tree0ef6f518a50a96780f5ed982e5753258ef4d6c89
parent36d83a7f75123b69f967dd22d75c010ffde649c0 (diff)
python: Call 'wait' methods correctly in jsonrpc and stream code.
Bug #12301. Reported-by: Mike Kruze <mkruze@nicira.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
-rw-r--r--python/ovs/jsonrpc.py2
-rw-r--r--python/ovs/stream.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
index cf081313..a054401b 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 82ea0c12..aa512f62 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