summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorArnaud Simon <arnaudsimon@apache.org>2007-10-29 14:46:28 +0000
committerArnaud Simon <arnaudsimon@apache.org>2007-10-29 14:46:28 +0000
commit0a45328fc13a926f62911d8cea4a9936e754293d (patch)
treeacebfcc44ca264ec6f6a96285a282e3cbfe5317a /qpid/java
parent8b406b8d90abe83250c4ec67532fd6d31fe17aeb (diff)
downloadqpid-python-0a45328fc13a926f62911d8cea4a9936e754293d.tar.gz
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
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java7
-rw-r--r--qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java2
2 files changed, 8 insertions, 1 deletions
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.