From commits-return-9985-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Sep 28 19:30:15 2019 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 5B64719FE8 for ; Sat, 28 Sep 2019 19:30:15 +0000 (UTC) Received: (qmail 37333 invoked by uid 500); 28 Sep 2019 19:30:14 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 37272 invoked by uid 500); 28 Sep 2019 19:30:13 -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 37122 invoked by uid 99); 28 Sep 2019 19:30:13 -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, 28 Sep 2019 19:30:13 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 15CAF81E76; Sat, 28 Sep 2019 19:30:12 +0000 (UTC) Date: Sat, 28 Sep 2019 19:30:18 +0000 To: "commits@jmeter.apache.org" Subject: [jmeter] 06/07: Use == to compare enumerations MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: fschumacher@apache.org In-Reply-To: <156969901259.17226.11258686357976129012@gitbox.apache.org> References: <156969901259.17226.11258686357976129012@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: jmeter X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: d5e13a2c9f41587bbd52cd2cceb415a6dbf4fe1e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190928193013.15CAF81E76@gitbox.apache.org> 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 commit d5e13a2c9f41587bbd52cd2cceb415a6dbf4fe1e Author: Felix Schumacher AuthorDate: Sat Sep 28 21:20:28 2019 +0200 Use == to compare enumerations --- .../apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java index cc63e9f..065337d 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/action/ParseCurlCommandAction.java @@ -430,7 +430,7 @@ public class ParseCurlCommandAction extends AbstractAction implements MenuCreato for (int i = 0; i < authManager.getAuthObjects().size(); i++) { if (!authManager.getAuthObjectAt(i).getUser().equals(auth.getUser()) || !authManager.getAuthObjectAt(i).getPass().equals(auth.getPass()) - || !authManager.getAuthObjectAt(i).getMechanism().equals(auth.getMechanism())) { + || authManager.getAuthObjectAt(i).getMechanism() != auth.getMechanism()) { return true; } }