You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/11/20 16:09:53 UTC

ignite git commit: IGNITE-9999 Added verbose logging for node recovery (fixed NPE)

Repository: ignite
Updated Branches:
  refs/heads/master 8c08de7be -> d6d4965fd


IGNITE-9999 Added verbose logging for node recovery (fixed NPE)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6d4965f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6d4965f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6d4965f

Branch: refs/heads/master
Commit: d6d4965fd86d8177903abf0ccf9a7e8ac77917a0
Parents: 8c08de7
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Nov 20 19:09:10 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Nov 20 19:09:10 2018 +0300

----------------------------------------------------------------------
 .../cache/persistence/wal/serializer/RecordDataV1Serializer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d6d4965f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
index 926e403..ab35f46 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
@@ -244,7 +244,9 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
         if (encSpi instanceof NoopEncryptionSpi)
             return false;
 
-        return encMgr.groupKey(grpId) != null;
+        GridEncryptionManager encMgr = cctx.kernalContext().encryption();
+
+        return encMgr != null && encMgr.groupKey(grpId) != null;
     }
 
     /**