diff --git a/akka-stream/src/main/mima-filters/2.6.11.backwards.excludes/pr-29086-rename-grouped.excludes b/akka-stream/src/main/mima-filters/2.6.12.backwards.excludes/pr-29086-rename-grouped.excludes similarity index 100% rename from akka-stream/src/main/mima-filters/2.6.11.backwards.excludes/pr-29086-rename-grouped.excludes rename to akka-stream/src/main/mima-filters/2.6.12.backwards.excludes/pr-29086-rename-grouped.excludes diff --git a/akka-stream/src/main/mima-filters/2.6.16.backwards.excludes/context-propagation.backwards.excludes b/akka-stream/src/main/mima-filters/2.6.16.backwards.excludes/context-propagation.backwards.excludes new file mode 100644 index 0000000000..839f4fa6ac --- /dev/null +++ b/akka-stream/src/main/mima-filters/2.6.16.backwards.excludes/context-propagation.backwards.excludes @@ -0,0 +1,3 @@ +# internal +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.stream.impl.ContextPropagation.currentContext") +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.stream.impl.ContextPropagation.resumeContext") \ No newline at end of file diff --git a/akka-stream/src/main/scala/akka/stream/impl/ContextPropagation.scala b/akka-stream/src/main/scala/akka/stream/impl/ContextPropagation.scala index 9b459bc41d..32d9435419 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ContextPropagation.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ContextPropagation.scala @@ -9,15 +9,17 @@ import akka.annotation.InternalApi /** * INTERNAL API */ -@InternalApi private[akka] trait ContextPropagation { +@InternalApi trait ContextPropagation { def suspendContext(): Unit def resumeContext(): Unit + def currentContext(): AnyRef + def resumeContext(context: AnyRef): Unit } /** * INTERNAL API */ -@InternalApi private[akka] object ContextPropagation { +@InternalApi object ContextPropagation { /** * INTERNAL API @@ -28,4 +30,6 @@ import akka.annotation.InternalApi private[akka] final class ContextPropagationImpl extends ContextPropagation { def suspendContext(): Unit = () def resumeContext(): Unit = () + def currentContext(): AnyRef = null + def resumeContext(context: AnyRef): Unit = () }