Revert "[SUREFIRE-1322] - Surefire and Failsafe should dump critical errors in dump file and console"
This reverts commit 4d3673c42e2af75c22f3abbaa2a0237a5c25e0ce. Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c12adb87 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c12adb87 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c12adb87 Branch: refs/heads/master Commit: c12adb87547a56c54c22c86191d214dc9b79b2eb Parents: 90654a0 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> Authored: Mon Jan 23 10:56:01 2017 +0000 Committer: Stephen Connolly <stephen.alan.conno...@gmail.com> Committed: Mon Jan 23 10:56:01 2017 +0000 ---------------------------------------------------------------------- .../apache/maven/surefire/booter/CommandReader.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c12adb87/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java index 3f24a1b..3990d46 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java @@ -377,7 +377,7 @@ public final class CommandReader if ( command == null ) { String errorMessage = "[SUREFIRE] std/in stream corrupted: first sequence not recognized"; - DumpErrorSingleton.getSingleton().dumpStreamText( errorMessage ); + DumpErrorSingleton.getSingleton().dumpText( errorMessage ); logger.error( errorMessage ); break; } @@ -414,27 +414,24 @@ public final class CommandReader } catch ( EOFException e ) { + DumpErrorSingleton.getSingleton().dumpException( e ); + CommandReader.this.state.set( TERMINATED ); if ( !isTestSetFinished ) { - String msg = "TestSet has not finished before stream error has appeared >> " - + "initializing exit by non-null configuration: " - + CommandReader.this.shutdown; - DumpErrorSingleton.getSingleton().dumpStreamException( e, msg ); - exitByConfiguration(); // does not go to finally } } catch ( IOException e ) { + DumpErrorSingleton.getSingleton().dumpException( e ); + CommandReader.this.state.set( TERMINATED ); // If #stop() method is called, reader thread is interrupted and cause is InterruptedException. if ( !( e.getCause() instanceof InterruptedException ) ) { - String msg = "[SUREFIRE] std/in stream corrupted"; - DumpErrorSingleton.getSingleton().dumpStreamException( e, msg ); - logger.error( msg, e ); + logger.error( "[SUREFIRE] std/in stream corrupted", e ); } } finally
