Fixing potential NRE in transaction manager

2026-02-09 09:16:41 +08:00 · 2013-10-02 17:58:07 -07:00
parent 5e93dfa190
commit dfd6e0985e
1 changed files with 7 additions and 3 deletions
@@ -53,9 +53,13 @@ namespace Orchard.Data {
            EnsureSession();

            if (_cancelled) {
-                _transaction.Rollback();
-                _transaction.Dispose();
-                _transaction = null;
+                if (_transaction != null) {
+                    _transaction.Rollback();
+                    _transaction.Dispose();
+                    _transaction = null;
+                }
+
+                _cancelled = false;
            }
            else {
                if (_transaction != null) {