diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-07-02 10:34:32 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-07-02 15:23:44 -0700 |
| commit | 993b4f06f53573c45e0a1d2da02526f03f19699e (patch) | |
| tree | cf3a1e91293a1e6cdd3f6f3abea38a0bbe80aed6 | |
| parent | cd74f7c0fa6585f2cda9d79ed4857ea2b1cc3889 (diff) | |
| download | openvswitch-993b4f06f53573c45e0a1d2da02526f03f19699e.tar.gz | |
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.py | 2 | ||||
| -rw-r--r-- | 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 b72af77cf..c9b39684a 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 4264b443f..ff5bda303 100644 --- a/python/ovs/stream.py +++ b/python/ovs/stream.py @@ -118,7 +118,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 |