Merge branch 'master' into 4.0.x (Fix setPluginEntries)

This commit is contained in:
Andrew Grieve
2014-07-08 11:55:04 -04:00
@@ -67,6 +67,8 @@ public class PluginManager {
this.onPause(false);
this.onDestroy();
this.clearPluginObjects();
entries.clear();
urlMap.clear();
for (PluginEntry entry : pluginEntries) {
addService(entry);
}