Repository: ignite Updated Branches: refs/heads/master 1840f756d -> a7651b2f0
IGNITE-8404 Fixed NPE in MappedFileMemoryProvider Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a7651b2f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a7651b2f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a7651b2f Branch: refs/heads/master Commit: a7651b2f0f27f9af750bd482a42c1813f870e6f0 Parents: b7fd021 Author: Alexey Goncharuk <[email protected]> Authored: Thu Apr 26 19:38:03 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Apr 26 19:47:40 2018 +0300 ---------------------------------------------------------------------- .../mem/file/MappedFileMemoryProvider.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a7651b2f/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java index 3800214..7186b27 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java @@ -94,14 +94,18 @@ public class MappedFileMemoryProvider implements DirectMemoryProvider { /** {@inheritDoc} */ @Override public void shutdown() { - for (MappedFile file : mappedFiles) { - try { - file.close(); - } - catch (IOException e) { - log.error("Failed to close memory-mapped file upon stop (will ignore) [file=" + - file.file() + ", err=" + e.getMessage() + ']'); + if (mappedFiles != null) { + for (MappedFile file : mappedFiles) { + try { + file.close(); + } + catch (IOException e) { + log.error("Failed to close memory-mapped file upon stop (will ignore) [file=" + + file.file() + ", err=" + e.getMessage() + ']'); + } } + + mappedFiles = null; } }
