Code review fixes

Author: Michael Penick

src/token_map.cpp

@@ -25,10 +25,8 @@ TokenMap* TokenMap::from_partitioner(StringRef partitioner) {
     return new TokenMapImpl<Murmur3Partitioner>();
   } else if (ends_with(partitioner, RandomPartitioner::name())) {
     return new TokenMapImpl<RandomPartitioner>();
-    return NULL;
   } else if (ends_with(partitioner, ByteOrderedPartitioner::name())) {
     return new TokenMapImpl<ByteOrderedPartitioner>();
-    return NULL;
   } else {
     LOG_WARN("Unsupported partitioner class '%s'", partitioner.to_string().c_str());
     return NULL;

src/token_map_impl.hpp

@@ -172,7 +172,7 @@ struct ReplicationFactor {
   size_t count;
   std::string name; // Used for logging the datacenter name
   bool operator==(const ReplicationFactor& other) const {
-    return count == other.count;
+    return count == other.count && name == other.name;
   }
 };