From e96c392479a385a200bc9512da96af638213ffd4 Mon Sep 17 00:00:00 2001
From: Jim Macdonald <>
Date: Thu, 20 Mar 2014 16:17:27 -0700
Subject: [PATCH] #20434: Better transaction disposal

Work Item: 20434
---
 src/Orchard/Data/SessionLocator.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Orchard/Data/SessionLocator.cs b/src/Orchard/Data/SessionLocator.cs
index 120d9c297..d64d7963c 100644
--- a/src/Orchard/Data/SessionLocator.cs
+++ b/src/Orchard/Data/SessionLocator.cs
@@ -87,14 +87,14 @@ namespace Orchard.Data {
                         Logger.Debug("Reverting operations from transaction");
                         _transaction.Rollback();
                     }
-
-                    _transaction.Dispose();
-                    Logger.Debug("Transaction disposed");
                 }
                 catch (Exception e) {
                     Logger.Error(e, "Error while disposing the transaction.");
                 }
                 finally {
+                    _transaction.Dispose();
+                    Logger.Debug("Transaction disposed");
+
                     _transaction = null;
                     _cancelled = false;
                 }