Return-Path: Delivered-To: apmail-incubator-qpid-commits-archive@locus.apache.org Received: (qmail 82030 invoked from network); 29 Oct 2007 14:50:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Oct 2007 14:50:37 -0000 Received: (qmail 21375 invoked by uid 500); 29 Oct 2007 14:46:44 -0000 Delivered-To: apmail-incubator-qpid-commits-archive@incubator.apache.org Received: (qmail 21367 invoked by uid 500); 29 Oct 2007 14:46:44 -0000 Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: qpid-dev@incubator.apache.org Delivered-To: mailing list qpid-commits@incubator.apache.org Received: (qmail 21355 invoked by uid 99); 29 Oct 2007 14:46:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2007 07:46:44 -0700 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; Mon, 29 Oct 2007 14:47:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6B0891A9832; Mon, 29 Oct 2007 07:46:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r589643 - in /incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply: InitialContextHelper.java PingPongProducer.java Date: Mon, 29 Oct 2007 14:46:29 -0000 To: qpid-commits@incubator.apache.org From: arnaudsimon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071029144633.6B0891A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: arnaudsimon Date: Mon Oct 29 07:46:28 2007 New Revision: 589643 URL: http://svn.apache.org/viewvc?rev=589643&view=rev Log: Changed to set session and initial context Modified: incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java Modified: incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java?rev=589643&r1=589642&r2=589643&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java (original) +++ incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java Mon Oct 29 07:46:28 2007 @@ -42,7 +42,14 @@ ClassLoader cl = Thread.currentThread().getContextClassLoader(); // NB: Need to change path to reflect package if moving classes around ! InputStream is = cl.getResourceAsStream(propertyFile); + if( is != null ) + { fileProperties.load(is); return new InitialContext(fileProperties); + } + else + { + return new InitialContext(); + } } } Modified: incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java?rev=589643&r1=589642&r2=589643&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java (original) +++ incubator/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java Mon Oct 29 07:46:28 2007 @@ -558,7 +558,7 @@ /** * Holds the producer controlSession, needed to create ping messages. */ - protected Session _producerSession = (Session) _connection.createSession(_transacted, _ackMode); + protected Session _producerSession ; /** * Holds the destination where the response messages will arrive.