ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/ScheduledThreadPoolExecutor.java

Comparing jsr166/src/main/java/util/concurrent/ScheduledThreadPoolExecutor.java (file contents):
Revision 1.86 by jsr166, Fri Feb 27 19:01:11 2015 UTC vs.
Revision 1.87 by jsr166, Sat Feb 28 22:51:09 2015 UTC

#	Line 1066 | Line 1066 | public class ScheduledThreadPoolExecutor
1066		lock.lock();
1067		try {
1068		RunnableScheduledFuture<?> first = queue[0];
1069	<	if (first == null || first.getDelay(NANOSECONDS) > 0)
1070	<	return null;
1071	<	else
1072	<	return finishPoll(first);
1069	>	return (first == null || first.getDelay(NANOSECONDS) > 0)
1070	>	? null
1071	>	: finishPoll(first);
1072		} finally {
1073		lock.unlock();
1074		}

Diff Legend

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