Channel factory now resolving channel instances through IoC, closes #…

…1970
Particular · Mar 4, 2014 · 9e48e3d · 9e48e3d · johnsimons · Mar 4, 2014
1 parent 1db5ccc
commit 9e48e3d
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/NServiceBus.Core/Gateway/Channels/ChannelFactory.cs b/src/NServiceBus.Core/Gateway/Channels/ChannelFactory.cs
@@ -14,12 +14,16 @@ public class ChannelFactory : IChannelFactory
     {
         public IChannelReceiver GetReceiver(string channelType)
         {
-            return Activator.CreateInstance(receivers[channelType.ToLower()]) as IChannelReceiver;
+            var receiver = receivers[channelType.ToLower()];
+
+            return Configure.Instance.Builder.Build(receiver) as IChannelReceiver;
         }
 
         public IChannelSender GetSender(string channelType)
         {
-            return Activator.CreateInstance(senders[channelType.ToLower()]) as IChannelSender;
+            var sender = senders[channelType.ToLower()];
+
+            return Configure.Instance.Builder.Build(sender) as IChannelSender;
         }
 
 
@@ -31,6 +35,11 @@ public void RegisterReceiver(Type receiver)
         public void RegisterReceiver(Type receiver, string type)
         {
             receivers.Add(type.ToLower(), receiver);
+
+            if (!Configure.HasComponent(receiver))
+            {
+                Configure.Component(receiver, DependencyLifecycle.InstancePerCall);
+            }
         }
 
 
@@ -51,6 +60,11 @@ public void RegisterSender(Type sender)
         public void RegisterSender(Type sender, string type)
         {
             senders.Add(type.ToLower(), sender);
+
+            if (!Configure.HasComponent(sender))
+            {
+                Configure.Component(sender, DependencyLifecycle.InstancePerCall);
+            }
         }
 
         readonly IDictionary<string, Type> receivers = new Dictionary<string, Type>();