fixed selector's handling of deadlines

Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/363ea503
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/363ea503
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/363ea503

Branch: refs/heads/master
Commit: 363ea5031d26bc19cd12e113e8b365d398120dea
Parents: 80ddb34
Author: Rafael Schloming <[email protected]>
Authored: Sun Jan 11 14:18:37 2015 -0500
Committer: Rafael Schloming <[email protected]>
Committed: Sun Jan 11 14:18:37 2015 -0500

----------------------------------------------------------------------
 proton-c/src/posix/selector.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/363ea503/proton-c/src/posix/selector.c
----------------------------------------------------------------------
diff --git a/proton-c/src/posix/selector.c b/proton-c/src/posix/selector.c
index 53ef790..7c84f02 100644
--- a/proton-c/src/posix/selector.c
+++ b/proton-c/src/posix/selector.c
@@ -33,7 +33,6 @@ struct pn_selector_t {
   pn_timestamp_t *deadlines;
   size_t capacity;
   pn_list_t *selectables;
-  pn_timestamp_t deadline;
   size_t current;
   pn_timestamp_t awoken;
   pn_error_t *error;
@@ -46,7 +45,6 @@ void pn_selector_initialize(void *obj)
   selector->deadlines = NULL;
   selector->capacity = 0;
   selector->selectables = pn_list(PN_WEAKREF, 0);
-  selector->deadline = 0;
   selector->current = 0;
   selector->awoken = 0;
   selector->error = pn_error();
@@ -153,7 +151,7 @@ int pn_selector_select(pn_selector_t *selector, int timeout)
 
     if (deadline) {
       pn_timestamp_t now = pn_i_now();
-      int delta = selector->deadline - now;
+      int64_t delta = deadline - now;
       if (delta < 0) {
         timeout = 0;
       } else if (delta < timeout) {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to