You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by bo...@apache.org on 2011/11/30 23:02:48 UTC
svn commit: r1208826 - in /incubator/rat/main/trunk:
apache-rat-plugin/src/main/java/org/apache/rat/mp/
apache-rat-tasks/src/test/java/org/apache/rat/anttasks/
Author: bodewig
Date: Wed Nov 30 22:02:46 2011
New Revision: 1208826
URL: http://svn.apache.org/viewvc?rev=1208826&view=rev
Log:
reduce probabilty of race-condition. Suggested by Sebb. RAT-109
Modified:
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java?rev=1208826&r1=1208825&r2=1208826&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java Wed Nov 30 22:02:46 2011
@@ -153,7 +153,7 @@ public class RatCheckMojo extends Abstra
public void execute() throws MojoExecutionException, MojoFailureException
{
File parent = reportFile.getParentFile();
- if(!parent.isDirectory() && !parent.mkdirs()) {
+ if(!parent.mkdirs() && !parent.isDirectory()) {
throw new MojoExecutionException("Could not create report parent directory " + parent);
}
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java?rev=1208826&r1=1208825&r2=1208826&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java Wed Nov 30 22:02:46 2011
@@ -217,7 +217,7 @@ public class RatReportMojo extends Abstr
SiteRendererSink sink = new SiteRendererSink( context );
generate( sink, locale );
- if( !outputDirectory.isDirectory() && !outputDirectory.mkdirs() ) {
+ if( !outputDirectory.mkdirs() && !outputDirectory.isDirectory() ) {
throw new IOException("Could not created output directory " + outputDirectory);
}
Modified: incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java?rev=1208826&r1=1208825&r2=1208826&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java (original)
+++ incubator/rat/main/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java Wed Nov 30 22:02:46 2011
@@ -40,7 +40,7 @@ public class ReportTest extends Abstract
public void testWithReportSentToFile() throws Exception {
final File reportFile = new File(getTempDir(), "selftest.report");
- if(!getTempDir().isDirectory() && !getTempDir().mkdirs()) {
+ if(!getTempDir().mkdirs() && !getTempDir().isDirectory()) {
throw new IOException("Could not create temporary directory " + getTempDir());
}
final String alLine = "AL +\\Q" + getAntFileName() + "\\E";