Resolve merge conflict with master

2011-09-19 19:00:58 +02:00 · 2011-09-19 19:00:58 +02:00 · c5b276db5b
commit c5b276db5b
parent f100170925 1ac8c2876c
1 changed files with 1 additions and 1 deletions
--- a/akka-http/src/main/scala/akka/http/Mist.scala
+++ b/akka-http/src/main/scala/akka/http/Mist.scala
@ -258,7 +258,7 @@ trait Endpoint { this: Actor ⇒

      if (!endpoints.isEmpty) endpoints.foreach { _.apply(uri) ! req }
      else {
-        self.channel match {
+        channel match {
          case null | NullChannel ⇒ _na(uri, req)
          case channel            ⇒ channel ! NoneAvailable(uri, req)
        }