From cd1f7108a7c41b2d75afaba4691c37b06c84048e Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 15 Dec 2010 19:45:44 +0300
Subject: [PATCH] memleaks in tests

---
 .../intellij/openapi/module/impl/ModuleImpl.java    | 13 +++++--------
 .../openapi/application/impl/ApplicationImpl.java   |  5 +++++
 .../intellij/openapi/project/impl/ProjectImpl.java  |  1 +
 .../intellij/util/messages/impl/MessageBusImpl.java |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java
index a02cc0d7afd5..b272e9bf6a52 100644
--- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java
@@ -37,6 +37,7 @@ import com.intellij.openapi.module.impl.scopes.ModuleWithDependentsScope;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.impl.storage.ClasspathStorage;
 import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.PathUtil;
@@ -322,16 +323,12 @@ public class ModuleImpl extends ComponentManagerImpl implements Module {
 
   @SuppressWarnings({"HardCodedStringLiteral"})
   public String toString() {
-    return "Module:" + getName() + " path:" + getModuleFilePath();
+    if (myName == null) return "Module"; // was called before initialized
+    return "Module: '" + getName() + "' path: '" + getModuleFilePath()+"'";
   }
 
-  private static String moduleNameByFileName(String fileName) {
-    if (fileName.endsWith(ModuleFileType.DOT_DEFAULT_EXTENSION)) {
-      return fileName.substring(0, fileName.length() - ModuleFileType.DOT_DEFAULT_EXTENSION.length());
-    }
-    else {
-      return fileName;
-    }
+  private static String moduleNameByFileName(@NotNull String fileName) {
+    return StringUtil.trimEnd(fileName, ModuleFileType.DOT_DEFAULT_EXTENSION);
   }
 
   public <T> T[] getExtensions(final ExtensionPointName<T> extensionPointName) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index 3c97e046ecc8..f318d33732ec 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -1196,4 +1196,9 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application
 
     return false;
   }
+
+  @Override
+  public String toString() {
+    return "Application";
+  }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java
index baf26ab22705..3eef1133d039 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java
@@ -220,6 +220,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
   @Nullable
   @NonNls
   public String getLocation() {
+    if (myName == null) return null; // was called before initialized
     return isDisposed() ? null : getStateStore().getLocation();
   }
 
diff --git a/platform/util/src/com/intellij/util/messages/impl/MessageBusImpl.java b/platform/util/src/com/intellij/util/messages/impl/MessageBusImpl.java
index 98a732c49eaa..16e35551f9ba 100644
--- a/platform/util/src/com/intellij/util/messages/impl/MessageBusImpl.java
+++ b/platform/util/src/com/intellij/util/messages/impl/MessageBusImpl.java
@@ -64,7 +64,7 @@ public class MessageBusImpl implements MessageBus {
   }
 
   public MessageBusImpl(final Object owner, MessageBus parentBus) {
-    myOwner = owner;
+    myOwner = owner == null ? null : owner.toString();
     myParentBus = (MessageBusImpl)parentBus;
     if (myParentBus != null) {
       myParentBus.notifyChildBusCreated(this);