Repository: ant Updated Branches: refs/heads/1.9.x 85ff7bf69 -> bcc245e99
we really want those fields to be static ... ... and manipulated from instance methods Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/720df700 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/720df700 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/720df700 Branch: refs/heads/1.9.x Commit: 720df700d8b98db4a2c03fbdcc00f980e318a67d Parents: 85ff7bf Author: Stefan Bodewig <[email protected]> Authored: Wed Dec 21 10:50:53 2016 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Wed Dec 21 10:50:53 2016 +0100 ---------------------------------------------------------------------- .../ant/taskdefs/optional/junit/AggregateTransformer.java | 4 ++-- .../apache/tools/ant/taskdefs/optional/splash/SplashTask.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/720df700/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java index 51be1b2..bae3b3c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java @@ -115,7 +115,7 @@ public class AggregateTransformer { /** * Used to ensure the uniqueness of a property */ - private static int counter = 0; + private volatile static int counter = 0; /** the format to use for the report. Must be <tt>FRAMES</tt> or <tt>NOFRAMES</tt> */ protected String format = FRAMES; @@ -260,7 +260,7 @@ public class AggregateTransformer { xsltTask.setIn(((XMLResultAggregator) task).getDestinationFile()); File outputFile = null; if (format.equals(FRAMES)) { - String tempFileProperty = getClass().getName() + String.valueOf(counter++); + String tempFileProperty = getClass().getName() + String.valueOf(counter++); //NOSONAR File tmp = FILE_UTILS.resolveFile(project.getBaseDir(), project .getProperty("java.io.tmpdir")); tempFileTask.setDestDir(tmp); http://git-wip-us.apache.org/repos/asf/ant/blob/720df700/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java index 146e0ff..9d995bc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java @@ -53,6 +53,7 @@ public class SplashTask extends Task { private String progressRegExp = null; private String displayText = null; + // class instance so we'll never show two splash screens at the same time private static SplashScreen splash = null; /** @@ -163,7 +164,7 @@ public class SplashTask extends Task { splash.setVisible(false); getProject().removeBuildListener(splash); splash.dispose(); - splash = null; + splash = null; //NOSONAR } log("Creating new SplashScreen", Project.MSG_VERBOSE); @@ -248,7 +249,7 @@ public class SplashTask extends Task { try { ImageIcon img = new ImageIcon(bout.toByteArray()); - splash = new SplashScreen(img, progressRegExp, displayText); + splash = new SplashScreen(img, progressRegExp, displayText); //NOSONAR success = true; } catch (Throwable e) { logHeadless(e); @@ -268,7 +269,7 @@ public class SplashTask extends Task { } } else { try { - splash = new SplashScreen("Image Unavailable.", progressRegExp, + splash = new SplashScreen("Image Unavailable.", progressRegExp, //NOSONAR displayText); success = true; } catch (Throwable e) {
