Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 585DC200CC2 for ; Fri, 2 Jun 2017 19:13:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 55BDE160BBA; Fri, 2 Jun 2017 17:13:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F287B160BFE for ; Fri, 2 Jun 2017 19:13:16 +0200 (CEST) Received: (qmail 80713 invoked by uid 500); 2 Jun 2017 17:13:16 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 79642 invoked by uid 99); 2 Jun 2017 17:13:15 -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; Fri, 02 Jun 2017 17:13:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 556E9E024D; Fri, 2 Jun 2017 17:13:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Fri, 02 Jun 2017 17:13:52 -0000 Message-Id: <497f04f83bbe4bb994b81e989986b0a6@git.apache.org> In-Reply-To: <4c530179ed0447069b35932ef372a970@git.apache.org> References: <4c530179ed0447069b35932ef372a970@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [39/49] ignite git commit: IGNITE-5301 JVM crashes on H2TreeIndex destroy archived-at: Fri, 02 Jun 2017 17:13:19 -0000 IGNITE-5301 JVM crashes on H2TreeIndex destroy Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74840aef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74840aef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74840aef Branch: refs/heads/ignite-5398 Commit: 74840aef195054e6abd0500d219ad8c3eb92fbd9 Parents: 7737bd5 Author: EdShangGG Authored: Mon May 29 18:27:50 2017 +0300 Committer: EdShangGG Committed: Mon May 29 18:27:50 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/query/h2/database/H2TreeIndex.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/74840aef/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java index dcfdec9..8dc3210 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java @@ -371,10 +371,11 @@ public class H2TreeIndex extends GridH2IndexBase { @Override public void destroy() { try { if (cctx.affinityNode()) { - if (!cctx.kernalContext().cache().context().database().persistenceEnabled()) + if (!cctx.kernalContext().cache().context().database().persistenceEnabled()) { tree.destroy(); - cctx.offheap().dropRootPageForIndex(tree.getName()); + cctx.offheap().dropRootPageForIndex(tree.getName()); + } } } catch (IgniteCheckedException e) {