Author: chirino
Date: Tue Dec 20 10:07:04 2005
New Revision: 358058
URL: http://svn.apache.org/viewcvs?rev=358058&view=rev
Log:
updated marshallers.
Modified:
incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c?rev=358058&r1=358057&r2=358058&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
(original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c Tue
Dec 20 10:07:04 2005
@@ -553,6 +553,7 @@
SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath));
ow_marshal1_long(buffer, object->arrival);
ow_marshal1_string(buffer, object->userID);
+ ow_bit_buffer_append(buffer, object->recievedByDFBridge);
return APR_SUCCESS;
}
@@ -583,6 +584,7 @@
SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer,
object->brokerPath));
SUCCESS_CHECK(ow_marshal2_long(buffer, bitbuffer, object->arrival));
SUCCESS_CHECK(ow_marshal2_string(buffer, bitbuffer, object->userID));
+ ow_bit_buffer_read(bitbuffer);
return APR_SUCCESS;
}
@@ -614,6 +616,7 @@
SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer,
&object->brokerPath, pool));
SUCCESS_CHECK(ow_unmarshal_long(buffer, bitbuffer, &object->arrival, pool));
SUCCESS_CHECK(ow_unmarshal_string(buffer, bitbuffer, &object->userID,
pool));
+ object->recievedByDFBridge = ow_bit_buffer_read(bitbuffer);
return APR_SUCCESS;
}
@@ -913,6 +916,7 @@
ow_bit_buffer_append(buffer, object->retroactive);
SUCCESS_CHECK(ow_marshal1_DataStructure_array(buffer, object->brokerPath));
+ ow_bit_buffer_append(buffer, object->networkSubscription);
return APR_SUCCESS;
}
@@ -931,6 +935,7 @@
ow_bit_buffer_read(bitbuffer);
SUCCESS_CHECK(ow_byte_buffer_append_byte(buffer, object->priority));
SUCCESS_CHECK(ow_marshal2_DataStructure_array(buffer, bitbuffer,
object->brokerPath));
+ ow_bit_buffer_read(bitbuffer);
return APR_SUCCESS;
}
@@ -950,6 +955,7 @@
object->retroactive = ow_bit_buffer_read(bitbuffer);
SUCCESS_CHECK(ow_byte_array_read_byte(buffer, &object->priority));
SUCCESS_CHECK(ow_unmarshal_DataStructure_array(buffer, bitbuffer,
&object->brokerPath, pool));
+ object->networkSubscription = ow_bit_buffer_read(bitbuffer);
return APR_SUCCESS;
}
Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h?rev=358058&r1=358057&r2=358058&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
(original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h Tue
Dec 20 10:07:04 2005
@@ -166,6 +166,7 @@
ow_DataStructure_array *brokerPath;
ow_long arrival;
ow_string *userID;
+ ow_boolean recievedByDFBridge;
} ow_Message;
ow_Message *ow_Message_create(apr_pool_t *pool);
@@ -248,6 +249,7 @@
ow_boolean retroactive;
ow_byte priority;
ow_DataStructure_array *brokerPath;
+ ow_boolean networkSubscription;
} ow_ConsumerInfo;
ow_ConsumerInfo *ow_ConsumerInfo_create(apr_pool_t *pool);
@@ -403,6 +405,7 @@
ow_DataStructure_array *brokerPath;
ow_long arrival;
ow_string *userID;
+ ow_boolean recievedByDFBridge;
} ow_ActiveMQMessage;
ow_ActiveMQMessage *ow_ActiveMQMessage_create(apr_pool_t *pool);
@@ -533,6 +536,7 @@
ow_DataStructure_array *brokerPath;
ow_long arrival;
ow_string *userID;
+ ow_boolean recievedByDFBridge;
} ow_ActiveMQStreamMessage;
ow_ActiveMQStreamMessage *ow_ActiveMQStreamMessage_create(apr_pool_t *pool);
@@ -606,6 +610,7 @@
ow_DataStructure_array *brokerPath;
ow_long arrival;
ow_string *userID;
+ ow_boolean recievedByDFBridge;
} ow_ActiveMQBytesMessage;
ow_ActiveMQBytesMessage *ow_ActiveMQBytesMessage_create(apr_pool_t *pool);
@@ -640,6 +645,7 @@
ow_DataStructure_array *brokerPath;
ow_long arrival;
ow_string *userID;
+ ow_boolean recievedByDFBridge;
} ow_ActiveMQTextMessage;
ow_ActiveMQTextMessage *ow_ActiveMQTextMessage_create(apr_pool_t *pool);
@@ -674,6 +680,7 @@
ow_DataStructure_array *brokerPath;
ow_long arrival;
ow_string *userID;
+ ow_boolean recievedByDFBridge;
} ow_ActiveMQMapMessage;
ow_ActiveMQMapMessage *ow_ActiveMQMapMessage_create(apr_pool_t *pool);
@@ -731,6 +738,7 @@
ow_DataStructure_array *brokerPath;
ow_long arrival;
ow_string *userID;
+ ow_boolean recievedByDFBridge;
} ow_ActiveMQObjectMessage;
ow_ActiveMQObjectMessage *ow_ActiveMQObjectMessage_create(apr_pool_t *pool);
