ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [04/31] incubator-ignite git commit: #IGNITE-GG-10440 Changed tests.
Date Fri, 26 Jun 2015 13:53:07 GMT
#IGNITE-GG-10440 Changed tests.


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

Branch: refs/heads/ignite-648
Commit: 5b306e1a035c94be6dcb357635d07ce7eaba84c0
Parents: 76f5377
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Mon Jun 22 17:17:44 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Mon Jun 22 17:17:44 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/GridKernalContextImpl.java     | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b306e1a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 7b07593..737dbee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -790,6 +790,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
 
         if (cls.equals(IgniteCacheObjectProcessor.class))
             return (T)new IgniteCacheObjectProcessorImpl(this);
+        if (cls.equals(CacheConflictResolutionManager.class))
+            return null;
 
         throw new IgniteException("Unsupported component type: " + cls);
     }


Mime
View raw message