From commits-return-8096-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Tue Nov 7 09:35:08 2017 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 [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B684E178EE for ; Tue, 7 Nov 2017 09:35:08 +0000 (UTC) Received: (qmail 73765 invoked by uid 500); 7 Nov 2017 09:35:08 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 73599 invoked by uid 500); 7 Nov 2017 09:35:08 -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 73361 invoked by uid 99); 7 Nov 2017 09:35:08 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2017 09:35:08 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 1C0373A00E6 for ; Tue, 7 Nov 2017 09:35:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1814470 - in /jmeter/trunk/src: core/org/apache/jmeter/functions/AbstractFunction.java functions/org/apache/jmeter/functions/DigestEncode.java Date: Tue, 07 Nov 2017 09:35:05 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171107093507.1C0373A00E6@svn01-us-west.apache.org> Author: pmouawad Date: Tue Nov 7 09:35:04 2017 New Revision: 1814470 URL: http://svn.apache.org/viewvc?rev=1814470&view=rev Log: Bug 61724 - Add __digest function to provide computing of Hashes (SHA-XXX, MDX) Fix tests failure Bugzilla Id: 61724 Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java jmeter/trunk/src/functions/org/apache/jmeter/functions/DigestEncode.java Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java?rev=1814470&r1=1814469&r2=1814470&view=diff ============================================================================== --- jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java Tue Nov 7 09:35:04 2017 @@ -143,21 +143,24 @@ public abstract class AbstractFunction i } /** - * Utility method to store value in a variable - * - * @param value value of variable to update - * @param values array of {@link CompoundVariable} from which variable name will be extracted - * @param index index of variable in values array + * Utility method to store value in a variable + * @param value + * value of variable to update + * @param values + * array of {@link CompoundVariable} from which variable name + * will be extracted + * @param index + * index of variable in values array */ - protected final void addVariableValue(String value, CompoundVariable[] values, int index) { - if (values.length > index) { - String variableName = values[index].execute().trim(); - if (StringUtils.isNotEmpty(variableName)) { - JMeterVariables vars = getVariables(); - if (vars != null) { - vars.put(variableName, value); - } - } - } - } + protected final void addVariableValue(String value, CompoundVariable[] values, int index) { + if (values.length > index) { + String variableName = values[index].execute().trim(); + if (StringUtils.isNotEmpty(variableName)) { + JMeterVariables vars = getVariables(); + if (vars != null) { + vars.put(variableName, value); + } + } + } + } } Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/DigestEncode.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/DigestEncode.java?rev=1814470&r1=1814469&r2=1814470&view=diff ============================================================================== --- jmeter/trunk/src/functions/org/apache/jmeter/functions/DigestEncode.java (original) +++ jmeter/trunk/src/functions/org/apache/jmeter/functions/DigestEncode.java Tue Nov 7 09:35:04 2017 @@ -131,4 +131,4 @@ public class DigestEncode extends Abstra public List getArgumentDesc() { return desc; } -} \ No newline at end of file +}