ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [21/55] [abbrv] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-42
Date Thu, 22 Jan 2015 13:17:51 GMT
# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-42


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

Branch: refs/heads/sprint-1
Commit: 6d920419b6156aa6e1ce4cf77916a3f63c8727a9
Parents: fd408ff
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jan 19 16:08:34 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jan 19 16:08:34 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d920419/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
index 3f762e4..f8927ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.processors.cache;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
@@ -29,6 +30,7 @@ import org.jetbrains.annotations.*;
 
 import javax.cache.configuration.*;
 import javax.cache.event.*;
+import javax.cache.event.CacheEntryEvent;
 import javax.cache.expiry.*;
 import javax.cache.processor.*;
 
@@ -61,8 +63,8 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override protected GridCacheConfiguration cacheConfiguration(String gridName) throws
Exception {
-        GridCacheConfiguration cfg = super.cacheConfiguration(gridName);
+    @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception
{
+        CacheConfiguration cfg = super.cacheConfiguration(gridName);
 
         if (lsnrCfg != null)
             cfg.addCacheEntryListenerConfiguration(lsnrCfg);


Mime
View raw message