From e8ccf7dfbcf5267562213dafe73953569711d510 Mon Sep 17 00:00:00 2001
From: Michael Penick <michael.penick@datastax.com>
Date: Tue, 28 Jun 2016 15:38:58 -0700
Subject: [PATCH] Fix: Hang in schema change handler cause by server error

---
 src/schema_change_handler.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/schema_change_handler.cpp b/src/schema_change_handler.cpp
index b8adc4981..c9844444a 100644
--- a/src/schema_change_handler.cpp
+++ b/src/schema_change_handler.cpp
@@ -109,9 +109,8 @@ void SchemaChangeHandler::on_set(const ResponseMap& responses) {
       has_error = true;
     }
   }
-  if (has_error) return;
 
-  if (has_schema_agreement(responses)) {
+  if (!has_error && has_schema_agreement(responses)) {
     LOG_DEBUG("Found schema agreement in %llu ms",
               static_cast<unsigned long long>(elapsed_ms_));
     request_handler_->set_response(request_response_);