summaryrefslogtreecommitdiff
path: root/qpid/java/bdbstore/src
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2014-06-09 08:35:17 +0000
committerAlex Rudyy <orudyy@apache.org>2014-06-09 08:35:17 +0000
commit695c1a6f9986e6118b553d541299117c5ccdf6ad (patch)
tree919c553447d274063e7e3e21c60d439c2eb35858 /qpid/java/bdbstore/src
parentb6249df102d7bd6e43bba2cdc5e8e6d333f1c8b1 (diff)
downloadqpid-python-695c1a6f9986e6118b553d541299117c5ccdf6ad.tar.gz
QPID-5715: Close committer on message store close
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1601323 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore/src')
-rw-r--r--qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java2
-rw-r--r--qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
index ca32ffaa73..6ff4072d20 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
@@ -712,7 +712,7 @@ public class BDBConfigurationStore implements MessageStoreProvider, DurableConfi
{
if (_committer != null)
{
- _committer.stop();
+ _committer.close();
}
}
finally
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
index cf76d13f2a..c76f4ff2db 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
@@ -50,7 +50,9 @@ public class CoalescingCommiter implements Committer
@Override
public Thread newThread(Runnable r)
{
- return new Thread(r, "Commit-Thread-" + name);
+ Thread t = new Thread(r, "Commit-Thread-" + name);
+ t.setDaemon(true);
+ return t;
}
});
}