# | Line 145 | Line 145 | public class CancellableTask implements | |
---|---|---|
145 | if (setRunning()) { | |
146 | try { | |
147 | runnable.run(); | |
148 | < | } |
149 | < | finally { |
148 | > | } finally { |
149 | setDone(); | |
150 | } | |
151 | } | |
# | Line 180 | Line 179 | public class CancellableTask implements | |
179 | public void run() { | |
180 | try { | |
181 | set(callable.call()); | |
182 | < | } |
184 | < | catch(Throwable ex) { |
182 | > | } catch(Throwable ex) { |
183 | setException(ex); | |
184 | } | |
185 | } | |
# | Line 197 | Line 195 | public class CancellableTask implements | |
195 | throw new ExecutionException(exception); | |
196 | else | |
197 | return result; | |
198 | < | } |
201 | < | finally { |
198 | > | } finally { |
199 | lock.unlock(); | |
200 | } | |
201 | } | |
# | Line 221 | Line 218 | public class CancellableTask implements | |
218 | throw new ExecutionException(exception); | |
219 | else | |
220 | return result; | |
221 | < | } |
225 | < | finally { |
221 | > | } finally { |
222 | lock.unlock(); | |
223 | } | |
224 | } | |
# | Line 233 | Line 229 | public class CancellableTask implements | |
229 | result = v; | |
230 | setDone(); | |
231 | accessible.signalAll(); | |
232 | < | } |
237 | < | finally { |
232 | > | } finally { |
233 | lock.unlock(); | |
234 | } | |
235 | } | |
# | Line 245 | Line 240 | public class CancellableTask implements | |
240 | exception = t; | |
241 | setDone(); | |
242 | accessible.signalAll(); | |
243 | < | } |
249 | < | finally { |
243 | > | } finally { |
244 | lock.unlock(); | |
245 | } | |
246 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |