diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-07-08 15:30:05 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-07-08 15:30:05 +0000 |
| commit | 6ae5f5b800431c13e46ce3c1beff038834604688 (patch) | |
| tree | e9d2c41161a36940046d9499a1d616f7182dad12 /qpid/java/bdbstore/src | |
| parent | 16a59fad4a73a52505cfb6ebe4ed2f6bf86f7e2c (diff) | |
| download | qpid-python-6ae5f5b800431c13e46ce3c1beff038834604688.tar.gz | |
QPID-3923, QPID-3998: split out the IDs used for QMF (which have a different format) from those for the new config model, make it clearer which is being used where
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1358759 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/AbstractBDBMessageStore.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java index 3eeac71ebf..a812436f34 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java @@ -945,7 +945,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore if (_stateManager.isInState(State.ACTIVE)) { DatabaseEntry key = new DatabaseEntry(); - UUIDTupleBinding.getInstance().objectToEntry(link.getId(), key); + UUIDTupleBinding.getInstance().objectToEntry(link.getQMFId(), key); DatabaseEntry value = new DatabaseEntry(); LongBinding.longToEntry(link.getCreateTime(), value); @@ -966,7 +966,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore public void deleteBrokerLink(final BrokerLink link) throws AMQStoreException { DatabaseEntry key = new DatabaseEntry(); - UUIDTupleBinding.getInstance().objectToEntry(link.getId(), key); + UUIDTupleBinding.getInstance().objectToEntry(link.getQMFId(), key); try { OperationStatus status = _linkDb.delete(null, key); @@ -986,10 +986,10 @@ public abstract class AbstractBDBMessageStore implements MessageStore if (_stateManager.isInState(State.ACTIVE)) { DatabaseEntry key = new DatabaseEntry(); - UUIDTupleBinding.getInstance().objectToEntry(bridge.getId(), key); + UUIDTupleBinding.getInstance().objectToEntry(bridge.getQMFId(), key); DatabaseEntry value = new DatabaseEntry(); - UUIDTupleBinding.getInstance().objectToEntry(bridge.getLink().getId(),value); + UUIDTupleBinding.getInstance().objectToEntry(bridge.getLink().getQMFId(),value); LongBinding.longToEntry(bridge.getCreateTime(),value); StringMapBinding.getInstance().objectToEntry(bridge.getArguments(), value); @@ -1009,7 +1009,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore public void deleteBridge(final Bridge bridge) throws AMQStoreException { DatabaseEntry key = new DatabaseEntry(); - UUIDTupleBinding.getInstance().objectToEntry(bridge.getId(), key); + UUIDTupleBinding.getInstance().objectToEntry(bridge.getQMFId(), key); try { OperationStatus status = _bridgeDb.delete(null, key); |