You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/07/12 04:31:46 UTC
svn commit: r555464 - in /mina: branches/1.0/core/src/main/java/org/apache/mina/handler/demux/ branches/1.1/core/src/main/java/org/apache/mina/handler/demux/ trunk/core/src/main/java/org/apache/mina/handler/demux/

Author: trustin
Date: Wed Jul 11 19:31:45 2007
New Revision: 555464

URL: http://svn.apache.org/viewvc?view=rev&rev=555464
Log:
Resolved issue: DIRMINA-398 (Change the default Map implementation of DemuxingIoHandler to ConcurrentHashMap)
* Replaced Hashtable with ConcurrentHashMap in DemuxingIoHandler


Modified:
    mina/branches/1.0/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
    mina/branches/1.1/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
    mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java

Modified: mina/branches/1.0/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java?view=diff&rev=555464&r1=555463&r2=555464
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java Wed Jul 11 19:31:45 2007
@@ -20,7 +20,6 @@
 package org.apache.mina.handler.demux;
 
 import java.util.Collections;
-import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
 
@@ -29,6 +28,8 @@
 import org.apache.mina.common.IoSession;
 import org.apache.mina.util.IdentityHashSet;
 
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+
 /**
  * A {@link IoHandler} that demuxes <code>messageReceived</code> events
  * to the appropriate {@link MessageHandler}.
@@ -78,8 +79,8 @@
  */
 public class DemuxingIoHandler extends IoHandlerAdapter
 {
-    private final Map findHandlerCache = new Hashtable();
-    private final Map type2handler = new Hashtable();
+    private final Map findHandlerCache = new ConcurrentHashMap();
+    private final Map type2handler = new ConcurrentHashMap();
 
     /**
      * Creates a new instance with no registered {@link MessageHandler}s.

Modified: mina/branches/1.1/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java?view=diff&rev=555464&r1=555463&r2=555464
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java (original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java Wed Jul 11 19:31:45 2007
@@ -20,9 +20,9 @@
 package org.apache.mina.handler.demux;
 
 import java.util.Collections;
-import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoHandlerAdapter;
@@ -78,8 +78,8 @@
  */
 public class DemuxingIoHandler extends IoHandlerAdapter
 {
-    private final Map<Class, MessageHandler> findHandlerCache = new Hashtable<Class, MessageHandler>();
-    private final Map<Class, MessageHandler> type2handler = new Hashtable<Class, MessageHandler>();
+    private final Map<Class, MessageHandler> findHandlerCache = new ConcurrentHashMap<Class, MessageHandler>();
+    private final Map<Class, MessageHandler> type2handler = new ConcurrentHashMap<Class, MessageHandler>();
 
     /**
      * Creates a new instance with no registered {@link MessageHandler}s.

Modified: mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java?view=diff&rev=555464&r1=555463&r2=555464
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java Wed Jul 11 19:31:45 2007
@@ -20,9 +20,9 @@
 package org.apache.mina.handler.demux;
 
 import java.util.Collections;
-import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoHandlerAdapter;
@@ -78,8 +78,8 @@
  */
 public class DemuxingIoHandler extends IoHandlerAdapter
 {
-    private final Map<Class, MessageHandler> findHandlerCache = new Hashtable<Class, MessageHandler>();
-    private final Map<Class, MessageHandler> type2handler = new Hashtable<Class, MessageHandler>();
+    private final Map<Class, MessageHandler> findHandlerCache = new ConcurrentHashMap<Class, MessageHandler>();
+    private final Map<Class, MessageHandler> type2handler = new ConcurrentHashMap<Class, MessageHandler>();
 
     /**
      * Creates a new instance with no registered {@link MessageHandler}s.