svn commit: r292957 - in /jakarta/velocity/core/trunk/src/java/org/apache/velocity: runtime/resource/loader/ texen/ant/ texen/util/

[henning]

Author: henning
Date: Sat Oct  1 04:28:17 2005
New Revision: 292957

URL: http://svn.apache.org/viewcvs?rev=292957&view=rev
Log:
Check a number of generic "catch Exception" instances found by
Findbugs and replace them either with more specialized Exceptions or
document which Exceptions are caught.


Modified:
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/util/PropertiesUtil.java

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=292957&r1=292956&r2=292957&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
 Sat Oct  1 04:28:17 2005
@@ -247,6 +247,7 @@
                  closeDbConnection(conn);
              }
          }
+         // IOException, SQLException
          catch(Exception e)
          {
              String msg = "DataSourceResourceLoader Error: database problem 
trying to load resource "

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/JarHolder.java?rev=292957&r1=292956&r2=292957&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
 Sat Oct  1 04:28:17 2005
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.JarURLConnection;
 import java.net.URL;
@@ -71,7 +72,7 @@
             conn.connect();
             theJar = conn.getJarFile();
         } 
-        catch (Exception e)
+        catch (IOException e)
         {
             log.error("JarHolder: error establishing connection to JAR ", e);
         }

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java?rev=292957&r1=292956&r2=292957&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
 Sat Oct  1 04:28:17 2005
@@ -46,7 +46,8 @@
             
             return loader;
         }
-        catch( Exception e)
+        // The ugly three strike again: 
ClassNotFoundException,IllegalAccessException,InstantiationException
+        catch(Exception e)
         {
             rs.getLog().error("Problem instantiating the template loader.\n" +
                           "Look at your properties file and make sure the\n" +

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java?rev=292957&r1=292956&r2=292957&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/ant/TexenTask.java
 Sat Oct  1 04:28:17 2005
@@ -282,7 +282,7 @@
                 log("Using contextProperties file: " + fullPath);
                 source.load(new FileInputStream(fullPath));
             }
-            catch (Exception e)
+            catch (IOException e)
             {
                 ClassLoader classLoader = this.getClass().getClassLoader();
 

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/util/PropertiesUtil.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/util/PropertiesUtil.java?rev=292957&r1=292956&r2=292957&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/util/PropertiesUtil.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/texen/util/PropertiesUtil.java
 Sat Oct  1 04:28:17 2005
@@ -122,7 +122,7 @@
                 // we found a valid file.
                 break;
             }
-            catch (Exception e)
+            catch (IOException e)
             {
                 // do nothing
             }



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