diff options
| author | Keith Wall <kwall@apache.org> | 2014-02-01 00:35:06 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-02-01 00:35:06 +0000 |
| commit | a65175f3f958e10a39cfee4c2bc071aaada7d2e8 (patch) | |
| tree | d06cbde4dc415b93e4aa9812b30accf05284fe78 | |
| parent | 56a2b3e0eb0d72fab2e9546e9473c76fa19d14a7 (diff) | |
| download | qpid-python-a65175f3f958e10a39cfee4c2bc071aaada7d2e8.tar.gz | |
QPID-5211: Broker logs spurious "No valid transition..." - merge second change from trunk.
svn merge -c 1562452 https://svn.apache.org/repos/asf/qpid/trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1563358 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 11 insertions, 7 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java index 3abf083026..e2078ba288 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java @@ -133,9 +133,11 @@ abstract public class AbstractMemoryMessageStore extends NullMessageStore @Override public void close() throws Exception { - _stateManager.attainState(State.CLOSING); - _closed.getAndSet(true); - _stateManager.attainState(State.CLOSED); + if (_closed.compareAndSet(false, true)) + { + _stateManager.attainState(State.CLOSING); + _stateManager.attainState(State.CLOSED); + } } @Override diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java index e19aeb38e7..ee92095b3f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java @@ -154,9 +154,11 @@ public class @Override public void close() throws Exception { - _stateManager.attainState(State.CLOSING); - _closed.getAndSet(true); - _stateManager.attainState(State.CLOSED); + if (_closed.compareAndSet(false, true)) + { + _stateManager.attainState(State.CLOSING); + _stateManager.attainState(State.CLOSED); + } } @Override diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java index 182cd5ff0c..74afbf7903 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java @@ -57,7 +57,7 @@ public class SyncWaitDelayTest extends QpidBrokerTestCase final String prefix = "virtualhosts.virtualhost." + VIRTUALHOST; setVirtualHostConfigurationProperty(prefix + ".type", StandardVirtualHostFactory.TYPE); - setVirtualHostConfigurationProperty(prefix + ".store.class", "org.apache.qpid.server.store.SlowMessageStore"); + setVirtualHostConfigurationProperty(prefix + ".store.class", org.apache.qpid.server.store.SlowMessageStore.class.getName()); setVirtualHostConfigurationProperty(prefix + ".store.delays.commitTran.post", String.valueOf(POST_COMMIT_DELAY)); super.setUp(); |