You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by ka...@apache.org on 2022/01/24 08:51:10 UTC
[james-project] branch master updated: JAMES-3705 Refactoring POP3 handlers to be more extensible
This is an automated email from the ASF dual-hosted git repository.
kao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new e21b129 JAMES-3705 Refactoring POP3 handlers to be more extensible
new 45a2d4d Merge pull request #850 from ottoka/JAMES-3705
e21b129 is described below
commit e21b12990939e647748a45bb9abb826a4b2878ea
Author: Karsten Otto <ka...@akquinet.de>
AuthorDate: Wed Jan 19 08:59:48 2022 +0100
JAMES-3705 Refactoring POP3 handlers to be more extensible
---
.../java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java | 6 +++++-
.../java/org/apache/james/protocols/pop3/core/TopCmdHandler.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
index f89b8cf..22f31e4 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java
@@ -98,7 +98,7 @@ public class RetrCmdHandler extends AbstractPOP3CommandHandler {
String uid = data.getUid();
if (!deletedUidList.contains(uid)) {
- InputStream content = session.getUserMailbox().getMessage(uid);
+ InputStream content = getMessageContent(session, data);
if (content != null) {
InputStream in = new CRLFTerminatedInputStream(new ExtraDotInputStream(content));
@@ -120,6 +120,10 @@ public class RetrCmdHandler extends AbstractPOP3CommandHandler {
}
return response;
}
+
+ protected InputStream getMessageContent(POP3Session session, MessageMetaData data) throws IOException {
+ return session.getUserMailbox().getMessage(data.getUid());
+ }
@Override
public Collection<String> getImplCommands() {
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
index 3a56360..e7cd77a 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
@@ -119,7 +119,7 @@ public class TopCmdHandler extends RetrCmdHandler implements CapaCapability {
String uid = data.getUid();
if (!deletedUidList.contains(uid)) {
- InputStream message = new CountingBodyInputStream(new ExtraDotInputStream(new CRLFTerminatedInputStream(session.getUserMailbox().getMessage(uid))), lines);
+ InputStream message = new CountingBodyInputStream(new ExtraDotInputStream(new CRLFTerminatedInputStream(getMessageContent(session, data))), lines);
return new POP3StreamResponse(POP3Response.OK_RESPONSE, "Message follows", message);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org