ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [17/20] ignite git commit: IGNITE-1651: WIP.
Date Wed, 21 Oct 2015 14:50:09 GMT
IGNITE-1651: WIP.


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

Branch: refs/heads/ignite-1651
Commit: 8ab9877e28a8f40a54d49f8b2bc4d2e0533e3d0d
Parents: 4282aea
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Oct 21 15:41:31 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Oct 21 15:41:31 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/portable/PortableObjectImpl.java   | 2 +-
 .../ignite/internal/portable/GridPortableMarshallerSelfTest.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8ab9877e/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
index 47ff1ab..cc2047d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableObjectImpl.java
@@ -286,7 +286,7 @@ public final class PortableObjectImpl extends PortableObjectEx implements
Extern
 
     /** {@inheritDoc} */
     @Override public int hashCode() {
-        return PRIM.readInt(arr, start + 6);
+        return PRIM.readInt(arr, start + GridPortableMarshaller.HASH_CODE_POS);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/8ab9877e/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
index 21fc81c..3a45100 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
@@ -747,8 +747,9 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest
{
         byte[] arr = new byte[20];
 
         arr[0] = 103;
+        arr[1] = 1;
 
-        U.intToBytes(Integer.reverseBytes(11111), arr, 2);
+        U.intToBytes(Integer.reverseBytes(11111), arr, 3);
 
         final PortableObject po = new PortableObjectImpl(initPortableContext(new PortableMarshaller()),
arr, 0);
 


Mime
View raw message