cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/2] git commit: Fix fat client schema pull NPE
Date Wed, 25 Sep 2013 19:11:55 GMT
Updated Branches:
  refs/heads/cassandra-2.0 b3b7508cc -> 643dc0068


Fix fat client schema pull NPE

patch by Mikhail Panchenko; reviewed by Aleksey Yeschenko for
CASSANDRA-6089


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

Branch: refs/heads/cassandra-2.0
Commit: 5d08a2518d3c538ba7c6a91893424493b28fd9ac
Parents: 25926d0
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Sep 25 22:08:25 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Sep 25 22:08:25 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 src/java/org/apache/cassandra/service/MigrationManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d08a251/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6341e29..27ebc9b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@
  * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
  * Move batchlog replay to its own executor (CASSANDRA-6079)
  * Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057)
+ * Fix fat client schema pull NPE (CASSANDRA-6089)
 
 
 1.2.10

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d08a251/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java
index 9aa6f22..e901b61 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -110,7 +110,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber
      */
     private static void maybeScheduleSchemaPull(final UUID theirVersion, final InetAddress
endpoint)
     {
-        if (Schema.instance.getVersion().equals(theirVersion) || !shouldPullSchemaFrom(endpoint))
+        if ((Schema.instance.getVersion() != null && Schema.instance.getVersion().equals(theirVersion))
|| !shouldPullSchemaFrom(endpoint))
             return;
 
         if (Schema.emptyVersion.equals(Schema.instance.getVersion()) || runtimeMXBean.getUptime()
< MIGRATION_DELAY_IN_MS)


Mime
View raw message