From 60528537f237073bd8f93a2489d0ebff3e4197f4 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 10 Oct 2002 07:03:43 +0000
Subject: [PATCH] "plain" result formatter could throw NPE if an exception
 occured in the test's setUp method.

PR: 13465


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273422 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                             |  3 +++
 .../optional/junit/PlainJUnitResultFormatter.java    | 12 ++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index cf2a7ed55..5d9a32755 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -25,6 +25,9 @@ Fixed bugs:
 * ant.bat now supports the ANT_ARGS environment variable again (like
   Ant 1.5 did).
 
+* The "plain" <junit> <formatter> could throw a NullPointerException
+  if an error occured in setUp.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
index 97c5bb9b2..c9688be26 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
@@ -203,10 +203,14 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter {
                 return;
             }
             Long l = (Long) testStarts.get(test);
-            wri.println(" took " 
-                        + nf.format((System.currentTimeMillis() - l.longValue())
-                                    / 1000.0)
-                        + " sec");
+            double seconds = 0;
+            // can be null if an error occured in setUp
+            if (l != null) {
+                seconds = 
+                    (System.currentTimeMillis() - l.longValue()) / 1000.0;
+            }
+            
+            wri.println(" took " + nf.format(seconds) + " sec");
         }
     }