diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-09-08 12:32:50 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-09-08 12:32:50 +0000 |
| commit | e1fea178b285b0ce8c302443f3a8cc69950eca36 (patch) | |
| tree | 858bc35f20ad1c0d8a99c962f0851d2b1190265a | |
| parent | f69a14cb6de1e43d03e7c478c4c181553ef6ecb0 (diff) | |
| download | qpid-python-e1fea178b285b0ce8c302443f3a8cc69950eca36.tar.gz | |
QPID-6080 : Merged revision 1622968 from trunk to 0.30
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1623376 13f79535-47bb-0310-9956-ffa450edef68
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 78cddc708e..0c8a9dc2c9 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 @@ -1330,7 +1330,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore } else { - data = new byte[0]; + return null; } } 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 d0acf1a46f..71754b21c9 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 @@ -1561,7 +1561,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore } else { - data = new byte[0]; + return null; } } return ByteBuffer.wrap(data,offsetInMessage,Math.min(size,data.length-offsetInMessage)); |