Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 55994 invoked from network); 12 Feb 2007 21:52:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Feb 2007 21:52:58 -0000 Received: (qmail 30920 invoked by uid 500); 12 Feb 2007 21:53:06 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 30890 invoked by uid 500); 12 Feb 2007 21:53:06 -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 30881 invoked by uid 99); 12 Feb 2007 21:53:05 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Feb 2007 13:53:05 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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, 12 Feb 2007 13:52:57 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id C22EC1A981D; Mon, 12 Feb 2007 13:52:37 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r506682 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire: OpenWireCommandReader.h OpenWireCommandWriter.h Date: Mon, 12 Feb 2007 21:52:37 -0000 To: commits@activemq.apache.org From: nmittler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070212215237.C22EC1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nmittler Date: Mon Feb 12 13:52:36 2007 New Revision: 506682 URL: http://svn.apache.org/viewvc?view=rev&rev=506682 Log: [AMQCPP-30] Fixed memory leak in OpenWireCommandReader/Writer Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.h Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.h?view=diff&rev=506682&r1=506681&r2=506682 ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.h Mon Feb 12 13:52:36 2007 @@ -64,7 +64,7 @@ OpenWireCommandReader( io::InputStream* inputStream, OpenWireFormat* openWireFormat ); - virtual ~OpenWireCommandReader() {} + virtual ~OpenWireCommandReader(); /** * Reads a command from the given input stream. @@ -80,7 +80,11 @@ */ virtual void setInputStream( io::InputStream* inputStream ){ this->inputStream = inputStream; - delete dataInputStream; + + if( dataInputStream != NULL ) { + delete dataInputStream; + } + dataInputStream = new io::DataInputStream( inputStream ); } Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.h?view=diff&rev=506682&r1=506681&r2=506682 ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.h Mon Feb 12 13:52:36 2007 @@ -62,7 +62,7 @@ OpenWireCommandWriter( io::OutputStream* outputStream, OpenWireFormat* openWireFormat ); - virtual ~OpenWireCommandWriter(void) {} + virtual ~OpenWireCommandWriter(); /** * Sets the target output stream. @@ -70,14 +70,18 @@ */ virtual void setOutputStream( io::OutputStream* outputStream ){ this->outputStream = outputStream; - delete dataOutputStream; + + if( dataOutputStream != NULL ) { + delete dataOutputStream; + } + dataOutputStream = new io::DataOutputStream( outputStream ); } /** * Gets the target output stream. */ - virtual io::OutputStream* getOutputStream(void){ + virtual io::OutputStream* getOutputStream(){ return outputStream; } @@ -93,7 +97,7 @@ * Gets the target input stream. * @return Target Input Stream */ - virtual OpenWireFormat* getOpenWireFormat(void){ + virtual OpenWireFormat* getOpenWireFormat(){ return this->openWireFormat; }