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 2019/03/27 11:58:03 UTC
[ignite] branch master updated: IGNITE-10949 Fix NPE in
org.apache.ignite.internal.MarshallerContextImpl.CombinedMap - Fixes #5834.
This is an automated email from the ASF dual-hosted git repository.
agoncharuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9f51dc7 IGNITE-10949 Fix NPE in org.apache.ignite.internal.MarshallerContextImpl.CombinedMap - Fixes #5834.
9f51dc7 is described below
commit 9f51dc76a6b6a1366e987a2fd6e4121c2098b437
Author: Andrey Kalinin <pr...@gmail.com>
AuthorDate: Wed Mar 27 14:57:11 2019 +0300
IGNITE-10949 Fix NPE in org.apache.ignite.internal.MarshallerContextImpl.CombinedMap - Fixes #5834.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
---
.../src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 68d68e3..02aefd9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -638,7 +638,7 @@ public class MarshallerContextImpl implements MarshallerContext {
/** {@inheritDoc} */
@Override public Set<Entry<Integer, MappedName>> entrySet() {
- return null;
+ return Collections.emptySet();
}
/** {@inheritDoc} */