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/916acd49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/916acd49 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/916acd49 Branch: refs/heads/trunk Commit: 916acd4910da5943271d189597ef1908b3bf29d8 Parents: 80c3b2d Author: Jonathan Ellis <[email protected]> Authored: Sun Jul 29 12:23:42 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Sun Jul 29 12:24:14 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/916acd49/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 5591488..10a66bf 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -571,7 +571,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;
