From 7af7d8b8a26453c814b5c09a98c326054a8ea820 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 6 Jun 2012 13:14:26 +0400
Subject: [PATCH] diagnostics

---
 .../com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java | 4 ++--
 .../openapi/vfs/impl/VirtualFilePointerManagerImpl.java       | 4 ++--
 .../src/com/intellij/openapi/util/TraceableDisposable.java    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
index ec63024221e4..df0a0a449e79 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
@@ -83,7 +83,7 @@ class VirtualFilePointerImpl extends TraceableDisposable implements VirtualFileP
 
   private void checkDisposed() {
     if (isDisposed()) {
-      throwDisposalError("Already disposed: URL=" + getUrlNoUpdate());
+      throwDisposalError("Already disposed: URL='" + this+"'");
     }
   }
 
@@ -102,7 +102,7 @@ class VirtualFilePointerImpl extends TraceableDisposable implements VirtualFileP
   public void dispose() {
     checkDisposed();
     if (myNode.incrementUsageCount(-1) == 0) {
-      kill(null);
+      kill("URL when die: "+ toString());
       VirtualFilePointerManager pointerManager = VirtualFilePointerManager.getInstance();
       if (pointerManager instanceof VirtualFilePointerManagerImpl) {
         ((VirtualFilePointerManagerImpl)pointerManager).removeNode(myNode, myListener); // remove from the tree
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java
index bbdb217f8967..e92039ec2039 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java
@@ -275,7 +275,7 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
       if (!left.isEmpty()) {
         VirtualFilePointerImpl p = left.get(0).leaf;
         try {
-          p.throwDisposalError("Not disposed pointer: "+p.getUrlNoUpdate());
+          p.throwDisposalError("Not disposed pointer: "+p);
         }
         finally {
           for (FilePointerPartNode pair : left) {
@@ -308,7 +308,7 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
     try {
       for (VirtualFilePointerImpl pointer : pointers) {
         if (!myStoredPointers.contains(pointer)) {
-          pointer.throwDisposalError("Virtual pointer hasn't been disposed: "+pointer.getUrlNoUpdate());
+          pointer.throwDisposalError("Virtual pointer hasn't been disposed: "+pointer);
         }
       }
     }
diff --git a/platform/util/src/com/intellij/openapi/util/TraceableDisposable.java b/platform/util/src/com/intellij/openapi/util/TraceableDisposable.java
index d62ff60d8802..c1c70463ca9b 100644
--- a/platform/util/src/com/intellij/openapi/util/TraceableDisposable.java
+++ b/platform/util/src/com/intellij/openapi/util/TraceableDisposable.java
@@ -34,9 +34,9 @@ public class TraceableDisposable {
     CREATE_TRACE = creation;
   }
 
-  public void kill(@Nullable String msg) {
+  public void kill(@NonNls @Nullable String msg) {
     if (CREATE_TRACE != null) {
-      KILL_TRACE = new Throwable();
+      KILL_TRACE = new Throwable(msg);
     }
   }