JAMES-1854 Fields should be above methods in Local Delivery

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

Branch: refs/heads/master
Commit: 73fce64a3e0041bb778d4675b9bcb91b980c3912
Parents: 9ac1ca7
Author: Benoit Tellier <[email protected]>
Authored: Mon Oct 31 18:46:52 2016 +0100
Committer: Benoit Tellier <[email protected]>
Committed: Fri Nov 18 18:46:46 2016 +0700

----------------------------------------------------------------------
 .../org/apache/james/transport/mailets/LocalDelivery.java     | 5 ++---
 .../apache/james/transport/mailets/SieveLocalDelivery.java    | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/73fce64a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
----------------------------------------------------------------------
diff --git 
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
 
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
index 9f20812..08e4f02 100644
--- 
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
+++ 
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
@@ -49,6 +49,8 @@ public class LocalDelivery extends GenericMailet {
     private UsersRepository usersRepository;
     private MailboxManager mailboxManager;
     private DomainList domainList;
+    private MailDispatcher mailDispatcher;
+    private RecipientRewriteTable recipientRewriteTable;
 
     @Inject
     public void setRrt(org.apache.james.rrt.api.RecipientRewriteTable rrt) {
@@ -70,9 +72,6 @@ public class LocalDelivery extends GenericMailet {
         this.domainList = domainList;
     }
 
-    private MailDispatcher mailDispatcher;  // Mailet that actually stores the 
message
-    private RecipientRewriteTable recipientRewriteTable;  // Mailet that 
applies RecipientRewriteTable
-
     public void service(Mail mail) throws MessagingException {
         recipientRewriteTable.service(mail);
         if (!mail.getState().equals(Mail.GHOST)) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/73fce64a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
----------------------------------------------------------------------
diff --git 
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
 
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
index 4da3436..e9b2d6e 100644
--- 
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
+++ 
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
@@ -51,6 +51,8 @@ public class SieveLocalDelivery extends GenericMailet {
     private MailboxManager mailboxManager;
     private DomainList domainList;
     private SieveRepository sieveRepository;
+    private MailDispatcher mailDispatcher;
+    private RecipientRewriteTable recipientRewriteTable;
 
     @Inject
     public void setSieveRepository(SieveRepository sieveRepository) {
@@ -77,9 +79,6 @@ public class SieveLocalDelivery extends GenericMailet {
         this.domainList = domainList;
     }
 
-    private MailDispatcher mailDispatcher;  // Mailet that actually stores the 
message
-    private RecipientRewriteTable recipientRewriteTable;  // Mailet that 
applies RecipientRewriteTable
-
     public void service(Mail mail) throws MessagingException {
         recipientRewriteTable.service(mail);
         if (!mail.getState().equals(Mail.GHOST)) {
@@ -88,7 +87,7 @@ public class SieveLocalDelivery extends GenericMailet {
     }
 
     public String getMailetInfo() {
-        return "Local Delivery Mailet";
+        return "Sieve Local Delivery Mailet";
     }
 
     public void init() throws MessagingException {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to