Merge

2012-08-02 08:38:52 -04:00
parent 6e8bfb6d9b 6d049cd470
commit 86511152c2
6 changed files with 55 additions and 8 deletions
@@ -141,7 +141,7 @@ namespace MediaBrowser.Common.Kernel
        /// <summary>
        /// Reloads application configuration from the config file
        /// </summary>
-        private void ReloadConfiguration()
+        protected virtual void ReloadConfiguration()
        {
            //Configuration information for anything other than server-specific configuration will have to come via the API... -ebr

@@ -199,7 +199,7 @@ namespace MediaBrowser.Common.Kernel
        /// <summary>
        /// Disposes all resources currently in use.
        /// </summary>
-        public void Dispose()
+        public virtual void Dispose()
        {
            DisposeHttpServer();
            DisposeLogger();