This is an automated email from the ASF dual-hosted git repository.
jonyang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 7459a85be Issue #2715 Update ClientSessionGroupMapping.java (#2955)
7459a85be is described below
commit 7459a85beb8fba3b6bfdde67c805dc38ccf52b6b
Author: Preet Angad Singh Nanda
<[email protected]>
AuthorDate: Thu Jan 26 19:40:57 2023 -0500
Issue #2715 Update ClientSessionGroupMapping.java (#2955)
* Issue #2715 Update ClientSessionGroupMapping.java
* Revert "Issue #2715 Update ClientSessionGroupMapping.java"
This reverts commit ff0b270039cc2f0380cb00a55b979d9864714886.
* Issue #2715 Update ClientSessionGroupMapping.java
* Update ClientSessionGroupMapping.java
change import order
* Update ClientSessionGroupMapping.java
delete log debug will occur NPE
Co-authored-by: jonyangx <[email protected]>
---
.../protocol/tcp/client/group/ClientSessionGroupMapping.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientSessionGroupMapping.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientSessionGroupMapping.java
index 93f77d20f..02fab45b8 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientSessionGroupMapping.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/ClientSessionGroupMapping.java
@@ -32,6 +32,7 @@ import
org.apache.eventmesh.runtime.core.protocol.tcp.client.session.push.DownSt
import org.apache.eventmesh.runtime.util.EventMeshUtil;
import org.apache.eventmesh.runtime.util.RemotingHelper;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import java.lang.ref.WeakReference;
@@ -321,16 +322,15 @@ public class ClientSessionGroupMapping {
}
private void cleanClientGroupWrapperCommon(ClientGroupWrapper
clientGroupWrapper) throws Exception {
- log.info("GroupConsumerSessions size:{}",
- clientGroupWrapper.getGroupConsumerSessions().size());
- if (clientGroupWrapper.getGroupConsumerSessions().size() == 0) {
+
+ if
(CollectionUtils.isEmpty(clientGroupWrapper.getGroupConsumerSessions())) {
shutdownClientGroupConsumer(clientGroupWrapper);
}
log.info("GroupProducerSessions size:{}",
clientGroupWrapper.getGroupProducerSessions().size());
- if ((clientGroupWrapper.getGroupConsumerSessions().size() == 0)
- && (clientGroupWrapper.getGroupProducerSessions().size() ==
0)) {
+ if
((CollectionUtils.isEmpty(clientGroupWrapper.getGroupConsumerSessions()))
+ &&
(CollectionUtils.isEmpty(clientGroupWrapper.getGroupProducerSessions()))) {
shutdownClientGroupProducer(clientGroupWrapper);
clientGroupMap.remove(clientGroupWrapper.getGroup());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
