Change order of query responses

joeynor · Jul 24, 2017 · f4b348a · f4b348a
1 parent 884de4e
commit f4b348a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/irohad/torii/processor/impl/query_processor_impl.cpp b/irohad/torii/processor/impl/query_processor_impl.cpp
@@ -31,14 +31,17 @@ namespace iroha {
       response.query = query;
       response.passed = false;
 
-      if (validator_.validate(query)) {
+      // if not valid send wrong response
+      if (!validator_.validate(query)) {
+        subject_.get_subscriber().on_next(
+            std::make_shared<model::QueryStatelessResponse>(response));
+      } else {  // else send positive response on stateless validation
         response.passed = true;
-        auto qpf_response = qpf_.execute(query);
-        subject_.get_subscriber().on_next(qpf_response);
+        subject_.get_subscriber().on_next(
+            std::make_shared<model::QueryStatelessResponse>(response));
       }
-
-      subject_.get_subscriber().on_next(
-          std::make_shared<model::QueryStatelessResponse>(response));
+      auto qpf_response = qpf_.execute(query);
+      subject_.get_subscriber().on_next(qpf_response);
     }
 
     rxcpp::observable<std::shared_ptr<model::QueryResponse>>