git commit: https://issues.apache.org/jira/browse/AMQCPP-545

2014-06-18 Thread tabish 
Repository: activemq-cpp
Updated Branches:
  refs/heads/trunk 91f5566f0 - 352475374


https://issues.apache.org/jira/browse/AMQCPP-545

Only timeout on Message send operations.  

Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/35247537
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/35247537
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/35247537

Branch: refs/heads/trunk
Commit: 352475374fd96ac560f56ec6a47aba817f3cba1d
Parents: 91f5566
Author: Timothy Bish tabish...@gmail.com
Authored: Wed Jun 18 14:13:59 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Wed Jun 18 14:13:59 2014 -0400

--
 .../src/main/activemq/transport/failover/FailoverTransport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/35247537/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
--
diff --git 
a/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp 
b/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
index 7cad404..1c35e9e 100644
--- a/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
+++ b/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
@@ -437,7 +437,7 @@ void FailoverTransport::oneway(const PointerCommand 
command) {
 
 while (transport == NULL  !this-impl-closed  
this-impl-connectionFailure == NULL) {
 long long end = System::currentTimeMillis();
-if (this-impl-timeout  0  (end - start  
this-impl-timeout)) {
+if (command-isMessage()  this-impl-timeout  0  
(end - start  this-impl-timeout)) {
 timedout = true;
 break;
 }

git commit: https://issues.apache.org/jira/browse/AMQCPP-545

2014-06-18 Thread tabish 
Repository: activemq-cpp
Updated Branches:
  refs/heads/3.8.x 928292dcc - cea38b846


https://issues.apache.org/jira/browse/AMQCPP-545

Only timeout on Message send operations.


Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/cea38b84
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/cea38b84
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/cea38b84

Branch: refs/heads/3.8.x
Commit: cea38b8469591773d174fb80689439d1b39f70be
Parents: 928292d
Author: Timothy Bish tabish...@gmail.com
Authored: Wed Jun 18 14:13:59 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Wed Jun 18 14:15:00 2014 -0400

--
 .../src/main/activemq/transport/failover/FailoverTransport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/cea38b84/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
--
diff --git 
a/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp 
b/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
index 7cad404..1c35e9e 100644
--- a/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
+++ b/activemq-cpp/src/main/activemq/transport/failover/FailoverTransport.cpp
@@ -437,7 +437,7 @@ void FailoverTransport::oneway(const PointerCommand 
command) {
 
 while (transport == NULL  !this-impl-closed  
this-impl-connectionFailure == NULL) {
 long long end = System::currentTimeMillis();
-if (this-impl-timeout  0  (end - start  
this-impl-timeout)) {
+if (command-isMessage()  this-impl-timeout  0  
(end - start  this-impl-timeout)) {
 timedout = true;
 break;
 }