From 0a45328fc13a926f62911d8cea4a9936e754293d Mon Sep 17 00:00:00 2001 From: Arnaud Simon Date: Mon, 29 Oct 2007 14:46:28 +0000 Subject: Changed to set session and initial context git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@589643 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/requestreply/InitialContextHelper.java | 7 +++++++ .../main/java/org/apache/qpid/requestreply/PingPongProducer.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'qpid/java/perftests/src') diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java index 067aad4095..b684fd6b9b 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java @@ -42,7 +42,14 @@ public class InitialContextHelper 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(); + } } } diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java index 638f5ae8c0..6860b57d26 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java @@ -558,7 +558,7 @@ public class PingPongProducer implements Runnable /*, MessageListener*/, Excepti /** * 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. -- cgit v1.2.1