You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2017/10/12 23:02:19 UTC

[2/3] maven-surefire git commit: Issue which should not happen: Do not print "null" if error stack trace does not exist

Issue which should not happen: Do not print "null" if error stack trace does not exist


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

Branch: refs/heads/master
Commit: 0bc4d729dc070238cae48a507af5946517eb21fe
Parents: cac0ad1
Author: Tibor17 <ti...@apache.org>
Authored: Thu Oct 12 22:39:48 2017 +0200
Committer: Tibor17 <ti...@apache.org>
Committed: Thu Oct 12 22:39:48 2017 +0200

----------------------------------------------------------------------
 .../apache/maven/plugin/surefire/report/WrappedReportEntry.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/0bc4d729/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
index 4565099..1322d36 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
@@ -152,8 +152,9 @@ public class WrappedReportEntry
 
     public String getOutput( boolean trimStackTrace )
     {
-        return getElapsedTimeSummary() + "  <<< " + getReportEntryType().toString().toUpperCase() + "!" + NL
-            + getStackTrace( trimStackTrace );
+        String outputLine = getElapsedTimeSummary() + "  <<< " + getReportEntryType().name() + "!";
+        String trimmedStackTrace = getStackTrace( trimStackTrace );
+        return trimmedStackTrace == null ? outputLine : outputLine + NL + trimmedStackTrace;
     }
 
     public String getElapsedTimeVerbose()