diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2012-11-30 11:44:52 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-11-30 14:48:18 +0900 |
| commit | dae4bc4dc3293c7969f0a9e1084371a39dcb23da (patch) | |
| tree | 2c1d86dd4fef7dfa2ce1517aba155d843696783b | |
| parent | c5c7dc9cfe1e44199cb33158a67416abbd3bbf0f (diff) | |
Revert "contrib/ovs/stream.py: TypeError: bad operand type for unary -: 'NoneType'"
This reverts commit c3a41d06a654ea81cdc79d7bda5106d05f2e1deb.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/contrib/ovs/stream.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ryu/contrib/ovs/stream.py b/ryu/contrib/ovs/stream.py index b4f5ba6f..c4d243d0 100644 --- a/ryu/contrib/ovs/stream.py +++ b/ryu/contrib/ovs/stream.py @@ -152,10 +152,9 @@ class Stream(object): assert retval != errno.EINPROGRESS if retval == 0: self.state = Stream.__S_CONNECTED - else: + elif retval != errno.EAGAIN: + self.state = Stream.__S_DISCONNECTED self.error = retval - if retval != errno.EAGAIN: - self.state = Stream.__S_DISCONNECTED def connect(self): """Tries to complete the connection on this stream. If the connection @@ -167,11 +166,6 @@ class Stream(object): last_state = self.state if self.state == Stream.__S_CONNECTING: self.__scs_connecting() - if self.state == Stream.__S_CONNECTING: - # try again - assert self.error == errno.EAGAIN - last_state = -1 - assert self.state != last_state elif self.state == Stream.__S_CONNECTED: return 0 elif self.state == Stream.__S_DISCONNECTED: |