You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2011/05/09 09:50:18 UTC

svn commit: r1100909 - in /james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic: BayesianAnalysis.java BayesianAnalysisFeeder.java JDBCBayesianAnalyzer.java JDBCUtil.java

Author: rdonkin
Date: Mon May  9 07:50:18 2011
New Revision: 1100909

URL: http://svn.apache.org/viewvc?rev=1100909&view=rev
Log:
Logged exceptions caught and ignored. Thanks, PMD.

Modified:
    james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
    james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
    james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
    james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java

Modified: james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
URL: http://svn.apache.org/viewvc/james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java?rev=1100909&r1=1100908&r2=1100909&view=diff
==============================================================================
--- james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java (original)
+++ james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java Mon May  9 07:50:18 2011
@@ -137,6 +137,11 @@ public class BayesianAnalysis extends Ge
         protected void delegatedLog(String logString) {
             log("BayesianAnalysis: " + logString);
         }
+
+        @Override
+        protected void delegatedLog(String logString, Throwable t) {
+            log("BayesianAnalysis: " + logString, t);
+        }
     };
 
     DataSource datasource;

Modified: james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
URL: http://svn.apache.org/viewvc/james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java?rev=1100909&r1=1100908&r2=1100909&view=diff
==============================================================================
--- james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java (original)
+++ james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java Mon May  9 07:50:18 2011
@@ -141,6 +141,11 @@ public class BayesianAnalysisFeeder exte
         protected void delegatedLog(String logString) {
             log("BayesianAnalysisFeeder: " + logString);
         }
+        
+        @Override
+        protected void delegatedLog(String logString, Throwable t) {
+            log("BayesianAnalysis: " + logString, t);
+        }
     };
 
     private DataSource datasource;

Modified: james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java
URL: http://svn.apache.org/viewvc/james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java?rev=1100909&r1=1100908&r2=1100909&view=diff
==============================================================================
--- james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java (original)
+++ james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java Mon May  9 07:50:18 2011
@@ -57,6 +57,17 @@ abstract public class JDBCBayesianAnalyz
     abstract protected void delegatedLog(String errorString);
 
     /**
+     * An abstract method which child classes override to handle logging of
+     * errors in their particular environments.
+     * 
+     * @param errorString
+     *            the error message generated
+     * @param t 
+     *            exception 
+     */
+    abstract protected void delegatedLog(String errorString, Throwable t);
+    
+    /**
      * The JDBCUtil helper class
      */
     private final JDBCUtil theJDBCUtil = new JDBCUtil() {
@@ -210,6 +221,7 @@ abstract public class JDBCBayesianAnalyz
                 try {
                     rs.close();
                 } catch (java.sql.SQLException se) {
+                    delegatedLog("Failed to close statement after selecting spam tokens.", se);
                 }
 
                 rs = null;
@@ -219,6 +231,7 @@ abstract public class JDBCBayesianAnalyz
                 try {
                     pstmt.close();
                 } catch (java.sql.SQLException se) {
+                    delegatedLog("Failed to close statement selecting message counts.", se);
                 }
 
                 pstmt = null;
@@ -289,12 +302,14 @@ abstract public class JDBCBayesianAnalyz
                 try {
                     init.close();
                 } catch (java.sql.SQLException ignore) {
+                    delegatedLog("Failed to close statement after initializing message count.", ignore);
                 }
             }
             if (update != null) {
                 try {
                     update.close();
                 } catch (java.sql.SQLException ignore) {
+                    delegatedLog("Failed to close statement after setting message count.", ignore);
                 }
             }
         }
@@ -330,6 +345,7 @@ abstract public class JDBCBayesianAnalyz
                 try {
                     insert.close();
                 } catch (java.sql.SQLException ignore) {
+                    delegatedLog("Failed to close statement after updating tokens.", ignore);
                 }
 
                 insert = null;
@@ -339,6 +355,7 @@ abstract public class JDBCBayesianAnalyz
                 try {
                     update.close();
                 } catch (java.sql.SQLException ignore) {
+                    delegatedLog("Failed to close statement after updating tokens.", ignore);
                 }
 
                 update = null;
@@ -432,8 +449,9 @@ abstract public class JDBCBayesianAnalyz
                 try {
                     delete.close();
                 } catch (java.sql.SQLException ignore) {
+                    delegatedLog("Failed to close statement after deleting ham statement. ", ignore);
                 }
-
+                
                 delete = null;
             }
         }

Modified: james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java
URL: http://svn.apache.org/viewvc/james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java?rev=1100909&r1=1100908&r2=1100909&view=diff
==============================================================================
--- james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java (original)
+++ james/mailet/ai/trunk/classic/src/main/java/org/apache/james/ai/classic/JDBCUtil.java Mon May  9 07:50:18 2011
@@ -194,7 +194,7 @@ abstract class JDBCUtil {
     private void subclassLogWrapper(String logString) {
         try {
             delegatedLog(logString);
-        } catch (Throwable t) {
+        } catch (Throwable t) { //NOPMD
             // Throwables generated by the logging system are ignored
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org