Return-Path: X-Original-To: apmail-drill-commits-archive@www.apache.org Delivered-To: apmail-drill-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7432A10B79 for ; Sat, 14 Feb 2015 09:24:01 +0000 (UTC) Received: (qmail 56149 invoked by uid 500); 14 Feb 2015 09:15:24 -0000 Delivered-To: apmail-drill-commits-archive@drill.apache.org Received: (qmail 41240 invoked by uid 500); 14 Feb 2015 09:15:13 -0000 Mailing-List: contact commits-help@drill.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@drill.apache.org Delivered-To: mailing list commits@drill.apache.org Received: (qmail 24529 invoked by uid 99); 14 Feb 2015 05:51:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Feb 2015 05:51:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6CDA7E07F6; Sat, 14 Feb 2015 05:51:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: parthc@apache.org To: commits@drill.apache.org Date: Sat, 14 Feb 2015 05:51:42 -0000 Message-Id: <233a550ed1b94f9a92ebd5ec1820444f@git.apache.org> In-Reply-To: <370c7014a59140be9f983e6af878489c@git.apache.org> References: <370c7014a59140be9f983e6af878489c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] drill git commit: DRILL-1697: C++ client. Fix crash when listener exits prematurely. DRILL-1697: C++ client. Fix crash when listener exits prematurely. Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/7f5ce329 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/7f5ce329 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/7f5ce329 Branch: refs/heads/master Commit: 7f5ce329d8c96936a97788717e621ff8535cd76f Parents: 0553798 Author: Parth Chandra Authored: Wed Feb 11 21:37:31 2015 -0800 Committer: Parth Chandra Committed: Fri Feb 13 21:50:48 2015 -0800 ---------------------------------------------------------------------- contrib/native/client/src/clientlib/drillClientImpl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/7f5ce329/contrib/native/client/src/clientlib/drillClientImpl.cpp ---------------------------------------------------------------------- diff --git a/contrib/native/client/src/clientlib/drillClientImpl.cpp b/contrib/native/client/src/clientlib/drillClientImpl.cpp index c0382ba..ebeeee2 100644 --- a/contrib/native/client/src/clientlib/drillClientImpl.cpp +++ b/contrib/native/client/src/clientlib/drillClientImpl.cpp @@ -1134,7 +1134,9 @@ void DrillClientQueryResult::clearAndDestroy(){ } m_columnDefs->clear(); } - DRILL_LOG(LOG_TRACE) << "Clearing state for Query Id - " << debugPrintQid(*this->m_pQueryId) << std::endl; + if(this->m_pQueryId!=NULL){ + DRILL_LOG(LOG_TRACE) << "Clearing state for Query Id - " << debugPrintQid(*this->m_pQueryId) << std::endl; + } //Tell the parent to remove this from its lists m_pClient->clearMapEntries(this);