| commit | 6c2d47111003763d0f81cab83e1e7d24544dd852 | [log] [tgz] |
|---|---|---|
| author | Alex Rudyy <orudyy@apache.org> | Tue Jan 20 18:03:19 2015 +0000 |
| committer | Alex Rudyy <orudyy@apache.org> | Tue Jan 20 18:03:19 2015 +0000 |
| tree | 9cf31b4221f759bf433fe30d87e47c94cb668bd8 | |
| parent | b5df74c2a2b4b62783f05b8801a5d0233dda5791 [diff] |
QPID-6259: Fix stopping of BDB committer from committer thread git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1653320 13f79535-47bb-0310-9956-ffa450edef68
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 ff383ec..9643358 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,14 +50,17 @@ public void stop() { _commitThread.close(); - try + if (Thread.currentThread() != _commitThread) { - _commitThread.join(); - } - catch (InterruptedException ie) - { - Thread.currentThread().interrupt(); - throw new RuntimeException("Commit thread has not shutdown", ie); + try + { + _commitThread.join(); + } + catch (InterruptedException ie) + { + Thread.currentThread().interrupt(); + throw new RuntimeException("Commit thread has not shutdown", ie); + } } }