summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2011-02-09 14:08:25 +0100
committermguetlein <martin.guetlein@gmail.com>2011-02-09 14:08:25 +0100
commit532ebf4d2e88b6ad982d5e4830a129f374f26bc6 (patch)
tree4b809eb1d52d7fcbbba52855644d99988f1b30f6
parentdce8c014595c85e991b001718fd2d5e8df7c5562 (diff)
fix check for waiting_for
-rw-r--r--application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/application.rb b/application.rb
index f8c0e1f..47cafa5 100644
--- a/application.rb
+++ b/application.rb
@@ -173,7 +173,7 @@ put '/:id/:hasStatus/?' do
#LOGGER.debug "Task " + params[:id].to_s + " set percentage completed to: "+params[:percentageCompleted].to_s
end
when /Cancelled|Error/
- OpenTox::Task.find(task.waiting_for).cancel if task.waiting_for
+ OpenTox::Task.find(task.waiting_for).cancel if task.waiting_for and task.waiting_for.uri?
LOGGER.debug("Aborting task "+task.uri.to_s)
Process.kill(9,task.pid) unless task.pid.nil?
task.pid = nil