ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/50] ignite git commit: IGNITE-2294: Fixed incorrect merge of BinaryObjectOffheapImpl.typeId().
Date Tue, 06 Dec 2016 08:40:07 GMT
IGNITE-2294: Fixed incorrect merge of BinaryObjectOffheapImpl.typeId().


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0822dc23
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0822dc23
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0822dc23

Branch: refs/heads/ignite-comm-balance-master
Commit: 0822dc2370e75427078875bcd67051eb9cd44779
Parents: 7b35ba7
Author: devozerov <vozerov@gridgain.com>
Authored: Fri Nov 25 12:38:13 2016 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Fri Nov 25 12:38:13 2016 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0822dc23/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
index 354ac11..f9a31db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
@@ -96,7 +96,7 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements
Exter
         if (typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID) {
             int off = start + GridBinaryMarshaller.DFLT_HDR_LEN;
 
-            String clsName = BinaryUtils.doReadClassName(new BinaryOffheapInputStream(off,
size));
+            String clsName = BinaryUtils.doReadClassName(new BinaryOffheapInputStream(ptr
+ off, size));
 
             typeId = ctx.typeId(clsName);
         }


Mime
View raw message