Merge pull request #16789 from reactific/master

=act #16745 Improve error logging in akka.io.SelectionHandler
akka · Feb 7, 2015 · a15ad56 · a15ad56
2 parents f632183 + 34499e1
commit a15ad56
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/akka-actor/src/main/scala/akka/io/SelectionHandler.scala b/akka-actor/src/main/scala/akka/io/SelectionHandler.scala
@@ -257,7 +257,12 @@ private[io] class SelectionHandler(settings: SelectionHandlerSettings) extends A
                               decision: SupervisorStrategy.Directive): Unit =
         try {
           val logMessage = cause match {
-            case e: ActorInitializationException if e.getCause ne null ⇒ e.getCause.getMessage
+            case e: ActorInitializationException if (e.getCause ne null) && (e.getCause.getMessage ne null) ⇒ e.getCause.getMessage
+            case e: ActorInitializationException if e.getCause ne null ⇒
+              e.getCause match {
+                case ie: java.lang.reflect.InvocationTargetException ⇒ ie.getTargetException.toString
+                case t: Throwable                                    ⇒ Logging.simpleName(t)
+              }
             case e ⇒ e.getMessage
           }
           context.system.eventStream.publish(