ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject ignite git commit: IGNITE-1770: Fixed compilation after merge from master.
Date Thu, 29 Oct 2015 13:09:41 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1770 7eedab172 -> 42da3fa5f


IGNITE-1770: Fixed compilation after merge from master.


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

Branch: refs/heads/ignite-1770
Commit: 42da3fa5fa953fdd1e6d0890b3edda1db23ee531
Parents: 7eedab1
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Oct 29 16:10:22 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Oct 29 16:10:22 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/42da3fa5/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
index b0a3645..7736826 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
@@ -47,7 +47,6 @@ import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Properties;
@@ -2523,7 +2522,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
         assert typeId != UNREGISTERED_TYPE_ID;
 
         if (idMapper == null)
-            idMapper = ctx.idMapper(typeId);
+            idMapper = ctx.userTypeIdMapper(typeId);
 
         return idMapper.fieldId(typeId, name);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/42da3fa5/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
index 723293a..70ea56d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
@@ -1696,7 +1696,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
                 "via rawWriter() method. Consider fixing serialization logic for class: "
+ cls.getName());
 
         if (idMapper == null)
-            idMapper = ctx.idMapper(typeId);
+            idMapper = ctx.userTypeIdMapper(typeId);
 
         int id = idMapper.fieldId(typeId, fieldName);
 


Mime
View raw message