From 588afceb7f6c69e611dc8a15ca0cd3dcd817983d Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Wed, 13 Apr 2011 19:27:37 +0400 Subject: [PATCH] EA-26244 - NPE: ContentEntryEditor.getContentEntry --- .../roots/ui/configuration/ContentEntryEditor.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryEditor.java index 43ac1f39631a..759183d274b0 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryEditor.java @@ -93,9 +93,12 @@ public abstract class ContentEntryEditor implements ContentRootPanel.ActionCallb @Nullable protected ContentEntry getContentEntry() { - final ContentEntry[] entries = getModel().getContentEntries(); - for (ContentEntry entry : entries) { - if (entry.getUrl().equals(myContentEntryUrl)) return entry; + final ModifiableRootModel model = getModel(); + if (model != null) { + final ContentEntry[] entries = model.getContentEntries(); + for (ContentEntry entry : entries) { + if (entry.getUrl().equals(myContentEntryUrl)) return entry; + } } return null;