Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 43888 invoked from network); 22 Oct 2007 16:37:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Oct 2007 16:37:33 -0000 Received: (qmail 7594 invoked by uid 500); 22 Oct 2007 16:37:21 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 7539 invoked by uid 500); 22 Oct 2007 16:37:21 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 7530 invoked by uid 99); 22 Oct 2007 16:37:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2007 09:37:21 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2007 16:37:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A398D1A9832; Mon, 22 Oct 2007 09:36:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r587147 - /activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp Date: Mon, 22 Oct 2007 16:36:37 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071022163642.A398D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Mon Oct 22 09:36:27 2007 New Revision: 587147 URL: http://svn.apache.org/viewvc?rev=587147&view=rev Log: https://issues.apache.org/activemq/browse/AMQCPP-142 Cleaning up the marshaling code. Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp?rev=587147&r1=587146&r2=587147&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp (original) +++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp Mon Oct 22 09:36:27 2007 @@ -322,8 +322,7 @@ "No valid data structure type for object of this type"); } - DataStreamMarshaller* dsm = - dynamic_cast< DataStreamMarshaller* >( dataMarshallers[type & 0xFF] ); + DataStreamMarshaller* dsm = dataMarshallers[type & 0xFF]; if( dsm == NULL ) { throw IOException( @@ -363,8 +362,7 @@ } else { - DataStreamMarshaller* dsm = - dynamic_cast< DataStreamMarshaller* >( dataMarshallers[type & 0xFF] ); + DataStreamMarshaller* dsm = dataMarshallers[type & 0xFF]; if( dsm == NULL ) { throw IOException( @@ -374,7 +372,6 @@ } dsm->tightMarshal2( this, o, ds, bs ); - } } AMQ_CATCH_RETHROW( IOException ) @@ -393,9 +390,7 @@ const unsigned char dataType = dis->readByte(); - DataStreamMarshaller* dsm = - dynamic_cast< DataStreamMarshaller* >( - dataMarshallers[dataType & 0xFF] ); + DataStreamMarshaller* dsm = dataMarshallers[dataType & 0xFF]; if( dsm == NULL ) { throw IOException( @@ -439,9 +434,7 @@ unsigned char dataType = dis->readByte(); - DataStreamMarshaller* dsm = - dynamic_cast< DataStreamMarshaller* >( - dataMarshallers[dataType & 0xFF] ); + DataStreamMarshaller* dsm = dataMarshallers[dataType & 0xFF]; if( dsm == NULL ) { throw IOException( @@ -478,9 +471,7 @@ dataOut->writeByte( dataType ); - DataStreamMarshaller* dsm = - dynamic_cast< DataStreamMarshaller* >( - dataMarshallers[dataType & 0xFF] ); + DataStreamMarshaller* dsm = dataMarshallers[dataType & 0xFF]; if( dsm == NULL ) { throw IOException(