You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/06/06 23:50:05 UTC

svn commit: r412223 - /jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java

Author: sebb
Date: Tue Jun  6 14:50:04 2006
New Revision: 412223

URL: http://svn.apache.org/viewvc?rev=412223&view=rev
Log:
Bug 39735 - remove unnecessary thread array

Modified:
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=412223&r1=412222&r2=412223&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Tue Jun  6 14:50:04 2006
@@ -338,7 +338,6 @@
 		// for each thread group, generate threads
 		// hand each thread the sampler controller
 		// and the listeners, and the timer
-		JMeterThread[] threads;
 		Iterator iter = searcher.getSearchResults().iterator();
 
 		/*
@@ -364,8 +363,6 @@
 			String groupName = group.getName();
 			int rampUp = group.getRampUp();
 			float perThreadDelay = ((float) (rampUp * 1000) / (float) numThreads);
-			threads = new JMeterThread[numThreads];
-
 			log.info("Starting " + numThreads + " threads for group " + groupName + ". Ramp up = " + rampUp + ".");
 
 			if (onErrorStopTest) {
@@ -378,26 +375,25 @@
 
             ListedHashTree threadGroupTree = (ListedHashTree) searcher.getSubTree(group);
             threadGroupTree.add(group, testLevelElements);
-			for (int i = 0; running && i < threads.length; i++) {
-				threads[i] = new JMeterThread(cloneTree(threadGroupTree), this, notifier);
-				threads[i].setThreadNum(i);
-				threads[i].setThreadGroup(group);
-				threads[i].setInitialContext(JMeterContextService.getContext());
-				threads[i].setInitialDelay((int) (perThreadDelay * i));
-				threads[i].setThreadName(groupName + " " + (groupCount) + "-" + (i + 1));
+			for (int i = 0; running && i < numThreads; i++) {
+                final JMeterThread jmeterThread = new JMeterThread(cloneTree(threadGroupTree), this, notifier);
+                jmeterThread.setThreadNum(i);
+				jmeterThread.setThreadGroup(group);
+				jmeterThread.setInitialContext(JMeterContextService.getContext());
+				jmeterThread.setInitialDelay((int) (perThreadDelay * i));
+				jmeterThread.setThreadName(groupName + " " + (groupCount) + "-" + (i + 1));
 
-				scheduleThread(threads[i], group);
+				scheduleThread(jmeterThread, group);
 
 				// Set up variables for stop handling
-				threads[i].setEngine(this);
-				threads[i].setOnErrorStopTest(onErrorStopTest);
-				threads[i].setOnErrorStopThread(onErrorStopThread);
-
-				Thread newThread = new Thread(threads[i]);
-				newThread.setName(threads[i].getThreadName());
-				allThreads.put(threads[i], newThread);
-				if (serialized && !iter.hasNext() && i == threads.length - 1) // last
-				// thread
+				jmeterThread.setEngine(this);
+				jmeterThread.setOnErrorStopTest(onErrorStopTest);
+				jmeterThread.setOnErrorStopThread(onErrorStopThread);
+
+				Thread newThread = new Thread(jmeterThread);
+				newThread.setName(jmeterThread.getThreadName());
+				allThreads.put(jmeterThread, newThread);
+				if (serialized && !iter.hasNext() && i == numThreads - 1) // last thread
 				{
 					serialized = false;
 				}



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org