From 36246a21d4539bc718a9522c764874cd76b7d4af Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 7 Oct 2016 13:54:57 +0300 Subject: [PATCH] old project settings conversion: assertion fixed (EA-72215) --- .../com/intellij/conversion/impl/ConversionContextImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java index efea0311998d..0696a70597d2 100644 --- a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java @@ -40,6 +40,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.util.ArrayUtil; +import com.intellij.util.ObjectUtils; import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xmlb.XmlSerializer; @@ -484,6 +485,6 @@ public class ConversionContextImpl implements ConversionContext { @NotNull private File[] getSettingsXmlFiles(@NotNull String dirName) { final File librariesDir = new File(mySettingsBaseDir, dirName); - return librariesDir.exists() ? librariesDir.listFiles(FileFilters.filesWithExtension("xml")) : ArrayUtil.EMPTY_FILE_ARRAY; + return ObjectUtils.notNull(librariesDir.listFiles(FileFilters.filesWithExtension("xml")), ArrayUtil.EMPTY_FILE_ARRAY); } }