nhibernate-commit

[Nhibernate-commit] SF.net SVN: nhibernate:[4311] trunk/nhibernate/src/NHibernate/AdoNet/ AbstractBatcher.cs

[<aye...@us...>]

Revision: 4311
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4311&view=rev
Author:   ayenderahien
Date:     2009-05-15 05:10:15 +0000 (Fri, 15 May 2009)

Log Message:
-----------
minor - fixing spelling mistake in the log
changing the log level of errors when querying the database to be Error instead of Warn

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs

Modified: trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs	2009-05-15 04:38:07 UTC (rev 4310)
+++ trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs	2009-05-15 05:10:15 UTC (rev 4311)
@@ -199,7 +199,7 @@
 		    catch (Exception e)
 		    {
 		        e.Data["actual-sql-query"] = cmd.CommandText;
-		    	log.Warn("Could not execute command: " + cmd.CommandText, e);
+		    	log.Error("Could not execute command: " + cmd.CommandText, e);
 		        throw;
 		    }
 		}
@@ -217,7 +217,7 @@
 		    catch (Exception e)
 		    {
 		        e.Data["actual-sql-query"] = cmd.CommandText;
-		    	log.Warn("Could not exeucte query: " + cmd.CommandText, e);
+		    	log.Error("Could not execute query: " + cmd.CommandText, e);
 		        throw;
 		    }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[4983] trunk/nhibernate/src/NHibernate/AdoNet/ AbstractBatcher.cs

[<ric...@us...>]

Revision: 4983
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4983&view=rev
Author:   ricbrown
Date:     2010-05-27 10:11:44 +0000 (Thu, 27 May 2010)

Log Message:
-----------
Fix NH-2205 (NHibernate.Loader.Loader.DoQuery can hide exceptions)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs

Modified: trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs	2010-05-27 09:19:36 UTC (rev 4982)
+++ trunk/nhibernate/src/NHibernate/AdoNet/AbstractBatcher.cs	2010-05-27 10:11:44 UTC (rev 4983)
@@ -371,7 +371,17 @@
 			ResultSetWrapper rsw = reader as ResultSetWrapper;
 			var actualReader = rsw == null ? reader : rsw.Target;
 			readersToClose.Remove(actualReader);
-			reader.Dispose();
+
+			try
+			{
+				reader.Dispose();
+			}
+			catch (Exception e)
+			{
+				// NH2205 - prevent exceptions when closing the reader from hiding any original exception
+				log.Warn("exception closing reader", e);
+			}
+
 			LogCloseReader();
 			
 			if (!log.IsDebugEnabled) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.