[ARVADOS] updated: 6520a31f91a590fe8d559c14e75e6c99a676ba20

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  6520a31f91a590fe8d559c14e75e6c99a676ba20 (commit)
      from  b00bc4b607cbd1eeb9cf749dc8b681e48002e2bc (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 6520a31f91a590fe8d559c14e75e6c99a676ba20
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Aug 12 14:15:51 2014 -0400

    Fix "undefined method `uuid' for nil:NilClass". closes #3576

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index fc445ae..1ef0b79 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -191,7 +191,7 @@ class Job < ArvadosModel
       if self.cancelled_at and not self.cancelled_at_was
         self.cancelled_at = Time.now
         self.cancelled_by_user_uuid = current_user.uuid
-        self.cancelled_by_client_uuid = current_api_client.uuid
+        self.cancelled_by_client_uuid = current_api_client.andand.uuid
         @need_crunch_dispatch_trigger = true
       else
         self.cancelled_at = self.cancelled_at_was

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


hooks/post-receive
--