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

=act small compilation fixes for JDK9 (#23658)

Browse source
This commit is contained in:
Konrad `ktoso` Malawski 2017-09-20 16:24:29 +09:00 • committed by GitHub
parent 3307b3522c
commit 9965fc592b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-stream/src/main/scala/akka/stream/impl/io/TLSActor.scala
View file

@ -99,9 +99,9 @@ import scala.util.{ Failure, Success, Try }
setNewSessionParameters(n) setNewSessionParameters(n)
ByteString.empty ByteString.empty
} }
if (tracing) log.debug(s"chopping from new chunk of ${buffer.size} into $name (${b.position})") if (tracing) log.debug(s"chopping from new chunk of ${buffer.size} into $name (${b.position()})")
} else { } else {
if (tracing) log.debug(s"chopping from old chunk of ${buffer.size} into $name (${b.position})") if (tracing) log.debug(s"chopping from old chunk of ${buffer.size} into $name (${b.position()})")
} }
val copied = buffer.copyToBuffer(b) val copied = buffer.copyToBuffer(b)
buffer = buffer.drop(copied) buffer = buffer.drop(copied)
@ -348,7 +348,7 @@ import scala.util.{ Failure, Success, Try }
private def doWrap(): Unit = { private def doWrap(): Unit = {
val result = engine.wrap(userInBuffer, transportOutBuffer) val result = engine.wrap(userInBuffer, transportOutBuffer)
lastHandshakeStatus = result.getHandshakeStatus lastHandshakeStatus = result.getHandshakeStatus
if (tracing) log.debug(s"wrap: status=${result.getStatus} handshake=$lastHandshakeStatus remaining=${userInBuffer.remaining} out=${transportOutBuffer.position}") if (tracing) log.debug(s"wrap: status=${result.getStatus} handshake=$lastHandshakeStatus remaining=${userInBuffer.remaining} out=${transportOutBuffer.position()}")
if (lastHandshakeStatus == FINISHED) handshakeFinished() if (lastHandshakeStatus == FINISHED) handshakeFinished()
runDelegatedTasks() runDelegatedTasks()
result.getStatus match { result.getStatus match {
@ -368,7 +368,7 @@ import scala.util.{ Failure, Success, Try }
val result = engine.unwrap(transportInBuffer, userOutBuffer) val result = engine.unwrap(transportInBuffer, userOutBuffer)
if (ignoreOutput) userOutBuffer.clear() if (ignoreOutput) userOutBuffer.clear()
lastHandshakeStatus = result.getHandshakeStatus lastHandshakeStatus = result.getHandshakeStatus
if (tracing) log.debug(s"unwrap: status=${result.getStatus} handshake=$lastHandshakeStatus remaining=${transportInBuffer.remaining} out=${userOutBuffer.position}") if (tracing) log.debug(s"unwrap: status=${result.getStatus} handshake=$lastHandshakeStatus remaining=${transportInBuffer.remaining} out=${userOutBuffer.position()}")
runDelegatedTasks() runDelegatedTasks()
result.getStatus match { result.getStatus match {
case OK ⇒ case OK ⇒