svn commit: r291901 - /jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/Generator.java

[henning]

Author: henning
Date: Tue Sep 27 03:58:41 2005
New Revision: 291901

URL: http://svn.apache.org/viewcvs?rev=291901&view=rev
Log:
Make sure that all streams are closed at all times (again, found by
Findbugs)


Modified:
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/Generator.java

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/Generator.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/Generator.java?rev=291901&r1=291900&r2=291901&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/Generator.java 
(original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/Generator.java 
Tue Sep 27 03:58:41 2005
@@ -22,6 +22,7 @@
 import java.io.BufferedInputStream;
 import java.io.Writer;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.io.StringWriter;
 import java.io.OutputStreamWriter;
 import java.io.BufferedWriter;
@@ -158,8 +159,11 @@
                 }
             }
         }
-        catch (Exception e)
+        catch (IOException e)
         {
+            System.err.println("Could not load " + propFile
+                    + ", falling back to defaults. ("
+                    + e.getMessage() + ")");
             /*
              * If something goes wrong we use default properties
              */
@@ -202,9 +206,9 @@
                 }
             }
         }
-        catch (Exception ioe)
+        catch (IOException ioe)
         {
-            System.err.println("Cannot get default properties!");
+            System.err.println("Cannot get default properties: " + 
ioe.getMessage());
         }
     }
 
@@ -523,9 +527,17 @@
             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]