Repository: cassandra
Updated Branches:
  refs/heads/trunk 720772033 -> cc4367700


Ninja fix bitwise OR to logical OR in StorageServer.onChange

Patch by Ariel Weisberg; Reviewed by Kurt Greaves for CASSANDRA-7544


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc436770
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc436770
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc436770

Branch: refs/heads/trunk
Commit: cc436770010034f5e9fbde06b9a2e713ddbffcee
Parents: 7207720
Author: Ariel Weisberg <aweisb...@apple.com>
Authored: Mon Feb 19 22:31:29 2018 -0500
Committer: Ariel Weisberg <aweisb...@apple.com>
Committed: Mon Feb 19 22:31:29 2018 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc436770/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 42e3ddf..d465431 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2011,7 +2011,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
      */
     public void onChange(InetAddressAndPort endpoint, ApplicationState state, 
VersionedValue value)
     {
-        if (state == ApplicationState.STATUS | state == 
ApplicationState.STATUS_WITH_PORT)
+        if (state == ApplicationState.STATUS || state == 
ApplicationState.STATUS_WITH_PORT)
         {
             String[] pieces = splitValue(value);
             assert (pieces.length > 0);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to