Author: sebb
Date: Mon Oct 20 07:52:56 2008
New Revision: 706313
URL: http://svn.apache.org/viewvc?rev=706313&view=rev
Log:
Bug 46016 - avoid possible NPE in JMSSampler
Replace inefficient iterator usage
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
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=706313&r1=706312&r2=706313&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
Mon Oct 20 07:52:56 2008
@@ -298,7 +298,8 @@
context = getInitialContext();
Object obj = context.lookup(getQueueConnectionFactory());
if (!(obj instanceof QueueConnectionFactory)) {
- String msg = "QueueConnectionFactory expected, but got " +
obj.getClass().getName();
+ String msg = "QueueConnectionFactory expected, but got "
+ + obj == null ? "null" : obj.getClass().getName();
LOGGER.fatalError(msg);
throw new IllegalStateException(msg);
}
@@ -383,10 +384,10 @@
LOGGER.debug("Number of JNDI properties: " + map.size());
}
}
- Iterator it = map.keySet().iterator();
+ Iterator it = map.entrySet().iterator();
while (it.hasNext()) {
- String key = (String) it.next();
- table.put(key, map.get(key));
+ Map.Entry me = (Map.Entry) it.next();
+ table.put(me.getKey(), me.getValue());
}
Context context = new InitialContext(table);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
