ignite-3477-master - minor
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c449d6e9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c449d6e9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c449d6e9 Branch: refs/heads/ignite-3477-master Commit: c449d6e93ffda3e895615d5958a1b00e476e3ad6 Parents: 035b0fa Author: Sergi Vladykin <[email protected]> Authored: Mon Apr 10 10:22:03 2017 +0300 Committer: Sergi Vladykin <[email protected]> Committed: Mon Apr 10 10:22:03 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/database/tree/BPlusTree.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c449d6e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java index e5fd0ab..648f35a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java @@ -971,6 +971,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements } long page = acquirePage(firstPageId); + try { long pageAddr = readLock(firstPageId, page); @@ -1001,6 +1002,9 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements catch (AssertionError e) { throw new AssertionError("Assertion error on first row lookup", e); } + finally { + checkDestroyed(); + } } /** {@inheritDoc} */ @@ -1023,6 +1027,9 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements catch (AssertionError e) { throw new AssertionError("Assertion error on last row lookup", e); } + finally { + checkDestroyed(); + } } /**
