You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/08/14 18:14:04 UTC
svn commit: r1372957 -
/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Author: sebb
Date: Tue Aug 14 16:14:04 2012
New Revision: 1372957
URL: http://svn.apache.org/viewvc?rev=1372957&view=rev
Log:
Fix indentation
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=1372957&r1=1372956&r2=1372957&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Tue Aug 14 16:14:04 2012
@@ -457,51 +457,51 @@ public class StandardJMeterEngine implem
private void startThreadGroup(AbstractThreadGroup group, int groupCount, SearchByClass<?> searcher, List<?> testLevelElements, ListenerNotifier notifier)
{
- int numThreads = group.getNumThreads();
- JMeterContextService.addTotalThreads(numThreads);
- boolean onErrorStopTest = group.getOnErrorStopTest();
- boolean onErrorStopTestNow = group.getOnErrorStopTestNow();
- boolean onErrorStopThread = group.getOnErrorStopThread();
- boolean onErrorStartNextLoop = group.getOnErrorStartNextLoop();
- String groupName = group.getName();
- log.info("Starting " + numThreads + " threads for group " + groupName + ".");
-
- if (onErrorStopTest) {
- log.info("Test will stop on error");
- } else if (onErrorStopTestNow) {
- log.info("Test will stop abruptly on error");
- } else if (onErrorStopThread) {
- log.info("Thread will stop on error");
- } else if (onErrorStartNextLoop) {
- log.info("Thread will start next loop on error");
- } else {
- log.info("Thread will continue on error");
- }
- ListedHashTree threadGroupTree = (ListedHashTree) searcher.getSubTree(group);
- threadGroupTree.add(group, testLevelElements);
-
- JMeterThread[] jmThreads =
- new JMeterThread[numThreads];
- for (int i = 0; running && i < numThreads; i++) {
- final JMeterThread jmeterThread = new JMeterThread(cloneTree(threadGroupTree), group, notifier);
- jmeterThread.setThreadNum(i);
- jmeterThread.setThreadGroup(group);
- jmeterThread.setInitialContext(JMeterContextService.getContext());
- final String threadName = groupName + " " + (groupCount) + "-" + (i + 1);
- jmeterThread.setThreadName(threadName);
- jmeterThread.setEngine(this);
- jmeterThread.setOnErrorStopTest(onErrorStopTest);
- jmeterThread.setOnErrorStopTestNow(onErrorStopTestNow);
- jmeterThread.setOnErrorStopThread(onErrorStopThread);
- jmeterThread.setOnErrorStartNextLoop(onErrorStartNextLoop);
-
- group.scheduleThread(jmeterThread);
-
- jmThreads[i] = jmeterThread;
- } // end of thread startup for this thread group
- group.setJMeterThreads(jmThreads);
- groups.add(group);
- group.start();
+ int numThreads = group.getNumThreads();
+ JMeterContextService.addTotalThreads(numThreads);
+ boolean onErrorStopTest = group.getOnErrorStopTest();
+ boolean onErrorStopTestNow = group.getOnErrorStopTestNow();
+ boolean onErrorStopThread = group.getOnErrorStopThread();
+ boolean onErrorStartNextLoop = group.getOnErrorStartNextLoop();
+ String groupName = group.getName();
+ log.info("Starting " + numThreads + " threads for group " + groupName + ".");
+
+ if (onErrorStopTest) {
+ log.info("Test will stop on error");
+ } else if (onErrorStopTestNow) {
+ log.info("Test will stop abruptly on error");
+ } else if (onErrorStopThread) {
+ log.info("Thread will stop on error");
+ } else if (onErrorStartNextLoop) {
+ log.info("Thread will start next loop on error");
+ } else {
+ log.info("Thread will continue on error");
+ }
+ ListedHashTree threadGroupTree = (ListedHashTree) searcher.getSubTree(group);
+ threadGroupTree.add(group, testLevelElements);
+
+ JMeterThread[] jmThreads =
+ new JMeterThread[numThreads];
+ for (int i = 0; running && i < numThreads; i++) {
+ final JMeterThread jmeterThread = new JMeterThread(cloneTree(threadGroupTree), group, notifier);
+ jmeterThread.setThreadNum(i);
+ jmeterThread.setThreadGroup(group);
+ jmeterThread.setInitialContext(JMeterContextService.getContext());
+ final String threadName = groupName + " " + (groupCount) + "-" + (i + 1);
+ jmeterThread.setThreadName(threadName);
+ jmeterThread.setEngine(this);
+ jmeterThread.setOnErrorStopTest(onErrorStopTest);
+ jmeterThread.setOnErrorStopTestNow(onErrorStopTestNow);
+ jmeterThread.setOnErrorStopThread(onErrorStopThread);
+ jmeterThread.setOnErrorStartNextLoop(onErrorStartNextLoop);
+
+ group.scheduleThread(jmeterThread);
+
+ jmThreads[i] = jmeterThread;
+ } // end of thread startup for this thread group
+ group.setJMeterThreads(jmThreads);
+ groups.add(group);
+ group.start();
}
/**