From da2e4cc0925b8ec3ed1f8511359510e9644a4bbd Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 20 Jan 2014 17:05:19 +0100
Subject: [PATCH] =con Unbork genjavadoc for ReliableProxy

* genjavadoc fails with NPE for the ReliableProxy.DebugLogging trait,
  workaround by moving it to top level
---
 .../akka/contrib/pattern/ReliableProxy.scala  | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala b/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala
index df27a70c86..f8e807b45c 100644
--- a/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala
+++ b/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala
@@ -44,7 +44,7 @@ object ReliableProxy {
     props(targetPath, retryAfter, None, None)
   }
 
-  class Receiver(target: ActorRef, initialSerial: Int) extends Actor with DebugLogging {
+  class Receiver(target: ActorRef, initialSerial: Int) extends Actor with ReliableProxyDebugLogging {
     var lastSerial = initialSerial
 
     context.watch(target)
@@ -108,20 +108,24 @@ object ReliableProxy {
   val active = Active
   val reconnecting = Connecting
 
-  trait DebugLogging extends ActorLogging { this: Actor ⇒
-    val debug =
-      Try(context.system.settings.config.getBoolean("akka.reliable-proxy.debug")) getOrElse false
+}
 
-    def enabled = debug && log.isDebugEnabled
+/**
+ * INTERNAL API
+ */
+private[akka] trait ReliableProxyDebugLogging extends ActorLogging { this: Actor ⇒
+  val debug: Boolean =
+    Try(context.system.settings.config.getBoolean("akka.reliable-proxy.debug")) getOrElse false
 
-    def addSelf(template: String) = s"$template [$self]"
+  def enabled: Boolean = debug && log.isDebugEnabled
 
-    def logDebug(template: String, arg1: Any, arg2: Any): Unit =
-      if (enabled) log.debug(addSelf(template), arg1, arg2)
+  def addSelf(template: String): String = s"$template [$self]"
 
-    def logDebug(template: String, arg1: Any): Unit =
-      if (enabled) log.debug(addSelf(template), arg1)
-  }
+  def logDebug(template: String, arg1: Any, arg2: Any): Unit =
+    if (enabled) log.debug(addSelf(template), arg1, arg2)
+
+  def logDebug(template: String, arg1: Any): Unit =
+    if (enabled) log.debug(addSelf(template), arg1)
 }
 
 import ReliableProxy._
@@ -220,7 +224,7 @@ import ReliableProxy._
  */
 class ReliableProxy(targetPath: ActorPath, retryAfter: FiniteDuration,
                     reconnectAfter: Option[FiniteDuration], maxConnectAttempts: Option[Int])
-  extends Actor with LoggingFSM[State, Vector[Message]] with DebugLogging {
+  extends Actor with LoggingFSM[State, Vector[Message]] with ReliableProxyDebugLogging {
 
   var tunnel: ActorRef = _
   var currentSerial: Int = 0