Author: henning
Date: Tue Sep 27 03:59:16 2005
New Revision: 291902

URL: http://svn.apache.org/viewcvs?rev=291902&view=rev
Log:
remove an unnecessary null test and make sure that 
all streams are always closed (Findbugs)


Modified:
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java?rev=291902&r1=291901&r2=291902&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java 
(original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java 
Tue Sep 27 03:59:16 2005
@@ -19,6 +19,7 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.Iterator;
@@ -408,7 +409,8 @@
         }
         catch (JDOMException e)
         {
-            if (outFile != null ) outFile.delete();
+            outFile.delete();
+
             if (e.getCause() != null)
             {
                 Throwable rootCause = e.getCause();
@@ -448,10 +450,19 @@
                 try
                 {
                     writer.flush();
+                }
+                catch (IOException e)
+                {
+                    // Do nothing
+                }
+
+                try
+                {
                     writer.close();
                 }
-                catch (Exception e)
+                catch (IOException e)
                 {
+                    // Do nothing
                 }
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to