Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9E0C217433 for ; Sun, 15 Mar 2015 23:20:21 +0000 (UTC) Received: (qmail 7286 invoked by uid 500); 15 Mar 2015 23:20:21 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 7247 invoked by uid 500); 15 Mar 2015 23:20:21 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 7234 invoked by uid 99); 15 Mar 2015 23:20:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Mar 2015 23:20:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2E4ECE1072; Sun, 15 Mar 2015 23:20:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: use short-circuiting ops Date: Sun, 15 Mar 2015 23:20:21 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/trunk d919cc998 -> b274aa1c7 use short-circuiting ops Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b274aa1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b274aa1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b274aa1c Branch: refs/heads/trunk Commit: b274aa1c7f9332205b4753de6c765a3c5e1f1ef8 Parents: d919cc9 Author: Dave Brosius Authored: Sun Mar 15 19:20:01 2015 -0400 Committer: Dave Brosius Committed: Sun Mar 15 19:20:01 2015 -0400 ---------------------------------------------------------------------- .../cassandra/stress/generate/DistributionBoundApache.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b274aa1c/tools/stress/src/org/apache/cassandra/stress/generate/DistributionBoundApache.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/DistributionBoundApache.java b/tools/stress/src/org/apache/cassandra/stress/generate/DistributionBoundApache.java index 23ce3e9..db077a5 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/DistributionBoundApache.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/DistributionBoundApache.java @@ -61,7 +61,7 @@ public class DistributionBoundApache extends Distribution private static long bound(long min, long max, double val) { long r = (long) val; - if ((r >= min) & (r <= max)) + if ((r >= min) && (r <= max)) return r; if (r < min) return min; @@ -72,7 +72,7 @@ public class DistributionBoundApache extends Distribution private static double boundDouble(long min, long max, double r) { - if ((r >= min) & (r <= max)) + if ((r >= min) && (r <= max)) return r; if (r < min) return min;