fixed unloadedappdomain exception bug

fasalex · Aug 12, 2013 · 3978f1c · 3978f1c
1 parent 0cb733b
commit 3978f1c
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 81 deletions.
diff --git a/DistrEx.Communication.Service.Test/DistrEx.Communication.Service.Test.csproj b/DistrEx.Communication.Service.Test/DistrEx.Communication.Service.Test.csproj
@@ -143,7 +143,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <PropertyGroup>
-    <PostBuildEvent>copy ..\..\DistrEx.Communication.Service.Test.dll.config</PostBuildEvent>
+    <PostBuildEvent>copy ..\..\..\DistrEx.Communication.Service.Test.dll.config</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/DistrEx.Coordinator.Test/DistrEx.Coordinator.Test.csproj b/DistrEx.Coordinator.Test/DistrEx.Coordinator.Test.csproj
@@ -168,7 +168,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <PropertyGroup>
-    <PostBuildEvent>copy ..\..\DistrEx.Coordinator.Test.dll.config .\</PostBuildEvent>
+    <PostBuildEvent>copy ..\..\..\DistrEx.Coordinator.Test.dll.config .\</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/DistrEx.Coordinator.Test/DistrEx.Coordinator.Test.dll.config b/DistrEx.Coordinator.Test/DistrEx.Coordinator.Test.dll.config
@@ -29,6 +29,6 @@
   </system.serviceModel>
 
   <appSettings>
-    <add key="DistrEx.Coordinator.Test.worker-exe-file" value="..\..\..\DistrEx.Worker.Host\bin\Debug\DistrEx.Worker.Host.exe" />
+    <add key="DistrEx.Coordinator.Test.worker-exe-file" value="..\..\..\..\DistrEx.Worker.Host\bin\Debug\DistrEx.Worker.Host.exe" />
   </appSettings>
 </configuration>
diff --git a/DistrEx.Coordinator.Test/TargetSpecs/OnWorkerTest.cs b/DistrEx.Coordinator.Test/TargetSpecs/OnWorkerTest.cs
@@ -184,10 +184,15 @@ public void TimeoutOnWorker()
             var result = Interface.Coordinator.Do(_onWorker.Do(_haltingIdentity), _argumentIdentity).ResultValue;
         }
 
+        [TearDown]
+        public void Teardown()
+        {
+            _onWorker.ClearEverything();
+        }
+
         [TestFixtureTearDown]
         public void TeardownFixture()
         {
-            _onWorker.ClearEverything();
             ProcessHelper.Stop(_workerProcess);
         }
     }

diff --git a/DistrEx.Plugin.Test/DistrEx.Plugin.Test.csproj b/DistrEx.Plugin.Test/DistrEx.Plugin.Test.csproj
@@ -135,7 +135,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <PropertyGroup>
-    <PostBuildEvent>copy ..\..\DistrEx.Plugin.Test.dll.config .\</PostBuildEvent>
+    <PostBuildEvent>copy ..\..\..\DistrEx.Plugin.Test.dll.config .\</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/DistrEx.Plugin/ExecutionException.cs b/DistrEx.Plugin/ExecutionException.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.Serialization;
+using DistrEx.Common.Serialization;
 
 namespace DistrEx.Plugin
 {
@@ -21,6 +22,23 @@ protected ExecutionException(SerializationInfo info, StreamingContext context)
             SerializedInnerException = info.GetValue("SerializedInnerException", typeof(string)) as string;
         }
 
+        public static ExecutionException FromException(Exception e)
+        {
+            string serializedExTypeName;
+            string serializedEx;
+            try
+            {
+                serializedEx = Serializer.Serialize(e);
+                serializedExTypeName = e.GetType().FullName;
+            }
+            catch
+            {
+                serializedEx = null;
+                serializedExTypeName = typeof(Exception).FullName;
+            }
+            return new ExecutionException(serializedExTypeName, serializedEx);
+        }
+
         public string InnerExceptionTypeName
         {
             get;

diff --git a/DistrEx.Plugin/Executor.cs b/DistrEx.Plugin/Executor.cs
@@ -52,7 +52,7 @@ internal SerializedResult Execute(ExecutorCallback callback, string assemblyQual
             }
             catch (Exception e)
             {
-                throw HandleException(e);
+                throw ExecutionException.FromException(e);
             }
         }
 
