From 7d771f445d1e0b3f2f6ee971ae18dfe86980536d Mon Sep 17 00:00:00 2001
From: Sergey Vasiliev <Sergey.Vasiliev@jetbrains.com>
Date: Mon, 29 Jan 2007 13:33:41 +0300
Subject: [PATCH] fixed some bugs

---
 .../src/com/intellij/util/xml/impl/StableInvocationHandler.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dom/impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java b/dom/impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java
index 6c1bdf37a6..e62420e304 100644
--- a/dom/impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java
+++ b/dom/impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java
@@ -3,13 +3,13 @@
  */
 package com.intellij.util.xml.impl;
 
+import com.intellij.openapi.util.Factory;
 import com.intellij.util.xml.DomElement;
 import com.intellij.util.xml.StableElement;
-import com.intellij.openapi.util.Factory;
 import net.sf.cglib.proxy.InvocationHandler;
 
-import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Set;
 
 /**
@@ -79,7 +79,10 @@ class StableInvocationHandler<T extends DomElement> implements InvocationHandler
   }
 
   private void doInvalidate() {
-    DomManagerImpl.getDomInvocationHandler(myCachedValue).detach(true);
+    final DomInvocationHandler handler = DomManagerImpl.getDomInvocationHandler(myCachedValue);
+    if (handler != null) {
+      handler.detach(true);
+    }
   }
 
   public final void invalidate() {
-- 
2.11.4.GIT