Better algorithm for selecting which assembly to load

ozanyurt · Nov 30, 2011 · 7f6f55e · 7f6f55e
1 parent aab7fd1
commit 7f6f55e
Showing 1 changed file with 27 additions and 10 deletions.
diff --git a/Rhino.ServiceBus/Hosting/RemoteAppDomainHost.cs b/Rhino.ServiceBus/Hosting/RemoteAppDomainHost.cs
@@ -37,16 +37,33 @@ public RemoteAppDomainHost(string assemblyPath, string configuration)
         {
             configurationFile = configuration;
             assemblyName = Path.GetFileNameWithoutExtension(assemblyPath);
-            assemblyLocation = Path.GetDirectoryName(assemblyPath);
+			assemblyLocation = GetAssemblyLocation(assemblyPath);
         }
-
-        protected string AssemblyName
+
+    	private static string GetAssemblyLocation(string assemblyPath)
+    	{
+    		if (Path.IsPathRooted(assemblyPath))
+    			return Path.GetDirectoryName(assemblyPath);
+
+    		var currentDirPath = Path.Combine(Environment.CurrentDirectory, assemblyPath);
+			if (File.Exists(currentDirPath))
+				return Path.GetDirectoryName(currentDirPath);
+
+    		var basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, assemblyPath);
+			if (File.Exists(basePath))
+				return Path.GetDirectoryName(basePath);
+
+			// no idea, use the default
+			return Path.GetDirectoryName(assemblyPath);
+    	}
+
+    	protected string AssemblyName
         {
             get { return assemblyName; }
-        }
-
-		public IApplicationHost ApplicationHost { get { return current.ApplicationHost; } }
-
+        }
+
+		public IApplicationHost ApplicationHost { get { return current.ApplicationHost; } }
+
         public void Start()
         {
             HostedService service = CreateNewAppDomain();
@@ -118,8 +135,8 @@ protected class HostedService
             private readonly string assembly;
             private readonly AppDomain appDomain;
         	private readonly ILog log = LogManager.GetLogger(typeof (HostedService));
-
-			public IApplicationHost ApplicationHost { get { return hoster; } }
+
+			public IApplicationHost ApplicationHost { get { return hoster; } }
 
             public HostedService(IApplicationHost hoster, string assembly, AppDomain appDomain)
             {
@@ -182,5 +199,5 @@ public RemoteAppDomainHost Configuration(string configFile)
             configurationFile = configFile;
             return this;
         }
-    }
+    }
 }