1.1 --- a/mdr/src/org/netbeans/mdr/NBMDRepositoryImpl.java	Fri May 21 07:39:56 2004 +0000
     1.2 +++ b/mdr/src/org/netbeans/mdr/NBMDRepositoryImpl.java	Fri May 21 08:47:05 2004 +0000
     1.3 @@ -1342,7 +1342,7 @@
     1.4      //                Logger.getDefault().log("Removing: " + reference.getProxyMofId());
     1.5                      String mofId = reference.getProxyMofId();
     1.6                      java.lang.ref.Reference currentRef = (java.lang.ref.Reference) super.remove(mofId);
     1.7 -                    if (currentRef != reference && currentRef.get() != null) {
     1.8 +                    if (currentRef != null && currentRef != reference && currentRef.get() != null) {
     1.9                          super.put(mofId, currentRef);
    1.10                      }
    1.11                  }

     2.1 --- a/mdr/src/org/netbeans/mdr/storagemodel/MdrStorage.java	Fri May 21 07:39:56 2004 +0000
     2.2 +++ b/mdr/src/org/netbeans/mdr/storagemodel/MdrStorage.java	Fri May 21 08:47:05 2004 +0000
     2.3 @@ -1827,7 +1827,7 @@
     2.4  //                Logger.getDefault().log("Removing: " + reference.getProxyMofId());
     2.5                  Object key = reference.getKey();
     2.6                  Reference currentRef = (Reference) super.remove(key);
     2.7 -                if (currentRef != reference && currentRef.get() != null) {
     2.8 +                if (currentRef != null && currentRef != reference && currentRef.get() != null) {
     2.9                      super.put(key, currentRef);
    2.10                  }
    2.11              }