Scan only explicitly specified assemblies

OrleansContrib · Aug 1, 2017 · f146302 · f146302
1 parent abbb0ca
commit f146302
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Source/Orleankka/Core/ActorInterfaceMapping.cs b/Source/Orleankka/Core/ActorInterfaceMapping.cs
@@ -1,13 +1,15 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 namespace Orleankka.Core
 {
     class ActorInterfaceMapping : IEquatable<ActorInterfaceMapping>
     {
         public static ActorInterfaceMapping Of(string typeName) => new ActorInterfaceMapping(typeName, null, null);
 
-        public static ActorInterfaceMapping Of(Type type)
+        public static ActorInterfaceMapping Of(Type type, IEnumerable<Assembly> assemblies)
         {
             var name = ActorTypeName.Of(type);
 
@@ -22,7 +24,7 @@ public static ActorInterfaceMapping Of(Type type)
 
             if (type.IsInterface)
             {
-                var classes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(a => a.GetTypes()
+                var classes = assemblies.SelectMany(a => a.GetTypes()
                     .Where(x => x.IsClass && type.IsAssignableFrom(x)))
                     .ToArray();
 

diff --git a/Source/Orleankka/Core/ActorInterfaceRegistry.cs b/Source/Orleankka/Core/ActorInterfaceRegistry.cs
@@ -33,7 +33,7 @@ internal void Register(Assembly[] assemblies, Func<Assembly, IEnumerable<Type>>
 
             foreach (var type in assemblies.SelectMany(selector))
             {
-                var mapping = ActorInterfaceMapping.Of(type);
+                var mapping = ActorInterfaceMapping.Of(type, assemblies);
 
                 if (interfaces.Contains(mapping.TypeName))
                 {