You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/06/02 11:40:35 UTC
[4/5] incubator-ignite git commit: ignite-471-2: modifications after
the next review round
ignite-471-2: modifications after the next review round
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e2299bc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e2299bc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e2299bc3
Branch: refs/heads/ignite-gg-10054
Commit: e2299bc323e1b9d5a2b91e696776e3397d93c66a
Parents: 2e58d49
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jun 2 12:05:03 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jun 2 12:05:03 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/MarshallerContextAdapter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2299bc3/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
index 4ccb759..2be5afa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
@@ -41,7 +41,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
private final ConcurrentMap<Integer, String> map = new ConcurrentHashMap8<>();
/** */
- private final Set<String> registeredTypes = new HashSet<>();
+ private final Set<String> registeredSystemTypes = new HashSet<>();
/**
* Initializes context.
@@ -86,7 +86,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
throw new IgniteException("Duplicate type ID [id=" + typeId + ", clsName=" + clsName +
", oldClsName=" + oldClsName + ']');
- registeredTypes.add(clsName);
+ registeredSystemTypes.add(clsName);
}
}
}
@@ -131,7 +131,7 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
/** {@inheritDoc} */
@Override public boolean isSystemType(String typeName) {
- return registeredTypes.contains(typeName);
+ return registeredSystemTypes.contains(typeName);
}
/**