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

Merge pull request #28704 from chbatey/fix-ambiguous-reference-buffer

Browse source 
Fix ambiguous reference to position in ByteBuffer/Buffer
This commit is contained in:
Patrik Nordwall 2020-03-09 13:05:04 +01:00 • committed by GitHub
commit ede2e56ccb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -373,7 +373,7 @@ object ByteString {
val dst = Base64.getDecoder.decode(ByteBuffer.wrap(bytes, startIndex, length)) val dst = Base64.getDecoder.decode(ByteBuffer.wrap(bytes, startIndex, length))
if (dst.hasArray) { if (dst.hasArray) {
if (dst.array.length == dst.remaining) ByteString1C(dst.array) if (dst.array.length == dst.remaining) ByteString1C(dst.array)
else ByteString1(dst.array, dst.arrayOffset + dst.position, dst.remaining) else ByteString1(dst.array, dst.arrayOffset + dst.position(), dst.remaining)
} else CompactByteString(dst) } else CompactByteString(dst)
} }
@ -384,7 +384,7 @@ object ByteString {
val dst = Base64.getEncoder.encode(ByteBuffer.wrap(bytes, startIndex, length)) val dst = Base64.getEncoder.encode(ByteBuffer.wrap(bytes, startIndex, length))
if (dst.hasArray) { if (dst.hasArray) {
if (dst.array.length == dst.remaining) ByteString1C(dst.array) if (dst.array.length == dst.remaining) ByteString1C(dst.array)
else ByteString1(dst.array, dst.arrayOffset + dst.position, dst.remaining) else ByteString1(dst.array, dst.arrayOffset + dst.position(), dst.remaining)
} else CompactByteString(dst) } else CompactByteString(dst)
} }