From 3acc50feb4b940ba17d7563ede46b23e15a646fa Mon Sep 17 00:00:00 2001
From: Christopher Batey <christopher.batey@gmail.com>
Date: Tue, 4 Dec 2018 09:20:29 +0000
Subject: [PATCH] Parse akka.remote.log-frame-size-exceeding as bytes

Missed in PR validation as only used in multi jvm tests
---
 .../scala/akka/remote/RemoteSettings.scala    |  2 +-
 .../akka/remote/RemoteSettingsSpec.scala      | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 akka-remote/src/test/scala/akka/remote/RemoteSettingsSpec.scala

diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
index 632c8e3cff..1b813a28d4 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
@@ -28,7 +28,7 @@ final class RemoteSettings(val config: Config) {
 
   val LogFrameSizeExceeding: Option[Int] = {
     if (config.getString("akka.remote.log-frame-size-exceeding").toLowerCase == "off") None
-    else Some(getInt("akka.remote.log-frame-size-exceeding"))
+    else Some(getBytes("akka.remote.log-frame-size-exceeding").toInt)
   }
 
   val UntrustedMode: Boolean = getBoolean("akka.remote.untrusted-mode")
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteSettingsSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteSettingsSpec.scala
new file mode 100644
index 0000000000..bb0e9090b6
--- /dev/null
+++ b/akka-remote/src/test/scala/akka/remote/RemoteSettingsSpec.scala
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+package akka.remote
+
+import com.typesafe.config.ConfigFactory
+import org.scalatest.{ Matchers, WordSpec }
+
+class RemoteSettingsSpec extends WordSpec with Matchers {
+
+  "Remote settings" must {
+    "default akka.remote.log-frame-size-exceeding to off" in {
+      new RemoteSettings(ConfigFactory.load()).LogFrameSizeExceeding shouldEqual None
+    }
+
+    "parse akka.remote.log-frame-size-exceeding  value as bytes" in {
+      new RemoteSettings(ConfigFactory.parseString("akka.remote.log-frame-size-exceeding = 100b").withFallback(ConfigFactory.load())).LogFrameSizeExceeding shouldEqual Some(100)
+    }
+  }
+
+}