MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Start plugins wizard #13

Browse Source
This commit is contained in:
Vassiliy
2014-04-16 20:12:25 +04:00
parent 199e9d8119
commit 1d23857944
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
+1 -1
View File
@@ -648,7 +648,7 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
} catch (IOException e) {
path = getPath().getAbsolutePath();
}
if (ApplicationManager.getApplication().isInternal()) {
if (ApplicationManager.getApplication() != null && ApplicationManager.getApplication().isInternal()) {
if (path.startsWith(PathManager.getHomePath() + File.separator + "out" + File.separator + "classes")) {
return true;
}
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+1 -1
View File
@@ -673,7 +673,7 @@ public class PluginManagerCore {
descriptor = loadDescriptorFromJar(file, fileName);
}
if (descriptor != null && !descriptor.getOptionalConfigs().isEmpty()) {
if (descriptor != null && descriptor.getOptionalConfigs() != 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()) {
String optionalDescriptorName = entry.getValue();