ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/16] incubator-ignite git commit: # ignite-556 minor
Date Mon, 23 Mar 2015 14:21:45 GMT
# ignite-556 minor


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

Branch: refs/heads/ignite-556
Commit: 32af4a60cc7b0b598c1c19fff0e8dbb4dbf8c0cc
Parents: f3fc9ac
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Mar 23 17:19:44 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Mar 23 17:19:44 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/IgniteKernal.java  | 2 +-
 .../ignite/internal/IgniteDynamicCacheConfigTest.java       | 9 +++------
 .../java/org/apache/ignite/internal/TestNodeFilter.java     | 3 ++-
 3 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32af4a60/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 520309f..676b9f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2889,7 +2889,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
                 spring.loadConfigurations(url, cl);
 
             if (cfgMap.get1().size() != 1)
-                throw new IgniteException("File " + url.toString() + " should have one cache
configuration");
+                throw new IgniteException("File " + url.toString() + " should have one cache
configuration.");
 
             return F.first(cfgMap.get1());
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32af4a60/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
b/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
index 7e62f53..db91d76 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
@@ -21,7 +21,6 @@ package org.apache.ignite.internal;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.events.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.http.*;
@@ -80,8 +79,6 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
 
         cfg.setCacheConfiguration(cacheCfg);
 
-        cfg.setIncludeEventTypes(EventType.EVT_CACHE_STARTED, EventType.EVT_CACHE_STOPPED,
EventType.EVT_CACHE_NODES_LEFT);
-
         return cfg;
     }
 
@@ -112,7 +109,7 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
 
             assertEquals(CACHE_NAME, cache.getName());
 
-            IgniteCache clientCache1 = ignite(nodeCount() + 1).createNearCache(CACHE_NAME,
+            IgniteCache<Integer, Integer> clientCache1 = ignite(nodeCount() + 1).createNearCache(CACHE_NAME,
                 "modules/core/src/test/config/cache.xml");
 
             IgniteCache clientCache2 = ignite(nodeCount() + 1).getOrCreateNearCache(CACHE_NAME,
@@ -144,7 +141,7 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
 
             assertEquals(cache.getName(), CACHE_NAME);
 
-            IgniteCache clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
+            IgniteCache<Integer, Integer> clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
                 "modules/core/src/test/config/cache.xml");
 
             IgniteCache clientCache2 = ignite(clientNode).getOrCreateNearCache(CACHE_NAME,
@@ -179,7 +176,7 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
 
             assertEquals(cache.getName(), cache1.getName());
 
-            IgniteCache clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
+            IgniteCache<Integer, Integer> clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
                 "modules/core/src/test/config/cache.xml");
 
             IgniteCache clientCache2 = ignite(clientNode).getOrCreateNearCache(CACHE_NAME,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32af4a60/modules/spring/src/test/java/org/apache/ignite/internal/TestNodeFilter.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/TestNodeFilter.java b/modules/spring/src/test/java/org/apache/ignite/internal/TestNodeFilter.java
index 5d2c97d..84bec44 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/TestNodeFilter.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/TestNodeFilter.java
@@ -27,9 +27,10 @@ public class TestNodeFilter implements IgnitePredicate<ClusterNode>
{
     /** */
     public static final String TEST_ATTRIBUTE_NAME = "TEST_ATTRIBUTE_NAME";
 
+    /** {@inheritDoc} */
     @Override public boolean apply(ClusterNode n) {
         Boolean val = n.attribute(TEST_ATTRIBUTE_NAME);
 
         return val != null && val;
     }
-}
\ No newline at end of file
+}


Mime
View raw message