commit 8eca4ad01a595c747ca6012f202ae836b76723c3
author Aleksey Yeschenko <aleksey@apache.org> Thu Mar 14 03:08:42 2013 +0300
committer Aleksey Yeschenko <aleksey@apache.org> Thu Mar 14 03:08:42 2013 +0300
tree 0e92867b9330a18d0e90d309eeb67556d7e39e36
parent bb63238749171ebb4a6631f28c93246f3fd31743

Return empty schema to pre-1.2 nodes' migration requests

src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java

diff --git a/src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java b/src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java
index 97fd641..1992c01 100644
--- a/src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java
@@ -18,6 +18,7 @@
 package org.apache.cassandra.db;
 
 import java.util.Collection;
+import java.util.Collections;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,8 +40,16 @@
     public void doVerb(MessageIn message, String id)
     {
         logger.debug("Received migration request from {}.", message.from);
+
+        if (message.version < MessagingService.VERSION_12)
+            logger.debug("Returning empty response to the migration request from {} (version < 1.2).", message.from);
+
+        Collection<RowMutation> schema = message.version < MessagingService.VERSION_12
+                                         ? Collections.EMPTY_SET
+                                         : SystemTable.serializeSchema();
+
         MessageOut<Collection<RowMutation>> response = new MessageOut<Collection<RowMutation>>(MessagingService.Verb.INTERNAL_RESPONSE,
-                                                                                               SystemTable.serializeSchema(),
+                                                                                               schema,
                                                                                                MigrationManager.MigrationsSerializer.instance);
         MessagingService.instance().sendReply(response, id, message.from);
     }