From 7ac2ffe72d1d5b3aea07c835cfa5d2f2e242e072 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 23 Nov 2015 18:54:21 +0300 Subject: [PATCH] external system: reuse module library w/o name model --- .../service/project/manage/LibraryDependencyDataService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java index 9cbdfa3acc59..deb81e1e37e7 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java @@ -185,7 +185,7 @@ public class LibraryDependencyDataService extends AbstractDependencyDataService< moduleLibraryKey.add(ExternalSystemApiUtil.getLocalFileSystemPath(file) + moduleLibraryOrderEntry.getScope().name()); } LibraryDependencyData existing = moduleLibrariesToImport.remove(moduleLibraryKey); - if (existing == null || !StringUtil.equals(existing.getInternalName(), library.getName())) { + if (existing == null || !StringUtil.equals(StringUtil.nullize(existing.getInternalName()), library.getName())) { moduleRootModel.removeOrderEntry(entry); } else {