[05/17] maven-surefire git commit: o Updated to correct issues introduced by latest commits. I did not notice the merge commits also had simple-merge file changes.

[tibordigana]

o Updated to correct issues introduced by latest commits. I did not notice the
  merge commits also had simple-merge file changes.

o I missed this email
    <http://www.mail-archive.com/dev@maven.apache.org/msg112056.html>
  but I read this email
    <http://www.mail-archive.com/commits@maven.apache.org/msg55791.html>
  and pulled.


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d580f672
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d580f672
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d580f672

Branch: refs/heads/SUREFIRE-1322
Commit: d580f672bad6bb234309890f30dc0c8a83a427d8
Parents: 780f913
Author: Christian Schulte <schu...@apache.org>
Authored: Sun Jan 8 01:12:09 2017 +0100
Committer: Christian Schulte <schu...@apache.org>
Committed: Sun Jan 8 01:12:09 2017 +0100

----------------------------------------------------------------------
 .../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, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d580f672/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 da08d01..4c49c9e 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,7 +66,10 @@ public class ConsoleOutputFileReporter
     {
         try
         {
-            this.fileOutputStream.close();
+            if ( this.fileOutputStream != null )
+            {
+                this.fileOutputStream.close();
+            }
         }
         catch ( final IOException e )
         {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d580f672/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 2e9c133..b9f9b0e 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,6 +23,7 @@ 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/d580f672/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 d5f6375..095201d 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,7 +24,6 @@ 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;