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

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

Author: jhowell at redhat.com
Date: 2007-12-12 15:01:33 -0500 (Wed, 12 Dec 2007)
New Revision: 2139

Modified:
   oswego-concurrent/1.3.4-jboss/lib/concurrent-src.zip
   oswego-concurrent/1.3.4-jboss/lib/concurrent.jar
   oswego-concurrent/1.3.4-jboss/src/ConcurrentHashMap.patch
Log:
Reverted changes back to previous.  Moving changes to update 1.

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

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

Modified: oswego-concurrent/1.3.4-jboss/src/ConcurrentHashMap.patch
===================================================================
--- oswego-concurrent/1.3.4-jboss/src/ConcurrentHashMap.patch	2007-12-12 18:51:21 UTC (rev 2138)
+++ oswego-concurrent/1.3.4-jboss/src/ConcurrentHashMap.patch	2007-12-12 20:01:33 UTC (rev 2139)
@@ -1,8 +1,8 @@
-Index: /root/jboss/4.0.5GA/oswegolocalrepos/src/EDU/oswego/cs/dl/util/concurrent/ConcurrentHashMap.java
-===================================================================
---- /root/jboss/4.0.5GA/oswegolocalrepos/src/EDU/oswego/cs/dl/util/concurrent/ConcurrentHashMap.java	(revision 4)
-+++ /root/jboss/4.0.5GA/oswegolocalrepos/src/EDU/oswego/cs/dl/util/concurrent/ConcurrentHashMap.java	(working copy)
-@@ -21,6 +21,7 @@
+--- src/EDU/oswego/cs/dl/util/concurrent/ConcurrentHashMap.java	2007-09-11 14:32:37.000000000 +0200
++++ /home/ejort/temp/ConcurrentHashMap.java	2005-07-15 20:47:11.000000000 +0200
+@@ -19,20 +19,22 @@
+   Date       Who                What
+   26nov2000  dl               Created, based on ConcurrentReaderHashMap
    12jan2001  dl               public release
    17nov2001  dl               Minor tunings
    24oct2003  dl               Segment implements Serializable
@@ -10,7 +10,10 @@
  */
  
  package EDU.oswego.cs.dl.util.concurrent;
-@@ -31,6 +32,7 @@
+ 
+ import java.util.Map;
+ import java.util.AbstractMap;
+ import java.util.AbstractSet;
  import java.util.AbstractCollection;
  import java.util.Collection;
  import java.util.Set;
@@ -18,102 +21,74 @@
  import java.util.Iterator;
  import java.util.Enumeration;
  import java.util.NoSuchElementException;
-@@ -879,6 +881,32 @@
+ 
+ import java.io.Serializable;
+@@ -877,10 +879,22 @@
+       return ConcurrentHashMap.this.remove(o) != null;
+     }
      public void clear() {
        ConcurrentHashMap.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);
-+    	  } 
-+      }
++          c.add(i.next());
 +      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);
-+    	  } 
-+      }
++          c.add(i.next());
 +      return c.toArray(a);
 +    }
    }
  
    /**
-@@ -911,6 +939,32 @@
+    * Returns a collection view of the values contained in this map.  The
+    * collection is backed by the map, so changes to the map are reflected in
+@@ -909,10 +923,22 @@
+       return ConcurrentHashMap.this.containsValue(o);
+     }
      public void clear() {
        ConcurrentHashMap.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);
-+    	  } 
-+      }
++          c.add(i.next());
 +      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);
-+    	  } 
-+      }
++          c.add(i.next());
 +      return c.toArray(a);
 +    }
    }
  
    /**
-@@ -954,6 +1008,32 @@
+    * Returns a collection view of the mappings contained in this map.  Each
+    * element in the returned collection is a <tt>Map.Entry</tt>.  The
+@@ -952,10 +978,22 @@
+       return ConcurrentHashMap.this.size();
+     }
      public void clear() {
        ConcurrentHashMap.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);
-+    	  } 
-+      }
++          c.add(i.next());
 +      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);
-+    	  } 
-+      }
++          c.add(i.next());
 +      return c.toArray(a);
 +    }
    }
  
    /**
+    * Returns an enumeration of the keys in this table.
+    *