Return-Path: 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 BA6771811E for ; Thu, 17 Mar 2016 17:56:40 +0000 (UTC) Received: (qmail 69514 invoked by uid 500); 17 Mar 2016 17:56:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 69462 invoked by uid 500); 17 Mar 2016 17:56:40 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 69453 invoked by uid 99); 17 Mar 2016 17:56:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Mar 2016 17:56:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5561DDFAB5; Thu, 17 Mar 2016 17:56:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Thu, 17 Mar 2016 17:56:40 -0000 Message-Id: <5f18e9d3c19f45e9889393dda55f3899@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: ARTEMIS-441 correct time-unit for large msg poll Repository: activemq-artemis Updated Branches: refs/heads/master ab98eb962 -> 57c1c338e ARTEMIS-441 correct time-unit for large msg poll Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7653d17e Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7653d17e Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7653d17e Branch: refs/heads/master Commit: 7653d17e6ace6e37effdca706b96ca327cd7b04e Parents: ab98eb9 Author: jbertram Authored: Thu Mar 17 09:22:05 2016 -0500 Committer: jbertram Committed: Thu Mar 17 09:22:14 2016 -0500 ---------------------------------------------------------------------- .../artemis/core/client/impl/LargeMessageControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7653d17e/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java index 289181e..77134ee 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java @@ -1089,7 +1089,7 @@ public class LargeMessageControllerImpl implements LargeMessageController { } int sizeToAdd = currentPacket != null ? currentPacket.chunk.length : 1; - currentPacket = largeMessageData.poll(readTimeout, TimeUnit.SECONDS); + currentPacket = largeMessageData.poll(readTimeout, TimeUnit.MILLISECONDS); if (currentPacket == null) { throw new IndexOutOfBoundsException(); }