[jboss-cvs] Repository SVN: r2161 - in oswego-concurrent/1.3.4-jboss-update1: src and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jhowell at redhat.com
Date: 2007-12-13 13:57:50 -0500 (Thu, 13 Dec 2007)
New Revision: 2161

Added:
   oswego-concurrent/1.3.4-jboss-update1/src/ConcurrentReaderHashMap.patch
Modified:
   oswego-concurrent/1.3.4-jboss-update1/lib/concurrent-src.zip
   oswego-concurrent/1.3.4-jboss-update1/lib/concurrent.jar
Log:
Forgot to add the code for the ConcurrentReaderHashMap also.  So adding it today.

Modified: oswego-concurrent/1.3.4-jboss-update1/lib/concurrent-src.zip
===================================================================
(Binary files differ)

Modified: oswego-concurrent/1.3.4-jboss-update1/lib/concurrent.jar
===================================================================
(Binary files differ)

Added: oswego-concurrent/1.3.4-jboss-update1/src/ConcurrentReaderHashMap.patch
===================================================================
--- oswego-concurrent/1.3.4-jboss-update1/src/ConcurrentReaderHashMap.patch	                        (rev 0)
+++ oswego-concurrent/1.3.4-jboss-update1/src/ConcurrentReaderHashMap.patch	2007-12-13 18:57:50 UTC (rev 2161)
@@ -0,0 +1,118 @@
+Index: /root/jboss/4.0.5GA/oswegolocalrepos/src/EDU/oswego/cs/dl/util/concurrent/ConcurrentReaderHashMap.java
+===================================================================
+--- /root/jboss/4.0.5GA/oswegolocalrepos/src/EDU/oswego/cs/dl/util/concurrent/ConcurrentReaderHashMap.java	(revision 3)
++++ /root/jboss/4.0.5GA/oswegolocalrepos/src/EDU/oswego/cs/dl/util/concurrent/ConcurrentReaderHashMap.java	(working copy)
+@@ -28,6 +28,7 @@
+ 
+ package EDU.oswego.cs.dl.util.concurrent;
+ 
++import java.util.ArrayList;
+ import java.util.Map;
+ import java.util.AbstractMap;
+ import java.util.AbstractSet;
+@@ -901,6 +902,34 @@
+     public void clear() {
+       ConcurrentReaderHashMap.this.clear();
+     }
++    
++    public Object[] toArray() {
++        Collection c = new ArrayList();
++        Object o=null;
++        for (Iterator i = iterator(); i.hasNext(); )
++        {
++      	  o = i.next();
++      	  if(o!=null)
++      	  {
++      		  c.add(o);
++      	  } 
++        }
++        return c.toArray();
++      }
++    
++    public Object[] toArray(Object[] a) {
++        Collection c = new ArrayList();
++        Object o=null;
++        for (Iterator i = iterator(); i.hasNext(); )
++        {
++      	  o = i.next();
++      	  if(o!=null)
++      	  {
++      		  c.add(o);
++      	  } 
++        }
++        return c.toArray(a);
++      }
+   }
+ 
+   /**
+@@ -933,6 +962,35 @@
+     public void clear() {
+       ConcurrentReaderHashMap.this.clear();
+     }
++    
++    public Object[] toArray() {
++        Collection c = new ArrayList();
++        Object o=null;
++        for (Iterator i = iterator(); i.hasNext(); )
++        {
++      	  o = i.next();
++      	  if(o!=null)
++      	  {
++      		  c.add(o);
++      	  } 
++        }
++        return c.toArray();
++      }
++    
++    public Object[] toArray(Object[] a) {
++        Collection c = new ArrayList();
++        Object o=null;
++        for (Iterator i = iterator(); i.hasNext(); )
++        {
++      	  o = i.next();
++      	  if(o!=null)
++      	  {
++      		  c.add(o);
++      	  } 
++        }
++        return c.toArray(a);
++      }
++    
+   }
+ 
+   /**
+@@ -975,6 +1033,34 @@
+     public void clear() {
+       ConcurrentReaderHashMap.this.clear();
+     }
++    
++    public Object[] toArray() {
++        Collection c = new ArrayList();
++        Object o=null;
++        for (Iterator i = iterator(); i.hasNext(); )
++        {
++      	  o = i.next();
++      	  if(o!=null)
++      	  {
++      		  c.add(o);
++      	  } 
++        }
++        return c.toArray();
++      }
++    
++    public Object[] toArray(Object[] a) {
++        Collection c = new ArrayList();
++        Object o=null;
++        for (Iterator i = iterator(); i.hasNext(); )
++        {
++      	  o = i.next();
++      	  if(o!=null)
++      	  {
++      		  c.add(o);
++      	  } 
++        }
++        return c.toArray(a);
++      }
+   }
+ 
+   /**