Author: sebb
Date: Sat Mar 6 21:02:34 2010
New Revision: 919850
URL: http://svn.apache.org/viewvc?rev=919850&view=rev
Log:
Bug 48350 - Deadlock on distributed testing with 2 clients
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java?rev=919850&r1=919849&r2=919850&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
Sat Mar 6 21:02:34 2010
@@ -39,6 +39,8 @@
public class ClientJMeterEngine implements JMeterEngine, Runnable {
private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Object LOCK = new Object();
+
private RemoteJMeterEngine remote;
private HashTree test;
@@ -119,7 +121,15 @@
try {
JMeterContextService.startTest();
- remote.configure(test, host);
+ /*
+ * Add fix for Deadlocks, see:
+ *
+ * See https://issues.apache.org/bugzilla/show_bug.cgi?id=48350
+ */
+ synchronized(LOCK)
+ {
+ remote.configure(testTree, host);
+ }
log.info("sent test to " + host);
if (savep != null){
log.info("Sending properties "+savep);
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=919850&r1=919849&r2=919850&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Mar 6 21:02:34 2010
@@ -130,6 +130,7 @@
<li>Bug 47646 - NullPointerException in the "Random Variable" element</li>
<li>Disallow adding any child elements to JDBC Configuration</li>
<li>BeanInfoSupport now caches getBeanDescriptor() - should avoid an NPE on
non-Sun JVMs when using CSVDataSet (and some other TestBeans)</li>
+<li>Bug 48350 - Deadlock on distributed testing with 2 clients</li>
</ul>
<!-- ==================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
