From 0cb6a781b60394cf1de8e1950c7fe0521985345c Mon Sep 17 00:00:00 2001 From: sbohlen Date: Wed, 29 Sep 2010 15:21:32 +0000 Subject: [PATCH] SPRNET-1264 Introduced fallback case to use the AppDomain's .BaseDirectory property instead of the .DyanmicDirectory property as the location for the generated assembly should the .DynamicDirectory property be NULL --- .../EnterpriseServices/EnterpriseServicesExporter.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs b/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs index 6098e08e..8801aca6 100644 --- a/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs +++ b/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs @@ -281,7 +281,8 @@ namespace Spring.EnterpriseServices { string ext = (ActivationMode == ActivationOption.Library) ? ".dll" : ".exe"; string moduleName = assemblyName + ext; - string assemblyFileName = AppDomain.CurrentDomain.DynamicDirectory.Trim('\\', '/') + "\\" + moduleName; + string basePath = !StringUtils.IsNullOrEmpty(AppDomain.CurrentDomain.DynamicDirectory) ? AppDomain.CurrentDomain.DynamicDirectory : AppDomain.CurrentDomain.BaseDirectory; + string assemblyFileName = String.Format("{0}\\{1}", basePath.Trim('\\', '/'), moduleName); FileInfo assemblyFile = new FileInfo(assemblyFileName); GenerateComponentAssembly(assemblyFile);