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

Merge branch 'master' of github.com:akka/akka

Browse source
This commit is contained in:
Roland 2012-06-25 11:27:22 +02:00
commit 508b108afc
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
View file

@ -206,7 +206,8 @@ private[zeromq] class ConcurrentSocketActor(params: Seq[SocketOption]) extends A
}
result match {
case null ⇒
if (currentFrames.isEmpty) currentFrames
if (socket.hasReceiveMore) receiveMessage(mode, currentFrames)
else if (currentFrames.isEmpty) currentFrames
else throw new IllegalStateException("no more frames available while socket.hasReceivedMore==true")
case bytes ⇒
val frames = currentFrames :+ Frame(if (bytes.length == 0) noBytes else bytes)