From ae2d085ba1d63f39ec866abfe29dcf77bc87ba1d Mon Sep 17 00:00:00 2001
From: parallelbgls <parallelbgls@outlook.com>
Date: Tue, 23 May 2017 16:24:51 +0800
Subject: [PATCH] Change TParamOut to class

---
 Modbus.Net/src/Base.Common/BaseProtocal.cs   | 2 +-
 Modbus.Net/src/Base.Common/BaseUtility.cs    | 2 +-
 Modbus.Net/src/Base.Common/ProtocalLinker.cs | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Modbus.Net/src/Base.Common/BaseProtocal.cs b/Modbus.Net/src/Base.Common/BaseProtocal.cs
index fea5f5d..08473da 100644
--- a/Modbus.Net/src/Base.Common/BaseProtocal.cs
+++ b/Modbus.Net/src/Base.Common/BaseProtocal.cs
@@ -38,7 +38,7 @@ namespace Modbus.Net
     ///     基本协议
     /// </summary>
     public abstract class BaseProtocal<TParamIn, TParamOut, TProtocalUnit> :
-        IProtocal<TParamIn, TParamOut, TProtocalUnit> where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut>
+        IProtocal<TParamIn, TParamOut, TProtocalUnit> where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut> where TParamOut : class
     {
         /// <summary>
         ///     构造器
diff --git a/Modbus.Net/src/Base.Common/BaseUtility.cs b/Modbus.Net/src/Base.Common/BaseUtility.cs
index ddb7331..3b069dd 100644
--- a/Modbus.Net/src/Base.Common/BaseUtility.cs
+++ b/Modbus.Net/src/Base.Common/BaseUtility.cs
@@ -44,7 +44,7 @@ namespace Modbus.Net
     ///     基础Api入口
     /// </summary>
     public abstract class BaseUtility<TParamIn, TParamOut, TProtocalUnit> : IUtilityProperty, IUtilityMethodData
-        where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut>
+        where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut> where TParamOut : class
     {
         /// <summary>
         ///     协议收发主体
diff --git a/Modbus.Net/src/Base.Common/ProtocalLinker.cs b/Modbus.Net/src/Base.Common/ProtocalLinker.cs
index bd7accd..c66290d 100644
--- a/Modbus.Net/src/Base.Common/ProtocalLinker.cs
+++ b/Modbus.Net/src/Base.Common/ProtocalLinker.cs
@@ -70,7 +70,7 @@ namespace Modbus.Net
     /// <summary>
     ///     基本的协议连接器
     /// </summary>
-    public abstract class ProtocalLinker<TParamIn, TParamOut> : IProtocalLinker<TParamIn, TParamOut>
+    public abstract class ProtocalLinker<TParamIn, TParamOut> : IProtocalLinker<TParamIn, TParamOut> where TParamOut : class
     {
         /// <summary>
         ///     传输连接器
@@ -106,8 +106,7 @@ namespace Modbus.Net
         {
             var extBytes = BytesExtend(content);
             var receiveBytes = await SendReceiveWithoutExtAndDecAsync(extBytes);
-            if (receiveBytes != null) return receiveBytes;
-            throw new NullReferenceException();
+            return receiveBytes;
         }
 
         /// <summary>
@@ -132,8 +131,7 @@ namespace Modbus.Net
             //容错处理
             var checkRight = CheckRight(receiveBytes);
             //返回字符
-            if (checkRight == true) return receiveBytes;
-            throw new NullReferenceException();
+            return checkRight == true ? receiveBytes : null;
         }
 
         /// <summary>