Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 26474 invoked from network); 16 Dec 2006 14:28:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Dec 2006 14:28:59 -0000 Received: (qmail 10866 invoked by uid 500); 16 Dec 2006 14:28:50 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 10856 invoked by uid 500); 16 Dec 2006 14:28:50 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 10847 invoked by uid 99); 16 Dec 2006 14:28:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Dec 2006 06:28:50 -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; Sat, 16 Dec 2006 06:28:42 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 9E4281A981A; Sat, 16 Dec 2006 06:27:55 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r487805 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src: main/activemq/exceptions/ActiveMQException.cpp test/activemq/io/ByteArrayInputStreamTest.h test/activemq/util/GuidTest.h Date: Sat, 16 Dec 2006 14:27:55 -0000 To: activemq-commits@geronimo.apache.org From: nmittler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061216142755.9E4281A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nmittler Date: Sat Dec 16 06:27:54 2006 New Revision: 487805 URL: http://svn.apache.org/viewvc?view=rev&rev=487805 Log: [AMQCPP-27] Applying patch for mismatched new[] and delete[] Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/exceptions/ActiveMQException.cpp incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/ByteArrayInputStreamTest.h incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/GuidTest.h Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/exceptions/ActiveMQException.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/exceptions/ActiveMQException.cpp?view=diff&rev=487805&r1=487804&r2=487805 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/exceptions/ActiveMQException.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/exceptions/ActiveMQException.cpp Sat Dec 16 06:27:54 2006 @@ -42,7 +42,7 @@ // assign isn't passing ownership, just copying, delete // the allocated buffer. - delete buffer; + delete [] buffer; break; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/ByteArrayInputStreamTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/ByteArrayInputStreamTest.h?view=diff&rev=487805&r1=487804&r2=487805 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/ByteArrayInputStreamTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/ByteArrayInputStreamTest.h Sat Dec 16 06:27:54 2006 @@ -84,7 +84,7 @@ stream_a.close(); - delete buffer; + delete [] buffer; } }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/GuidTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/GuidTest.h?view=diff&rev=487805&r1=487804&r2=487805 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/GuidTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/GuidTest.h Sat Dec 16 06:27:54 2006 @@ -71,7 +71,7 @@ CPPUNIT_ASSERT( guid == bytesGUID ); - delete bytes; + delete [] bytes; Guid bytesGUID2; bytesGUID2.fromBytes((const unsigned char*)guid);