diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-02-07 16:57:49 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-02-07 16:57:49 +0000 |
| commit | 65b1a1ddfe95b9e273d4cdaf23067a0aaff9b1d1 (patch) | |
| tree | 427d5ce851b9336fea70eb8fc6f87135ad239065 /qpid/java/bdbstore/src | |
| parent | 3ab4f9bdc9bbc8375534f45022a02257eb6e030d (diff) | |
| download | qpid-python-65b1a1ddfe95b9e273d4cdaf23067a0aaff9b1d1.tar.gz | |
QPID-5504 : Refactoring to allow for nodes other than queues to be subscribed from, and nodes other than exchanges to be sent to (merged from separate branch)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1565726 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore/src')
3 files changed, 16 insertions, 4 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java index 6925c9ee2b..e0a79fa1c1 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java @@ -69,7 +69,7 @@ public class MessageMetaDataBinding extends TupleBinding<StorableMessageMetaData buf.position(1); buf = buf.slice(); - metaData.writeToBuffer(0, buf); + metaData.writeToBuffer(buf); tupleOutput.writeInt(bodySize); tupleOutput.writeFast(underlying); } diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java index e543cfb719..8fb011152c 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java @@ -73,7 +73,7 @@ public class PreparedTransactionBinding extends TupleBinding<PreparedTransaction output.writeInt(records.length); for(Transaction.Record record : records) { - UUID id = record.getQueue().getId(); + UUID id = record.getResource().getId(); output.writeLong(id.getMostSignificantBits()); output.writeLong(id.getLeastSignificantBits()); output.writeLong(record.getMessage().getMessageNumber()); @@ -93,7 +93,7 @@ public class PreparedTransactionBinding extends TupleBinding<PreparedTransaction _queueId = queueId; } - public TransactionLogResource getQueue() + public TransactionLogResource getResource() { return this; } @@ -119,9 +119,21 @@ public class PreparedTransactionBinding extends TupleBinding<PreparedTransaction } @Override + public String getName() + { + return _queueId.toString(); + } + + @Override public UUID getId() { return _queueId; } + + @Override + public boolean isDurable() + { + return true; + } } } diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java index 9d52241c4c..14793cbfd3 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java @@ -741,7 +741,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade buf.position(1); buf = buf.slice(); - metaData.writeToBuffer(0, buf); + metaData.writeToBuffer(buf); output.writeInt(bodySize); output.writeFast(underlying); } |