Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 79573 invoked from network); 9 Nov 2007 14:21:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Nov 2007 14:21:20 -0000 Received: (qmail 53747 invoked by uid 500); 9 Nov 2007 14:21:07 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 53722 invoked by uid 500); 9 Nov 2007 14:21:07 -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 53713 invoked by uid 99); 9 Nov 2007 14:21:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Nov 2007 06:21:07 -0800 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; Fri, 09 Nov 2007 14:21:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CAF331A9832; Fri, 9 Nov 2007 06:20:54 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r593533 - /activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/WireFormatInfo.h Date: Fri, 09 Nov 2007 14:20:54 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071109142054.CAF331A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Fri Nov 9 06:20:53 2007 New Revision: 593533 URL: http://svn.apache.org/viewvc?rev=593533&view=rev Log: http://issues.apache.org/activemq/browse/AMQCPP-103 Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/WireFormatInfo.h Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/WireFormatInfo.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/WireFormatInfo.h?rev=593533&r1=593532&r2=593533&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/WireFormatInfo.h (original) +++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/WireFormatInfo.h Fri Nov 9 06:20:53 2007 @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -229,7 +230,7 @@ * @param wireFormat - the wireformatting controller */ virtual void beforeMarshal( OpenWireFormat* wireFormat AMQCPP_UNUSED ) - throw ( io::IOException ) { + throw ( decaf::io::IOException ) { try{ @@ -240,9 +241,9 @@ &properties, marshalledProperties ); } } - AMQ_CATCH_RETHROW( io::IOException ) - AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException ) - AMQ_CATCHALL_THROW( io::IOException ) + AMQ_CATCH_RETHROW( decaf::io::IOException ) + AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException ) + AMQ_CATCHALL_THROW( decaf::io::IOException ) } /** @@ -251,16 +252,16 @@ * @param wireFormat - the wireformat object to control unmarshaling */ virtual void afterUnmarshal( OpenWireFormat* wireFormat AMQCPP_UNUSED ) - throw ( io::IOException ) { + throw ( decaf::io::IOException ) { try{ marshal::PrimitiveMapMarshaller::unmarshal( &properties, marshalledProperties ); } - AMQ_CATCH_RETHROW( io::IOException ) - AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException ) - AMQ_CATCHALL_THROW( io::IOException ) + AMQ_CATCH_RETHROW( decaf::io::IOException ) + AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException ) + AMQ_CATCHALL_THROW( decaf::io::IOException ) } private: