Skip to content

Commit c106450

Browse files
committed
remove reply/error distinction
1 parent 04873c7 commit c106450

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

pyjdb/pyjdb.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,8 @@ def __listen(self):
182182
pass
183183
if err == EVENT_MAGIC_NUMBER:
184184
self.__handle_event(req_id, reply_packed)
185-
if err == 0:
186-
self.__handle_reply(req_id, reply_packed)
187185
else:
188-
self.__handle_error(req_id, err)
186+
self.__handle_reply(req_id, err, reply_packed)
189187

190188
def __handle_event(self, req_id, event_packed):
191189
command = self.__jdwp_spec.lookup_command("Event", "Composite")
@@ -194,15 +192,9 @@ def __handle_event(self, req_id, event_packed):
194192
self.event_cv.notify()
195193
self.event_cv.release()
196194

197-
def __handle_reply(self, req_id, reply_packed):
195+
def __handle_reply(self, req_id, err, reply_packed):
198196
self.reply_cv.acquire()
199-
self.__replies_by_req_id[req_id] = (0, reply_packed)
200-
self.reply_cv.notify()
201-
self.reply_cv.release()
202-
203-
def __handle_error(self, req_id, err):
204-
self.reply_cv.acquire()
205-
self.__replies_by_req_id[req_id] = (err, [])
197+
self.__replies_by_req_id[req_id] = (err, reply_packed)
206198
self.reply_cv.notify()
207199
self.reply_cv.release()
208200

0 commit comments

Comments
 (0)