[Title] Fixed a bug about canceling job with no project info
authordonghee yang <donghee.yang@samsung.com>
Thu, 29 Nov 2012 07:00:23 +0000 (16:00 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Thu, 29 Nov 2012 07:00:23 +0000 (16:00 +0900)
src/build_server/SocketJobRequestListener.rb

index 9de8ed088054efb90aa8b4a344ebdcd20fa432e5..93c9c9a3cd0f98e3a480e8abf7a742469d312874 100644 (file)
@@ -551,12 +551,17 @@ class SocketJobRequestListener
                                        BuildCommServer.send(req, "\"#{cancel_job.id}, #{cancel_job.get_sub_jobs().map{|x| x.id}.join(", ")}\" will be canceled")
                                        cancel_job.cancel_state = "INIT"
                                else
-                                       if not check_project_password( cancel_job.get_project, tok[2], req) then
-                                               BuildCommServer.send(req, "Project's password is not matched!!")
-                                               raise "Project's password is not matched!!"
+                                       prj = cancel_job.get_project()
+                                       if not prj.nil? then
+                                               if not check_project_password( prj, tok[2], req) then
+                                                       BuildCommServer.send(req, "Project's password is not matched!!")
+                                                       raise "Project's password is not matched!!"
+                                               else
+                                                       BuildCommServer.send(req, "\"#{cancel_job.id}\" will be canceled")
+                                                       cancel_job.cancel_state = "INIT"
+                                               end
                                        else
-                                               BuildCommServer.send(req, "\"#{cancel_job.id}\" will be canceled")
-                                               cancel_job.cancel_state = "INIT"
+                                               BuildCommServer.send(req, "Cannot cancel the job \"#{cancel_job.id}\"")
                                        end
                                end
                        else