diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9a0c7aec8..b6ade3e2e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -30,6 +30,7 @@ Benoit Moussaud
Bernd Dutkowski
Brad Clark
Brant Langer Gurganus
+Brian Curnow
Brian Deitte
Brian Felder
Bruce Atherton
diff --git a/WHATSNEW b/WHATSNEW
index f61bd14d8..f6b3d8b7a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -158,6 +158,9 @@ Fixed bugs:
filter tokens
Bugzilla Report 44226.
+ * failures were treated as errors in forked JUnit tests when JUnit 4
+ was used.
+ Bugzilla Report 43892.
Other changes:
--------------
diff --git a/contributors.xml b/contributors.xml
index 33d7dd385..03e1bda0a 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -145,6 +145,10 @@
Langer
Gurganus
+
+ Brian
+ Curnow
+
Brian
Deitte
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index d59bb5292..fa145b8e3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -451,9 +451,10 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
}
fireEndTestSuite();
- if (retCode != SUCCESS || res.errorCount() != 0) {
+ // junitTest has the correct counts for JUnit4, while res doesn't
+ if (retCode != SUCCESS || junitTest.errorCount() != 0) {
retCode = ERRORS;
- } else if (res.failureCount() != 0) {
+ } else if (junitTest.failureCount() != 0) {
retCode = FAILURES;
}
}