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/16 09:51:03 UTC
[04/12] ignite git commit: IGNITE-1282: Minor change.
IGNITE-1282: Minor change.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/66ed62a6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/66ed62a6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/66ed62a6
Branch: refs/heads/ignite-1917
Commit: 66ed62a62fcd2fbb4342fd0aa745102498082e22
Parents: ab65d48
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Nov 13 16:17:40 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Nov 13 16:17:40 2015 +0300
----------------------------------------------------------------------
.../portable/PortableClassDescriptor.java | 25 ++++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/66ed62a6/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
index 0916444..4762e81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
@@ -682,13 +682,24 @@ public class PortableClassDescriptor {
if (writer.tryWriteAsHandle(obj))
return false;
- PortableUtils.writeHeader(
- writer,
- userType,
- registered ? typeId : GridPortableMarshaller.UNREGISTERED_TYPE_ID,
- obj instanceof CacheObjectImpl ? 0 : obj.hashCode(),
- registered ? null : cls.getName()
- );
+ if (registered) {
+ PortableUtils.writeHeader(
+ writer,
+ userType,
+ typeId,
+ obj instanceof CacheObjectImpl ? 0 : obj.hashCode(),
+ null
+ );
+ }
+ else {
+ PortableUtils.writeHeader(
+ writer,
+ userType,
+ GridPortableMarshaller.UNREGISTERED_TYPE_ID,
+ obj instanceof CacheObjectImpl ? 0 : obj.hashCode(),
+ cls.getName()
+ );
+ }
return true;
}