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 2016/11/25 09:38:50 UTC
[1/2] ignite git commit: IGNITE-2294: Fixed incorrect merge of
BinaryObjectOffheapImpl.typeId().
Repository: ignite
Updated Branches:
refs/heads/ignite-1.8 3f797b673 -> ccbe60076
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-1.8
Commit: 0822dc2370e75427078875bcd67051eb9cd44779
Parents: 7b35ba7
Author: devozerov <vo...@gridgain.com>
Authored: Fri Nov 25 12:38:13 2016 +0300
Committer: devozerov <vo...@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);
}
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.8' into ignite-1.8
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.8' into ignite-1.8
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ccbe6007
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ccbe6007
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ccbe6007
Branch: refs/heads/ignite-1.8
Commit: ccbe60076f32edc642515351cb69044dabea3436
Parents: 0822dc2 3f797b6
Author: devozerov <vo...@gridgain.com>
Authored: Fri Nov 25 12:38:45 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Nov 25 12:38:45 2016 +0300
----------------------------------------------------------------------
.../Examples/Example.cs | 6 +--
.../Examples/ExamplesTest.cs | 7 +++-
.../Process/IgniteProcess.cs | 40 ++++++--------------
3 files changed, 17 insertions(+), 36 deletions(-)
----------------------------------------------------------------------