From e3cb23da1dff22e7fbbd10b3124757750323c32c Mon Sep 17 00:00:00 2001
From: yangxiaodong <yangxiaodong1214@126.com>
Date: Thu, 10 Aug 2017 14:50:30 +0800
Subject: [PATCH] refactor publisher base class.

---
 .../Abstractions/CapPublisherBase.cs          | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/DotNetCore.CAP/Abstractions/CapPublisherBase.cs b/src/DotNetCore.CAP/Abstractions/CapPublisherBase.cs
index feb4f7b..257f881 100644
--- a/src/DotNetCore.CAP/Abstractions/CapPublisherBase.cs
+++ b/src/DotNetCore.CAP/Abstractions/CapPublisherBase.cs
@@ -9,13 +9,10 @@ namespace DotNetCore.CAP.Abstractions
 {
     public abstract class CapPublisherBase : ICapPublisher
     {
-        protected IDbConnection _dbConnection;
-        protected IDbTransaction _dbTranasaction;
-
+        protected IDbConnection DbConnection { get; set; }
+        protected IDbTransaction DbTranasaction { get; set; }
         protected bool IsCapOpenedTrans { get; set; }
-
         protected bool IsUsingEF { get; set; }
-
         protected IServiceProvider ServiceProvider { get; set; }
          
         public void Publish<T>(string name, T contentObj)
@@ -25,7 +22,7 @@ namespace DotNetCore.CAP.Abstractions
 
             var content = Serialize(contentObj);
 
-            PublishWithTrans(name, content, _dbConnection, _dbTranasaction);
+            PublishWithTrans(name, content, DbConnection, DbTranasaction);
         }
 
         public Task PublishAsync<T>(string name, T contentObj)
@@ -35,7 +32,7 @@ namespace DotNetCore.CAP.Abstractions
 
             var content = Serialize(contentObj);
 
-            return PublishWithTransAsync(name, content, _dbConnection, _dbTranasaction);
+            return PublishWithTransAsync(name, content, DbConnection, DbTranasaction);
         }
 
         public void Publish<T>(string name, T contentObj, IDbConnection dbConnection, IDbTransaction dbTransaction = null)
@@ -121,6 +118,12 @@ namespace DotNetCore.CAP.Abstractions
 
             await ExecuteAsync(dbConnection, dbTransaction, message);
 
+            if (IsCapOpenedTrans)
+            {
+                dbTransaction.Commit();
+                dbTransaction.Dispose();
+                dbConnection.Dispose();
+            }
             PublishQueuer.PulseEvent.Set();
         }
 
@@ -133,8 +136,14 @@ namespace DotNetCore.CAP.Abstractions
                 StatusName = StatusName.Scheduled
             };
 
-            Execute(dbConnection, dbTransaction, message);         
-           
+            Execute(dbConnection, dbTransaction, message);
+
+            if (IsCapOpenedTrans)
+            {
+                dbTransaction.Commit();
+                dbTransaction.Dispose();
+                dbConnection.Dispose();
+            }
             PublishQueuer.PulseEvent.Set();
         }