From 71e5b8f5ccf0fded30891301194c1872a0b02b43 Mon Sep 17 00:00:00 2001 From: Hyoun Jiil Date: Fri, 12 Jul 2013 11:07:53 +0900 Subject: [PATCH] [Title] fix infinity wait problem [Type] Bugfix [Module] Toolchain / [Priority] Critical [Jira#] [Redmine#] 9933 [Problem] [Cause] get_db_connection ruturn false when db error situation but not handing in get_all_projects_summary [Solution] get_all_projects_summary default return value setted as [] [TestCase] Change-Id: Iaa1add4a4729da27af6c620da9921b5da1eac78f --- src/build_server/BuildServer.rb | 4 ++++ src/build_server/ProjectManager.rb | 1 + 2 files changed, 5 insertions(+) diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb index 2732e53..db9268c 100644 --- a/src/build_server/BuildServer.rb +++ b/src/build_server/BuildServer.rb @@ -370,6 +370,7 @@ class BuildServer get_db_connection() do |db| return RemoteBuildServer.load_all(db, self) end + return [] end @@ -786,6 +787,9 @@ class BuildServer @log.error e.errstr if not @log.nil? @log.error e.backtrace.inspect if not @log.nil? + rescue => e + @log.error e.errstr if not @log.nil? + @log.error e.backtrace.inspect if not @log.nil? ensure if @db_dsn =~ /^SQLite3:/ then @db.disconnect if @db diff --git a/src/build_server/ProjectManager.rb b/src/build_server/ProjectManager.rb index 5b52350..27fbb85 100644 --- a/src/build_server/ProjectManager.rb +++ b/src/build_server/ProjectManager.rb @@ -67,6 +67,7 @@ class ProjectManager @server.get_db_connection() do |db| return CommonProject.get_all_project_rows(db) end + return [] end def get_all_projects() -- 2.7.4