[ARVADOS] updated: ce69b2c94aeb8f897f41fbeaabfed3f3c55495d5

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/job.rb | 4 ++++
 1 file changed, 4 insertions(+)

       via  ce69b2c94aeb8f897f41fbeaabfed3f3c55495d5 (commit)
      from  5759cf04d9a87c1e0cb70ae0785ace15af6ee491 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ce69b2c94aeb8f897f41fbeaabfed3f3c55495d5
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jul 3 15:03:17 2014 -0400

    Do not blow up trying to run a job if runtime_constraints is set to nil
    
    no issue #

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 8bd308d..654778a 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -104,6 +104,10 @@ class Job < ArvadosModel
   def find_docker_image_locator
     # Find the Collection that holds the Docker image specified in the
     # runtime constraints, and store its locator in docker_image_locator.
+    if runtime_constraints.nil? then
+      self.docker_image_locator = nil
+      return false
+    end
     image_search = runtime_constraints['docker_image']
     image_tag = runtime_constraints['docker_image_tag']
     if image_search.nil?

-----------------------------------------------------------------------


hooks/post-receive
--