You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/08/15 17:09:23 UTC
svn commit: r1618206 - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
Author: rgodfrey
Date: Fri Aug 15 15:09:23 2014
New Revision: 1618206
URL: http://svn.apache.org/r1618206
Log:
QPID-6005 : [Java Broker] AMQP 1.0 messages cannot be recovered from the store on restart
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1618206&r1=1618205&r2=1618206&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java Fri Aug 15 15:09:23 2014
@@ -1333,7 +1333,7 @@ public abstract class AbstractBDBMessage
data = new byte[0];
}
}
- return ByteBuffer.wrap(data,offsetInMessage,size);
+ return ByteBuffer.wrap(data,offsetInMessage,Math.min(size,data.length-offsetInMessage));
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1618206&r1=1618205&r2=1618206&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java Fri Aug 15 15:09:23 2014
@@ -1564,7 +1564,7 @@ public abstract class AbstractJDBCMessag
data = new byte[0];
}
}
- return ByteBuffer.wrap(data,offsetInMessage,size);
+ return ByteBuffer.wrap(data,offsetInMessage,Math.min(size,data.length-offsetInMessage));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org