You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/12/20 21:35:21 UTC
[1/3] ant git commit: avoid NPE
Repository: ant
Updated Branches:
refs/heads/master cb933030d -> 20026444c
avoid NPE
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/fba969ee
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/fba969ee
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/fba969ee
Branch: refs/heads/master
Commit: fba969ee60878fd293c47a921d9d19b4f463a61a
Parents: 99deebc
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 20 22:33:39 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 20 22:33:39 2016 +0100
----------------------------------------------------------------------
.../apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/fba969ee/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
index 5007c45..f2ad686 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
@@ -135,7 +135,9 @@ public class AntSoundPlayer implements LineListener, BuildListener {
}
audioClip.drain();
} finally {
- audioClip.close();
+ if (audioClip != null) {
+ audioClip.close();
+ }
}
} else {
project.log("Can't get data from file " + file.getName());
[2/3] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c939c1f3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c939c1f3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c939c1f3
Branch: refs/heads/master
Commit: c939c1f3a9ef5d2a31a95781e7c0b41f4f9282d6
Parents: cb93303 fba969e
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 20 22:33:59 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 20 22:33:59 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/3] ant git commit: use FileUtils
Posted by bo...@apache.org.
use FileUtils
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/20026444
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/20026444
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/20026444
Branch: refs/heads/master
Commit: 20026444c48d2aa705aef34f9b75e2860b1bd41e
Parents: c939c1f
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 20 22:35:04 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 20 22:35:04 2016 +0100
----------------------------------------------------------------------
.../tools/ant/taskdefs/optional/sound/AntSoundPlayer.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/20026444/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
index f2ad686..47e2014 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
@@ -36,7 +36,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.Project;
-
+import org.apache.tools.ant.util.FileUtils;
/**
@@ -135,9 +135,7 @@ public class AntSoundPlayer implements LineListener, BuildListener {
}
audioClip.drain();
} finally {
- if (audioClip != null) {
- audioClip.close();
- }
+ FileUtils.close(audioClip);
}
} else {
project.log("Can't get data from file " + file.getName());