Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A5054200B96 for ; Thu, 6 Oct 2016 12:53:38 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A1E8F160AE0; Thu, 6 Oct 2016 10:53:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E0C62160AAD for ; Thu, 6 Oct 2016 12:53:37 +0200 (CEST) Received: (qmail 44369 invoked by uid 500); 6 Oct 2016 10:53:37 -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 44360 invoked by uid 99); 6 Oct 2016 10:53:36 -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, 06 Oct 2016 10:53:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BC221DFF5A; Thu, 6 Oct 2016 10:53:36 +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: <46effd28c93d417eafa327e3aa584c45@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: AMQ-6403 - init broker temp from provided temp store to align usage checks. Thanks for the patchh shailendra14k@gmail.com, made a mod to respect broker.tmpDataDirectory as a default. This closes #204 Date: Thu, 6 Oct 2016 10:53:36 +0000 (UTC) archived-at: Thu, 06 Oct 2016 10:53:38 -0000 Repository: activemq Updated Branches: refs/heads/master c1e94c615 -> b6759b33d AMQ-6403 - init broker temp from provided temp store to align usage checks. Thanks for the patchh shailendra14k@gmail.com, made a mod to respect broker.tmpDataDirectory as a default. This closes #204 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b6759b33 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b6759b33 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b6759b33 Branch: refs/heads/master Commit: b6759b33dc5c67dd7c0deaf41abeaecff6f9afe7 Parents: c1e94c6 Author: gtully Authored: Thu Oct 6 11:47:55 2016 +0100 Committer: gtully Committed: Thu Oct 6 11:47:55 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/activemq/broker/BrokerService.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/b6759b33/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java index 19910a5..5145a2e 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -1772,6 +1772,13 @@ public class BrokerService implements Service { */ public void setTempDataStore(PListStore tempDataStore) { this.tempDataStore = tempDataStore; + if (tempDataStore != null) { + if (tmpDataDirectory == null) { + tmpDataDirectory = tempDataStore.getDirectory(); + } else if (tempDataStore.getDirectory() == null) { + tempDataStore.setDirectory(tmpDataDirectory); + } + } configureService(tempDataStore); }