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 3BBA5F035 for ; Tue, 1 Oct 2013 12:02:42 +0000 (UTC) Received: (qmail 1703 invoked by uid 500); 1 Oct 2013 12:02:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 1593 invoked by uid 500); 1 Oct 2013 12:02:38 -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 1540 invoked by uid 99); 1 Oct 2013 12:02:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Oct 2013 12:02:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 544E68AC634; Tue, 1 Oct 2013 12:02:31 +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 Date: Tue, 01 Oct 2013 12:02:32 -0000 Message-Id: <29f18f65a78d4b36892e4b20c46f8ae4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: https://issues.apache.org/jira/browse/AMQ-4365 - fix up LeaseDatabaseLockerTest config, needs a lockable instance https://issues.apache.org/jira/browse/AMQ-4365 - fix up LeaseDatabaseLockerTest config, needs a lockable instance Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/45e7d3a2 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/45e7d3a2 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/45e7d3a2 Branch: refs/heads/trunk Commit: 45e7d3a21b4f944df9f2824f58fd135dd326ee59 Parents: 2a5ad36 Author: gtully Authored: Tue Oct 1 13:00:40 2013 +0100 Committer: gtully Committed: Tue Oct 1 13:02:17 2013 +0100 ---------------------------------------------------------------------- .../apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/45e7d3a2/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java index be08439..b499611 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java @@ -70,11 +70,11 @@ public class LeaseDatabaseLockerTest { LeaseDatabaseLocker lockerA = new LeaseDatabaseLocker(); lockerA.setLeaseHolderId("First"); - lockerA.configure(jdbc); + jdbc.setLocker(lockerA); final LeaseDatabaseLocker lockerB = new LeaseDatabaseLocker(); lockerB.setLeaseHolderId("Second"); - lockerB.configure(jdbc); + jdbc.setLocker(lockerB); final AtomicBoolean blocked = new AtomicBoolean(true); final Connection connection = dataSource.getConnection(); @@ -141,11 +141,11 @@ public class LeaseDatabaseLockerTest { final LeaseDatabaseLocker lockerA = new LeaseDatabaseLocker(); lockerA.setLeaseHolderId("A"); - lockerA.configure(jdbc); + jdbc.setLocker(lockerA); final LeaseDatabaseLocker lockerB = new LeaseDatabaseLocker(); lockerB.setLeaseHolderId("B"); - lockerB.configure(jdbc); + jdbc.setLocker(lockerB); final Set lockedSet = new HashSet(); ExecutorService executor = Executors.newCachedThreadPool(); @@ -259,6 +259,7 @@ public class LeaseDatabaseLockerTest { }}); underTest.configure(jdbcPersistenceAdapter); + underTest.setLockable(jdbcPersistenceAdapter); return underTest.determineTimeDifference(connection); }