Return-Path: 
 <commits-return-9494-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 67931 invoked from network); 4 Nov 2008 22:03:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Nov 2008 22:03:35 -0000
Received: (qmail 16562 invoked by uid 500); 4 Nov 2008 22:03:41 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 16504 invoked by uid 500); 4 Nov 2008 22:03:41 -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 16495 invoked by uid 99); 4 Nov 2008 22:03:41 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 14:03:41 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 22:02:32 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 72EF723889A0; Tue,  4 Nov 2008 14:02:44 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r711440 -
 /activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
Date: Tue, 04 Nov 2008 22:02:44 -0000
To: commits@activemq.apache.org
From: tabish@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081104220244.72EF723889A0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tabish
Date: Tue Nov  4 14:02:44 2008
New Revision: 711440

URL: http://svn.apache.org/viewvc?rev=711440&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-200

Remove code that was forcing the use of the same Client Id for each connection which could cause errors.

Modified:
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp

Modified: activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp?rev=711440&r1=711439&r2=711440&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp (original)
+++ activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp Tue Nov  4 14:02:44 2008
@@ -22,25 +22,26 @@
 
 #include <activemq/core/ActiveMQConnectionFactory.h>
 #include <activemq/exceptions/ActiveMQException.h>
-#include <decaf/lang/Thread.h>
 #include <activemq/connector/stomp/StompConnector.h>
-#include <decaf/util/Properties.h>
 #include <activemq/transport/TransportFactory.h>
-#include <decaf/util/UUID.h>
-#include <decaf/util/Properties.h>
-#include <decaf/util/StringTokenizer.h>
 #include <activemq/connector/ConnectorFactoryMap.h>
-#include <decaf/net/SocketFactory.h>
 #include <activemq/transport/TransportFactory.h>
-#include <decaf/net/Socket.h>
-#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/core/ActiveMQConnection.h>
 #include <activemq/core/ActiveMQConsumer.h>
 #include <activemq/core/ActiveMQProducer.h>
+
 #include <decaf/util/StringTokenizer.h>
 #include <decaf/lang/Boolean.h>
 #include <decaf/lang/Runnable.h>
 #include <decaf/util/concurrent/CountDownLatch.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/net/Socket.h>
+#include <decaf/net/SocketFactory.h>
+#include <decaf/util/UUID.h>
+#include <decaf/util/Properties.h>
+#include <decaf/util/StringTokenizer.h>
+#include <decaf/util/Properties.h>
+#include <decaf/lang/Thread.h>
 
 #include <cms/Connection.h>
 #include <cms/MessageConsumer.h>
@@ -231,14 +232,9 @@
 
             try {
 
-                string user,passwd,sID;
-                user="default";
-                passwd="";
-                sID="lsgID";
-
                 // Create a Connection
                 connection = ActiveMQConnectionFactory::createConnection(
-                    IntegrationCommon::getInstance().getStompURL(), user, passwd, sID );
+                    IntegrationCommon::getInstance().getStompURL(), "", "", "" );
 
                 connection->start();