qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cliffjan...@apache.org
Subject qpid-proton git commit: PROTON-1349: Windows iocp reconnect_test fix, run io loop only once on topup
Date Mon, 02 Oct 2017 18:44:01 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master f40577175 -> b0a0633be


PROTON-1349: Windows iocp reconnect_test fix, run io loop only once on topup


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

Branch: refs/heads/master
Commit: b0a0633be32377c6720d8f7737ca07c182ff7f86
Parents: f405771
Author: Clifford Jansen <cliffjansen@apache.org>
Authored: Mon Oct 2 11:44:19 2017 -0700
Committer: Clifford Jansen <cliffjansen@apache.org>
Committed: Mon Oct 2 11:44:19 2017 -0700

----------------------------------------------------------------------
 proton-c/bindings/cpp/CMakeLists.txt | 5 +----
 proton-c/src/proactor/win_iocp.c     | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b0a0633b/proton-c/bindings/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt
index 83f564f..9409d30 100644
--- a/proton-c/bindings/cpp/CMakeLists.txt
+++ b/proton-c/bindings/cpp/CMakeLists.txt
@@ -207,7 +207,4 @@ add_cpp_test(scalar_test)
 add_cpp_test(value_test)
 add_cpp_test(container_test)
 add_cpp_test(url_test)
-# windows exclusion only for 0.18 beta
-if(NOT WIN32)
-  add_cpp_test(reconnect_test)
-endif()
+add_cpp_test(reconnect_test)

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b0a0633b/proton-c/src/proactor/win_iocp.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/win_iocp.c b/proton-c/src/proactor/win_iocp.c
index 36467ff..885081e 100644
--- a/proton-c/src/proactor/win_iocp.c
+++ b/proton-c/src/proactor/win_iocp.c
@@ -2402,10 +2402,10 @@ static pn_event_batch_t *pconnection_process(pconnection_t *pc, iocp_result_t
*r
         if (!pconnection_write(pc, wbuf))
           open = false;
       }
-
-      if (topup)
-        return NULL;  // regardless if new events made available
     }
+
+    if (topup)
+      return NULL;  // regardless if new events made available
   }
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message