From commits-return-52489-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Thu Aug 2 15:46:02 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9AC7B180629 for ; Thu, 2 Aug 2018 15:46:01 +0200 (CEST) Received: (qmail 16629 invoked by uid 500); 2 Aug 2018 13:46:00 -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 16620 invoked by uid 99); 2 Aug 2018 13:46:00 -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, 02 Aug 2018 13:46:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9E91FDFB34; Thu, 2 Aug 2018 13:46:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Message-Id: <564709155abb4d2c8f8978a3ea041357@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: AMQ-7030 - trap exceptions on future.get, fix and test Date: Thu, 2 Aug 2018 13:46:00 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/master 550f76cd5 -> bdfa3394a AMQ-7030 - trap exceptions on future.get, fix and test Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/bdfa3394 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/bdfa3394 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/bdfa3394 Branch: refs/heads/master Commit: bdfa3394adddd011c7d978d5a086fa3bcdaf1b41 Parents: 550f76c Author: gtully Authored: Thu Aug 2 14:44:57 2018 +0100 Committer: gtully Committed: Thu Aug 2 14:45:31 2018 +0100 ---------------------------------------------------------------------- .../region/cursors/AbstractStoreCursor.java | 4 +- .../region/cursors/AbstractStoreCursorTest.java | 52 ++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/bdfa3394/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java index 5140c72..2dd934f 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java @@ -148,7 +148,9 @@ public abstract class AbstractStoreCursor extends AbstractPendingMessageCursor i // if the index suppressed it (original still present), or whether it was stored and needs to be removed Object possibleFuture = message.getMessageId().getFutureOrSequenceLong(); if (possibleFuture instanceof Future) { - ((Future) possibleFuture).get(); + try { + ((Future) possibleFuture).get(); + } catch (Exception okToErrorOrCancelStoreOp) {} } // need to access again after wait on future Object sequence = message.getMessageId().getFutureOrSequenceLong(); http://git-wip-us.apache.org/repos/asf/activemq/blob/bdfa3394/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorTest.java new file mode 100644 index 0000000..0a7569f --- /dev/null +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursorTest.java @@ -0,0 +1,52 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.activemq.broker.region.cursors; + +import org.apache.activemq.command.ActiveMQMessage; +import org.apache.activemq.command.MessageId; +import org.junit.Test; + +import java.util.concurrent.Callable; +import java.util.concurrent.FutureTask; + +import static org.junit.Assert.assertFalse; + +public class AbstractStoreCursorTest { + + @Test + public void testGotToStore() throws Exception { + + ActiveMQMessage message = new ActiveMQMessage(); + message.setRecievedByDFBridge(true); + + MessageId messageId = new MessageId(); + message.setMessageId(messageId); + + FutureTask futureTask = new FutureTask(new Callable() { + @Override + public Long call() { + return 0l; + } + }); + messageId.setFutureOrSequenceLong(futureTask); + + futureTask.cancel(false); + + assertFalse(AbstractStoreCursor.gotToTheStore(message)); + } +}