You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/06 11:18:03 UTC

[9/9] incubator-ignite git commit: # ignite-841

# ignite-841


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

Branch: refs/heads/ignite-841
Commit: f05e7bf5f8cab5027c893809ebb82d77a89fbba3
Parents: e1d978b
Author: sboikov <sb...@gridgain.com>
Authored: Wed May 6 12:17:23 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed May 6 12:17:23 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheProcessor.java    | 22 +++++++-------------
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |  2 ++
 2 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f05e7bf5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index f5371de..6c57e1f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -2448,26 +2448,20 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
     /**
      * @param name Cache name.
-     * @param <K> type of keys.
-     * @param <V> type of values.
      * @return Cache instance for given name.
+     * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings("unchecked")
-    public <K, V> IgniteInternalCache<K, V> getOrStartCache(@Nullable String name) {
-        try {
-            if (log.isDebugEnabled())
-                log.debug("Getting cache for name: " + name);
+    public <K, V> IgniteInternalCache<K, V> getOrStartCache(@Nullable String name) throws IgniteCheckedException {
+        if (log.isDebugEnabled())
+            log.debug("Getting cache for name: " + name);
 
-            IgniteCache<K, V> jcache = (IgniteCache<K, V>)jCacheProxies.get(maskNull(name));
+        IgniteCache<K, V> jcache = (IgniteCache<K, V>)jCacheProxies.get(maskNull(name));
 
-            if (jcache == null)
-                jcache = startJCache(name, true);
+        if (jcache == null)
+            jcache = startJCache(name, true);
 
-            return jcache == null ? null : ((IgniteCacheProxy<K, V>)jcache).internalProxy();
-        }
-        catch (IgniteCheckedException e) {
-            throw U.convertException(e);
-        }
+        return jcache == null ? null : ((IgniteCacheProxy<K, V>)jcache).internalProxy();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f05e7bf5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
index 11e22b1..4f3178e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
@@ -59,6 +59,8 @@ public class IgniteIgfsTestSuite extends TestSuite {
         suite.addTest(new TestSuite(IgfsDualSyncSelfTest.class));
         suite.addTest(new TestSuite(IgfsDualAsyncSelfTest.class));
 
+        suite.addTest(new TestSuite(IgfsClientCacheSelfTest.class));
+
         suite.addTest(new TestSuite(IgfsModeResolverSelfTest.class));
 
         suite.addTestSuite(IgfsFragmentizerSelfTest.class);