From: Ben Pfaff <blp@nicira.com>
Date: Mon, 2 Jul 2012 17:34:32 +0000 (-0700)
Subject: python: Call 'wait' methods correctly in jsonrpc and stream code.
X-Git-Tag: sliver-openvswitch-1.8.90-0~48^2~294
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5796d9cf8572c2ab977446d45b5847a47a439a62;p=sliver-openvswitch.git

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>
---

diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
index cf0813132..a054401b2 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 82ea0c126..aa512f627 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