You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2007/07/30 18:07:18 UTC

svn commit: r561028 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java

Author: rajdavies
Date: Mon Jul 30 09:07:17 2007
New Revision: 561028

URL: http://svn.apache.org/viewvc?view=rev&rev=561028
Log:
added support for properties brokerInTime and brokerOutTime

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java?view=diff&rev=561028&r1=561027&r2=561028
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java Mon Jul 30 09:07:17 2007
@@ -103,6 +103,8 @@
         else {
             info.setCluster(null);
         }
+        info.setBrokerInTime(tightUnmarshalLong(wireFormat, dataIn, bs));
+        info.setBrokerOutTime(tightUnmarshalLong(wireFormat, dataIn, bs));
 
         info.afterUnmarshall(wireFormat);
 
@@ -143,6 +145,8 @@
         bs.writeBoolean(info.isRecievedByDFBridge());
         bs.writeBoolean(info.isDroppable());
         rc += tightMarshalObjectArray1(wireFormat, info.getCluster(), bs);
+        rc+=tightMarshalLong1(wireFormat, info.getBrokerInTime(), bs);
+        rc+=tightMarshalLong1(wireFormat, info.getBrokerOutTime(), bs);
 
         return rc + 9;
     }
@@ -185,6 +189,8 @@
         bs.readBoolean();
         bs.readBoolean();
         tightMarshalObjectArray2(wireFormat, info.getCluster(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getBrokerInTime(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getBrokerOutTime(), dataOut, bs);
 
         info.afterMarshall(wireFormat);
 
@@ -253,6 +259,8 @@
         else {
             info.setCluster(null);
         }
+        info.setBrokerInTime(looseUnmarshalLong(wireFormat, dataIn));
+        info.setBrokerOutTime(looseUnmarshalLong(wireFormat, dataIn));
 
         info.afterUnmarshall(wireFormat);
 
@@ -296,6 +304,8 @@
         dataOut.writeBoolean(info.isRecievedByDFBridge());
         dataOut.writeBoolean(info.isDroppable());
         looseMarshalObjectArray(wireFormat, info.getCluster(), dataOut);
+        looseMarshalLong(wireFormat, info.getBrokerInTime(), dataOut);
+        looseMarshalLong(wireFormat, info.getBrokerOutTime(), dataOut);
 
     }
 }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java?view=diff&rev=561028&r1=561027&r2=561028
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java Mon Jul 30 09:07:17 2007
@@ -88,5 +88,7 @@
             }
             info.setCluster(value);
         }
+        info.setBrokerInTime(4);
+        info.setBrokerOutTime(5);
     }
 }