fixup! MAILBOX-304 Logging empty should be a responsibility from 
AttachmentMapper


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7ee5f12a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7ee5f12a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7ee5f12a

Branch: refs/heads/master
Commit: 7ee5f12ac39eb6cfa786d6b1b3b79734f230df4e
Parents: f16436a
Author: benwa <btell...@linagora.com>
Authored: Fri Sep 8 18:45:38 2017 +0700
Committer: benwa <btell...@linagora.com>
Committed: Fri Sep 8 18:45:38 2017 +0700

----------------------------------------------------------------------
 .../mailbox/cassandra/mail/CassandraAttachmentMapper.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/7ee5f12a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
----------------------------------------------------------------------
diff --git 
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
 
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
index ee2e5d1..8388c20 100644
--- 
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
+++ 
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
@@ -135,10 +135,10 @@ public class CassandraAttachmentMapper implements 
AttachmentMapper {
             .thenCompose(attachmentDAOV2::storeAttachment);
     }
 
-    private Optional<Attachment> logNotFound(AttachmentId attachmentId, 
Optional<Attachment> optional) {
-        if (!optional.isPresent()) {
+    private Optional<Attachment> logNotFound(AttachmentId attachmentId, 
Optional<Attachment> optionalAttachment) {
+        if (!optionalAttachment.isPresent()) {
             LOGGER.warn("Failed retrieving attachment {}", attachmentId);
         }
-        return optional;
+        return optionalAttachment;
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to