Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Part of AMQ-4563: Include the textView as part of the persisted fields in OpenWire 10. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1488354 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2013-05-31 18:53:56 +00:00
parent b2b4fc81f7
commit 34e8331829
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
View File

@ -87,6 +87,7 @@ public class MessageId implements DataStructure, Comparable<MessageId> {
} }
/** /**
* @openwire:property version=10
* @return * @return
*/ */
public String getTextView() { public String getTextView() {

5
activemq-client/src/main/java/org/apache/activemq/openwire/v10/MessageIdMarshaller.java
View File

@ -66,6 +66,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
super.tightUnmarshal(wireFormat, o, dataIn, bs); super.tightUnmarshal(wireFormat, o, dataIn, bs);
MessageId info = (MessageId)o; MessageId info = (MessageId)o;
info.setTextView(tightUnmarshalString(dataIn, bs));
info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
@ -81,6 +82,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
MessageId info = (MessageId)o; MessageId info = (MessageId)o;
int rc = super.tightMarshal1(wireFormat, o, bs); int rc = super.tightMarshal1(wireFormat, o, bs);
rc += tightMarshalString1(info.getTextView(), bs);
rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs); rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs);
rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs); rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs);
@ -99,6 +101,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
super.tightMarshal2(wireFormat, o, dataOut, bs); super.tightMarshal2(wireFormat, o, dataOut, bs);
MessageId info = (MessageId)o; MessageId info = (MessageId)o;
tightMarshalString2(info.getTextView(), dataOut, bs);
tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
tightMarshalLong2(wireFormat, info.getProducerSequenceId(), dataOut, bs); tightMarshalLong2(wireFormat, info.getProducerSequenceId(), dataOut, bs);
tightMarshalLong2(wireFormat, info.getBrokerSequenceId(), dataOut, bs); tightMarshalLong2(wireFormat, info.getBrokerSequenceId(), dataOut, bs);
@ -116,6 +119,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
super.looseUnmarshal(wireFormat, o, dataIn); super.looseUnmarshal(wireFormat, o, dataIn);
MessageId info = (MessageId)o; MessageId info = (MessageId)o;
info.setTextView(looseUnmarshalString(dataIn));
info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn)); info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn)); info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
@ -131,6 +135,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller {
MessageId info = (MessageId)o; MessageId info = (MessageId)o;
super.looseMarshal(wireFormat, o, dataOut); super.looseMarshal(wireFormat, o, dataOut);
looseMarshalString(info.getTextView(), dataOut);
looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
looseMarshalLong(wireFormat, info.getProducerSequenceId(), dataOut); looseMarshalLong(wireFormat, info.getProducerSequenceId(), dataOut);
looseMarshalLong(wireFormat, info.getBrokerSequenceId(), dataOut); looseMarshalLong(wireFormat, info.getBrokerSequenceId(), dataOut);