From 1a0e0414c1a0514c4d534b4bca8ef2b166cf95bc Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@jetbrains.com>
Date: Fri, 21 Jan 2005 18:10:57 +0300
Subject: [PATCH] fix npe because of invalid usages on UsageView regrouping

---
 UsageView/src/com/intellij/usages/impl/UsageViewImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java b/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java
index ff08376008a8..3719ef206c41 100644
--- a/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java
+++ b/UsageView/src/com/intellij/usages/impl/UsageViewImpl.java
@@ -248,6 +248,10 @@ public class UsageViewImpl implements UsageView {
     myBuilder.setFilteringRules(getFilteringRuleProvider().getActiveRules(myProject));
     for (Iterator<Usage> i = allUsages.iterator(); i.hasNext();) {
       Usage usage = i.next();
+      if (!usage.isValid()) {
+        i.remove();
+        continue;
+      }
       if (usage instanceof MergeableUsage) {
         ((MergeableUsage)usage).reset();
       }