From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLinePool.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLinePool.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLinePool.java
index 2a0d4fc..30c764a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLinePool.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/OnLinePool.java
@@ -6,7 +6,7 @@
public class OnLinePool {
- protected static HashMap<String, List<OnLine>> pool = new HashMap<String, List<OnLine>>() ;
+ protected static HashMap<String, List<OnLine>> pool = new HashMap<>() ;
/**
* 鐢熸垚瀵硅薄
@@ -15,14 +15,14 @@
*/
public static synchronized OnLine getInstance(Class<?> clazz)throws Exception {
if(pool == null){
- pool = new HashMap<String, List<OnLine>>() ;
+ pool = new HashMap<>() ;
}
String className = clazz.getName() ;
OnLine obj = null ;
List<OnLine> list = pool.get(className) ;
if(list == null){
- list = new ArrayList<OnLine>() ;
+ list = new ArrayList<>() ;
}else{
obj = list.get(0) ;
}
@@ -32,7 +32,8 @@
return obj ;
}else{
try {
- obj = (OnLine)clazz.newInstance();
+ obj = (OnLine)clazz.getDeclaredConstructor().newInstance() ;
+ //obj = (OnLine)clazz.newInstance();
} catch (Exception e) {
throw new Exception( "鐢�" + className + "鐢熸垚瀹炰緥澶辫触锛�");
}
--
Gitblit v1.8.0