[FIX] Refactor slightly ImapChannelUpstreamHandler::manageUnknownError
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 5f35d3a..5c464c9 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
@@ -338,10 +338,8 @@
private void manageUnknownError(ChannelHandlerContext ctx) {
// logout on error not sure if that is the best way to handle it
- final ImapSession imapSession = ctx.channel().attr(IMAP_SESSION_ATTRIBUTE_KEY).get();
-
- Optional.ofNullable(ctx.channel().attr(REQUEST_IN_FLIGHT_ATTRIBUTE_KEY).getAndSet(null))
- .ifPresent(Disposable::dispose);
+ ImapSession imapSession = ctx.channel().attr(IMAP_SESSION_ATTRIBUTE_KEY).get();
+ Optional.ofNullable(imapSession).ifPresent(ImapSession::cancelOngoingProcessing);
Optional.ofNullable(imapSession)
.map(ImapSession::logout)