# Fix javax.cache.configuration.ConfigurationTest tests.

apache · Feb 12, 2015 · be23ac6 · be23ac6
1 parent ff788da
commit be23ac6
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -104,23 +104,19 @@ public CacheManager(URI uri, CachingProvider cachingProvider, ClassLoader clsLdr
         if (cacheName == null)
             throw new NullPointerException();
 
-        if (!(cacheCfg instanceof CompleteConfiguration))
-            throw new UnsupportedOperationException("Configuration is not supported: " + cacheCfg);
+        CacheConfiguration igniteCacheCfg;
 
-        if (cacheCfg instanceof CacheConfiguration) {
-            String cfgCacheName = ((CacheConfiguration)cacheCfg).getName();
-
-            if (cfgCacheName != null) {
-                if (!cacheName.equals(cfgCacheName))
-                    throw new IllegalArgumentException();
-            }
-            else {
-                cacheCfg = (C)new CacheConfiguration((CompleteConfiguration)cacheCfg);
+        if (cacheCfg instanceof CompleteConfiguration)
+            igniteCacheCfg = new CacheConfiguration((CompleteConfiguration)cacheCfg);
+        else {
+            igniteCacheCfg = new CacheConfiguration();
 
-                ((CacheConfiguration)cacheCfg).setName(cacheName);
-            }
+            igniteCacheCfg.setTypes(cacheCfg.getKeyType(), cacheCfg.getValueType());
+            igniteCacheCfg.setStoreValueBytes(cacheCfg.isStoreByValue());
         }
 
+        igniteCacheCfg.setName(cacheName);
+
         IgniteCache<K, V> res;
 
         synchronized (igniteMap) {
@@ -133,9 +129,7 @@ public CacheManager(URI uri, CachingProvider cachingProvider, ClassLoader clsLdr
                 IgniteConfiguration cfg = new IgniteConfiguration();
                 cfg.setGridName(mgrIdx.incrementAndGet() + "-grid-for-" + cacheName);
 
-                cfg.setCacheConfiguration(new CacheConfiguration((CompleteConfiguration)cacheCfg));
-
-                cfg.getCacheConfiguration()[0].setName(cacheName);
+                cfg.setCacheConfiguration(igniteCacheCfg);
 
                 try {
                     ignite = Ignition.start(cfg);
@@ -152,10 +146,10 @@ public CacheManager(URI uri, CachingProvider cachingProvider, ClassLoader clsLdr
             igniteMap.put(cacheName, ignite);
         }
 
-        if (((CompleteConfiguration)cacheCfg).isManagementEnabled())
+        if (igniteCacheCfg.isManagementEnabled())
             enableManagement(cacheName, true);
 
-        if (((CompleteConfiguration)cacheCfg).isStatisticsEnabled())
+        if (igniteCacheCfg.isStatisticsEnabled())
             enableStatistics(cacheName, true);
 
         return res;