Merge pull request #1018 from akka/wip-2872-npe-defaultAddress-patriknw

Throw startup exception from Remoting, see #2872
2013-01-11 04:09:04 -08:00 · 2013-01-11 04:09:04 -08:00 · 586aa38b62
commit 586aa38b62
parent cb41c1f930 bf47a16447
1 changed files with 6 additions and 2 deletions
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@ -207,8 +207,12 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
          eventPublisher.notifyListeners(RemotingListenEvent(addresses))

        } catch {
-          case e: TimeoutException ⇒ notifyError("Startup timed out", e)
-          case NonFatal(e)         ⇒ notifyError("Startup failed", e)
+          case e: TimeoutException ⇒
+            notifyError("Startup timed out", e)
+            throw e
+          case NonFatal(e) ⇒
+            notifyError("Startup failed", e)
+            throw e
        }

      case Some(_) ⇒