From commits-return-4412-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Fri Dec 11 20:36:26 2015 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 0A15D186B7 for ; Fri, 11 Dec 2015 20:36:26 +0000 (UTC) Received: (qmail 38844 invoked by uid 500); 11 Dec 2015 20:36:26 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 38811 invoked by uid 500); 11 Dec 2015 20:36:26 -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 38802 invoked by uid 99); 11 Dec 2015 20:36:25 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2015 20:36:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 89C55180A9A for ; Fri, 11 Dec 2015 20:36:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id j10g_lKWIikh for ; Fri, 11 Dec 2015 20:36:25 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id DFA5625085 for ; Fri, 11 Dec 2015 20:36:24 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 81A8EE0044 for ; Fri, 11 Dec 2015 20:36:24 +0000 (UTC) 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 833D93A01DC for ; Fri, 11 Dec 2015 20:36:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1719539 - /jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java Date: Fri, 11 Dec 2015 20:36:24 -0000 To: commits@jmeter.apache.org From: fschumacher@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151211203624.833D93A01DC@svn01-us-west.apache.org> Author: fschumacher Date: Fri Dec 11 20:36:24 2015 New Revision: 1719539 URL: http://svn.apache.org/viewvc?rev=1719539&view=rev Log: Use equals for String comparison. Change order of operands to guard against null pointer dereference. Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java?rev=1719539&r1=1719538&r2=1719539&view=diff ============================================================================== --- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java Fri Dec 11 20:36:24 2015 @@ -79,7 +79,7 @@ public class BytesThroughputGraphConsume @Override public double select(String series, Sample sample) { // TODO Add Received bytes support - return (series == SENT_BYTES_SERIES_LABEL) ? sample + return (SENT_BYTES_SERIES_LABEL.equals(series)) ? sample .getSentBytes() : 0; } }, false, false));