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:36 UTC
[5/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-471-2' into ignite-gg-10054
Merge remote-tracking branch 'remotes/origin/ignite-471-2' into ignite-gg-10054
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/73daf3cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73daf3cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73daf3cd
Branch: refs/heads/ignite-gg-10054
Commit: 73daf3cdb084bf3ccb088edf7d92a0858b81a381
Parents: f15b1b0 e2299bc
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue Jun 2 12:36:51 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue Jun 2 12:36:51 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/MarshallerContextAdapter.java | 13 +++++++++----
.../internal/processors/cache/GridCacheProcessor.java | 2 +-
modules/yardstick/config/ignite-base-config.xml | 5 +++++
3 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73daf3cd/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java
index ea006fb,2be5afa..e7ee2ff
--- 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,13 -82,11 +82,13 @@@ public abstract class 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 + ']');
+ }
- registeredTypes.add(clsName);
+ registeredSystemTypes.add(clsName);
}
}
}