Author: sebb
Date: Sun Nov 15 01:49:25 2009
New Revision: 836310
URL: http://svn.apache.org/viewvc?rev=836310&view=rev
Log:
Bug 47556 - JMS-PoinToPoint-Sampler Timout field should use Strings
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java?rev=836310&r1=836309&r2=836310&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
Sun Nov 15 01:49:25 2009
@@ -186,7 +186,7 @@
useNonPersistentDelivery.setSelected(sampler.isNonPersistent());
useReqMsgIdAsCorrelId.setSelected(sampler.isUseReqMsgIdAsCorrelId());
- timeout.setText(String.valueOf(sampler.getTimeout()));
+ timeout.setText(sampler.getTimeout());
soapXml.setText(sampler.getContent());
initialContextFactory.setText(sampler.getInitialContextFactory());
providerUrl.setText(sampler.getContextProvider());
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=836310&r1=836309&r2=836310&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
Sun Nov 15 01:49:25 2009
@@ -61,6 +61,7 @@
private static final long serialVersionUID = 233L;
private static final int DEFAULT_TIMEOUT = 2000;
+ private static final String DEFAULT_TIMEOUT_STRING =
Integer.toString(DEFAULT_TIMEOUT);
//++ These are JMX names, and must not be changed
private static final String JNDI_INITIAL_CONTEXT_FACTORY =
"JMSSampler.initialContextFactory"; // $NON-NLS-1$
@@ -341,7 +342,7 @@
if (isNonPersistent()) {
producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
}
- executor = new FixedQueueExecutor(producer, getTimeout(),
isUseReqMsgIdAsCorrelId());
+ executor = new FixedQueueExecutor(producer,
getTimeoutAsInt(), isUseReqMsgIdAsCorrelId());
}
}
if (LOGGER.isDebugEnabled()) {
@@ -407,6 +408,7 @@
private void printEnvironment(Context context) throws NamingException {
Hashtable<?,?> env = context.getEnvironment();
LOGGER.debug("Initial Context Properties");
+ @SuppressWarnings("unchecked")
Enumeration<String> keys = (Enumeration<String>) env.keys();
while (keys.hasMoreElements()) {
String key = keys.nextElement();
@@ -425,12 +427,16 @@
}
}
- public int getTimeout() {
+ private int getTimeoutAsInt() {
if (getPropertyAsInt(TIMEOUT) < 1) {
return DEFAULT_TIMEOUT;
}
return getPropertyAsInt(TIMEOUT);
}
+
+ public String getTimeout() {
+ return getPropertyAsString(TIMEOUT, DEFAULT_TIMEOUT_STRING);
+ }
/*
* (non-Javadoc)
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=836310&r1=836309&r2=836310&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sun Nov 15 01:49:25 2009
@@ -123,6 +123,7 @@
<li>JUnit sampler now supports JUnit4 tests (using annotations)</li>
<li>Bug 47900 - Allow JMS SubscriberSampler to be interrupted</li>
<li>Added JSR223 Sampler</li>
+<li>Bug 47556 - JMS-PoinToPoint-Sampler Timout field should use Strings</li>
</ul>
<h3>Controllers</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
