[infinispan-commits] Infinispan SVN: r2479 - trunk/demos/gui/src/main/java/org/infinispan/demo.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2010-10-03 15:08:58 -0400 (Sun, 03 Oct 2010)
New Revision: 2479

Modified:
   trunk/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
Log:
stop CM on cache stop

Modified: trunk/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
===================================================================
--- trunk/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java	2010-10-03 19:00:42 UTC (rev 2478)
+++ trunk/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java	2010-10-03 19:08:58 UTC (rev 2479)
@@ -84,6 +84,7 @@
    private Random r = new Random();
    private ClusterTableModel clusterTableModel;
    private CachedDataTableModel cachedDataTableModel;
+   private DefaultCacheManager cacheManager;
 
    public static void main(String[] args) {
       String cfgFileName = LegacyKeySupportSystemProperties.getProperty("infinispan.configuration", "infinispan.demo.cfg", "config-samples/gui-demo-cache-config.xml");
@@ -317,12 +318,12 @@
                URL resource = getClass().getClassLoader().getResource(cacheConfigFile);
                if (resource == null) resource = new URL(cacheConfigFile);
 
-               if (cache == null) {
+               if (cacheManager == null) {
                   // update config file display
-                  cache = new DefaultCacheManager(resource.openStream()).getCache();
-               } else {
-                  cache.start();
-               }
+                  cacheManager = new DefaultCacheManager(resource.openStream());                                    
+               } 
+               cache = cacheManager.getCache();    
+               cache.start();
 
                // repaint the cfg file display
                configFileName.setText(resource.toString());
@@ -362,7 +363,14 @@
       // actually stop the cache asynchronously
       asyncExecutor.execute(new Runnable() {
          public void run() {
-            if (cache != null) cache.stop();
+            if (cache != null) {
+               cache.stop();
+               cache = null;
+            }
+            if (cacheManager != null) {
+               cacheManager.stop();
+               cacheManager = null;
+            }
             cachedDataTableModel.reset();
             configFileContents.setText("");
             configFileContents.repaint();