From 957f89f4e3f952b68097279692ca7d0e84db7e6a Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 18 Oct 2012 23:52:31 +0000
Subject: [PATCH] dbms: development [#CONV-2944].

---
 dbms/include/DB/DataStreams/RemoteBlockInputStream.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h b/dbms/include/DB/DataStreams/RemoteBlockInputStream.h
index fa40eadedf3..f7f4eec3bcb 100644
--- a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/RemoteBlockInputStream.h
@@ -109,11 +109,9 @@ public:
 		  */
 
 		/// Отправим просьбу прервать выполнение запроса, если ещё не отправляли.
-		if (!was_cancelled)
+		if (!was_cancelled && !std::uncaught_exception())
 		{
-			LOG_TRACE(log, (std::uncaught_exception()
-				? "Cancelling query because of exception on client"
-				: "Cancelling query because enough data has been read"));
+			LOG_TRACE(log, "Cancelling query because enough data has been read");
 				
 			was_cancelled = true;
 			connection.sendCancel();