You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/03/22 02:01:46 UTC
[james-project] 15/29: JAMES-3715 IMAP: We no longer have EXECUTION_HANDLER in Netty 4
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c62f06b4d40ddd1c4854adb7266409d778af9553
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Mar 10 15:59:20 2022 +0700
JAMES-3715 IMAP: We no longer have EXECUTION_HANDLER in Netty 4
---
.../apache/james/imapserver/netty/ImapChannelUpstreamHandler.java | 6 +-----
.../main/java/org/apache/james/imapserver/netty/NettyConstants.java | 1 -
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
index c264e11..d9017cf 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
@@ -249,11 +249,7 @@ public class ImapChannelUpstreamHandler extends ChannelInboundHandlerAdapter imp
try {
try {
- if (cp.get(NettyConstants.EXECUTION_HANDLER) != null) {
- cp.addBefore(NettyConstants.EXECUTION_HANDLER, NettyConstants.HEARTBEAT_HANDLER, heartbeatHandler);
- } else {
- cp.addBefore(NettyConstants.CORE_HANDLER, NettyConstants.HEARTBEAT_HANDLER, heartbeatHandler);
- }
+ cp.addBefore(NettyConstants.CORE_HANDLER, NettyConstants.HEARTBEAT_HANDLER, heartbeatHandler);
} catch (IllegalArgumentException e) {
LOGGER.info("heartbeat handler is already part of this pipeline", e);
}
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java
index 4733fb4..68bbd6d 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java
@@ -41,7 +41,6 @@ public interface NettyConstants {
String CONNECTION_LIMIT_PER_IP_HANDLER = "connectionPerIpLimitHandler";
String CONNECTION_COUNT_HANDLER = "connectionCountHandler";
String CHUNK_WRITE_HANDLER = "chunkWriteHandler";
- String EXECUTION_HANDLER = "executionHandler";
String HEARTBEAT_HANDLER = "heartbeatHandler";
AttributeKey<ImapSession> IMAP_SESSION_ATTRIBUTE_KEY = AttributeKey.valueOf("ImapSession");
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org