SOE and the guard against

This commit is contained in:
Alexey Kudravtsev
2011-12-07 16:25:29 +04:00
parent 73954d4919
commit 5f62ca7136
@@ -908,6 +908,7 @@ public class PluginManager {
if (descriptor != null && !descriptor.getOptionalConfigs().isEmpty()) {
final Map<PluginId, IdeaPluginDescriptorImpl> descriptors = new HashMap<PluginId, IdeaPluginDescriptorImpl>(descriptor.getOptionalConfigs().size());
for (Map.Entry<PluginId, String> entry: descriptor.getOptionalConfigs().entrySet()) {
assert !Comparing.equal(fileName, entry.getValue()) : "recursive dependency: "+fileName;
final IdeaPluginDescriptorImpl optionalDescriptor = loadDescriptor(file, entry.getValue());
if (optionalDescriptor != null) {
descriptors.put(entry.getKey(), optionalDescriptor);
@@ -1122,6 +1123,7 @@ public class PluginManager {
ourDisabledPlugins = null;
}
@NotNull
public static List<String> getDisabledPlugins() {
if (ourDisabledPlugins == null) {
ourDisabledPlugins = new ArrayList<String>();