From d4ce08da13fe325fcd304e7618ba6169fcd05a9c Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期四, 11 四月 2024 11:09:39 +0800
Subject: [PATCH] 兼容在icd文件丢失的情况下仍能继续连接设备,读取加载设备端icd文件信息

---
 iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
index d53322b..842876f 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
+++ b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -155,7 +155,7 @@
 				m_ClientSap = new ClientSap();
 				m_Association = m_ClientSap.associate(InetAddress.getByName(FBSDeviceIp), 102, null, null);
 				
-				if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName())) {
+				if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName()) || null == m_ServerModel) {
 					//涓庨鍔犺浇鐨勬ā鍨嬫枃浠朵笉涓�鑷存椂
 					m_ServerModel = m_Association.retrieveModel();
 				}

--
Gitblit v1.9.1