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/PrefixedDataAvailablePool.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailablePool.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailablePool.java
index bb9761b..ba5b121 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailablePool.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailablePool.java
@@ -24,22 +24,21 @@
List<PrefixedDataAvailable> list = pool.get(className) ;
if(list == null){
list = new ArrayList<>() ;
- }else{
+ pool.put(className, list) ;
+ }else if(list.size() > 0){
obj = list.get(0) ;
+ list.remove(0) ;
}
- if(obj != null){
- list.remove(0) ;
- return obj ;
- }else{
+ if(obj == null){
try {
obj = (PrefixedDataAvailable)clazz.getDeclaredConstructor().newInstance() ;
//obj = (PrefixedDataAvailable)clazz.newInstance();
} catch (Exception e) {
throw new Exception( "鐢�" + className + "鐢熸垚瀹炰緥澶辫触锛�");
}
- return obj ;
}
+ return obj ;
}
/**
--
Gitblit v1.8.0