From 56ebd61d8af355ad630625ff8044e93ce6d9dfef Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Wed, 24 May 2023 22:40:51 +0200
Subject: [PATCH] [SUREFIRE-2169] Potential NPE in WrappedReportEntry when
 #getElapsed() is called

This closes #643
---
 .../maven/plugin/surefire/report/WrappedReportEntry.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 97b3734c21..b66a1cfea2 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
@@ -140,7 +140,7 @@ public String getStackTrace(boolean trimStackTrace) {
     }
 
     public String elapsedTimeAsString() {
-        return formatElapsedTime(getElapsed());
+        return getElapsed() != null ? formatElapsedTime(getElapsed()) : null;
     }
 
     String getReportSourceName() {
@@ -171,7 +171,7 @@ public String getOutput(boolean trimStackTrace) {
     }
 
     public String getElapsedTimeVerbose() {
-        return "Time elapsed: " + elapsedTimeAsString() + " s";
+        return "Time elapsed: " + (getElapsed() != null ? elapsedTimeAsString() + " s" : "(unknown)");
     }
 
     public String getElapsedTimeSummary() {