Removed old JSR 166 CHM which was ported from JDK 5 to JDK 1.4

Motivation:

To benefit from newer JDK CHM as the current internal CHM is the one from JDK 5.

Modification:

Removed old JDK 5 CHM from internal package.

Result:

If you are using JDK 7 or 8 there will be a slight performance benefit.

src/main/java/org/jboss/netty/channel/AbstractChannel.java

@@ -15,10 +15,9 @@
  */
 package org.jboss.netty.channel;
 
-import org.jboss.netty.util.internal.ConcurrentHashMap;
-
 import java.net.SocketAddress;
 import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 

src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java

@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -30,7 +31,6 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelFutureListener;
 import org.jboss.netty.channel.ServerChannel;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
 
 /**
  * The default {@link ChannelGroup} implementation.

src/main/java/org/jboss/netty/channel/local/LocalChannelRegistry.java

@@ -15,10 +15,10 @@
  */
 package org.jboss.netty.channel.local;
 
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import org.jboss.netty.channel.Channel;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
 
 /**
  */

src/main/java/org/jboss/netty/handler/traffic/GlobalChannelTrafficShapingHandler.java

@@ -26,13 +26,13 @@ import org.jboss.netty.util.ObjectSizeEstimator;
 import org.jboss.netty.util.Timeout;
 import org.jboss.netty.util.Timer;
 import org.jboss.netty.util.TimerTask;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
 
 import java.util.AbstractCollection;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;

src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java

@@ -27,10 +27,10 @@ import org.jboss.netty.util.ObjectSizeEstimator;
 import org.jboss.netty.util.Timeout;
 import org.jboss.netty.util.Timer;
 import org.jboss.netty.util.TimerTask;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;