ViewVC Help

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

root/jsr166/jsr166/src/jsr166e/ForkJoinPool.java

Comparing jsr166/src/jsr166e/ForkJoinPool.java (file contents):
Revision 1.12 by dl, Wed Nov 14 17:20:29 2012 UTC vs.
Revision 1.13 by jsr166, Wed Nov 14 18:45:53 2012 UTC

#	Line 1291 | Line 1291 | public class ForkJoinPool extends Abstra
1291		--spins;
1292		}
1293		else if (U.compareAndSwapInt(this, PLOCK, ps, ps | PL_SIGNAL)) {
1294	<	synchronized(this) {
1294	>	synchronized (this) {
1295		if ((plock & PL_SIGNAL) != 0) {
1296		try {
1297		wait();
#	Line 1315 | Line 1315 | public class ForkJoinPool extends Abstra
1315		*/
1316		private void releasePlock(int ps) {
1317		plock = ps;
1318	<	synchronized(this) { notifyAll(); }
1318	>	synchronized (this) { notifyAll(); }
1319		}
1320
1321		//  Registering and deregistering workers
#	Line 2305 | Line 2305 | public class ForkJoinPool extends Abstra
2305		}
2306		break;
2307		}
2308	<	} while((r = r.completer) != null);
2308	>	} while ((r = r.completer) != null);
2309		}
2310		}
2311		if (task != null)
#	Line 3196 | Line 3196 | public class ForkJoinPool extends Abstra
3196		getSystemClassLoader().loadClass(hp).newInstance());
3197		if (pp != null)
3198		par = Integer.parseInt(pp);
3199	<	} catch(Exception ignore) {
3199	>	} catch (Exception ignore) {
3200		}
3201
3202		int s; // initialize field offsets for CAS etc

Diff Legend

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