ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/ForkJoinPool.java

Comparing jsr166/src/jsr166y/ForkJoinPool.java (file contents):
Revision 1.140 by dl, Wed Nov 14 17:20:37 2012 UTC vs.
Revision 1.141 by jsr166, Wed Nov 14 18:45:53 2012 UTC

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

Diff Legend

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