ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.112 by jsr166, Fri Jun 3 02:28:05 2011 UTC vs.
Revision 1.113 by jsr166, Wed Jun 8 00:21:52 2011 UTC

# Line 8 | Line 8 | package java.util.concurrent;
8   import java.util.concurrent.locks.*;
9   import java.util.*;
10   import java.io.Serializable;
11 – import java.io.IOException;
12 – import java.io.ObjectInputStream;
13 – import java.io.ObjectOutputStream;
11  
12   /**
13   * A hash table supporting full concurrency of retrievals and
# Line 1397 | Line 1394 | public class ConcurrentHashMap<K, V> ext
1394       * for each key-value mapping, followed by a null pair.
1395       * The key-value mappings are emitted in no particular order.
1396       */
1397 <    private void writeObject(java.io.ObjectOutputStream s) throws IOException {
1397 >    private void writeObject(java.io.ObjectOutputStream s)
1398 >            throws java.io.IOException {
1399          // force all segments for serialization compatibility
1400          for (int k = 0; k < segments.length; ++k)
1401              ensureSegment(k);
# Line 1431 | Line 1429 | public class ConcurrentHashMap<K, V> ext
1429       */
1430      @SuppressWarnings("unchecked")
1431      private void readObject(java.io.ObjectInputStream s)
1432 <        throws IOException, ClassNotFoundException {
1432 >            throws java.io.IOException, ClassNotFoundException {
1433          s.defaultReadObject();
1434  
1435          // Re-initialize segments to be minimally sized, and let grow.

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines