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.
