diff --git a/platform/testFramework/src/com/intellij/testFramework/LoggedErrorProcessor.java b/platform/testFramework/src/com/intellij/testFramework/LoggedErrorProcessor.java index d844b7a8ef03..0ecc7b18d561 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LoggedErrorProcessor.java +++ b/platform/testFramework/src/com/intellij/testFramework/LoggedErrorProcessor.java @@ -51,9 +51,9 @@ public class LoggedErrorProcessor { System.err.println("ERROR: " + message); if (t != null) t.printStackTrace(System.err); if (details != null && details.length > 0) { - System.out.println("details: "); + System.err.println("details: "); for (String detail : details) { - System.out.println(detail); + System.err.println(detail); } } } diff --git a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java index 3eed3647b205..204555c91d4a 100644 --- a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java +++ b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java @@ -156,14 +156,16 @@ final class ObjectNode { private static void handleExceptions(List exceptions) { if (!exceptions.isEmpty()) { + for (Throwable exception : exceptions) { + if (!(exception instanceof ProcessCanceledException)) { + LOG.error(exception); + } + } + ProcessCanceledException pce = ContainerUtil.findInstance(exceptions, ProcessCanceledException.class); if (pce != null) { throw pce; } - - for (Throwable exception : exceptions) { - LOG.error(exception); - } } } diff --git a/platform/util/testSrc/com/intellij/openapi/util/objectTree/DisposerTest.java b/platform/util/testSrc/com/intellij/openapi/util/objectTree/DisposerTest.java index 27f3312af8cc..ad769c48a9b4 100644 --- a/platform/util/testSrc/com/intellij/openapi/util/objectTree/DisposerTest.java +++ b/platform/util/testSrc/com/intellij/openapi/util/objectTree/DisposerTest.java @@ -354,7 +354,7 @@ public class DisposerTest extends TestCase { Disposer.dispose(parent); fail("Should throw"); } - catch (Exception e) { + catch (Throwable e) { assertEquals("Expected", e.getMessage()); }