CVS update: JGroups/src/org/jgroups/blocks PartitionedHashMap.java ReplCache.java ReplicatedHashMap.java
"Bela Ban" <[email protected]> Fri, 17 Sep 2010 11:59:53 +0000
| Newsgroups | gmane.comp.java.javagroups.cvs |
|---|---|
| Message-ID | <[email protected]> |
User: belaban
Date: 10/09/17 11:59:53
Modified: src/org/jgroups/blocks PartitionedHashMap.java
ReplCache.java ReplicatedHashMap.java
Log:
use of Util.createConcurrentMap() instead of new ConcurrentHashMap()
Revision Changes Path
1.21 +9 -10 JGroups/src/org/jgroups/blocks/PartitionedHashMap.java
Index: PartitionedHashMap.java
===================================================================
RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/blocks/PartitionedHashMap.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- PartitionedHashMap.java 13 May 2009 13:06:54 -0000 1.20
+++ PartitionedHashMap.java 17 Sep 2010 11:59:53 -0000 1.21
@@ -1,24 +1,23 @@
package org.jgroups.blocks;
-import org.jgroups.logging.Log;
-import org.jgroups.logging.LogFactory;
import org.jgroups.Address;
import org.jgroups.JChannel;
import org.jgroups.MembershipListener;
import org.jgroups.View;
-import org.jgroups.util.Util;
import org.jgroups.annotations.Experimental;
import org.jgroups.annotations.ManagedAttribute;
import org.jgroups.annotations.ManagedOperation;
import org.jgroups.annotations.Unsupported;
+import org.jgroups.logging.Log;
+import org.jgroups.logging.LogFactory;
+import org.jgroups.util.Util;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
import java.io.DataInputStream;
-import java.io.ByteArrayInputStream;
+import java.io.DataOutputStream;
+import java.lang.reflect.Method;
+import java.util.*;
/** Hashmap which distributes its keys and values across the cluster. A PUT/GET/REMOVE computes the cluster node to which
* or from which to get/set the key/value from a hash of the key and then forwards the request to the remote cluster node.
@@ -35,7 +34,7 @@
* <li>Documentation, comparison to memcached
* </ol>
* @author Bela Ban
- * @version $Id: PartitionedHashMap.java,v 1.20 2009/05/13 13:06:54 belaban Exp $
+ * @version $Id: PartitionedHashMap.java,v 1.21 2010/09/17 11:59:53 belaban Exp $
*/
@Experimental @Unsupported
public class PartitionedHashMap<K,V> implements MembershipListener {
@@ -72,7 +71,7 @@
private static final short GET = 2;
private static final short REMOVE = 3;
- protected static Map<Short, Method> methods=new ConcurrentHashMap<Short,Method>(8);
+ protected static Map<Short,Method> methods=Util.createConcurrentMap(8);
static {
try {
1.28 +5 -6 JGroups/src/org/jgroups/blocks/ReplCache.java
Index: ReplCache.java
===================================================================
RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/blocks/ReplCache.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ReplCache.java 30 Dec 2009 12:45:59 -0000 1.27
+++ ReplCache.java 17 Sep 2010 11:59:53 -0000 1.28
@@ -1,7 +1,5 @@
package org.jgroups.blocks;
-import org.jgroups.logging.Log;
-import org.jgroups.logging.LogFactory;
import org.jgroups.Address;
import org.jgroups.JChannel;
import org.jgroups.MembershipListener;
@@ -10,15 +8,16 @@
import org.jgroups.annotations.ManagedAttribute;
import org.jgroups.annotations.ManagedOperation;
import org.jgroups.annotations.Unsupported;
+import org.jgroups.logging.Log;
+import org.jgroups.logging.LogFactory;
import org.jgroups.util.Rsp;
import org.jgroups.util.RspList;
-import org.jgroups.util.Util;
import org.jgroups.util.TimeScheduler;
+import org.jgroups.util.Util;
import java.io.*;
import java.lang.reflect.Method;
import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
@@ -27,7 +26,7 @@
* of a key/value we create across the cluster.<br/>
* See doc/design/ReplCache.txt for details.
* @author Bela Ban
- * @version $Id: ReplCache.java,v 1.27 2009/12/30 12:45:59 belaban Exp $
+ * @version $Id: ReplCache.java,v 1.28 2010/09/17 11:59:53 belaban Exp $
*/
@Experimental @Unsupported
public class ReplCache<K,V> implements MembershipListener, Cache.ChangeListener {
@@ -80,7 +79,7 @@
private static final short REMOVE = 4;
private static final short REMOVE_MANY = 5;
- protected static Map<Short, Method> methods=new ConcurrentHashMap<Short,Method>(8);
+ protected static Map<Short, Method> methods=Util.createConcurrentMap(8);
private TimeScheduler timer;
1.23 +3 -3 JGroups/src/org/jgroups/blocks/ReplicatedHashMap.java
Index: ReplicatedHashMap.java
===================================================================
RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/blocks/ReplicatedHashMap.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ReplicatedHashMap.java 25 Jan 2010 16:26:06 -0000 1.22
+++ ReplicatedHashMap.java 17 Sep 2010 11:59:53 -0000 1.23
@@ -1,9 +1,9 @@
package org.jgroups.blocks;
-import org.jgroups.logging.Log;
-import org.jgroups.logging.LogFactory;
import org.jgroups.*;
import org.jgroups.annotations.Unsupported;
+import org.jgroups.logging.Log;
+import org.jgroups.logging.LogFactory;
import org.jgroups.persistence.PersistenceFactory;
import org.jgroups.persistence.PersistenceManager;
import org.jgroups.util.Promise;
@@ -41,7 +41,7 @@
* into one class
*
* @author Bela Ban
- * @version $Id: ReplicatedHashMap.java,v 1.22 2010/01/25 16:26:06 belaban Exp $
+ * @version $Id: ReplicatedHashMap.java,v 1.23 2010/09/17 11:59:53 belaban Exp $
*/
@Unsupported(comment="Use JBossCache instead")
public class ReplicatedHashMap<K extends Serializable, V extends Serializable> extends
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev