diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-15 15:09:23 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-15 15:09:23 +0000 |
| commit | 8043f729a31d5ecb5d7b6ead4a84281166a55a6a (patch) | |
| tree | 920b6979909fa6b4bdff4415de73af2e48b3aa50 /qpid/java | |
| parent | 1ff3713e888cb54ffe3f7e3b7077742669034883 (diff) | |
| download | qpid-python-8043f729a31d5ecb5d7b6ead4a84281166a55a6a.tar.gz | |
QPID-6005 : [Java Broker] AMQP 1.0 messages cannot be recovered from the store on restart
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618206 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 2 insertions, 2 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 835846a5ec..78cddc708e 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 @@ -1333,7 +1333,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore data = new byte[0]; } } - return ByteBuffer.wrap(data,offsetInMessage,size); + return ByteBuffer.wrap(data,offsetInMessage,Math.min(size,data.length-offsetInMessage)); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java index 57142e6e1f..d0acf1a46f 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java @@ -1564,7 +1564,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore data = new byte[0]; } } - return ByteBuffer.wrap(data,offsetInMessage,size); + return ByteBuffer.wrap(data,offsetInMessage,Math.min(size,data.length-offsetInMessage)); } |