Improve validation and directory creation in LockableFileWriter

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@292959 13f79535-47bb-0310-9956-ffa450edef68

Author: Stephen Colebourne

RELEASE-NOTES.txt

@@ -22,21 +22,22 @@ Binary compatible - Yes
 Source compatible - Yes
 
 Semantic compatible - Yes, except:
-- FileUtils.touch()
+- FileUtils.writeStringToFile()
+    A null encoding previously used 'ISO-8859-1', now it uses the platform default
+    Generally this will make no difference
+
+- LockableFileWriter
+    Improved validation and now create directories if necesssary
+
+plus these bug fixes may affect you semantically:
+- FileUtils.touch()  (Bug fix 29821)
     Now creates the file if it did not previously exist
-    (Bug fix 29821)
 
-- FileUtils.toFile(URL)
+- FileUtils.toFile(URL) (Bug fix 32575)
     Now handles escape syntax such as %20
-    (Bug fix 32575)
 
-- FileUtils.sizeOfDirectory()
+- FileUtils.sizeOfDirectory()  (Bug fix 36801)
     May now return a size of 0 if the directory is security restricted
-    (Bug fix 36801)
-
-- FileUtils.writeStringToFile()
-    A null encoding previously used 'ISO-8859-1', now it uses the platform default
-    Generally this will make no difference
 
 
 Deprecations from 1.0
@@ -173,6 +174,8 @@ Enhancements from 1.0
 
 - LockableFileWriter - encoding support [36825]
     Add support for character encodings to LockableFileWriter
+    Improve the validation
+    Create directories if necesssary
 
 - IOUtils and EndianUtils are no longer final  [28978]
     Allows developers to have subclasses if desired

src/java/org/apache/commons/io/output/LockableFileWriter.java

@@ -22,6 +22,8 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
+import org.apache.commons.io.FileUtils;
+
 /**
  * FileWriter that will create and honor lock files to allow simple
  * cross thread file lock handling.
@@ -153,19 +155,25 @@ public LockableFileWriter(File file, String encoding) throws IOException {
     public LockableFileWriter(File file, String encoding, boolean append,
             String lockDir) throws IOException {
         super();
+        // init file to create/append
         file = file.getAbsoluteFile();
-        if (file.exists()) {
-            if (file.isDirectory()) {
-                throw new IOException("File specified is a directory");
-            }
-        } else if (file.getParentFile() != null) {
-            file.getParentFile().mkdirs();
+        if (file.getParentFile() != null) {
+            FileUtils.forceMkdir(file.getParentFile());
         }
+        if (file.isDirectory()) {
+            throw new IOException("File specified is a directory");
+        }
+        
+        // init lock file
         if (lockDir == null) {
             lockDir = System.getProperty("java.io.tmpdir");
         }
-        testLockDir(new File(lockDir));
-        this.lockFile = new File(lockDir, file.getName() + LCK);
+        File lockDirFile = new File(lockDir);
+        FileUtils.forceMkdir(lockDirFile);
+        testLockDir(lockDirFile);
+        this.lockFile = new File(lockDirFile, file.getName() + LCK);
+        
+        // init wrapped writer
         try {
             createLock();
             if (encoding == null) {
@@ -178,7 +186,6 @@ public LockableFileWriter(File file, String encoding, boolean append,
             this.lockFile.delete();
             throw ioe;
         }
-
         this.out = new FileWriter(file.getAbsolutePath(), append);
     }