commit | 7b426df1c0befed402f82afacd1a87976ec51941 | [log] [tgz] |
---|---|---|
author | pouria.pirzadeh <pouria@Pourias-MacBook-Pro.local> | Wed Dec 04 00:09:20 2013 -0800 |
committer | pouria.pirzadeh <pouria@Pourias-MacBook-Pro.local> | Wed Dec 04 00:09:20 2013 -0800 |
tree | 97284a6915a21fd7dec3cb3f8f8e3be119a87273 | |
parent | 3d94fc5c0ae842df3dd7c1ab8e7974aaaa956164 [diff] |
merge master to fix-mem branch
diff --git a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/Task.java b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/Task.java index 250634c..30e0b5b 100644 --- a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/Task.java +++ b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/Task.java
@@ -246,7 +246,8 @@ sem.acquire(); final int cIdx = i; executor.execute(new Runnable() { - public void run() { + @Override + public void run() { if (aborted) { return; }