[jboss-svn-commits] JBL Code SVN: r5826 - labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2006-08-12 11:15:13 -0400 (Sat, 12 Aug 2006)
New Revision: 5826

Modified:
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java
Log:
nomsg

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java	2006-08-12 15:08:54 UTC (rev 5825)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java	2006-08-12 15:15:13 UTC (rev 5826)
@@ -207,12 +207,15 @@
 				try {
 					// Caught the call to close the resultset - close the associated DbResources too!
 					return method.invoke(resultSet, args);
+				} catch (Exception e) {
+					TestCaseUtils.logAndFail("Failed to close database Resultset.  Connection Properties: " + properties, logger, e);
 				} finally {
 					dbResources.close();
 				}
-			} else {
-				return method.invoke(resultSet, args);
 			}
+			
+			// Call to something other than the "close" method.
+			return method.invoke(resultSet, args);
 		}
 	}
 	
@@ -244,11 +247,16 @@
 				if (stat != null) {
 					stat.close();
 				}
+			} catch (SQLException e) {
+				TestCaseUtils.logAndFail("Failed to close database Statement.  Connection Properties: " + properties, logger, e);
+			} finally {
 				if (con != null) {
-					con.close();
+					try {
+						con.close();
+					} catch (SQLException e) {
+						TestCaseUtils.logAndFail("Failed to close database Connection.  Connection Properties: " + properties, logger, e);
+					}
 				}
-			} catch (SQLException e) {
-				TestCaseUtils.logAndFail("Failed to close database resources.  Connection Properties: " + properties, logger, e);
 			}
 		}
 	}