activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r958724 [2/2] - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: util/ wireformat/ wireformat/openwire/ wireformat/openwire/marshal/ wireformat/openwire/utils/
Date Mon, 28 Jun 2010 20:52:29 GMT
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp Mon Jun 28 20:52:28 2010
@@ -93,8 +93,7 @@ OpenWireFormat::~OpenWireFormat() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Pointer<Transport> OpenWireFormat::createNegotiator( const Pointer<Transport>& transport )
-    throw( decaf::lang::exceptions::UnsupportedOperationException ) {
+Pointer<Transport> OpenWireFormat::createNegotiator( const Pointer<Transport>& transport ) {
 
     try{
         return Pointer<Transport>( new OpenWireFormatNegotiator( this, transport ) );
@@ -105,6 +104,7 @@ Pointer<Transport> OpenWireFormat::creat
 
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormat::destroyMarshalers() {
+
     try {
         for( size_t i = 0; i < dataMarshallers.size(); ++i ) {
             delete dataMarshallers[i];
@@ -116,7 +116,7 @@ void OpenWireFormat::destroyMarshalers()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void OpenWireFormat::setVersion( int version ) throw ( IllegalArgumentException ) {
+void OpenWireFormat::setVersion( int version ) {
 
     try{
 
@@ -145,17 +145,14 @@ void OpenWireFormat::addMarshaller( Data
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void OpenWireFormat::setPreferedWireFormatInfo(
-    const Pointer<commands::WireFormatInfo>& info ) throw ( IllegalStateException ) {
-
+void OpenWireFormat::setPreferedWireFormatInfo( const Pointer<commands::WireFormatInfo>& info ) {
     this->preferedWireFormatInfo = info;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormat::marshal( const Pointer<commands::Command>& command,
                               const activemq::transport::Transport* transport,
-                              decaf::io::DataOutputStream* dataOut )
-    throw ( decaf::io::IOException ) {
+                              decaf::io::DataOutputStream* dataOut ) {
 
     try {
 
@@ -240,8 +237,7 @@ void OpenWireFormat::marshal( const Poin
 
 ////////////////////////////////////////////////////////////////////////////////
 Pointer<commands::Command> OpenWireFormat::unmarshal( const activemq::transport::Transport* transport AMQCPP_UNUSED,
-                                                      decaf::io::DataInputStream* dis )
-    throw ( decaf::io::IOException ) {
+                                                      decaf::io::DataInputStream* dis ) {
 
     try {
 
@@ -278,8 +274,7 @@ Pointer<commands::Command> OpenWireForma
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-commands::DataStructure* OpenWireFormat::doUnmarshal( DataInputStream* dis )
-    throw ( IOException ) {
+commands::DataStructure* OpenWireFormat::doUnmarshal( DataInputStream* dis ) {
 
     try {
 
@@ -339,8 +334,7 @@ commands::DataStructure* OpenWireFormat:
 
 ////////////////////////////////////////////////////////////////////////////////
 int OpenWireFormat::tightMarshalNestedObject1( commands::DataStructure* object,
-                                               utils::BooleanStream* bs )
-    throw ( decaf::io::IOException ) {
+                                               utils::BooleanStream* bs ) {
 
     try {
 
@@ -386,8 +380,7 @@ int OpenWireFormat::tightMarshalNestedOb
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormat::tightMarshalNestedObject2( DataStructure* o,
                                                 DataOutputStream* ds,
-                                                BooleanStream* bs )
-                                                    throw ( IOException ) {
+                                                BooleanStream* bs ) {
 
     try {
 
@@ -427,8 +420,7 @@ void OpenWireFormat::tightMarshalNestedO
 
 ////////////////////////////////////////////////////////////////////////////////
 DataStructure* OpenWireFormat::tightUnmarshalNestedObject( DataInputStream* dis,
-                                                           BooleanStream* bs )
-    throw ( decaf::io::IOException ) {
+                                                           BooleanStream* bs ) {
 
     try {
 
@@ -472,8 +464,7 @@ DataStructure* OpenWireFormat::tightUnma
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* OpenWireFormat::looseUnmarshalNestedObject( decaf::io::DataInputStream* dis )
-    throw ( IOException ) {
+DataStructure* OpenWireFormat::looseUnmarshalNestedObject( decaf::io::DataInputStream* dis ) {
 
     try{
 
@@ -507,8 +498,7 @@ DataStructure* OpenWireFormat::looseUnma
 
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormat::looseMarshalNestedObject( commands::DataStructure* o,
-                                               decaf::io::DataOutputStream* dataOut )
-    throw ( decaf::io::IOException ) {
+                                               decaf::io::DataOutputStream* dataOut ) {
 
     try{
 
@@ -538,8 +528,7 @@ void OpenWireFormat::looseMarshalNestedO
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void OpenWireFormat::renegotiateWireFormat( const WireFormatInfo& info )
-    throw ( IllegalStateException ) {
+void OpenWireFormat::renegotiateWireFormat( const WireFormatInfo& info ) {
 
     if( preferedWireFormatInfo == NULL ) {
         throw IllegalStateException(

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.h Mon Jun 28 20:52:28 2010
@@ -91,22 +91,17 @@ namespace marshal {
         virtual ~OpenWireFormat();
 
         /**
-         * Returns true if this WireFormat has a Negotiator that needs to wrap the
-         * Transport that uses it.
-         * @returns true if the WireFormat provides a Negotiator.
+         * {@inheritDoc}
          */
         virtual bool hasNegotiator() const {
             return true;
         }
 
         /**
-         * If the Transport Provides a Negotiator this method will create and return
-         * a news instance of the Negotiator.
-         * @returns new instance of a WireFormatNegotiator.
+         * {@inheritDoc}
          */
         virtual Pointer<transport::Transport> createNegotiator(
-            const Pointer<transport::Transport>& transport )
-                throw( decaf::lang::exceptions::UnsupportedOperationException );
+            const Pointer<transport::Transport>& transport );
 
         /**
          * Allows an external source to add marshalers to this object for
@@ -116,35 +111,19 @@ namespace marshal {
         void addMarshaller( marshal::DataStreamMarshaller* marshaler );
 
         /**
-         * Stream based marshaling of a Command, this method blocks until the entire
-         * Command has been written out to the output stream.
-         *
-         * @param command
-         *      The Command to Marshal.
-         * @param transport
-         *      The Transport instance that called this method.
-         * @param out
-         *      The output stream to write the command to.
-         * @throws IOException
+         * {@inheritDoc}
          */
         virtual void marshal( const Pointer<commands::Command>& command,
                               const activemq::transport::Transport* transport,
-                              decaf::io::DataOutputStream* out )
-            throw ( decaf::io::IOException );
+                              decaf::io::DataOutputStream* out );
 
         /**
-         * Stream based un-marshaling, blocks on reads on the input stream until a complete
-         * command has been read and un-marshaled into the correct form.  Returns a Pointer
-         * to the newly un-marshaled Command.
-         *
-         * @param transport - Pointer to the transport that is making this request.
-         * @param in - the input stream to read the command from.
-         * @returns the newly marshaled Command, caller owns the pointer
-         * @throws IOException
+         * {@inheritDoc}
          */
         virtual Pointer<commands::Command> unmarshal( const activemq::transport::Transport* transport,
-                                                      decaf::io::DataInputStream* in )
-            throw ( decaf::io::IOException );
+                                                      decaf::io::DataInputStream* in );
+
+    public:
 
         /**
          * Utility method for Tight Marshaling the given object to the boolean
@@ -154,8 +133,7 @@ namespace marshal {
          * @returns size of the data returned.
          */
         virtual int tightMarshalNestedObject1( commands::DataStructure* object,
-                                               utils::BooleanStream* bs )
-            throw ( decaf::io::IOException );
+                                               utils::BooleanStream* bs );
 
         /**
          * Utility method that will Tight marshal some internally nested object
@@ -168,8 +146,7 @@ namespace marshal {
          */
         void tightMarshalNestedObject2( commands::DataStructure* o,
                                         decaf::io::DataOutputStream* ds,
-                                        utils::BooleanStream* bs )
-            throw ( decaf::io::IOException );
+                                        utils::BooleanStream* bs );
 
         /**
          * Utility method used to Unmarshal a Nested DataStructure type object
@@ -181,8 +158,7 @@ namespace marshal {
          * @throws IOException if an error occurs.
          */
         commands::DataStructure* tightUnmarshalNestedObject( decaf::io::DataInputStream* dis,
-                                                             utils::BooleanStream* bs )
-            throw ( decaf::io::IOException );
+                                                             utils::BooleanStream* bs );
 
         /**
          * Utility method to unmarshal an DataStructure object from an
@@ -193,9 +169,7 @@ namespace marshal {
          * @returns a new DataStructure derived Object pointer
          * @throws IOException if an error occurs.
          */
-        commands::DataStructure* looseUnmarshalNestedObject(
-            decaf::io::DataInputStream* dis )
-                throw ( decaf::io::IOException );
+        commands::DataStructure* looseUnmarshalNestedObject( decaf::io::DataInputStream* dis );
 
         /**
          * Utility method to loosely Marshal an object that is derived from the
@@ -206,30 +180,34 @@ namespace marshal {
          * @throw IOException if an error occurs.
          */
         void looseMarshalNestedObject( commands::DataStructure* o,
-                                       decaf::io::DataOutputStream* dataOut )
-                                           throw ( decaf::io::IOException );
+                                       decaf::io::DataOutputStream* dataOut );
 
         /**
          * Called to re-negotiate the settings for the WireFormatInfo, these
          * determine how the client and broker communicate.
-         * @param info - The new Wireformat Info settings
+         *
+         * @param info
+         *      The new Wireformat Info settings.
+         *
          * @throws IllegalStateException is wire format can't be negotiated.
          */
-        void renegotiateWireFormat( const commands::WireFormatInfo& info )
-            throw ( decaf::lang::exceptions::IllegalStateException );
+        void renegotiateWireFormat( const commands::WireFormatInfo& info );
 
         /**
          * Configures this object using the provided WireformatInfo object
-         * @param info - a WireFormatInfo object, takes ownership.
+         *
+         * @param info
+         *      A WireFormatInfo object, takes ownership.
+         *
+         * @throws IllegalStateException if the WireFormat object has not been initialized.
          */
-        virtual void setPreferedWireFormatInfo( const Pointer<commands::WireFormatInfo>& info )
-            throw ( decaf::lang::exceptions::IllegalStateException );
+        void setPreferedWireFormatInfo( const Pointer<commands::WireFormatInfo>& info );
 
         /**
          * Gets the Preferred WireFormatInfo object that this class holds
          * @return pointer to a preferred WireFormatInfo object
          */
-        virtual const Pointer<commands::WireFormatInfo>& getPreferedWireFormatInfo() const {
+        const Pointer<commands::WireFormatInfo>& getPreferedWireFormatInfo() const {
             return this->preferedWireFormatInfo;
         }
 
@@ -275,9 +253,13 @@ namespace marshal {
 
         /**
          * Set the current Wireformat Version
-         * @param version - int that identifies the version
+         *
+         * @param version
+         *      An int that identifies the version
+         *
+         * @throws IllegalArgumentException if the version given is not supported.
          */
-        void setVersion( int version ) throw ( decaf::lang::exceptions::IllegalArgumentException );
+        void setVersion( int version );
 
         /**
          * Is there a Message being unmarshaled?
@@ -391,12 +373,15 @@ namespace marshal {
          * return the unmarshalled DataStrucutre object once done, caller takes
          * ownership of this object.  This method can return null if the type
          * of the object to unmarshal is NULL, empty data.
-         * @param dis - DataInputStream to read from
-         * @returns new DataStructure* that the caller owns
-         * @throws IOException if an error occurs during the unmarshal
+         *
+         * @param dis
+         *      The DataInputStream to read from.
+         *
+         * @returns new DataStructure* that the caller owns.
+         *
+         * @throws IOException if an error occurs during the unmarshal.
          */
-        commands::DataStructure* doUnmarshal( decaf::io::DataInputStream* dis )
-            throw ( decaf::io::IOException );
+        commands::DataStructure* doUnmarshal( decaf::io::DataInputStream* dis );
 
         /**
          * Cleans up all registered Marshallers and empties the dataMarshallers

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp Mon Jun 28 20:52:28 2010
@@ -36,8 +36,7 @@ using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
 Pointer<WireFormat> OpenWireFormatFactory::createWireFormat(
-    const decaf::util::Properties& properties )
-        throw ( decaf::lang::exceptions::IllegalStateException ) {
+    const decaf::util::Properties& properties ) {
 
     try{
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.h Mon Jun 28 20:52:28 2010
@@ -53,14 +53,8 @@ namespace openwire{
 
         virtual ~OpenWireFormatFactory() {}
 
-        /**
-         * Creates a new WireFormat Object passing it a set of
-         * properties from which it can obtain any optional settings
-         * @param properties - the Properties for this WireFormat
-         */
         virtual Pointer<wireformat::WireFormat> createWireFormat(
-            const decaf::util::Properties& properties )
-                throw ( decaf::lang::exceptions::IllegalStateException );
+            const decaf::util::Properties& properties );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireResponseBuilder.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireResponseBuilder.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireResponseBuilder.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireResponseBuilder.h Mon Jun 28 20:52:28 2010
@@ -29,8 +29,10 @@ namespace openwire{
 
     using decaf::lang::Pointer;
 
-    class AMQCPP_API OpenWireResponseBuilder :
-        public transport::mock::ResponseBuilder{
+    /**
+     * Used to allow a MockTransport to generate response commands to OpenWire Commands.
+     */
+    class AMQCPP_API OpenWireResponseBuilder : public transport::mock::ResponseBuilder {
     public:
 
         OpenWireResponseBuilder() {}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp Mon Jun 28 20:52:28 2010
@@ -49,7 +49,7 @@ utils::HexTable BaseDataStreamMarshaller
 commands::DataStructure* BaseDataStreamMarshaller::tightUnmarshalCachedObject(
     OpenWireFormat* wireFormat,
     decaf::io::DataInputStream* dataIn,
-    utils::BooleanStream* bs ) throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
         return wireFormat->tightUnmarshalNestedObject( dataIn, bs );
@@ -63,8 +63,7 @@ commands::DataStructure* BaseDataStreamM
 int BaseDataStreamMarshaller::tightMarshalCachedObject1(
     OpenWireFormat* wireFormat,
     commands::DataStructure* data,
-    utils::BooleanStream* bs )
-        throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
         return wireFormat->tightMarshalNestedObject1( data, bs );
@@ -79,8 +78,7 @@ void BaseDataStreamMarshaller::tightMars
     OpenWireFormat* wireFormat,
     commands::DataStructure* data,
     decaf::io::DataOutputStream* dataOut,
-    utils::BooleanStream* bs )
-        throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
         wireFormat->tightMarshalNestedObject2( data, dataOut, bs );
@@ -94,8 +92,7 @@ void BaseDataStreamMarshaller::tightMars
 void BaseDataStreamMarshaller::looseMarshalCachedObject(
     OpenWireFormat* wireFormat,
     commands::DataStructure* data,
-    decaf::io::DataOutputStream* dataOut )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataOutputStream* dataOut ) {
 
     try{
         wireFormat->looseMarshalNestedObject( data, dataOut );
@@ -108,7 +105,7 @@ void BaseDataStreamMarshaller::looseMars
 ////////////////////////////////////////////////////////////////////////////////
 commands::DataStructure* BaseDataStreamMarshaller::looseUnmarshalCachedObject(
     OpenWireFormat* wireFormat,
-    decaf::io::DataInputStream* dataIn ) throw ( decaf::io::IOException ) {
+    decaf::io::DataInputStream* dataIn ) {
 
     try{
         return wireFormat->looseUnmarshalNestedObject( dataIn );
@@ -122,8 +119,7 @@ commands::DataStructure* BaseDataStreamM
 int BaseDataStreamMarshaller::tightMarshalNestedObject1(
     OpenWireFormat* wireFormat,
     commands::DataStructure* object,
-    utils::BooleanStream* bs )
-        throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
         return wireFormat->tightMarshalNestedObject1( object, bs );
@@ -138,8 +134,7 @@ void BaseDataStreamMarshaller::tightMars
     OpenWireFormat* wireFormat,
     commands::DataStructure* object,
     decaf::io::DataOutputStream* dataOut,
-    utils::BooleanStream* bs )
-        throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
         wireFormat->tightMarshalNestedObject2( object, dataOut, bs );
@@ -153,8 +148,7 @@ void BaseDataStreamMarshaller::tightMars
 commands::DataStructure* BaseDataStreamMarshaller::tightUnmarshalNestedObject(
     OpenWireFormat* wireFormat,
     decaf::io::DataInputStream* dataIn,
-    utils::BooleanStream* bs )
-        throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
         return wireFormat->tightUnmarshalNestedObject( dataIn, bs );
@@ -167,8 +161,7 @@ commands::DataStructure* BaseDataStreamM
 ////////////////////////////////////////////////////////////////////////////////
 commands::DataStructure* BaseDataStreamMarshaller::looseUnmarshalNestedObject(
     OpenWireFormat* wireFormat,
-    decaf::io::DataInputStream* dataIn )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataInputStream* dataIn ) {
 
     try{
         return wireFormat->looseUnmarshalNestedObject( dataIn );
@@ -182,8 +175,7 @@ commands::DataStructure* BaseDataStreamM
 void BaseDataStreamMarshaller::looseMarshalNestedObject(
     OpenWireFormat* wireFormat,
     commands::DataStructure* object,
-    decaf::io::DataOutputStream* dataOut )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataOutputStream* dataOut ) {
 
     try{
         wireFormat->looseMarshalNestedObject( object, dataOut );
@@ -196,7 +188,7 @@ void BaseDataStreamMarshaller::looseMars
 ////////////////////////////////////////////////////////////////////////////////
 std::string BaseDataStreamMarshaller::tightUnmarshalString(
     decaf::io::DataInputStream* dataIn,
-    utils::BooleanStream* bs ) throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
 
@@ -218,8 +210,7 @@ std::string BaseDataStreamMarshaller::ti
 
 ////////////////////////////////////////////////////////////////////////////////
 int BaseDataStreamMarshaller::tightMarshalString1( const std::string& value,
-                                                   utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException ) {
+                                                   utils::BooleanStream* bs ) {
     try{
 
         bs->writeBoolean( value != "" );
@@ -275,7 +266,7 @@ int BaseDataStreamMarshaller::tightMarsh
 void BaseDataStreamMarshaller::tightMarshalString2(
     const std::string& value,
     decaf::io::DataOutputStream* dataOut,
-    utils::BooleanStream* bs ) throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
 
@@ -298,7 +289,7 @@ void BaseDataStreamMarshaller::tightMars
 ////////////////////////////////////////////////////////////////////////////////
 void BaseDataStreamMarshaller::looseMarshalString(
     const std::string value,
-    decaf::io::DataOutputStream* dataOut ) throw ( decaf::io::IOException ) {
+    decaf::io::DataOutputStream* dataOut ) {
 
     try{
 
@@ -314,7 +305,7 @@ void BaseDataStreamMarshaller::looseMars
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string BaseDataStreamMarshaller::looseUnmarshalString(
-    decaf::io::DataInputStream* dataIn ) throw ( decaf::io::IOException ) {
+    decaf::io::DataInputStream* dataIn ) {
 
     try{
         if( dataIn->readBoolean() ) {
@@ -331,8 +322,7 @@ std::string BaseDataStreamMarshaller::lo
 ////////////////////////////////////////////////////////////////////////////////
 int BaseDataStreamMarshaller::tightMarshalLong1( OpenWireFormat* wireFormat AMQCPP_UNUSED,
                                                  long long value,
-                                                 utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException ) {
+                                                 utils::BooleanStream* bs ) {
 
     try{
 
@@ -369,8 +359,7 @@ int BaseDataStreamMarshaller::tightMarsh
 void BaseDataStreamMarshaller::tightMarshalLong2( OpenWireFormat* wireFormat AMQCPP_UNUSED,
                                                   long long value,
                                                   decaf::io::DataOutputStream* dataOut,
-                                                  utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException ) {
+                                                  utils::BooleanStream* bs ) {
     try{
 
         if( bs->readBoolean() ) {
@@ -397,8 +386,7 @@ void BaseDataStreamMarshaller::tightMars
 long long BaseDataStreamMarshaller::tightUnmarshalLong(
     OpenWireFormat* wireFormat AMQCPP_UNUSED,
     decaf::io::DataInputStream* dataIn,
-    utils::BooleanStream* bs )
-        throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
         if( bs->readBoolean() ) {
@@ -426,8 +414,7 @@ long long BaseDataStreamMarshaller::tigh
 ////////////////////////////////////////////////////////////////////////////////
 void BaseDataStreamMarshaller::looseMarshalLong( OpenWireFormat* wireFormat AMQCPP_UNUSED,
                                                  long long value,
-                                                 decaf::io::DataOutputStream* dataOut )
-                                                    throw ( decaf::io::IOException ) {
+                                                 decaf::io::DataOutputStream* dataOut ) {
 
     try{
         dataOut->writeLong( value );
@@ -440,8 +427,7 @@ void BaseDataStreamMarshaller::looseMars
 ////////////////////////////////////////////////////////////////////////////////
 long long BaseDataStreamMarshaller::looseUnmarshalLong(
     OpenWireFormat* wireFormat AMQCPP_UNUSED,
-    decaf::io::DataInputStream* dataIn )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataInputStream* dataIn ) {
 
     try{
         return dataIn->readLong();
@@ -455,7 +441,7 @@ long long BaseDataStreamMarshaller::loos
 commands::DataStructure* BaseDataStreamMarshaller::tightUnmarshalBrokerError(
     OpenWireFormat* wireFormat,
     decaf::io::DataInputStream* dataIn,
-    utils::BooleanStream* bs ) throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
 
@@ -502,8 +488,7 @@ commands::DataStructure* BaseDataStreamM
 int BaseDataStreamMarshaller::tightMarshalBrokerError1(
     OpenWireFormat* wireFormat,
     commands::DataStructure* data,
-    utils::BooleanStream* bs )
-        throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
 
@@ -550,8 +535,7 @@ void BaseDataStreamMarshaller::tightMars
     OpenWireFormat* wireFormat,
     commands::DataStructure* data,
     decaf::io::DataOutputStream* dataOut,
-    utils::BooleanStream* bs )
-        throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
 
@@ -591,8 +575,7 @@ void BaseDataStreamMarshaller::tightMars
 ////////////////////////////////////////////////////////////////////////////////
 commands::DataStructure* BaseDataStreamMarshaller::looseUnmarshalBrokerError(
     OpenWireFormat* wireFormat,
-    decaf::io::DataInputStream* dataIn )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataInputStream* dataIn ) {
 
     try{
 
@@ -640,8 +623,7 @@ commands::DataStructure* BaseDataStreamM
 void BaseDataStreamMarshaller::looseMarshalBrokerError(
     OpenWireFormat* wireFormat,
     commands::DataStructure* data,
-    decaf::io::DataOutputStream* dataOut )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataOutputStream* dataOut ) {
 
     try{
 
@@ -684,8 +666,7 @@ void BaseDataStreamMarshaller::looseMars
 ////////////////////////////////////////////////////////////////////////////////
 std::vector<unsigned char> BaseDataStreamMarshaller::tightUnmarshalByteArray(
     decaf::io::DataInputStream* dataIn,
-    utils::BooleanStream* bs )
-        throw ( decaf::io::IOException ) {
+    utils::BooleanStream* bs ) {
 
     try{
 
@@ -706,8 +687,7 @@ std::vector<unsigned char> BaseDataStrea
 
 ////////////////////////////////////////////////////////////////////////////////
 std::vector<unsigned char> BaseDataStreamMarshaller::looseUnmarshalByteArray(
-    decaf::io::DataInputStream* dataIn )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataInputStream* dataIn ) {
 
     try{
 
@@ -730,8 +710,7 @@ std::vector<unsigned char> BaseDataStrea
 std::vector<unsigned char> BaseDataStreamMarshaller::tightUnmarshalConstByteArray(
     decaf::io::DataInputStream* dataIn,
     utils::BooleanStream* bs AMQCPP_UNUSED,
-    int size )
-        throw ( decaf::io::IOException ) {
+    int size ) {
 
     try{
         std::vector<unsigned char> data;
@@ -746,9 +725,7 @@ std::vector<unsigned char> BaseDataStrea
 
 ////////////////////////////////////////////////////////////////////////////////
 std::vector<unsigned char> BaseDataStreamMarshaller::looseUnmarshalConstByteArray(
-    decaf::io::DataInputStream* dataIn,
-    int size )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataInputStream* dataIn, int size ) {
 
     try{
         std::vector<unsigned char> data;
@@ -810,8 +787,7 @@ std::string BaseDataStreamMarshaller::to
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string BaseDataStreamMarshaller::readAsciiString(
-    decaf::io::DataInputStream* dataIn )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataInputStream* dataIn ) {
 
     try{
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h Mon Jun 28 20:52:28 2010
@@ -55,8 +55,7 @@ namespace marshal{
          */
         virtual int tightMarshal1( OpenWireFormat* format AMQCPP_UNUSED,
                                    commands::DataStructure* command AMQCPP_UNUSED,
-                                   utils::BooleanStream* bs AMQCPP_UNUSED )
-                                       throw ( decaf::io::IOException ) { return 0; }
+                                   utils::BooleanStream* bs AMQCPP_UNUSED ) { return 0; }
 
         /**
          * Tight Marshal to the given stream
@@ -69,8 +68,7 @@ namespace marshal{
         virtual void tightMarshal2( OpenWireFormat* format AMQCPP_UNUSED,
                                     commands::DataStructure* command AMQCPP_UNUSED,
                                     decaf::io::DataOutputStream* ds AMQCPP_UNUSED,
-                                    utils::BooleanStream* bs AMQCPP_UNUSED )
-                                        throw ( decaf::io::IOException ) {}
+                                    utils::BooleanStream* bs AMQCPP_UNUSED ) {}
 
         /**
          * Tight Un-Marshal to the given stream
@@ -83,8 +81,7 @@ namespace marshal{
         virtual void tightUnmarshal( OpenWireFormat* format AMQCPP_UNUSED,
                                      commands::DataStructure* command AMQCPP_UNUSED,
                                      decaf::io::DataInputStream* dis AMQCPP_UNUSED,
-                                     utils::BooleanStream* bs AMQCPP_UNUSED )
-                                        throw ( decaf::io::IOException ) {}
+                                     utils::BooleanStream* bs AMQCPP_UNUSED ) {}
 
         /**
          * Tight Marshal to the given stream
@@ -95,8 +92,7 @@ namespace marshal{
          */
         virtual void looseMarshal( OpenWireFormat* format AMQCPP_UNUSED,
                                    commands::DataStructure* command AMQCPP_UNUSED,
-                                   decaf::io::DataOutputStream* ds AMQCPP_UNUSED )
-                                       throw ( decaf::io::IOException ) {}
+                                   decaf::io::DataOutputStream* ds AMQCPP_UNUSED ) {}
 
         /**
          * Loose Un-Marshal to the given stream
@@ -107,8 +103,7 @@ namespace marshal{
          */
         virtual void looseUnmarshal( OpenWireFormat* format AMQCPP_UNUSED,
                                      commands::DataStructure* command AMQCPP_UNUSED,
-                                     decaf::io::DataInputStream* dis AMQCPP_UNUSED )
-                                        throw ( decaf::io::IOException ) {}
+                                     decaf::io::DataInputStream* dis AMQCPP_UNUSED ) {}
 
     public:      // Statics
 
@@ -155,7 +150,7 @@ namespace marshal{
         virtual commands::DataStructure* tightUnmarshalCachedObject(
             OpenWireFormat* wireFormat,
             decaf::io::DataInputStream* dataIn,
-            utils::BooleanStream* bs ) throw ( decaf::io::IOException );
+            utils::BooleanStream* bs );
 
         /**
          * Tightly marshals the passed DataStructure based object to the passed
@@ -168,8 +163,7 @@ namespace marshal{
          */
         virtual int tightMarshalCachedObject1( OpenWireFormat* wireFormat,
                                                commands::DataStructure* data,
-                                               utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException );
+                                               utils::BooleanStream* bs );
 
         /**
          * Tightly marshals the passed DataStructure based object to the passed
@@ -183,8 +177,7 @@ namespace marshal{
         virtual void tightMarshalCachedObject2( OpenWireFormat* wireFormat,
                                                 commands::DataStructure* data,
                                                 decaf::io::DataOutputStream* dataOut,
-                                                utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException );
+                                                utils::BooleanStream* bs );
 
         /**
          * Loosely marshals the passed DataStructure based object to the passed
@@ -196,8 +189,7 @@ namespace marshal{
          */
         virtual void looseMarshalCachedObject( OpenWireFormat* wireFormat,
                                                commands::DataStructure* data,
-                                               decaf::io::DataOutputStream* dataOut )
-                                                    throw ( decaf::io::IOException );
+                                               decaf::io::DataOutputStream* dataOut );
 
         /**
          * Loose Unmarshal the cached object
@@ -208,7 +200,7 @@ namespace marshal{
          */
         virtual commands::DataStructure* looseUnmarshalCachedObject(
             OpenWireFormat* wireFormat,
-            decaf::io::DataInputStream* dataIn ) throw ( decaf::io::IOException );
+            decaf::io::DataInputStream* dataIn );
 
         /**
          * Tightly marshals the passed DataStructure based object to the passed
@@ -221,8 +213,7 @@ namespace marshal{
          */
         virtual int tightMarshalNestedObject1( OpenWireFormat* wireFormat,
                                                commands::DataStructure* object,
-                                               utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException );
+                                               utils::BooleanStream* bs );
 
         /**
          * Tightly marshals the passed DataStructure based object to the passed
@@ -236,8 +227,7 @@ namespace marshal{
         virtual void tightMarshalNestedObject2( OpenWireFormat* wireFormat,
                                                 commands::DataStructure* object,
                                                 decaf::io::DataOutputStream* dataOut,
-                                                utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException );
+                                                utils::BooleanStream* bs );
 
         /**
          * Tight Unmarshal the nested object
@@ -250,7 +240,7 @@ namespace marshal{
         virtual commands::DataStructure* tightUnmarshalNestedObject(
             OpenWireFormat* wireFormat,
             decaf::io::DataInputStream* dataIn,
-            utils::BooleanStream* bs ) throw ( decaf::io::IOException );
+            utils::BooleanStream* bs );
 
         /**
          * Loose Unmarshal the nested object
@@ -261,7 +251,7 @@ namespace marshal{
          */
         virtual commands::DataStructure* looseUnmarshalNestedObject(
             OpenWireFormat* wireFormat,
-            decaf::io::DataInputStream* dataIn ) throw ( decaf::io::IOException );
+            decaf::io::DataInputStream* dataIn );
 
         /**
          * Loose marshall the nested object
@@ -272,8 +262,7 @@ namespace marshal{
          */
         virtual void looseMarshalNestedObject( OpenWireFormat* wireFormat,
                                                commands::DataStructure* object,
-                                               decaf::io::DataOutputStream* dataOut )
-                                                    throw ( decaf::io::IOException );
+                                               decaf::io::DataOutputStream* dataOut );
 
         /**
          * Performs Tight Unmarshaling of String Objects
@@ -283,8 +272,7 @@ namespace marshal{
          * @throws IOException if an error occurs.
          */
         virtual std::string tightUnmarshalString( decaf::io::DataInputStream* dataIn,
-                                                  utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException );
+                                                  utils::BooleanStream* bs );
 
         /**
          * Tight Marshals the String to a Booleans Stream Object, returns
@@ -295,8 +283,7 @@ namespace marshal{
          * @throws IOException if an error occurs.
          */
         virtual int tightMarshalString1( const std::string& value,
-                                         utils::BooleanStream* bs )
-                                            throw ( decaf::io::IOException );
+                                         utils::BooleanStream* bs );
 
         /**
          * Tight Marshals the passed string to the streams passed
@@ -307,8 +294,7 @@ namespace marshal{
          */
         virtual void tightMarshalString2( const std::string& value,
                                           decaf::io::DataOutputStream* dataOut,
-                                          utils::BooleanStream* bs )
-                                                throw ( decaf::io::IOException );
+                                          utils::BooleanStream* bs );
 
         /**
          * Loose Marshal the String to the DataOuputStream passed
@@ -317,8 +303,7 @@ namespace marshal{
          * @throws IOException if an error occurs.
          */
         virtual void looseMarshalString( const std::string value,
-                                         decaf::io::DataOutputStream* dataOut )
-                                            throw ( decaf::io::IOException );
+                                         decaf::io::DataOutputStream* dataOut );
 
         /**
          * Loose Un-Marshal the String to the DataOuputStream passed
@@ -326,8 +311,7 @@ namespace marshal{
          * @return the unmarshaled string
          * @throws IOException if an error occurs.
          */
-        virtual std::string looseUnmarshalString( decaf::io::DataInputStream* dataIn )
-            throw ( decaf::io::IOException );
+        virtual std::string looseUnmarshalString( decaf::io::DataInputStream* dataIn );
 
         /**
          * Tightly marshal the long long to the BooleanStream passed.
@@ -339,8 +323,7 @@ namespace marshal{
          */
         virtual int tightMarshalLong1( OpenWireFormat* wireFormat,
                                        long long value,
-                                       utils::BooleanStream* bs )
-                                            throw ( decaf::io::IOException );
+                                       utils::BooleanStream* bs );
 
         /**
          * Tightly marshal the long long to the Streams passed.
@@ -353,8 +336,7 @@ namespace marshal{
         virtual void tightMarshalLong2( OpenWireFormat* wireFormat,
                                         long long value,
                                         decaf::io::DataOutputStream* dataOut,
-                                        utils::BooleanStream* bs )
-                                            throw ( decaf::io::IOException );
+                                        utils::BooleanStream* bs );
 
         /**
          * Tight marshal the long long type.
@@ -366,8 +348,7 @@ namespace marshal{
          */
         virtual long long tightUnmarshalLong( OpenWireFormat* wireFormat,
                                               decaf::io::DataInputStream* dataIn,
-                                              utils::BooleanStream* bs )
-                                                throw ( decaf::io::IOException );
+                                              utils::BooleanStream* bs );
 
         /**
          * Tightly marshal the long long to the BooleanStream passed.
@@ -378,8 +359,7 @@ namespace marshal{
          */
         virtual void looseMarshalLong( OpenWireFormat* wireFormat,
                                        long long value,
-                                       decaf::io::DataOutputStream* dataOut )
-                                            throw ( decaf::io::IOException );
+                                       decaf::io::DataOutputStream* dataOut );
 
         /**
          * Loose marshal the long long type.
@@ -389,8 +369,7 @@ namespace marshal{
          * @throws IOException if an error occurs.
          */
         virtual long long looseUnmarshalLong( OpenWireFormat* wireFormat,
-                                              decaf::io::DataInputStream* dataIn )
-                                                throw ( decaf::io::IOException );
+                                              decaf::io::DataInputStream* dataIn );
 
         /**
          * Tight Unmarshal an array of char
@@ -401,7 +380,7 @@ namespace marshal{
          */
         virtual std::vector<unsigned char> tightUnmarshalByteArray(
             decaf::io::DataInputStream* dataIn,
-            utils::BooleanStream* bs ) throw ( decaf::io::IOException );
+            utils::BooleanStream* bs );
 
         /**
          * Loose Unmarshal an array of char
@@ -410,7 +389,7 @@ namespace marshal{
          * @throws IOException if an error occurs.
          */
         virtual std::vector<unsigned char> looseUnmarshalByteArray(
-            decaf::io::DataInputStream* dataIn ) throw ( decaf::io::IOException );
+            decaf::io::DataInputStream* dataIn );
 
         /**
          * Tight Unmarshal a fixed size array from that data input stream
@@ -424,7 +403,7 @@ namespace marshal{
         virtual std::vector<unsigned char> tightUnmarshalConstByteArray(
             decaf::io::DataInputStream* dataIn,
             utils::BooleanStream* bs,
-            int size ) throw ( decaf::io::IOException );
+            int size );
 
         /**
          * Tight Unmarshal a fixed size array from that data input stream
@@ -435,7 +414,7 @@ namespace marshal{
          * @throws IOException if an error occurs.
          */
         virtual std::vector<unsigned char> looseUnmarshalConstByteArray(
-            decaf::io::DataInputStream* dataIn, int size ) throw ( decaf::io::IOException );
+            decaf::io::DataInputStream* dataIn, int size );
 
         /**
          * Tight Unarshall the Error object
@@ -448,7 +427,7 @@ namespace marshal{
         virtual commands::DataStructure* tightUnmarshalBrokerError(
             OpenWireFormat* wireFormat,
             decaf::io::DataInputStream* dataIn,
-            utils::BooleanStream* bs ) throw ( decaf::io::IOException );
+            utils::BooleanStream* bs );
 
         /**
          * Tight Marshal the Error object
@@ -460,8 +439,7 @@ namespace marshal{
          */
         virtual int tightMarshalBrokerError1( OpenWireFormat* wireFormat,
                                               commands::DataStructure* data,
-                                              utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException );
+                                              utils::BooleanStream* bs );
 
         /**
          * Tight Marshal the Error object
@@ -474,8 +452,7 @@ namespace marshal{
         virtual void tightMarshalBrokerError2( OpenWireFormat* wireFormat,
                                                commands::DataStructure* data,
                                                decaf::io::DataOutputStream* dataOut,
-                                               utils::BooleanStream* bs )
-                                                    throw ( decaf::io::IOException );
+                                               utils::BooleanStream* bs );
 
         /**
          * Loose Unarshal the Error object
@@ -486,7 +463,7 @@ namespace marshal{
          */
         virtual commands::DataStructure* looseUnmarshalBrokerError(
             OpenWireFormat* wireFormat,
-            decaf::io::DataInputStream* dataIn ) throw ( decaf::io::IOException );
+            decaf::io::DataInputStream* dataIn );
 
         /**
          * Tight Marshal the Error object
@@ -497,8 +474,7 @@ namespace marshal{
          */
         virtual void looseMarshalBrokerError( OpenWireFormat* wireFormat,
                                               commands::DataStructure* data,
-                                              decaf::io::DataOutputStream* dataOut )
-                                                  throw ( decaf::io::IOException );
+                                              decaf::io::DataOutputStream* dataOut );
 
         /**
          * Tightly Marshal an array of DataStructure objects to the provided
@@ -513,9 +489,8 @@ namespace marshal{
         template<typename T>
         int tightMarshalObjectArray1( OpenWireFormat* wireFormat,
                                       std::vector<T> objects,
-                                      utils::BooleanStream* bs )
-                                        throw ( decaf::io::IOException )
-        {
+                                      utils::BooleanStream* bs ) {
+
             try{
                 if( !objects.empty() )
                 {
@@ -552,8 +527,7 @@ namespace marshal{
         void tightMarshalObjectArray2( OpenWireFormat* wireFormat,
                                        std::vector<T> objects,
                                        decaf::io::DataOutputStream* dataOut,
-                                       utils::BooleanStream* bs )
-                                        throw ( decaf::io::IOException ) {
+                                       utils::BooleanStream* bs ) {
 
             try {
 
@@ -583,8 +557,7 @@ namespace marshal{
         template<typename T>
         void looseMarshalObjectArray( OpenWireFormat* wireFormat,
                                       std::vector<T> objects,
-                                      decaf::io::DataOutputStream* dataOut )
-                                        throw ( decaf::io::IOException ) {
+                                      decaf::io::DataOutputStream* dataOut ) {
 
             try {
 
@@ -611,8 +584,7 @@ namespace marshal{
          * @param dataIn - DataInputStream to read from
          * @return string value read from stream
          */
-        virtual std::string readAsciiString( decaf::io::DataInputStream* dataIn )
-            throw ( decaf::io::IOException );
+        virtual std::string readAsciiString( decaf::io::DataInputStream* dataIn );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/DataStreamMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/DataStreamMarshaller.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/DataStreamMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/DataStreamMarshaller.h Mon Jun 28 20:52:28 2010
@@ -54,15 +54,19 @@ namespace marshal{
 
         /**
          * Tight Marhsal to the given stream
-         * @param format - The OpenwireFormat properties
-         * @param command -  the object to Marshal
-         * @param bs - boolean stream to marshal to.
+         *
+         * @param format
+         *      The OpenwireFormat properties
+         * @param command
+         *      The object to Marshal
+         * @param bs
+         *      The boolean stream to marshal to.
+         *
          * @throws IOException if an error occurs.
          */
         virtual int tightMarshal1( OpenWireFormat* format,
                                    commands::DataStructure* command,
-                                   utils::BooleanStream* bs )
-                                       throw ( decaf::io::IOException ) = 0;
+                                   utils::BooleanStream* bs ) = 0;
 
         /**
          * Tight Marhsal to the given stream
@@ -75,8 +79,7 @@ namespace marshal{
         virtual void tightMarshal2( OpenWireFormat* format,
                                     commands::DataStructure* command,
                                     decaf::io::DataOutputStream* ds,
-                                    utils::BooleanStream* bs )
-                                        throw ( decaf::io::IOException ) = 0;
+                                    utils::BooleanStream* bs ) = 0;
 
         /**
          * Tight Un-marhsal to the given stream
@@ -89,8 +92,7 @@ namespace marshal{
         virtual void tightUnmarshal( OpenWireFormat* format,
                                      commands::DataStructure* command,
                                      decaf::io::DataInputStream* dis,
-                                     utils::BooleanStream* bs )
-                                        throw ( decaf::io::IOException ) = 0;
+                                     utils::BooleanStream* bs ) = 0;
 
         /**
          * Tight Marhsal to the given stream
@@ -101,8 +103,7 @@ namespace marshal{
          */
         virtual void looseMarshal( OpenWireFormat* format,
                                    commands::DataStructure* command,
-                                   decaf::io::DataOutputStream* ds )
-                                       throw ( decaf::io::IOException ) = 0;
+                                   decaf::io::DataOutputStream* ds ) = 0;
 
         /**
          * Loose Un-marhsal to the given stream
@@ -113,8 +114,7 @@ namespace marshal{
          */
         virtual void looseUnmarshal( OpenWireFormat* format,
                                      commands::DataStructure* command,
-                                     decaf::io::DataInputStream* dis )
-                                        throw ( decaf::io::IOException ) = 0;
+                                     decaf::io::DataInputStream* dis ) = 0;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.cpp Mon Jun 28 20:52:28 2010
@@ -38,8 +38,7 @@ using namespace decaf::io;
 using namespace decaf::lang;
 
 ///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::marshal( const PrimitiveMap* map, std::vector<unsigned char>& buffer )
-    throw ( decaf::lang::Exception ) {
+void PrimitiveTypesMarshaller::marshal( const PrimitiveMap* map, std::vector<unsigned char>& buffer ) {
 
     try {
 
@@ -63,8 +62,7 @@ void PrimitiveTypesMarshaller::marshal( 
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::unmarshal( PrimitiveMap* map, const std::vector<unsigned char>& buffer )
-    throw ( decaf::lang::Exception ) {
+void PrimitiveTypesMarshaller::unmarshal( PrimitiveMap* map, const std::vector<unsigned char>& buffer ) {
 
     try {
 
@@ -84,8 +82,7 @@ void PrimitiveTypesMarshaller::unmarshal
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::marshal( const PrimitiveList* list, std::vector<unsigned char>& buffer )
-    throw ( decaf::lang::Exception ) {
+void PrimitiveTypesMarshaller::marshal( const PrimitiveList* list, std::vector<unsigned char>& buffer ) {
 
     try {
 
@@ -109,8 +106,7 @@ void PrimitiveTypesMarshaller::marshal( 
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::unmarshal( PrimitiveList* list, const std::vector<unsigned char>& buffer )
-    throw ( decaf::lang::Exception ) {
+void PrimitiveTypesMarshaller::unmarshal( PrimitiveList* list, const std::vector<unsigned char>& buffer ) {
 
     try {
 
@@ -130,8 +126,7 @@ void PrimitiveTypesMarshaller::unmarshal
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::marshalMap( const PrimitiveMap* map, DataOutputStream& dataOut )
-    throw ( decaf::lang::Exception ) {
+void PrimitiveTypesMarshaller::marshalMap( const PrimitiveMap* map, DataOutputStream& dataOut ) {
 
     try {
 
@@ -146,8 +141,7 @@ void PrimitiveTypesMarshaller::marshalMa
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-PrimitiveMap* PrimitiveTypesMarshaller::unmarshalMap( DataInputStream& dataIn )
-    throw ( decaf::lang::Exception ) {
+PrimitiveMap* PrimitiveTypesMarshaller::unmarshalMap( DataInputStream& dataIn ) {
 
     try {
 
@@ -160,8 +154,7 @@ PrimitiveMap* PrimitiveTypesMarshaller::
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void PrimitiveTypesMarshaller::marshalList( const PrimitiveList* list, DataOutputStream& dataOut )
-    throw ( decaf::lang::Exception ) {
+void PrimitiveTypesMarshaller::marshalList( const PrimitiveList* list, DataOutputStream& dataOut ) {
 
     try {
 
@@ -176,8 +169,7 @@ void PrimitiveTypesMarshaller::marshalLi
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-PrimitiveList* PrimitiveTypesMarshaller::unmarshalList( DataInputStream& dataIn )
-    throw ( decaf::lang::Exception ) {
+PrimitiveList* PrimitiveTypesMarshaller::unmarshalList( DataInputStream& dataIn ) {
 
     try {
 
@@ -192,8 +184,7 @@ PrimitiveList* PrimitiveTypesMarshaller:
 ///////////////////////////////////////////////////////////////////////////////
 void PrimitiveTypesMarshaller::marshalPrimitiveMap(
     decaf::io::DataOutputStream& dataOut,
-    const decaf::util::Map<std::string, PrimitiveValueNode>& map )
-        throw ( decaf::io::IOException ) {
+    const decaf::util::Map<std::string, PrimitiveValueNode>& map ) {
 
     try{
 
@@ -217,8 +208,7 @@ void PrimitiveTypesMarshaller::marshalPr
 ///////////////////////////////////////////////////////////////////////////////
 void PrimitiveTypesMarshaller::marshalPrimitiveList(
     decaf::io::DataOutputStream& dataOut,
-    const decaf::util::List<PrimitiveValueNode>& list )
-        throw ( decaf::io::IOException ) {
+    const decaf::util::List<PrimitiveValueNode>& list ) {
 
     try{
         dataOut.writeInt( (int)list.size() );
@@ -234,8 +224,7 @@ void PrimitiveTypesMarshaller::marshalPr
 
 ///////////////////////////////////////////////////////////////////////////////
 void PrimitiveTypesMarshaller::marshalPrimitive( io::DataOutputStream& dataOut,
-                                               const activemq::util::PrimitiveValueNode& value )
-                                                    throw ( decaf::io::IOException ) {
+                                               const activemq::util::PrimitiveValueNode& value ) {
 
     try {
 
@@ -331,8 +320,7 @@ void PrimitiveTypesMarshaller::marshalPr
 
 ///////////////////////////////////////////////////////////////////////////////
 void PrimitiveTypesMarshaller::unmarshalPrimitiveMap(
-    decaf::io::DataInputStream& dataIn, PrimitiveMap& map )
-        throw ( decaf::io::IOException ) {
+    decaf::io::DataInputStream& dataIn, PrimitiveMap& map ) {
 
     try{
 
@@ -353,8 +341,7 @@ void PrimitiveTypesMarshaller::unmarshal
 ///////////////////////////////////////////////////////////////////////////////
 void PrimitiveTypesMarshaller::unmarshalPrimitiveList(
     decaf::io::DataInputStream& dataIn,
-    decaf::util::StlList<PrimitiveValueNode>& list )
-        throw ( decaf::io::IOException ) {
+    decaf::util::StlList<PrimitiveValueNode>& list ) {
 
     try{
 
@@ -369,8 +356,7 @@ void PrimitiveTypesMarshaller::unmarshal
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-PrimitiveValueNode PrimitiveTypesMarshaller::unmarshalPrimitive(
-    io::DataInputStream& dataIn ) throw ( decaf::io::IOException ) {
+PrimitiveValueNode PrimitiveTypesMarshaller::unmarshalPrimitive( io::DataInputStream& dataIn ) {
 
     try {
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.h Mon Jun 28 20:52:28 2010
@@ -54,8 +54,7 @@ namespace marshal{
          *
          * @throws Exception if an error occurs during the marshaling process.
          */
-        static void marshal( const util::PrimitiveMap* map, std::vector<unsigned char>& buffer )
-            throw ( decaf::lang::Exception );
+        static void marshal( const util::PrimitiveMap* map, std::vector<unsigned char>& buffer );
 
         /**
          * Unmarshal a PrimitiveMap from the provided Byte buffer.
@@ -67,8 +66,7 @@ namespace marshal{
          *
          * @throws Exception if an error occurs during the unmarshal process.
          */
-        static void unmarshal( util::PrimitiveMap* map, const std::vector<unsigned char>& buffer )
-            throw ( decaf::lang::Exception );
+        static void unmarshal( util::PrimitiveMap* map, const std::vector<unsigned char>& buffer );
 
         /**
          * Marshal a primitive list object to the given byte buffer.
@@ -80,8 +78,7 @@ namespace marshal{
          *
          * @throws Exception if an error occurs during the marshaling process.
          */
-        static void marshal( const util::PrimitiveList* list, std::vector<unsigned char>& buffer )
-            throw ( decaf::lang::Exception );
+        static void marshal( const util::PrimitiveList* list, std::vector<unsigned char>& buffer );
 
         /**
          * Unmarshal a PrimitiveList from the provided byte buffer.
@@ -93,8 +90,7 @@ namespace marshal{
          *
          * @throws Exception if an error occurs during the unmarshal process.
          */
-        static void unmarshal( util::PrimitiveList* list, const std::vector<unsigned char>& buffer )
-            throw ( decaf::lang::Exception );
+        static void unmarshal( util::PrimitiveList* list, const std::vector<unsigned char>& buffer );
 
     public:
 
@@ -108,8 +104,7 @@ namespace marshal{
          *
          * @throws Exception if an error occurs during the marshaling process.
          */
-        static void marshalMap( const util::PrimitiveMap* map, decaf::io::DataOutputStream& dataOut )
-            throw ( decaf::lang::Exception );
+        static void marshalMap( const util::PrimitiveMap* map, decaf::io::DataOutputStream& dataOut );
 
         /**
          * Unmarshal a PrimitiveMap from the provided DataInputStream.
@@ -121,8 +116,7 @@ namespace marshal{
          *
          * @throws Exception if an error occurs during the unmarshal process.
          */
-        static util::PrimitiveMap* unmarshalMap( decaf::io::DataInputStream& dataIn )
-            throw ( decaf::lang::Exception );
+        static util::PrimitiveMap* unmarshalMap( decaf::io::DataInputStream& dataIn );
 
         /**
          * Marshal a PrimitiveList to the given DataOutputStream.
@@ -134,8 +128,7 @@ namespace marshal{
          *
          * @throws Exception if an error occurs during the marshaling process.
          */
-        static void marshalList( const util::PrimitiveList* list, decaf::io::DataOutputStream& dataOut )
-            throw ( decaf::lang::Exception );
+        static void marshalList( const util::PrimitiveList* list, decaf::io::DataOutputStream& dataOut );
 
         /**
          * Unmarshal a PrimitiveList from the given DataInputStream.
@@ -147,78 +140,77 @@ namespace marshal{
          *
          * @throws Exception if an error occurs during the unmarshal process.
          */
-        static util::PrimitiveList* unmarshalList( decaf::io::DataInputStream& dataIn )
-            throw ( decaf::lang::Exception );
+        static util::PrimitiveList* unmarshalList( decaf::io::DataInputStream& dataIn );
 
     protected:
 
         /**
          * Marshal a Map of Primitives to the given OutputStream, can result
          * in recursive calls to this method if the map contains maps of maps.
+         *
          * @param dataOut - the DataOutputStream to write to
          * @param map - the ValueNode to write.
-         * @throws IOException
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
         static void marshalPrimitiveMap(
             decaf::io::DataOutputStream& dataOut,
-            const decaf::util::Map<std::string, util::PrimitiveValueNode>& map )
-                throw ( decaf::io::IOException );
+            const decaf::util::Map<std::string, util::PrimitiveValueNode>& map );
 
         /**
          * Marshal a List of Primitives to the given OutputStream, can result
          * in recursive calls to this method if the list contains lists of lists.
          * @param dataOut - the DataOutputStream to write to
          * @param list - the ValueNode to write.
-         * @throws IOException
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
         static void marshalPrimitiveList(
             decaf::io::DataOutputStream& dataOut,
-            const decaf::util::List<util::PrimitiveValueNode>& list )
-                throw ( decaf::io::IOException );
+            const decaf::util::List<util::PrimitiveValueNode>& list );
 
         /**
          * Used to Marshal the Primitive types out on the Wire.
          * @param dataOut - the DataOutputStream to write to
          * @param value - the ValueNode to write.
-         * @throws IOException
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
         static void marshalPrimitive( decaf::io::DataOutputStream& dataOut,
-                                      const util::PrimitiveValueNode& value )
-                                        throw ( decaf::io::IOException );
+                                      const util::PrimitiveValueNode& value );
 
         /**
          * Unmarshals a Map of Primitives from the given InputStream, can result
          * in recursive calls to this method if the map contains maps of maps.
          * @param dataIn - DataInputStream to read from.
          * @param map - the map to fill with data.
-         * @throws IOException
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
         static void unmarshalPrimitiveMap(
-            decaf::io::DataInputStream& dataIn, util::PrimitiveMap& map )
-                throw ( decaf::io::IOException );
+            decaf::io::DataInputStream& dataIn, util::PrimitiveMap& map );
 
         /**
          * Unmarshals a List of Primitives from the given InputStream, can result
          * in recursive calls to this method if the list contains lists of lists.
          * @param dataIn - DataInputStream to read from.
          * @param list - the ValueNode to write.
-         * @throws IOException
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
         static void unmarshalPrimitiveList(
             decaf::io::DataInputStream& dataIn,
-            decaf::util::StlList<util::PrimitiveValueNode>& list )
-                throw ( decaf::io::IOException );
+            decaf::util::StlList<util::PrimitiveValueNode>& list );
 
         /**
          * Unmarshals a Primitive Type from the stream, and returns it as a
          * value Node.
          * @param dataIn - DataInputStream to read from.
          * @return a PrimitiveValueNode containing the data.
-         * @throws IOException
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
-        static util::PrimitiveValueNode unmarshalPrimitive(
-            decaf::io::DataInputStream& dataIn )
-                throw ( decaf::io::IOException );
+        static util::PrimitiveValueNode unmarshalPrimitive( decaf::io::DataInputStream& dataIn );
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.cpp Mon Jun 28 20:52:28 2010
@@ -41,7 +41,11 @@ BooleanStream::BooleanStream() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-bool BooleanStream::readBoolean() throw ( IOException ) {
+BooleanStream::~BooleanStream() throw() {
+}
+
+///////////////////////////////////////////////////////////////////////////////
+bool BooleanStream::readBoolean() {
 
     try {
 
@@ -60,7 +64,7 @@ bool BooleanStream::readBoolean() throw 
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BooleanStream::writeBoolean( bool value ) throw ( IOException ) {
+void BooleanStream::writeBoolean( bool value ) {
 
     try{
 
@@ -91,7 +95,7 @@ void BooleanStream::writeBoolean( bool v
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BooleanStream::marshal( DataOutputStream* dataOut ) throw ( IOException ) {
+void BooleanStream::marshal( DataOutputStream* dataOut ) {
 
     try {
 
@@ -139,7 +143,7 @@ void BooleanStream::marshal( std::vector
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void BooleanStream::unmarshal( DataInputStream* dataIn ) throw ( IOException ) {
+void BooleanStream::unmarshal( DataInputStream* dataIn ) {
 
     try{
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/BooleanStream.h Mon Jun 28 20:52:28 2010
@@ -47,40 +47,66 @@ namespace utils{
      * If the first byte = 0x80, the following short (two bytes) are the size field.
      */
     class AMQCPP_API BooleanStream {
+    private:
+
+        // Internal Buffer of data
+        std::vector<unsigned char> data;
+
+        // Limit on buffer size
+        short arrayLimit;
+
+        // Byte we are on from the buffer
+        short arrayPos;
+
+        // Bit we are on in the byte we are on from the buffer
+        unsigned char bytePos;
+
     public:
 
         BooleanStream();
-        virtual ~BooleanStream() {}
+
+        virtual ~BooleanStream() throw();
 
         /**
          * Read a boolean data element from the internal data buffer
+         *
          * @returns boolean from the stream
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
-        bool readBoolean() throw ( decaf::io::IOException );
+        bool readBoolean();
 
         /**
          * Writes a Boolean value to the internal data buffer
          * @param value - boolean data to write.
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
-        void writeBoolean( bool value ) throw ( decaf::io::IOException );
+        void writeBoolean( bool value );
 
         /**
          * Marshal the data to a DataOutputStream
          * @param dataOut - Stream to write the data to.
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
-        void marshal( decaf::io::DataOutputStream* dataOut ) throw ( decaf::io::IOException );
+        void marshal( decaf::io::DataOutputStream* dataOut );
 
         /**
          * Marshal the data to a STL vector of unsigned chars
          * @param dataOut - reference to a vector to write the data to.
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
         void marshal( std::vector< unsigned char >& dataOut );
 
         /**
          * Unmarshal a Boolean data stream from the Input Stream
          * @param dataIn - Input Stream to read data from.
+         *
+         * @throws IOException if an I/O error occurs during this operation.
          */
-        void unmarshal( decaf::io::DataInputStream* dataIn ) throw ( decaf::io::IOException );
+        void unmarshal( decaf::io::DataInputStream* dataIn );
 
         /**
          * Clears to old position markers, data starts at the beginning
@@ -93,20 +119,6 @@ namespace utils{
          */
         int marshalledSize();
 
-    private:
-
-        // Internal Buffer of data
-        std::vector<unsigned char> data;
-
-        // Limit on buffer size
-        short arrayLimit;
-
-        // Byte we are on from the buffer
-        short arrayPos;
-
-        // Bit we are on in the byte we are on from the buffer
-        unsigned char bytePos;
-
     };
 
 }}}}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.cpp Mon Jun 28 20:52:28 2010
@@ -47,8 +47,7 @@ HexTable::HexTable(){
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const std::string& HexTable::operator[]( std::size_t index )
-    throw ( IndexOutOfBoundsException ) {
+const std::string& HexTable::operator[]( std::size_t index ) {
 
     try{
 
@@ -67,8 +66,7 @@ const std::string& HexTable::operator[](
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-const std::string& HexTable::operator[]( std::size_t index ) const
-    throw ( IndexOutOfBoundsException ) {
+const std::string& HexTable::operator[]( std::size_t index ) const {
 
     try{
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/HexTable.h Mon Jun 28 20:52:28 2010
@@ -35,6 +35,11 @@ namespace utils{
      * the table.
      */
     class AMQCPP_API HexTable {
+    private:
+
+        // Vector of Strings mapping hex to the value of the index.
+        std::vector<std::string> table;
+
     public:
 
         HexTable();
@@ -49,26 +54,20 @@ namespace utils{
          *
          * @returns string containing the hex value if the index
          *
-         * @throws IndexOutOfBoundsException
+         * @throws IndexOutOfBoundsException if the index exceeds the table size.
          */
-        virtual const std::string& operator[]( std::size_t index )
-            throw ( decaf::lang::exceptions::IndexOutOfBoundsException );
-        virtual const std::string& operator[]( std::size_t index ) const
-            throw ( decaf::lang::exceptions::IndexOutOfBoundsException );
+        virtual const std::string& operator[]( std::size_t index );
+        virtual const std::string& operator[]( std::size_t index ) const;
 
         /**
          * Returns the max size of this Table.
-         * @returns an integer size value
+         *
+         * @returns an integer size value for the table.
          */
         virtual std::size_t size() const{
             return table.size();
         }
 
-    private:
-
-        // Vector of Strings mapping hex to the value of the index.
-        std::vector<std::string> table;
-
     };
 
 }}}}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.cpp Mon Jun 28 20:52:28 2010
@@ -34,8 +34,7 @@ using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
 MessagePropertyInterceptor::MessagePropertyInterceptor(
-    commands::Message* message, PrimitiveMap* properties )
-        throw( decaf::lang::exceptions::NullPointerException ) : message( message ), properties( properties ) {
+    commands::Message* message, PrimitiveMap* properties ) : message( message ), properties( properties ) {
 
     if( message == NULL ) {
         throw NullPointerException(
@@ -60,7 +59,7 @@ MessagePropertyInterceptor& MessagePrope
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-MessagePropertyInterceptor::~MessagePropertyInterceptor() {
+MessagePropertyInterceptor::~MessagePropertyInterceptor() throw() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h?rev=958724&r1=958723&r2=958724&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h Mon Jun 28 20:52:28 2010
@@ -66,10 +66,9 @@ namespace utils {
          *
          * @throws NullPointerException if either param is NULL
          */
-        MessagePropertyInterceptor( commands::Message* message, util::PrimitiveMap* properties )
-            throw( decaf::lang::exceptions::NullPointerException );
+        MessagePropertyInterceptor( commands::Message* message, util::PrimitiveMap* properties );
 
-        virtual ~MessagePropertyInterceptor();
+        virtual ~MessagePropertyInterceptor() throw();
 
         /**
          * Gets a boolean property.



Mime
View raw message