Author: sebb
Date: Mon May 28 17:46:25 2012
New Revision: 1343334
URL: http://svn.apache.org/viewvc?rev=1343334&view=rev
Log:
Bug 53311 - JMeterUtils#runSafe should not throw Error when interrupted
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1343334&r1=1343333&r2=1343334&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Mon May 28
17:46:25 2012
@@ -1289,7 +1289,7 @@ public class JMeterUtils implements Unit
try {
SwingUtilities.invokeAndWait(runnable);
} catch (InterruptedException e) {
- throw new Error(e);
+ log.warn("Interrupted in thread
"+Thread.currentThread().getName(), e);
} catch (InvocationTargetException e) {
throw new Error(e);
}
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1343334&r1=1343333&r2=1343334&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon May 28 17:46:25 2012
@@ -128,6 +128,7 @@ or a Debug Sampler with all fields set t
<h2>Non-functional changes</h2>
<ul>
+<li>Bug 53311 - JMeterUtils#runSafe should not throw Error when
interrupted</li>
<li>Updated to commons-net-3.1 (from 3.0.1)</li>
</ul>
