Revert "o Updated to correct issues introduced by latest commits. I did not notice the"
This reverts commit d580f672bad6bb234309890f30dc0c8a83a427d8. Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/45457a33 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/45457a33 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/45457a33 Branch: refs/heads/master Commit: 45457a33657aa4ab1a4d3fc96274490a47890cbd Parents: 0dbb5bb Author: Stephen Connolly <stephen.alan.conno...@gmail.com> Authored: Mon Jan 23 10:55:09 2017 +0000 Committer: Stephen Connolly <stephen.alan.conno...@gmail.com> Committed: Mon Jan 23 10:55:09 2017 +0000 ---------------------------------------------------------------------- .../maven/plugin/surefire/report/ConsoleOutputFileReporter.java | 5 +---- .../maven/plugin/surefire/runorder/RunEntryStatisticsMap.java | 1 - .../org/apache/maven/surefire/booter/MasterProcessCommand.java | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/45457a33/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java index 4c49c9e..da08d01 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java @@ -66,10 +66,7 @@ public class ConsoleOutputFileReporter { try { - if ( this.fileOutputStream != null ) - { - this.fileOutputStream.close(); - } + this.fileOutputStream.close(); } catch ( final IOException e ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/45457a33/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java index b9f9b0e..2e9c133 100644 --- a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java +++ b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java @@ -23,7 +23,6 @@ package org.apache.maven.plugin.surefire.runorder; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; -import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.OutputStreamWriter; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/45457a33/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java index 095201d..d5f6375 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import static java.lang.String.format; +import org.apache.maven.surefire.util.internal.StringUtils; import static org.apache.maven.surefire.util.internal.ObjectUtils.requireNonNull; import static org.apache.maven.surefire.util.internal.StringUtils.FORK_STREAM_CHARSET_NAME; import static org.apache.maven.surefire.util.internal.StringUtils.encodeStringForForkCommunication;
