ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [24/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-split2
Date Mon, 15 Feb 2016 07:52:08 GMT
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-split2

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
#	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
#	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
#	modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java


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

Branch: refs/heads/ignite-1232
Commit: 1df11624aad98549472edc3507b6a9805b759d12
Parents: dddb817
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Mon Dec 14 21:12:21 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Mon Dec 14 21:12:21 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/binary/CacheObjectBinaryProcessorImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1df11624/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 15dd088..5b74f0f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -457,10 +457,10 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm
 
     /** {@inheritDoc} */
     @Override public String affinityField(String keyType) {
-        if (portableCtx == null)
+        if (binaryCtx == null)
             return null;
 
-        return portableCtx.affinityKeyFieldName(typeId(keyType));
+        return binaryCtx.affinityKeyFieldName(typeId(keyType));
     }
 
     /** {@inheritDoc} */


Mime
View raw message