@@ -86,7 +86,7 @@ internal SerializedResult ExecuteTwoStep(ExecutorCallback callback, ExecutorCall
             }
             catch (Exception e)
             {
-                throw HandleException(e);
+                throw ExecutionException.FromException(e);
             }
         }
 
@@ -113,23 +113,6 @@ private SerializedResult ExecuteWrapped(MethodInfo func, ExecutorCallback callba
             }
         }
 
-        private ExecutionException HandleException(Exception e)
-        {
-            string serializedExTypeName;
-            string serializedEx;
-            try
-            {
-                serializedEx = Serializer.Serialize(e);
-                serializedExTypeName = e.GetType().FullName;
-            }
-            catch
-            {
-                serializedEx = null;
-                serializedExTypeName = typeof(Exception).FullName;
-            }
-            return new ExecutionException(serializedExTypeName, serializedEx);
-        }
-
         internal void Cancel()
         {
             _cancellationTokenSource.Cancel();

diff --git a/DistrEx.Plugin/PluginManager.cs b/DistrEx.Plugin/PluginManager.cs
@@ -168,7 +168,15 @@ public SerializedResult Execute(string assemblyQualifiedName, string methodName,
             cancellationToken.Register(executor.Cancel);
             var callback = new ExecutorCallback(reportProgress);
 
-            return executor.Execute(callback, assemblyQualifiedName, methodName, argumentTypeName, serializedArgument);
+            try
+            {
+                return executor.Execute(callback, assemblyQualifiedName, methodName, argumentTypeName,
+                                        serializedArgument);
+            }
+            catch (AppDomainUnloadedException e)
+            {
+                throw ExecutionException.FromException(e);
+            }
         }
 
         public SerializedResult ExecuteTwoStep(string assemblyQualifiedName, string methodName, CancellationToken cancellationToken, Action reportProgress,

diff --git a/DistrEx.Worker/Executor.cs b/DistrEx.Worker/Executor.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
@@ -69,23 +70,25 @@ private void Execute(ExecuteEventArgs instruction)
             Action reportProgress = () => callback.Progress(progressMsg);
             try
             {
-                SerializedResult serializedResult = _pluginManager.Execute(instruction.AssemblyQualifiedName, instruction.MethodName, cts.Token,
-                                                                           reportProgress, instruction.ArgumentTypeName, instruction.SerializedArgument);
+                SerializedResult serializedResult = _pluginManager.Execute(instruction.AssemblyQualifiedName,
+                                                                           instruction.MethodName, cts.Token,
+                                                                           reportProgress, instruction.ArgumentTypeName,
+                                                                           instruction.SerializedArgument);
                 callback.Complete(new Result
-                {
-                    OperationId = operationId,
-                    ResultTypeName = serializedResult.TypeName,
-                    SerializedResult = serializedResult.Value
-                });
+                    {
+                        OperationId = operationId,
+                        ResultTypeName = serializedResult.TypeName,
+                        SerializedResult = serializedResult.Value
+                    });
             }
             catch (ExecutionException e)
             {
                 var msg = new Error
-                {
-                    OperationId = operationId,
-                    ExceptionTypeName = e.InnerExceptionTypeName,
-                    SerializedException = e.SerializedInnerException
-                };
+                    {
+                        OperationId = operationId,
+                        ExceptionTypeName = e.InnerExceptionTypeName,
+                        SerializedException = e.SerializedInnerException
+                    };
                 callback.Error(msg);
             }
             finally