svn commit: r1488354 - in /activemq/trunk/activemq-client/src/main/java/org/apache/activemq: command/MessageId.java openwire/v10/MessageIdMarshaller.java

[chirino]

Author: chirino
Date: Fri May 31 18:53:56 2013
New Revision: 1488354

URL: http://svn.apache.org/r1488354
Log:
Part of AMQ-4563: Include the textView as part of the persisted fields in 
OpenWire 10.

Modified:
    
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
    
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/openwire/v10/MessageIdMarshaller.java

Modified: 
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java?rev=1488354&r1=1488353&r2=1488354&view=diff
==============================================================================
--- 
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
 (original)
+++ 
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
 Fri May 31 18:53:56 2013
@@ -87,6 +87,7 @@ public class MessageId implements DataSt
     }
 
     /**
+     * @openwire:property version=10
      * @return
      */
     public String getTextView() {

Modified: 
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/openwire/v10/MessageIdMarshaller.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/openwire/v10/MessageIdMarshaller.java?rev=1488354&r1=1488353&r2=1488354&view=diff
==============================================================================
--- 
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/openwire/v10/MessageIdMarshaller.java
 (original)
+++ 
activemq/trunk/activemq-client/src/main/java/org/apache/activemq/openwire/v10/MessageIdMarshaller.java
 Fri May 31 18:53:56 2013
@@ -66,6 +66,7 @@ public class MessageIdMarshaller extends
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageId info = (MessageId)o;
+        info.setTextView(tightUnmarshalString(dataIn, bs));
         info.setProducerId((org.apache.activemq.command.ProducerId) 
tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
@@ -81,6 +82,7 @@ public class MessageIdMarshaller extends
         MessageId info = (MessageId)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalString1(info.getTextView(), bs);
         rc += tightMarshalCachedObject1(wireFormat, 
(DataStructure)info.getProducerId(), bs);
         rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs);
         rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs);
@@ -99,6 +101,7 @@ public class MessageIdMarshaller extends
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageId info = (MessageId)o;
+        tightMarshalString2(info.getTextView(), dataOut, bs);
         tightMarshalCachedObject2(wireFormat, 
(DataStructure)info.getProducerId(), dataOut, bs);
         tightMarshalLong2(wireFormat, info.getProducerSequenceId(), dataOut, 
bs);
         tightMarshalLong2(wireFormat, info.getBrokerSequenceId(), dataOut, bs);
@@ -116,6 +119,7 @@ public class MessageIdMarshaller extends
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageId info = (MessageId)o;
+        info.setTextView(looseUnmarshalString(dataIn));
         info.setProducerId((org.apache.activemq.command.ProducerId) 
looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
         info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
@@ -131,6 +135,7 @@ public class MessageIdMarshaller extends
         MessageId info = (MessageId)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
+        looseMarshalString(info.getTextView(), dataOut);
         looseMarshalCachedObject(wireFormat, 
(DataStructure)info.getProducerId(), dataOut);
         looseMarshalLong(wireFormat, info.getProducerSequenceId(), dataOut);
         looseMarshalLong(wireFormat, info.getBrokerSequenceId(), dataOut);