[infinispan-commits] Infinispan SVN: r2478 - branches/4.2.x/demos/gui/src/main/java/org/infinispan/demo.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Sun Oct 3 15:00:42 EDT 2010
Author: vblagojevic at jboss.com
Date: 2010-10-03 15:00:42 -0400 (Sun, 03 Oct 2010)
New Revision: 2478
Modified:
branches/4.2.x/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
Log:
stop CM on cache stop
Modified: branches/4.2.x/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
===================================================================
--- branches/4.2.x/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java 2010-10-03 18:57:11 UTC (rev 2477)
+++ branches/4.2.x/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java 2010-10-03 19:00:42 UTC (rev 2478)
@@ -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();
More information about the infinispan-commits
mailing list