From commits-return-10404-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Feb 15 12:32:44 2020 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id ECA7419B63 for ; Sat, 15 Feb 2020 12:32:43 +0000 (UTC) Received: (qmail 61797 invoked by uid 500); 15 Feb 2020 12:32:43 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 61759 invoked by uid 500); 15 Feb 2020 12:32:43 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 61714 invoked by uid 99); 15 Feb 2020 12:32:43 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Feb 2020 12:32:43 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C118E8B69B; Sat, 15 Feb 2020 12:32:42 +0000 (UTC) Date: Sat, 15 Feb 2020 12:32:42 +0000 To: "commits@jmeter.apache.org" Subject: [jmeter] branch master updated: spacepolice MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158176996251.26156.15147206214046571850@gitbox.apache.org> From: fschumacher@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: jmeter X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cfb2bd92acf19123ae8a0de32ca60a46f5a85043 X-Git-Newrev: d848aaa4a0f89c085b0785da26e6895a129ebaad X-Git-Rev: d848aaa4a0f89c085b0785da26e6895a129ebaad X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. fschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git The following commit(s) were added to refs/heads/master by this push: new d848aaa spacepolice d848aaa is described below commit d848aaa4a0f89c085b0785da26e6895a129ebaad Author: Felix Schumacher AuthorDate: Sat Feb 15 13:32:22 2020 +0100 spacepolice --- src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java index c43d199..b730df8 100644 --- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java +++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java @@ -526,8 +526,8 @@ public class JMeterThread implements Runnable, Interruptible { return transactionResult; } - private void fillThreadInformation(SampleResult result, - int nbActiveThreadsInThreadGroup, + private void fillThreadInformation(SampleResult result, + int nbActiveThreadsInThreadGroup, int nbTotalActiveThreads) { result.setGroupThreads(nbActiveThreadsInThreadGroup); result.setAllThreads(nbTotalActiveThreads);