Author: bodewig
Date: Mon Jul 13 09:35:33 2009
New Revision: 793516
URL: http://svn.apache.org/viewvc?rev=793516&view=rev
Log:
potential NPEs
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java?rev=793516&r1=793515&r2=793516&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
Mon Jul 13 09:35:33 2009
@@ -253,7 +253,7 @@
try {
resultWriter.write(formatTest(test) + type);
resultWriter.newLine();
- resultWriter.write(error.getMessage());
+ resultWriter.write(String.valueOf(error.getMessage()));
resultWriter.newLine();
String strace = JUnitTestRunner.getFilteredTrace(error);
resultWriter.write(strace);
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java?rev=793516&r1=793515&r2=793516&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Mon Jul 13 09:35:33 2009
@@ -1969,13 +1969,13 @@
private static void printDual(BufferedWriter w, PrintStream s, String text)
throws IOException {
- w.write(text);
+ w.write(String.valueOf(text));
s.print(text);
}
private static void printlnDual(BufferedWriter w, PrintStream s, String
text)
throws IOException {
- w.write(text);
+ w.write(String.valueOf(text));
w.newLine();
s.println(text);
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java?rev=793516&r1=793515&r2=793516&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
Mon Jul 13 09:35:33 2009
@@ -247,7 +247,7 @@
try {
wri.write(type);
wri.newLine();
- wri.write(t.getMessage());
+ wri.write(String.valueOf(t.getMessage()));
wri.newLine();
String strace = JUnitTestRunner.getFilteredTrace(t);
wri.write(strace);