Author: rgodfrey
Date: Sun Apr 12 09:52:52 2015
New Revision: 1672997
URL: http://svn.apache.org/r1672997
Log:
QPID-6476 : Fix InternalMessage implementation so it can be stored
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java?rev=1672997&r1=1672996&r2=1672997&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java
Sun Apr 12 09:52:52 2015
@@ -131,6 +131,7 @@ public class InternalMessage extends Abs
try (ObjectOutputStream os = new ObjectOutputStream(bytesOut))
{
os.writeObject(bodyObject);
+ os.close();
byte[] bytes = bytesOut.toByteArray();
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java?rev=1672997&r1=1672996&r2=1672997&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java
Sun Apr 12 09:52:52 2015
@@ -49,6 +49,7 @@ public class InternalMessageMetaData imp
{
os.writeInt(contentSize);
os.writeObject(header);
+ os.close();
_headerBytes = bytesOut.toByteArray();
}
catch (IOException e)
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=1672997&r1=1672996&r2=1672997&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
Sun Apr 12 09:52:52 2015
@@ -1973,7 +1973,7 @@ public abstract class AbstractJDBCMessag
ByteBuffer buf = ByteBuffer.wrap(dataAsBytes);
buf.position(1);
buf = buf.slice();
- MessageMetaDataType<?> type =
MessageMetaDataTypeRegistry.fromOrdinal(dataAsBytes[0]);
+ MessageMetaDataType<?> type =
MessageMetaDataTypeRegistry.fromOrdinal(((int)dataAsBytes[0]) &0xff);
StorableMessageMetaData metaData =
type.createMetaData(buf);
StoredJDBCMessage message = new
StoredJDBCMessage(messageId, metaData, true);
if (!handler.handle(message))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
