Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 787cab5c1 -> 658b82342
fixed hibernate examples Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a46b297 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a46b297 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a46b297 Branch: refs/heads/ignite-45 Commit: 5a46b2977e898ab01f53bfd85a64f6ef751da63b Parents: 787cab5 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Sun Mar 22 09:57:49 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Sun Mar 22 09:57:49 2015 +0300 ---------------------------------------------------------------------- examples/config/hibernate/example-hibernate-L2-cache.xml | 10 +++++----- .../hibernate/HibernateL2CacheExampleNodeStartup.java | 6 +++--- .../main/java/org/apache/ignite/cache/CacheManager.java | 10 ++-------- 3 files changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a46b297/examples/config/hibernate/example-hibernate-L2-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/hibernate/example-hibernate-L2-cache.xml b/examples/config/hibernate/example-hibernate-L2-cache.xml index 8966236..324c040 100644 --- a/examples/config/hibernate/example-hibernate-L2-cache.xml +++ b/examples/config/hibernate/example-hibernate-L2-cache.xml @@ -56,12 +56,12 @@ <property name="org.apache.ignite.hibernate.default_access_type">READ_ONLY</property> <!-- Specify the entity classes for mapping. --> - <mapping class="org.apache.ignite.examples.java7.datagrid.hibernate.User"/> - <mapping class="org.apache.ignite.examples.java7.datagrid.hibernate.Post"/> + <mapping class="org.apache.ignite.examples.datagrid.hibernate.User"/> + <mapping class="org.apache.ignite.examples.datagrid.hibernate.Post"/> <!-- Per-class L2 cache settings. --> - <class-cache class="org.apache.ignite.examples.java7.datagrid.hibernate.User" usage="read-only"/> - <class-cache class="org.apache.ignite.examples.java7.datagrid.hibernate.Post" usage="read-only"/> - <collection-cache collection="org.apache.ignite.examples.java7.datagrid.hibernate.User.posts" usage="read-only"/> + <class-cache class="org.apache.ignite.examples.datagrid.hibernate.User" usage="read-only"/> + <class-cache class="org.apache.ignite.examples.datagrid.hibernate.Post" usage="read-only"/> + <collection-cache collection="org.apache.ignite.examples.datagrid.hibernate.User.posts" usage="read-only"/> </session-factory> </hibernate-configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a46b297/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java index 19272f8..cef6526 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java @@ -69,9 +69,9 @@ public class HibernateL2CacheExampleNodeStartup { cfg.setCacheConfiguration( cacheConfiguration("org.hibernate.cache.spi.UpdateTimestampsCache", ATOMIC), cacheConfiguration("org.hibernate.cache.internal.StandardQueryCache", ATOMIC), - cacheConfiguration("org.apache.ignite.examples.java7.datagrid.hibernate.User", TRANSACTIONAL), - cacheConfiguration("org.apache.ignite.examples.java7.datagrid.hibernate.User.posts", TRANSACTIONAL), - cacheConfiguration("org.apache.ignite.examples.java7.datagrid.hibernate.Post", TRANSACTIONAL) + cacheConfiguration("org.apache.ignite.examples.datagrid.hibernate.User", TRANSACTIONAL), + cacheConfiguration("org.apache.ignite.examples.datagrid.hibernate.User.posts", TRANSACTIONAL), + cacheConfiguration("org.apache.ignite.examples.datagrid.hibernate.Post", TRANSACTIONAL) ); return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a46b297/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java ---------------------------------------------------------------------- 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 index 4a41dd5..6174f2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java @@ -31,6 +31,7 @@ import javax.cache.*; import javax.cache.configuration.*; import javax.cache.management.*; import javax.management.*; +import javax.sound.midi.*; import java.net.*; import java.util.*; import java.util.concurrent.atomic.*; @@ -257,11 +258,7 @@ public class CacheManager implements javax.cache.CacheManager { @Override public void destroyCache(String cacheName) { kernalGateway.readLock(); - IgniteCache<?, ?> cache; - - try { - cache = getCache0(cacheName); - + try (IgniteCache<?, ?> cache = getCache0(cacheName)) { if (cache != null) { unregisterCacheObject(cacheName, CACHE_CONFIGURATION); unregisterCacheObject(cacheName, CACHE_STATISTICS); @@ -270,9 +267,6 @@ public class CacheManager implements javax.cache.CacheManager { finally { kernalGateway.readUnlock(); } - - if (cache != null) - cache.close(); } /**
