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/11/05 11:00:57 UTC
[3/3] ignite git commit: IGNITE-1819: WIP.
IGNITE-1819: WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74b25b3d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74b25b3d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74b25b3d
Branch: refs/heads/ignite-1819
Commit: 74b25b3dcf39c53ecb7f62724af200f4eb2aa9a0
Parents: 7f04252
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Nov 5 12:57:07 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Nov 5 12:57:07 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/portable/PortableContext.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/74b25b3d/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
index 106f8cf..7c090c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
@@ -336,7 +336,7 @@ public class PortableContext implements Externalizable {
for (TypeDescriptor desc : descs.descriptors()) {
registerUserType(desc.clsName, desc.idMapper, desc.serializer, desc.affKeyFieldName,
- true, desc.keepDeserialized); // TODO: Remove.
+ desc.keepDeserialized);
}
}
@@ -713,7 +713,6 @@ public class PortableContext implements Externalizable {
* @param idMapper ID mapper.
* @param serializer Serializer.
* @param affKeyFieldName Affinity key field name.
- * @param metaDataEnabled Metadata enabled flag.
* @param keepDeserialized Keep deserialized flag.
* @throws PortableException In case of error.
*/
@@ -722,7 +721,6 @@ public class PortableContext implements Externalizable {
PortableIdMapper idMapper,
@Nullable PortableSerializer serializer,
@Nullable String affKeyFieldName,
- boolean metaDataEnabled,
boolean keepDeserialized)
throws PortableException {
assert idMapper != null;
@@ -749,7 +747,7 @@ public class PortableContext implements Externalizable {
typeMappers.put(typeName, idMapper);
- metaEnabled.put(id, metaDataEnabled);
+ metaEnabled.put(id, true); // TODO: Refactor.
Map<String, String> fieldsMeta = null;
@@ -762,7 +760,7 @@ public class PortableContext implements Externalizable {
typeName,
idMapper,
serializer,
- metaDataEnabled,
+ true,
keepDeserialized,
true, /* registered */
false /* predefined */