Author: dkulp
Date: Thu Jan 17 09:24:14 2008
New Revision: 612877
URL: http://svn.apache.org/viewvc?rev=612877&view=rev
Log:
Merged revisions 612293 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r612293 | dkulp | 2008-01-15 18:06:44 -0500 (Tue, 15 Jan 2008) | 2 lines
Fix issue with tests running in eclipse creating a "null" subdirectory
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=612877&r1=612876&r2=612877&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Thu Jan 17 09:24:14 2008
@@ -248,7 +248,13 @@
try {
fos = new FileOutputStream(outputDir + className + ".out");
} catch (FileNotFoundException fex) {
- outputDir = System.getProperty("basedir") +
"/target/surefire-reports/";
+ outputDir = System.getProperty("basedir");
+ if (outputDir == null) {
+ outputDir = "target/surefire-reports/";
+ } else {
+ outputDir += "/target/surefire-reports/";
+ }
+
File file = new File(outputDir);
file.mkdirs();
fos = new FileOutputStream(outputDir + className + ".out");