From c43baa9f408ceaa562992c293214886050ce89ec Mon Sep 17 00:00:00 2001 From: Isaac Devine Date: Fri, 5 Oct 2012 15:03:57 +1300 Subject: [PATCH] Fix Restore so that it uses the restore timeout Change the Restore method to override the admin connection timeout with the restore timeout instead of the normal connection timeout. This causes RH to respect the restore timeout parameter, as before it used the admin connection timeout instead of the restore timeout. --- product/roundhouse/databases/DefaultDatabase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product/roundhouse/databases/DefaultDatabase.cs b/product/roundhouse/databases/DefaultDatabase.cs index 01e13f41..0b49edd7 100644 --- a/product/roundhouse/databases/DefaultDatabase.cs +++ b/product/roundhouse/databases/DefaultDatabase.cs @@ -167,9 +167,9 @@ public void restore_database(string restore_from_path, string custom_restore_opt try { int current_connection_timeout = command_timeout; - command_timeout = restore_timeout; + admin_command_timeout = restore_timeout; run_sql(restore_database_script(restore_from_path, custom_restore_options), ConnectionType.Admin); - command_timeout = current_connection_timeout; + admin_command_timeout = current_connection_timeout; } catch (Exception ex) {