Repository: cassandra Updated Branches: refs/heads/trunk 6d59bbcfb -> 622e001c9
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/622e001c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/622e001c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/622e001c Branch: refs/heads/trunk Commit: 622e001c93c311afbdf9239db477738077b031a2 Parents: 6d59bbc Author: Dave Brosius <[email protected]> Authored: Thu Jun 11 00:28:37 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Thu Jun 11 00:28:37 2015 -0400 ---------------------------------------------------------------------- .../apache/cassandra/io/util/UnbufferedDataOutputStreamPlus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/622e001c/src/java/org/apache/cassandra/io/util/UnbufferedDataOutputStreamPlus.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/UnbufferedDataOutputStreamPlus.java b/src/java/org/apache/cassandra/io/util/UnbufferedDataOutputStreamPlus.java index d8036ff..087b888 100644 --- a/src/java/org/apache/cassandra/io/util/UnbufferedDataOutputStreamPlus.java +++ b/src/java/org/apache/cassandra/io/util/UnbufferedDataOutputStreamPlus.java @@ -258,7 +258,7 @@ public abstract class UnbufferedDataOutputStreamPlus extends DataOutputStreamPlu for (int i = 0 ; i < length ; i++) { int ch = str.charAt(i); - if ((ch > 0) & (ch <= 127)) + if ((ch > 0) && (ch <= 127)) utfCount += 1; else if (ch <= 2047) utfCount += 2;
