Merge branch 'master' into wip-traversal-oriented-layout-master-patriknw

2017-03-10 18:16:44 +01:00 · 2017-03-10 18:16:44 +01:00 · 3554ad7243
commit 3554ad7243
parent 8fad451610 acb8f09715
25 changed files with 313 additions and 64 deletions
--- a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala
+++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala
@ -328,10 +328,8 @@ object Source {
   */
  def empty[T]: Source[T, NotUsed] = _empty
  private[this] val _empty: Source[Nothing, NotUsed] =
-    fromGraph(new PublisherSource[Nothing](
-      EmptyPublisher,
-      DefaultAttributes.emptySource,
-      shape("EmptySource")))
+    Source.fromGraph(EmptySource)
+
  /**
   * Create a `Source` which materializes a [[scala.concurrent.Promise]] which controls what element
   * will be emitted by the Source.