From 16f2009786136e0e14f08b7daf82021a46edce55 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 5 Jul 2019 09:11:33 +0200
Subject: [PATCH] fix two log messages related to
 use-unsafe-remote-features-without-cluster (#27241)

* one was always logged at startup when using cluster provider
* the other was logged (at debug) each time an ordinary local actor was started
---
 .../akka/cluster/ClusterActorRefProvider.scala     |  2 ++
 .../scala/akka/remote/RemoteActorRefProvider.scala | 14 ++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
index 686e31044a..ac1a20f1af 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
@@ -51,6 +51,8 @@ private[akka] class ClusterActorRefProvider(
     Cluster(system)
   }
 
+  override protected def warnIfDirectUse(): Unit = ()
+
   override protected def createRemoteWatcher(system: ActorSystemImpl): ActorRef = {
     // make sure Cluster extension is initialized/loaded from init thread
     Cluster(system)
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index 3a36f9e63a..a1921c8e76 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -320,7 +320,7 @@ private[akka] class RemoteActorRefProvider(
       "remote-deployment-watcher")
 
   /** Can be overridden when using RemoteActorRefProvider as a superclass rather than directly */
-  protected def warnIfDirectUse() = {
+  protected def warnIfDirectUse(): Unit = {
     if (remoteSettings.WarnAboutDirectUse) {
       log.warning(
         "Using the 'remote' ActorRefProvider directly, which is a low-level layer. " +
@@ -426,11 +426,6 @@ private[akka] class RemoteActorRefProvider(
         }
       }
 
-      def warnThenFallback() = {
-        warnIfNotRemoteActorRef(path)
-        local.actorOf(system, props, supervisor, path, systemService, deployment.headOption, false, async)
-      }
-
       (Iterator(props.deploy) ++ deployment.iterator).reduce((a, b) => b.withFallback(a)) match {
         case d @ Deploy(_, _, _, RemoteScope(address), _, _) =>
           if (hasAddress(address)) {
@@ -456,13 +451,16 @@ private[akka] class RemoteActorRefProvider(
                   (RootActorPath(address) / "remote" / localAddress.protocol / localAddress.hostPort / path.elements)
                     .withUid(path.uid)
                 new RemoteActorRef(transport, localAddress, rpath, supervisor, Some(props), Some(d))
-              } else warnThenFallback()
+              } else {
+                warnIfNotRemoteActorRef(path)
+                local.actorOf(system, props, supervisor, path, systemService, deployment.headOption, false, async)
+              }
 
             } catch {
               case NonFatal(e) => throw new IllegalArgumentException(s"remote deployment failed for [$path]", e)
             }
         case _ =>
-          warnThenFallback()
+          local.actorOf(system, props, supervisor, path, systemService, deployment.headOption, false, async)
       }
     }