[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

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index 2732e537add724db971c9492fba757b3aab89c41..db9268cc75786633eb566f4ac223c540011ff5f8 100644 (file)
--- 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 5b52350d2e633a96aac0cd832c0b7fea2f79208a..27fbb8565c1969ce5908a29299f1d12aae5f647c 100644 (file)
--- 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()