Updated Branches: refs/heads/trunk fc8e4b565 -> c517c628f
handle ApplicationState.SCHEMA not present patch by jbellis for CASSANDRA-4427 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c517c628 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c517c628 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c517c628 Branch: refs/heads/trunk Commit: c517c628f882593c46ba467d4f7a0f4dcb308ab2 Parents: fc8e4b5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Jul 29 12:23:42 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Jul 29 12:24:59 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c517c628/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 1e73567..8cd5b0b 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -524,7 +524,8 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe continue; } - if (!entry.getValue().getApplicationState(ApplicationState.SCHEMA).value.equals(Schema.emptyVersion.toString())) + VersionedValue schemaValue = entry.getValue().getApplicationState(ApplicationState.SCHEMA); + if (schemaValue != null && !schemaValue.value.equals(Schema.emptyVersion.toString())) { schemaPresent = true; break;
