svn commit: r1517844 - /jmeter/trunk/src/reports/org/apache/jmeter/report/writers/AbstractReportWriter.java

[se...@apache.org]

Author: sebb
Date: Tue Aug 27 15:18:02 2013
New Revision: 1517844

URL: http://svn.apache.org/r1517844
Log:
Safer use of mkdir() - see for example discussion of mkdirs() here:
https://issues.apache.org/jira/browse/IO-280

Modified:
    jmeter/trunk/src/reports/org/apache/jmeter/report/writers/AbstractReportWriter.java

Modified: jmeter/trunk/src/reports/org/apache/jmeter/report/writers/AbstractReportWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/AbstractReportWriter.java?rev=1517844&r1=1517843&r2=1517844&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/report/writers/AbstractReportWriter.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/report/writers/AbstractReportWriter.java Tue Aug 27 15:18:02 2013
@@ -66,10 +66,9 @@ public abstract class AbstractReportWrit
 
     public void makeDirectory() {
         File output = new File(getTargetDirectory());
-        if (!output.exists() || !output.isDirectory()) {
-            if(!output.mkdir()) {
-                throw new IllegalStateException("Could not create directory:"+output.getAbsolutePath());
-            }
+        // mkdir() returns false if the directory was not created; could be because it exists
+        if (!output.mkdir() && !output.isDirectory()) {
+            throw new IllegalStateException("Could not create directory:"+output.getAbsolutePath());
         }
     }