ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [03/50] [abbrv] incubator-ignite git commit: # ignite-6
Date Thu, 05 Feb 2015 14:05:03 GMT
# ignite-6


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

Branch: refs/heads/ignite-54-55
Commit: e494237ef4f10215b3752d32e887d583fc0aa9bd
Parents: bd4db87
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Feb 4 13:30:09 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Feb 4 13:30:09 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheEventManager.java        |  4 +++-
 .../cache/GridCachePartitionExchangeManager.java       |  2 +-
 .../distributed/IgniteCrossCacheTxStoreSelfTest.java   | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e494237e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
index 8aa5e92..627ee36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
@@ -242,7 +242,9 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K,
V> {
      * @return {@code True} if event is recordable.
      */
     public boolean isRecordable(int type) {
-        return !CU.isUtilityCache(cctx.name()) && cctx.gridEvents().isRecordable(type);
+        return !cctx.system() &&
+            !CU.isAtomicsCache(cctx.name()) &&
+            cctx.gridEvents().isRecordable(type);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e494237e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index fb43177..dd3c7f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -809,7 +809,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                                 changed |= cacheCtx.topology().afterExchange(exchFut.exchangeId());
 
                                 // Preload event notification.
-                                if (!cacheCtx.system() && cctx.gridEvents().isRecordable(EVT_CACHE_PRELOAD_STARTED))
{
+                                if (cacheCtx.events().isRecordable(EVT_CACHE_PRELOAD_STARTED))
{
                                     if (!cacheCtx.isReplicated() || !startEvtFired) {
                                         IgniteDiscoveryEvent discoEvt = exchFut.discoveryEvent();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e494237e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
index f80549c..417eebf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
@@ -75,6 +75,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest
{
         cfg.setName(cacheName);
 
         cfg.setBackups(1);
+
         if (store != null) {
             cfg.setCacheStoreFactory(
                 new FactoryBuilder.SingletonFactory<CacheStore<? super Object, ? super
Object>>(store));
@@ -110,7 +111,17 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest
{
     public void testWriteThrough() throws Exception {
         IgniteEx grid = grid(0);
 
-        TestStore firstStore = (TestStore)grid(0).configuration().getCacheConfiguration()[1].getCacheStoreFactory().create();
+        TestStore firstStore = null;
+
+        for (CacheConfiguration ccfg : grid(0).configuration().getCacheConfiguration()) {
+            if (ccfg.getCacheStoreFactory() != null) {
+                firstStore = (TestStore)ccfg.getCacheStoreFactory().create();
+
+                break;
+            }
+        }
+
+        assertNotNull(firstStore);
 
         Collection<String> evts = firstStore.events();
 


Mime
View raw message