post-rebase fixes

akkadotnet · Feb 5, 2017 · 6722539 · 6722539
1 parent 5ac02e8
commit 6722539
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransport.cs b/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransport.cs
@@ -122,6 +122,13 @@ protected DotNettyTransport(ActorSystem system, Config config)
         {
             System = system;
             Config = config;
+
+            if (system.Settings.Config.HasPath("akka.remote.helios.tcp"))
+            {
+                var heliosFallbackConfig = system.Settings.Config.GetConfig("akka.remote.helios.tcp");
+                config = heliosFallbackConfig.WithFallback(config);
+            }
+
             Settings = DotNettyTransportSettings.Create(config);
             Log = Logging.GetLogger(System, GetType());
             serverEventLoopGroup = new MultithreadEventLoopGroup(Settings.ServerSocketWorkerPoolSize);

diff --git a/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransportSettings.cs b/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransportSettings.cs
@@ -19,7 +19,7 @@
 
 namespace Akka.Remote.Transport.DotNetty
 {
-    public sealed class DotNettyTransportSettings
+    internal sealed class DotNettyTransportSettings
     {
         public static DotNettyTransportSettings Create(ActorSystem system)
         {
@@ -219,13 +219,13 @@ private static int ComputeWorkerPoolSize(Config config)
             ByteOrder = byteOrder;
         }
     }
-    public enum TransportMode
+    internal enum TransportMode
     {
         Tcp,
         Udp
     }
 
-    public sealed class SslSettings
+    internal sealed class SslSettings
     {
         public static readonly SslSettings Empty = new SslSettings();
         public static SslSettings Create(Config config)