harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r901633 - in /harmony/enhanced/classlib/tags/5.0m12a: ./ modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
Date Thu, 21 Jan 2010 10:13:20 GMT
Author: hindessm
Date: Thu Jan 21 10:13:20 2010
New Revision: 901633

URL: http://svn.apache.org/viewvc?rev=901633&view=rev
Log:
Merging change 901124 from classlib trunk:

  r901124 | hindessm | 2010-01-20 10:45:48 +0000 (Wed, 20 Jan 2010) | 2 lines

  Quick fix for build break with Harmony version of this class.


Modified:
    harmony/enhanced/classlib/tags/5.0m12a/   (props changed)
    harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java

Propchange: harmony/enhanced/classlib/tags/5.0m12a/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 21 10:13:20 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk:901123
+/harmony/enhanced/classlib/trunk:901123-901124

Modified: harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java?rev=901633&r1=901632&r2=901633&view=diff
==============================================================================
--- harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
(original)
+++ harmony/enhanced/classlib/tags/5.0m12a/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
Thu Jan 21 10:13:20 2010
@@ -468,7 +468,7 @@
     }
 
     /**
-     * gets the internal data array
+     * gets the internal data array (or a new array if it is null)
      *
      * @return the data array
      */
@@ -725,6 +725,15 @@
     }
 
     /**
+     * gets the internal data array
+     *
+     * @return the data array
+     */
+    final E[] getArray() {
+        return arr;
+    }
+
+    /**
      * list iterator implementation,
      * when created gets snapshot of the list,
      * so never throws ConcurrentModificationException
@@ -1171,4 +1180,5 @@
             setData(back);
         }
     }
-}
+
+}
\ No newline at end of file



Mime
View raw message