EA-26244 - NPE: ContentEntryEditor.getContentEntry

This commit is contained in:
Alexey Pegov
2011-04-13 19:27:37 +04:00
parent 7d3a93e6e7
commit 588afceb7f
@@ -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;