Handle lifecycle better.

jbossas · Nov 6, 2008 · 1cb6cc1 · 1cb6cc1
1 parent e3504ad
commit 1cb6cc1
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/src/main/java/org/jboss/virtual/plugins/cache/CachePolicyVFSCache.java b/src/main/java/org/jboss/virtual/plugins/cache/CachePolicyVFSCache.java
@@ -36,7 +36,6 @@
 public abstract class CachePolicyVFSCache extends PathMatchingVFSCache
 {
    private CachePolicy policy;
-   private boolean started;
 
    public Iterable<VFSContext> getCachedContexts()
    {
@@ -57,25 +56,37 @@ protected void check()
 
    public void start() throws Exception
    {
-      if (started == false)
-      {
-         policy = createCachePolicy();
+      policy = createCachePolicy();
+      if (policy == null)
+         throw new IllegalArgumentException("Policy is null.");
 
-         policy.create();
+      policy.create();
+      try
+      {
          policy.start();
-
-         started = true;
+      }
+      catch (Exception e)
+      {
+         try
+         {
+            policy.destroy();
+         }
+         catch (Exception ignored)
+         {
+         }
+         throw e;
       }
    }
 
    public void stop()
    {
-      if (started)
+      if (policy != null)
       {
          policy.stop();
          policy.destroy();
+
+         policy = null;
       }
-      policy = null;
    }
 
    public void flush()
@@ -111,7 +122,7 @@ public void removeContext(String key, VFSContext context)
    /**
     * Read system property.
     *
-    * @param key the property key
+    * @param key          the property key
     * @param defaultValue the default value
     * @return system property or default value
     */