Ignore AppDomainUnloadedException

jake-at-work · Feb 23, 2021 · 4a2716a · 4a2716a
1 parent edfd3a1
commit 4a2716a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/clicache/src/impl/AppDomainContext.hpp b/clicache/src/impl/AppDomainContext.hpp
@@ -20,8 +20,11 @@
 
 #include <functional>
 #include <vcclr.h>
+#include <msclr/marshal_cppstd.h>
+#include <debugapi.h>
 #include "../begin_native.hpp"
 #include <AppDomainContext.hpp>
+#include <geode/ExceptionTypes.hpp>
 #include "../end_native.hpp"
 
 namespace Apache
@@ -61,7 +64,11 @@ class AppDomainContext : public apache::geode::client::AppDomainContext {
   }
 
   void run(runnable func) {
-    functionPointer(func);
+    try {
+      functionPointer(func);
+    } catch (AppDomainUnloadedException^) {
+      // if AppDomain has unloaded then we are shutting down so we can ignore.
+    }
   }
 
 private: