ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166e/ConcurrentHashMapV8.java
(Generate patch)

Comparing jsr166/src/jsr166e/ConcurrentHashMapV8.java (file contents):
Revision 1.112 by dl, Sat Jul 20 16:50:04 2013 UTC vs.
Revision 1.114 by dl, Fri Aug 9 18:43:44 2013 UTC

# Line 1366 | Line 1366 | public class ConcurrentHashMapV8<K,V> ex
1366       * Saves the state of the {@code ConcurrentHashMapV8} instance to a
1367       * stream (i.e., serializes it).
1368       * @param s the stream
1369 +     * @throws java.io.IOException if an I/O error occurs
1370       * @serialData
1371       * the key (Object) and value (Object)
1372       * for each key-value mapping, followed by a null pair.
# Line 1408 | Line 1409 | public class ConcurrentHashMapV8<K,V> ex
1409      /**
1410       * Reconstitutes the instance from a stream (that is, deserializes it).
1411       * @param s the stream
1412 +     * @throws ClassNotFoundException if the class of a serialized object
1413 +     *         could not be found
1414 +     * @throws java.io.IOException if an I/O error occurs
1415       */
1416      private void readObject(java.io.ObjectInputStream s)
1417          throws java.io.IOException, ClassNotFoundException {
# Line 2682 | Line 2686 | public class ConcurrentHashMapV8<K,V> ex
2686                          return;
2687                      }
2688                  }
2689 <                else if ((s | WAITER) == 0) {
2689 >                else if ((s & WAITER) == 0) {
2690                      if (U.compareAndSwapInt(this, LOCKSTATE, s, s | WAITER)) {
2691                          waiting = true;
2692                          waiter = Thread.currentThread();

Diff Legend

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