Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp Sun Nov 12 16:46:23 2006 @@ -32,7 +32,7 @@ using namespace activemq::connector::openwire; using namespace activemq::connector::openwire::commands; using namespace activemq::connector::openwire::marshal; -using namespace activemq::connector::openwire::util; +using namespace activemq::connector::openwire::utils; using namespace activemq::connector::openwire::marshal::v2; /////////////////////////////////////////////////////////////////////////////// @@ -46,81 +46,63 @@ } /////////////////////////////////////////////////////////////////////////////// -void TransactionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) { +void TransactionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){ BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs ); TransactionInfo* info = dynamic_cast<TransactionInfo*>( dataStructure ); info->setConnectionId( dynamic_cast< ConnectionId* >( - tightUnmarsalCachedObject( wireFormat, dataIn, bs ) ); + tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ); info->setTransactionId( dynamic_cast< TransactionId* >( - tightUnmarsalCachedObject( wireFormat, dataIn, bs ) ); + tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) ); info->setType( dataIn->readByte() ); } /////////////////////////////////////////////////////////////////////////////// -int TransactionInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) { +int TransactionInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){ TransactionInfo* info = dynamic_cast<TransactionInfo*>( dataStructure ); int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs ); - DataStructure* data = - dynamic_cast< DataStructure* >( info->getConnectionId() ); - - rc += tightMarshalCachedObject1( wireFormat, data, bs ); - DataStructure* data = - dynamic_cast< DataStructure* >( info->getTransactionId() ); - - rc += tightMarshalCachedObject1( wireFormat, data, bs ); + rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId(), bs ); + rc += tightMarshalCachedObject1( wireFormat, info->getTransactionId(), bs ); return rc + 1; } /////////////////////////////////////////////////////////////////////////////// -void TransactionInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) { +void TransactionInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){ BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs ); TransactionInfo* info = dynamic_cast<TransactionInfo*>( dataStructure ); - DataStructure* data = - dynamic_cast< DataStructure* >( info->getConnectionId() ); - - tightMarshalCachedObject2( wireFormat, data, dataOut, bs ); - DataStructure* data = - dynamic_cast< DataStructure* >( info->getTransactionId() ); - - tightMarshalCachedObject2( wireFormat, data, dataOut, bs ); + tightMarshalCachedObject2( wireFormat, info->getConnectionId(), dataOut, bs ); + tightMarshalCachedObject2( wireFormat, info->getTransactionId(), dataOut, bs ); dataOut->write( info->getType() ); } /////////////////////////////////////////////////////////////////////////////// -void TransactionInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) { +void TransactionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){ BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn ); TransactionInfo* info = dynamic_cast<TransactionInfo*>( dataStructure ); - info->setConnectionId( dynamic_cast<ConnectionId* >( - looseUnmarshalCachedObject( wireFormat, dataIn ) ) ); - info->setTransactionId( dynamic_cast<TransactionId* >( - looseUnmarshalCachedObject( wireFormat, dataIn ) ) ); + info->setConnectionId( dynamic_cast< ConnectionId* >( + looseUnmarshalCachedObject( wireFormat, dataIn ) ) ); + info->setTransactionId( dynamic_cast< TransactionId* >( + looseUnmarshalCachedObject( wireFormat, dataIn ) ) ); info->setType( dataIn->readByte() ); } /////////////////////////////////////////////////////////////////////////////// -void TransactionInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) { +void TransactionInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){ TransactionInfo* info = dynamic_cast<TransactionInfo*>( dataStructure ); BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut ); - DataStructure* data = - dynamic_cast< DataStructure* >( info->getConnectionId() ); - - looseMarshalCachedObject( wireFormat, data, dataOut ); - DataStructure* data = - dynamic_cast< DataStructure* >( info->getTransactionId() ); - - looseMarshalCachedObject( wireFormat, data, dataOut ); + looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut ); + looseMarshalCachedObject( wireFormat, info->getTransactionId(), dataOut ); dataOut->write( info->getType() ); }
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.h Sun Nov 12 16:46:23 2006 @@ -23,13 +23,14 @@ #pragma warning( disable : 4290 ) #endif -#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h> +#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h> #include <activemq/io/DataInputStream.h> #include <activemq/io/DataOutputStream.h> #include <activemq/io/IOException.h> +#include <activemq/connector/openwire/OpenWireFormat.h> #include <activemq/connector/openwire/commands/DataStructure.h> -#include <activemq/connector/openwire/util/BooleanStream.h> +#include <activemq/connector/openwire/utils/BooleanStream.h> namespace activemq{ namespace connector{ @@ -55,7 +56,7 @@ * Creates a new instance of this marshalable type. * @return new DataStructure object pointer caller owns it. */ - virtual DataStructure* createObject() const; + virtual commands::DataStructure* createObject() const; /** * Get the Data Structure Type that identifies this Marshaller @@ -73,7 +74,7 @@ virtual void tightUnmarshal( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, io::DataInputStream* dataIn, - util::BooleanStream* bs ) throws( io::IOException ); + utils::BooleanStream* bs ) throw( io::IOException ); /** * Write the booleans that this object uses to a BooleanStream @@ -84,7 +85,7 @@ */ virtual int tightMarshal1( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, - BooleanStream* bs ) throws( io::IOException ); + utils::BooleanStream* bs ) throw( io::IOException ); /** * Write a object instance to data output stream @@ -96,7 +97,7 @@ virtual void tightMarshal2( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, io::DataOutputStream* dataOut, - BooleanStream* bs ) throws( io::IOException ); + utils::BooleanStream* bs ) throw( io::IOException ); /** * Un-marshal an object instance from the data input stream @@ -106,7 +107,7 @@ */ virtual void looseUnmarshal( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, - io::DataInputStream* dataIn ) throws( io::IOException ); + io::DataInputStream* dataIn ) throw( io::IOException ); /** * Write a object instance to data output stream @@ -116,7 +117,7 @@ */ virtual void looseMarshal( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, - io::DataOutputStream* dataOut ) throws( io::IOException ); + io::DataOutputStream* dataOut ) throw( io::IOException ); }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp Sun Nov 12 16:46:23 2006 @@ -32,7 +32,7 @@ using namespace activemq::connector::openwire; using namespace activemq::connector::openwire::commands; using namespace activemq::connector::openwire::marshal; -using namespace activemq::connector::openwire::util; +using namespace activemq::connector::openwire::utils; using namespace activemq::connector::openwire::marshal::v2; /////////////////////////////////////////////////////////////////////////////// @@ -46,7 +46,7 @@ } /////////////////////////////////////////////////////////////////////////////// -void WireFormatInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) { +void WireFormatInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){ BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs ); WireFormatInfo* info = @@ -61,7 +61,7 @@ } /////////////////////////////////////////////////////////////////////////////// -int WireFormatInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) { +int WireFormatInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){ WireFormatInfo* info = dynamic_cast<WireFormatInfo*>( dataStructure ); @@ -75,7 +75,7 @@ } /////////////////////////////////////////////////////////////////////////////// -void WireFormatInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) { +void WireFormatInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){ BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs ); @@ -91,7 +91,7 @@ } /////////////////////////////////////////////////////////////////////////////// -void WireFormatInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) { +void WireFormatInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){ BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn ); WireFormatInfo* info = dynamic_cast<WireFormatInfo*>( dataStructure ); @@ -103,7 +103,7 @@ } /////////////////////////////////////////////////////////////////////////////// -void WireFormatInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) { +void WireFormatInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){ WireFormatInfo* info = dynamic_cast<WireFormatInfo*>( dataStructure ); info->beforeMarshall( wireFormat ); Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.h Sun Nov 12 16:46:23 2006 @@ -23,13 +23,14 @@ #pragma warning( disable : 4290 ) #endif -#include <activemq/connector/openwire/marshal/V2/BaseDataStreamMarshaller.h> +#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h> #include <activemq/io/DataInputStream.h> #include <activemq/io/DataOutputStream.h> #include <activemq/io/IOException.h> +#include <activemq/connector/openwire/OpenWireFormat.h> #include <activemq/connector/openwire/commands/DataStructure.h> -#include <activemq/connector/openwire/util/BooleanStream.h> +#include <activemq/connector/openwire/utils/BooleanStream.h> namespace activemq{ namespace connector{ @@ -55,7 +56,7 @@ * Creates a new instance of this marshalable type. * @return new DataStructure object pointer caller owns it. */ - virtual DataStructure* createObject() const; + virtual commands::DataStructure* createObject() const; /** * Get the Data Structure Type that identifies this Marshaller @@ -73,7 +74,7 @@ virtual void tightUnmarshal( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, io::DataInputStream* dataIn, - util::BooleanStream* bs ) throws( io::IOException ); + utils::BooleanStream* bs ) throw( io::IOException ); /** * Write the booleans that this object uses to a BooleanStream @@ -84,7 +85,7 @@ */ virtual int tightMarshal1( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, - BooleanStream* bs ) throws( io::IOException ); + utils::BooleanStream* bs ) throw( io::IOException ); /** * Write a object instance to data output stream @@ -96,7 +97,7 @@ virtual void tightMarshal2( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, io::DataOutputStream* dataOut, - BooleanStream* bs ) throws( io::IOException ); + utils::BooleanStream* bs ) throw( io::IOException ); /** * Un-marshal an object instance from the data input stream @@ -106,7 +107,7 @@ */ virtual void looseUnmarshal( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, - io::DataInputStream* dataIn ) throws( io::IOException ); + io::DataInputStream* dataIn ) throw( io::IOException ); /** * Write a object instance to data output stream @@ -116,7 +117,7 @@ */ virtual void looseMarshal( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, - io::DataOutputStream* dataOut ) throws( io::IOException ); + io::DataOutputStream* dataOut ) throw( io::IOException ); }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp Sun Nov 12 16:46:23 2006 @@ -32,7 +32,7 @@ using namespace activemq::connector::openwire; using namespace activemq::connector::openwire::commands; using namespace activemq::connector::openwire::marshal; -using namespace activemq::connector::openwire::util; +using namespace activemq::connector::openwire::utils; using namespace activemq::connector::openwire::marshal::v2; /////////////////////////////////////////////////////////////////////////////// @@ -46,7 +46,7 @@ } /////////////////////////////////////////////////////////////////////////////// -void XATransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) { +void XATransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){ TransactionIdMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs ); XATransactionId* info = @@ -57,7 +57,7 @@ } /////////////////////////////////////////////////////////////////////////////// -int XATransactionIdMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) { +int XATransactionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){ XATransactionId* info = dynamic_cast<XATransactionId*>( dataStructure ); @@ -72,7 +72,7 @@ } /////////////////////////////////////////////////////////////////////////////// -void XATransactionIdMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) { +void XATransactionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){ TransactionIdMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs ); @@ -90,7 +90,7 @@ } /////////////////////////////////////////////////////////////////////////////// -void XATransactionIdMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) { +void XATransactionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){ TransactionIdMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn ); XATransactionId* info = dynamic_cast<XATransactionId*>( dataStructure ); @@ -100,7 +100,7 @@ } /////////////////////////////////////////////////////////////////////////////// -void XATransactionIdMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) { +void XATransactionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){ XATransactionId* info = dynamic_cast<XATransactionId*>( dataStructure ); TransactionIdMarshaller::looseMarshal( wireFormat, dataStructure, dataOut ); Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.h Sun Nov 12 16:46:23 2006 @@ -23,13 +23,14 @@ #pragma warning( disable : 4290 ) #endif -#include <activemq/connector/openwire/marshal/V2/TransactionIdMarshaller.h> +#include <activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h> #include <activemq/io/DataInputStream.h> #include <activemq/io/DataOutputStream.h> #include <activemq/io/IOException.h> +#include <activemq/connector/openwire/OpenWireFormat.h> #include <activemq/connector/openwire/commands/DataStructure.h> -#include <activemq/connector/openwire/util/BooleanStream.h> +#include <activemq/connector/openwire/utils/BooleanStream.h> namespace activemq{ namespace connector{ @@ -55,7 +56,7 @@ * Creates a new instance of this marshalable type. * @return new DataStructure object pointer caller owns it. */ - virtual DataStructure* createObject() const; + virtual commands::DataStructure* createObject() const; /** * Get the Data Structure Type that identifies this Marshaller @@ -73,7 +74,7 @@ virtual void tightUnmarshal( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, io::DataInputStream* dataIn, - util::BooleanStream* bs ) throws( io::IOException ); + utils::BooleanStream* bs ) throw( io::IOException ); /** * Write the booleans that this object uses to a BooleanStream @@ -84,7 +85,7 @@ */ virtual int tightMarshal1( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, - BooleanStream* bs ) throws( io::IOException ); + utils::BooleanStream* bs ) throw( io::IOException ); /** * Write a object instance to data output stream @@ -96,7 +97,7 @@ virtual void tightMarshal2( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, io::DataOutputStream* dataOut, - BooleanStream* bs ) throws( io::IOException ); + utils::BooleanStream* bs ) throw( io::IOException ); /** * Un-marshal an object instance from the data input stream @@ -106,7 +107,7 @@ */ virtual void looseUnmarshal( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, - io::DataInputStream* dataIn ) throws( io::IOException ); + io::DataInputStream* dataIn ) throw( io::IOException ); /** * Write a object instance to data output stream @@ -116,7 +117,7 @@ */ virtual void looseMarshal( OpenWireFormat* wireFormat, commands::DataStructure* dataStructure, - io::DataOutputStream* dataOut ) throws( io::IOException ); + io::DataOutputStream* dataOut ) throw( io::IOException ); };