Try to cleanup more when plugins/scripts fail to load

diff --git a/acid/src/main/java/net/rizon/acid/core/Plugin.java b/acid/src/main/java/net/rizon/acid/core/Plugin.java
index 805302bd45505ee94cc58edfc02ed852ac41f828..cf7c45d38a918f1cce6f394c5095a3345dcc4c8c 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Plugin.java
+++ b/acid/src/main/java/net/rizon/acid/core/Plugin.java
@@ -64,7 +64,15 @@ public abstract class Plugin
                p = (Plugin) con.newInstance();
                p.name = name;
                p.loader = cl;
-               p.start();
+               try
+               {
+                       p.start();
+               }
+               catch (Exception ex)
+               {
+                       plugins.remove(p);
+                       throw ex;
+               }
                return p;
        }
 

diff --git a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/pyva.java b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/pyva.java
index 32b9d601fef609bd1a473f199bd11653d29c7971..7af46b226ad120301b24f445b7ce4686afa68439 100644 (file)
--- a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/pyva.java
+++ b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/pyva.java
@@ -141,11 +141,19 @@ public class pyva extends Plugin
 
                pyva.init();
 
+               try
+               {
+                       for (String plugin : conf.plugins)
+                               loadPyvaPlugin(plugin);
+               }
+               catch (Exception ex)
+               {
+                       pyva.stop();
+                       throw ex;
+               }
+               
                e = new PyvaEvent();
 
-               for (String plugin : conf.plugins)
-                       loadPyvaPlugin(plugin);
-
                t = new GCTimer();
                t.start();
        }