From 088129a371bb05d262a0d8ee618ff131c05d1b43 Mon Sep 17 00:00:00 2001 From: Stephane Bailliez Date: Sat, 26 Jan 2002 20:45:21 +0000 Subject: [PATCH] Fix audit violations git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270916 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/junit/JUnitTask.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index db2ab7540..6bced3495 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -155,7 +155,6 @@ public class JUnitTask extends Task { private Integer timeout = null; private boolean summary = false; private String summaryValue = ""; - private boolean filtertrace = true; private JUnitTestRunner runner = null; /** @@ -432,8 +431,8 @@ public class JUnitTask extends Task { boolean errorOccurredHere = exitValue == JUnitTestRunner.ERRORS; boolean failureOccurredHere = exitValue != JUnitTestRunner.SUCCESS; if (errorOccurredHere || failureOccurredHere) { - if (errorOccurredHere && test.getHaltonerror() - || failureOccurredHere && test.getHaltonfailure()) { + if ((errorOccurredHere && test.getHaltonerror()) + || (failureOccurredHere && test.getHaltonfailure())) { throw new BuildException("Test "+test.getName()+" failed" +(wasKilled ? " (timeout)" : ""), location); @@ -631,8 +630,9 @@ public class JUnitTask extends Task { * and return an enumeration over all JUnitTest. */ protected Enumeration getIndividualTests(){ - Enumeration[] enums = new Enumeration[ batchTests.size() + 1]; - for (int i = 0; i < batchTests.size(); i++) { + final int count = batchTests.size(); + final Enumeration[] enums = new Enumeration[ count + 1]; + for (int i = 0; i < count; i++) { BatchTest batchtest = (BatchTest)batchTests.elementAt(i); enums[i] = batchtest.elements(); }