From a20bcb4c50800a9edf0ba61ec4e297eb7a944837 Mon Sep 17 00:00:00 2001
From: donghee yang <donghee.yang@samsung.com>
Date: Fri, 12 Apr 2013 10:22:25 +0900
Subject: [PATCH] [Title] Fixed a bug that remote job is not released from
 remote server queue

---
 package/changelog              | 3 +++
 package/pkginfo.manifest       | 2 +-
 src/build_server/BuildJob.rb   | 3 +++
 src/build_server/JobManager.rb | 6 ------
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/changelog b/package/changelog
index f8449a7..dfb0f1c 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.25
+- Fixed a bug that remote job is not released from remote server queue
+== donghee yang <donghee.yang@samsung.com> 2013-04-12
 * 2.1.24
 - Fixed a bug that job assignment to child server is wrong
 == donghee yang <donghee.yang@samsung.com> 2013-04-12
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index bc39ff5..f4eb581 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :2.1.24
+Version :2.1.25
 Maintainer : taejun ha<taejun.ha@samsung.com>, jiil hyoun <jiil.hyoun@samsung.com>, donghyuk yang <donghyouk.yang@samsung.com>, donghee yang <donghee.yang@samsung.com>, sungmin kim <dev.sungmin.kim@samsung.com
 
 Package : dibs
diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index b9c9dc9..144e0ae 100644
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -742,6 +742,9 @@ class BuildJob < CommonJob
 			# build
 			if @is_remote_job then
 				result = builder.build_job(self, local_pkgs)
+				# if remote build finishes, remove job from remote server
+				get_remote_server().remove_working_job(self)
+				get_remote_server().update_db()
 			else
 				result =  builder.build_job(self, use_clean, local_pkgs, false )
 			end
diff --git a/src/build_server/JobManager.rb b/src/build_server/JobManager.rb
index 8fe82bf..7647fcb 100644
--- a/src/build_server/JobManager.rb
+++ b/src/build_server/JobManager.rb
@@ -335,12 +335,6 @@ class JobManager
 
 
 	def dispose_job(job)
-		# if remote job, remove it from remote server's queue
-		if job.type == "BUILD" and job.is_remote_job then
-			job.get_remote_server.remove_working_job(job)
-			job.get_remote_server.update_db()
-		end
-
 		# remove from queue
 		@jobs.delete_if {|j| j.id == job.id}
 		@internal_jobs.delete_if {|j| j.id == job.id}
-- 
2.34.1