Return-Path: 
 <commits-return-4666-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 54862 invoked from network); 12 Feb 2007 21:50:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Feb 2007 21:50:59 -0000
Received: (qmail 26647 invoked by uid 500); 12 Feb 2007 21:51:07 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 26602 invoked by uid 500); 12 Feb 2007 21:51:07 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 26588 invoked by uid 99); 12 Feb 2007 21:51:07 -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:51:06 -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:50:58 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 860EB1A981A; Mon, 12 Feb 2007 13:50:38 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r506678 - in
 /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire:
 OpenWireCommandReader.cpp OpenWireCommandWriter.cpp OpenWireFormat.cpp
 OpenWireFormatNegotiator.cpp
Date: Mon, 12 Feb 2007 21:50:37 -0000
To: commits@activemq.apache.org
From: nmittler@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070212215038.860EB1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: nmittler
Date: Mon Feb 12 13:50:36 2007
New Revision: 506678

URL: http://svn.apache.org/viewvc?view=rev&rev=506678
Log:
[AMQCPP-30] Fixed memory leak in OpenWireCommandReader/Writer

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp?view=diff&rev=506678&r1=506677&r2=506678
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp Mon Feb 12 13:50:36 2007
@@ -18,6 +18,7 @@
 #include "OpenWireCommandReader.h"
 
 #include <activemq/concurrent/Thread.h>
+#include <iostream>
 
 using namespace std;
 using namespace activemq;
@@ -29,7 +30,7 @@
 using namespace activemq::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
-OpenWireCommandReader::OpenWireCommandReader(void)
+OpenWireCommandReader::OpenWireCommandReader()
 {
     this->inputStream = NULL;
     this->openWireFormat = NULL;
@@ -45,7 +46,15 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Command* OpenWireCommandReader::readCommand(void)
+OpenWireCommandReader::~OpenWireCommandReader() {
+    
+    if( dataInputStream != NULL ) {
+        delete dataInputStream;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+Command* OpenWireCommandReader::readCommand()
     throw ( CommandIOException )
 {
     try
@@ -87,7 +96,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-unsigned char OpenWireCommandReader::readByte(void) throw( io::IOException )
+unsigned char OpenWireCommandReader::readByte() throw( io::IOException )
 {
     try
     {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp?view=diff&rev=506678&r1=506677&r2=506678
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp Mon Feb 12 13:50:36 2007
@@ -16,6 +16,7 @@
  */
 
 #include "OpenWireCommandWriter.h"
+#include <iostream>
 
 using namespace std;
 using namespace activemq;
@@ -26,7 +27,7 @@
 using namespace activemq::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
-OpenWireCommandWriter::OpenWireCommandWriter(void)
+OpenWireCommandWriter::OpenWireCommandWriter()
 {
     this->outputStream = NULL;
     this->openWireFormat = NULL;
@@ -39,6 +40,14 @@
 {
     this->setOutputStream( outputStream );
     this->openWireFormat = openWireFormat;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+OpenWireCommandWriter::~OpenWireCommandWriter() {
+    
+    if( dataOutputStream != NULL ) {
+        delete dataOutputStream;
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp?view=diff&rev=506678&r1=506677&r2=506678
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormat.cpp Mon Feb 12 13:50:36 2007
@@ -29,6 +29,7 @@
 #include <activemq/connector/openwire/marshal/MarshalAware.h>
 #include <activemq/connector/openwire/marshal/DataStreamMarshaller.h>
 #include <activemq/connector/openwire/marshal/v2/MarshallerFactory.h>
+#include <iostream>
 
 using namespace std;
 using namespace activemq;
@@ -199,6 +200,9 @@
     throw ( io::IOException ) {
 
     try{
+        
+        cout << "OpenWireFormat::unmarshal()" << endl;
+        cout.flush();
 
         if( !sizePrefixDisabled ) {
             dis->readInt();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp?view=diff&rev=506678&r1=506677&r2=506678
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp Mon Feb 12 13:50:36 2007
@@ -19,7 +19,9 @@
 
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/commands/WireFormatInfo.h>
+#include <iostream>
 
+using namespace std;
 using namespace activemq;
 using namespace activemq::exceptions;
 using namespace activemq::transport;
@@ -81,6 +83,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormatNegotiator::onCommand( Command* command ) {
 
+    cout << "OpenWireFormatNegotiator::onCommand" << endl;
+    cout.flush();
+    
     DataStructure* dataStructure =
         dynamic_cast<DataStructure*>( command );
 
@@ -177,6 +182,9 @@
 
             // Mark the latch
             wireInfoSentDownLatch.countDown();
+            
+            cout << "leaving OpenWireFormatNegotiator::start first time logic" << endl;
+            cout.flush();
 
         } catch( ActiveMQException& ex ) {