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:52:44 UTC
incubator-ignite git commit: # GG-10054 Interop .Net: Adopt latest
protocol changes from IGNITE-471.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 e2299bc32 -> 0dac0be26
# GG-10054 Interop .Net: Adopt latest protocol changes from IGNITE-471.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0dac0be2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0dac0be2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0dac0be2
Branch: refs/heads/ignite-471-2
Commit: 0dac0be2699d44710472ececd6c5d6958ff5956b
Parents: e2299bc
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue Jun 2 12:52:14 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue Jun 2 12:52:14 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/MarshallerContextAdapter.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dac0be2/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 2be5afa..e7ee2ff 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
@@ -82,9 +82,11 @@ public abstract class MarshallerContextAdapter implements MarshallerContext {
String oldClsName;
- if ((oldClsName = map.put(typeId, clsName)) != null)
- throw new IgniteException("Duplicate type ID [id=" + typeId + ", clsName=" + clsName +
+ if ((oldClsName = map.put(typeId, clsName)) != null) {
+ if (!oldClsName.equals(clsName))
+ throw new IgniteException("Duplicate type ID [id=" + typeId + ", clsName=" + clsName +
", oldClsName=" + oldClsName + ']');
+ }
registeredSystemTypes.add(clsName);
}