luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Fix

Browse Source
This commit is contained in:
parallelbgls
2017-05-19 10:41:41 +08:00
parent 85b178e5ab
commit 9672bfa201
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Modbus.Net/src/Base.Common/BaseProtocal.cs
View File

@@ -80,10 +80,11 @@ namespace Modbus.Net
get get
{ {
var protocalName = type.FullName; var protocalName = type.FullName;
TProtocalUnit protocalUnitReturn = null;
lock (Protocals) lock (Protocals)
{ {
if (Protocals.ContainsKey(protocalName)) if (Protocals.ContainsKey(protocalName))
return Protocals[protocalName]; protocalUnitReturn = Protocals[protocalName];
//自动寻找存在的协议并将其加载 //自动寻找存在的协议并将其加载
var protocalUnit = var protocalUnit =
Activator.CreateInstance(type.GetTypeInfo().Assembly.GetType(protocalName)) as TProtocalUnit; Activator.CreateInstance(type.GetTypeInfo().Assembly.GetType(protocalName)) as TProtocalUnit;
@@ -92,7 +93,7 @@ namespace Modbus.Net
protocalUnit.Endian = Endian; protocalUnit.Endian = Endian;
Register(protocalUnit); Register(protocalUnit);
} }
return Protocals[protocalName]; return protocalUnitReturn ?? Protocals[protocalName];
} }
} }