svn commit: r1786026 - /jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java

[mc...@apache.org]

Author: mchassagneux
Date: Wed Mar  8 17:04:13 2017
New Revision: 1786026

URL: http://svn.apache.org/viewvc?rev=1786026&view=rev
Log:
Fix NPE for addThreadLock transient object in remote mode
Bugzilla Id: 60829

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java?rev=1786026&r1=1786025&r2=1786026&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java Wed Mar  8 17:04:13 2017
@@ -18,6 +18,8 @@
 
 package org.apache.jmeter.threads;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
@@ -84,7 +86,7 @@ public class ThreadGroup extends Abstrac
     // List of active threads
     private final Map<JMeterThread, Thread> allThreads = new ConcurrentHashMap<>();
     
-    private final transient Object addThreadLock = new Object();
+    private transient Object addThreadLock = new Object();
 
     /**
      * Is test (still) running?
@@ -323,6 +325,15 @@ public class ThreadGroup extends Abstrac
         newThread.start();
         return jmThread;
     }
+    
+    /*
+     * Fix NPE for addThreadLock transient object in remote mode (BZ60829)
+     */
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        in.defaultReadObject();
+        addThreadLock = new Object();
+    }
+    
     /**
      * Register Thread when it starts
      * @param jMeterThread {@link JMeterThread}