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/11 09:42:34 UTC
[2/3] ignite git commit: IGNITE-1847: Enabled critical code piece
which was commented out due to IGNITE-1377.
IGNITE-1847: Enabled critical code piece which was commented out due to IGNITE-1377.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c44ca37
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c44ca37
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c44ca37
Branch: refs/heads/ignite-1816
Commit: 0c44ca379394606ba77adc055fc4fe1486d21552
Parents: 28cadee
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Nov 11 11:42:30 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Nov 11 11:42:30 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/portable/PortableContext.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c44ca37/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 f721f12..86578ad 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
@@ -203,7 +203,6 @@ public class PortableContext implements Externalizable {
registerPredefinedType(Date.class, GridPortableMarshaller.DATE);
registerPredefinedType(Timestamp.class, GridPortableMarshaller.TIMESTAMP);
registerPredefinedType(UUID.class, GridPortableMarshaller.UUID);
- // TODO: How to handle timestamp? It has the same ID in .Net.
registerPredefinedType(byte[].class, GridPortableMarshaller.BYTE_ARR);
registerPredefinedType(short[].class, GridPortableMarshaller.SHORT_ARR);
@@ -568,10 +567,7 @@ public class PortableContext implements Externalizable {
mappers.putIfAbsent(typeId, idMapper);
- // TODO: IGNITE-1847: Cannot proceed further due to this bug.
- // TODO uncomment for https://issues.apache.org/jira/browse/IGNITE-1377
-// if (registerMetadata && isMetaDataEnabled(typeId))
-// metaHnd.addMeta(typeId, new PortableMetaDataImpl(typeName, desc.fieldsMeta(), null));
+ metaHnd.addMeta(typeId, new BinaryMetadata(typeId, typeName, desc.fieldsMeta(), null).wrap(this));
return desc;
}