You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2016/10/06 10:53:36 UTC
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
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 <ga...@gmail.com>
Authored: Thu Oct 6 11:47:55 2016 +0100
Committer: gtully <ga...@gmail.com>
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);
}