raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Fix ByteIterator for 2.11 and 2.13 (#26680)

Browse source 
Fixes #26658 but for 2.11 and 2.13
This commit is contained in:
Arnout Engelen 2019-04-04 16:06:52 +02:00 • committed by GitHub
parent 0595975179
commit 91da4c26e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-actor/src/main/scala-2.11/akka/util/ByteIterator.scala
View file

@ -460,7 +460,11 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
override def indexWhere(p: Byte => Boolean): Int = indexWhere(p, 0) override def indexWhere(p: Byte => Boolean): Int = indexWhere(p, 0)
def indexWhere(p: Byte => Boolean, from: Int): Int = { def indexWhere(p: Byte => Boolean, from: Int): Int = {
var index = from var index = 0
while (index < from) {
next()
index += 1
}
var found = false var found = false
while (!found && hasNext) if (p(next())) { while (!found && hasNext) if (p(next())) {
found = true found = true
@ -471,7 +475,7 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
} }
def indexOf(elem: Byte): Int = indexOf(elem, 0) def indexOf(elem: Byte): Int = indexOf(elem, 0)
def indexOf(elem: Byte, from: Int): Int = indexWhere(_ == elem, 0) def indexOf(elem: Byte, from: Int): Int = indexWhere(_ == elem, from)
override def indexOf[B >: Byte](elem: B): Int = indexOf[B](elem, 0) override def indexOf[B >: Byte](elem: B): Int = indexOf[B](elem, 0)
def indexOf[B >: Byte](elem: B, from: Int): Int = indexWhere(_ == elem, from) def indexOf[B >: Byte](elem: B, from: Int): Int = indexWhere(_ == elem, from)

6
akka-actor/src/main/scala-2.13+/akka/util/ByteIterator.scala
View file

@ -466,7 +466,11 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
} }
override def indexWhere(p: Byte => Boolean, from: Int = 0): Int = { override def indexWhere(p: Byte => Boolean, from: Int = 0): Int = {
var index = from var index = 0
while (index < from) {
next()
index += 1
}
var found = false var found = false
while (!found && hasNext) if (p(next())) { while (!found && hasNext) if (p(next())) {
found = true found = true