Return-Path: 
 <commits-return-25780-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C8F3D11E5A
	for <apmail-activemq-commits-archive@www.apache.org>;
 Wed, 18 Jun 2014 18:14:14 +0000 (UTC)
Received: (qmail 19625 invoked by uid 500); 18 Jun 2014 18:14:14 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 19581 invoked by uid 500); 18 Jun 2014 18:14:14 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 19570 invoked by uid 99); 18 Jun 2014 18:14:14 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2014 18:14:14 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 30BA79430B0; Wed, 18 Jun 2014 18:14:14 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tabish@apache.org
To: commits@activemq.apache.org
Message-Id: <3db49c68ef2b4d0383db52b1437e479f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: https://issues.apache.org/jira/browse/AMQCPP-545
Date: Wed, 18 Jun 2014 18:14:14 +0000 (UTC)

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 <tabish121@gmail.com>
Authored: Wed Jun 18 14:13:59 2014 -0400
Committer: Timothy Bish <tabish121@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 Pointer<Command> 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;
                         }