You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2017/12/12 08:48:42 UTC

[12/12] james-project git commit: JAMES-2251 Switch to HashMap

JAMES-2251 Switch to HashMap

Using a synchronized collection appears to be unnecessary.


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

Branch: refs/heads/master
Commit: 78b04fed9f6d53bda65cb68674c40e8b5af5e16c
Parents: 23b9690
Author: Daniel Trebbien <dt...@gmail.com>
Authored: Wed Dec 6 17:45:11 2017 -0600
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Tue Dec 12 09:47:38 2017 +0100

----------------------------------------------------------------------
 .../james/mailetcontainer/impl/JamesMailetContext.java | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/78b04fed/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
index b013414..34db500 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
@@ -22,11 +22,12 @@ package org.apache.james.mailetcontainer.impl;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import javax.inject.Inject;
 import javax.mail.Address;
@@ -60,8 +61,6 @@ import org.apache.mailet.base.RFC2822Headers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.fge.lambdas.Throwing;
-import com.github.fge.lambdas.consumers.ConsumerChainer;
 import com.google.common.collect.ImmutableSet;
 
 @SuppressWarnings("deprecation")
@@ -71,7 +70,7 @@ public class JamesMailetContext implements MailetContext, Configurable {
     /**
      * A hash table of server attributes These are the MailetContext attributes
      */
-    private final Hashtable<String, Object> attributes = new Hashtable<>();
+    private final Map<String, Object> attributes = new HashMap<>();
     protected DNSService dns;
 
     private UsersRepository localusers;
@@ -130,11 +129,7 @@ public class JamesMailetContext implements MailetContext, Configurable {
 
     @Override
     public Iterator<String> getAttributeNames() {
-        final List<String> names;
-        synchronized (attributes) {
-            names = new ArrayList<>(attributes.keySet());
-        }
-        return names.iterator();
+        return attributes.keySet().iterator();
     }
 
     /**


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