ViewVC Help

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

root/jsr166/jsr166/src/test/tck/AbstractExecutorServiceTest.java

Comparing jsr166/src/test/tck/AbstractExecutorServiceTest.java (file contents):
Revision 1.25 by jsr166, Thu Sep 16 02:54:10 2010 UTC vs.
Revision 1.26 by jsr166, Fri Sep 17 00:53:15 2010 UTC

#	Line 29 | Line 29 | public class AbstractExecutorServiceTest
29		static class DirectExecutorService extends AbstractExecutorService {
30		public void execute(Runnable r) { r.run(); }
31		public void shutdown() { shutdown = true; }
32	<	public List<Runnable> shutdownNow() { shutdown = true; return Collections.EMPTY_LIST; }
32	>	public List<Runnable> shutdownNow() {
33	>	shutdown = true;
34	>	return Collections.EMPTY_LIST;
35	>	}
36		public boolean isShutdown() { return shutdown; }
37		public boolean isTerminated() { return isShutdown(); }
38	<	public boolean awaitTermination(long timeout, TimeUnit unit) { return isShutdown(); }
38	>	public boolean awaitTermination(long timeout, TimeUnit unit) {
39	>	return isShutdown();
40	>	}
41		private volatile boolean shutdown = false;
42		}
43

Diff Legend

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