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

=act #21237 fix regression in ByteString.slice (#21294)

Browse source 
* =act #21237 fix regression in ByteString.slice

* Update ByteStringSpec.scala
This commit is contained in:
Konrad Malawski 2016-08-29 09:38:09 +01:00 • committed by GitHub
parent 9ef93c6200
commit fb45dd03f3
2 changed files with 43 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
akka-actor/src/main/scala/akka/util/ByteString.scala
View file

@ -163,8 +163,8 @@ object ByteString {
else toByteString1.drop(n)
override def slice(from: Int, until: Int): ByteString =
if ((from == 0) && (until == length)) this
else if (from > length) ByteString.empty
if (from <= 0 && until >= length) this
else if (from >= length || until <= 0 || from >= until) ByteString.empty
else toByteString1.slice(from, until)
private[akka] override def writeToOutputStream(os: ObjectOutputStream): Unit =
@ -252,11 +252,8 @@ object ByteString {
if (n <= 0) ByteString.empty
else ByteString1(bytes, startIndex, Math.min(n, length))
override def slice(from: Int, until: Int): ByteString = {
if (from <= 0 && until >= length) this // we can do < / > since we're Compact
else if (until <= from) ByteString1.empty
else ByteString1(bytes, startIndex + from, until - from)
}
override def slice(from: Int, until: Int): ByteString =
drop(from).take(until - Math.max(0, from))
override def copyToBuffer(buffer: ByteBuffer): Int =
writeToBuffer(buffer)
@ -466,7 +463,7 @@ object ByteString {
}
override def slice(from: Int, until: Int): ByteString =
if ((from == 0) && (until == length)) this
if (from <= 0 && until >= length) this
else if (from > length || until <= from) ByteString.empty
else drop(from).dropRight(length - until)