You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/06/24 17:07:43 UTC
cassandra git commit: rollback short-circuit logical expression change
Repository: cassandra
Updated Branches:
refs/heads/trunk cb062839f -> 7392fb96d
rollback short-circuit logical expression change
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7392fb96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7392fb96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7392fb96
Branch: refs/heads/trunk
Commit: 7392fb96dbe4d1d9d70a691b721c1bb7b359dd78
Parents: cb06283
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Jun 24 16:07:28 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Jun 24 16:07:28 2015 +0100
----------------------------------------------------------------------
.../apache/cassandra/io/util/UnbufferedDataOutputStreamPlus.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7392fb96/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 8f2cee0..9137ba2 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;