Commit 688659bb authored by Derek DeMoro's avatar Derek DeMoro Committed by derek

Fixed reloading issue when in dev mode.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3852 b35dd754-fafc-0310-a699-88a17e54d16e
parent cc561652
...@@ -203,14 +203,17 @@ public class PluginManager { ...@@ -203,14 +203,17 @@ public class PluginManager {
String classesDirKey = pluginName + ".classes"; String classesDirKey = pluginName + ".classes";
String webRoot = System.getProperty(webRootKey); String webRoot = System.getProperty(webRootKey);
String classesDir = System.getProperty(classesDirKey); String classesDir = System.getProperty(classesDirKey);
if (webRoot != null) { if (webRoot != null) {
final File compilationClassesDir = new File(pluginDir, "classes"); final File compilationClassesDir = new File(pluginDir, "classes");
if (!compilationClassesDir.exists()) { if (!compilationClassesDir.exists()) {
compilationClassesDir.mkdir(); compilationClassesDir.mkdir();
} }
compilationClassesDir.deleteOnExit();
} }
if (parentPluginNode != null) { if (parentPluginNode != null) {
String parentPlugin = parentPluginNode.getTextTrim(); String parentPlugin = parentPluginNode.getTextTrim();
// See if the parent is already loaded. // See if the parent is already loaded.
...@@ -404,6 +407,9 @@ public class PluginManager { ...@@ -404,6 +407,9 @@ public class PluginManager {
return; return;
} }
// Remove from dev mode if it exists.
pluginDevelopment.remove(plugin);
// See if any child plugins are defined. // See if any child plugins are defined.
if (parentPluginMap.containsKey(plugin)) { if (parentPluginMap.containsKey(plugin)) {
for (String childPlugin : parentPluginMap.get(plugin)) { for (String childPlugin : parentPluginMap.get(plugin)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment