svn commit: r1311756 - /commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/LockableFileWriter.java

[ggregory]

Author: ggregory
Date: Tue Apr 10 14:32:42 2012
New Revision: 1311756

URL: http://svn.apache.org/viewvc?rev=1311756&view=rev
Log:
Use Charsets instead of conditional.

Modified:
    
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/LockableFileWriter.java

Modified: 
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/LockableFileWriter.java?rev=1311756&r1=1311755&r2=1311756&view=diff
==============================================================================
--- 
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
 (original)
+++ 
commons/proper/io/trunk/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
 Tue Apr 10 14:32:42 2012
@@ -271,12 +271,8 @@ public class LockableFileWriter extends 
         OutputStream stream = null;
         Writer writer = null;
         try {
-            if (encoding == null) {
-                writer = new FileWriter(file.getAbsolutePath(), append);
-            } else {
-                stream = new FileOutputStream(file.getAbsolutePath(), append);
-                writer = new OutputStreamWriter(stream, encoding);
-            }
+            stream = new FileOutputStream(file.getAbsolutePath(), append);
+            writer = new OutputStreamWriter(stream, 
Charsets.toCharset(encoding));
         } catch (IOException ex) {
             IOUtils.closeQuietly(writer);
             IOUtils.closeQuietly(stream);