From 9550e343947c19dbce05abfc3fc58fe1fb3ea2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Mon, 13 Mar 2017 14:52:56 +0200 Subject: [PATCH] #22429 Use Arrays.copy instead of scala builder --- .../akka/stream/impl/PhasedFusingActorMaterializer.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala b/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala index f6b41fce9a..3ae86f262a 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala @@ -579,8 +579,8 @@ final class GraphStageIsland( subflowFuser: OptionVal[GraphInterpreterShell ⇒ ActorRef]) extends PhaseIsland[GraphStageLogic] { // TODO: remove these private val logicArrayType = Array.empty[GraphStageLogic] - private[this] val logics = new ArrayList[GraphStageLogic](64) - // TODO: Resize + private[this] val logics = new ArrayList[GraphStageLogic](16) + private var connections = new Array[Connection](16) private var maxConnections = 0 private var outConnections: List[Connection] = Nil @@ -614,7 +614,7 @@ final class GraphStageIsland( def conn(slot: Int): Connection = { maxConnections = math.max(slot, maxConnections) if (maxConnections >= connections.length) { - connections = connections.padTo(connections.length * 2, null) + connections = java.util.Arrays.copyOf(connections, connections.length * 2) } val c = connections(slot) if (c ne null) c