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

Comparing jsr166/src/main/java/util/concurrent/LinkedTransferQueue.java (file contents):
Revision 1.88 by dl, Tue Jun 9 23:57:39 2015 UTC vs.
Revision 1.89 by dl, Thu Jun 11 16:23:03 2015 UTC

# Line 1044 | Line 1044 | public class LinkedTransferQueue<E> exte
1044                          ++i;
1045                      if (p == (p = p.next))
1046                          p = q.firstDataNode();
1047 <                } while (p != null && i < n);
1047 >                } while (p != null && i < n && p.isData);
1048                  if ((current = p) == null)
1049                      exhausted = true;
1050                  if (i > 0) {
# Line 1072 | Line 1072 | public class LinkedTransferQueue<E> exte
1072                          action.accept((E)e);
1073                      if (p == (p = p.next))
1074                          p = q.firstDataNode();
1075 <                } while (p != null);
1075 >                } while (p != null && p.isData);
1076              }
1077          }
1078  
# Line 1089 | Line 1089 | public class LinkedTransferQueue<E> exte
1089                          e = null;
1090                      if (p == (p = p.next))
1091                          p = q.firstDataNode();
1092 <                } while (e == null && p != null);
1092 >                } while (e == null && p != null && p.isData);
1093                  if ((current = p) == null)
1094                      exhausted = true;
1095                  if (e != null) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines