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

Fixed ByteIterator.{take,drop,slice} for extreme argument values

Browse source
This commit is contained in:
Oliver Schulz 2012-05-29 21:35:57 +02:00
parent 75c04d8944
commit d3e878effb
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,12 +101,12 @@ object ByteIterator {
final override def clone: ByteArrayIterator = new ByteArrayIterator(array, from, until) final override def clone: ByteArrayIterator = new ByteArrayIterator(array, from, until)
final override def take(n: Int): this.type = { final override def take(n: Int): this.type = {
until = until min (from + (0 max n)) if (n < len) until = { if (n > 0) (from + n) else from }
this this
} }
final override def drop(n: Int): this.type = { final override def drop(n: Int): this.type = {
from = until min (from + (0 max n)) if (n > 0) from = { if (n < len) (from + n) else until }
this this
} }
@ -389,8 +389,10 @@ abstract class ByteIterator extends BufferedIterator[Byte] {
// the parent class. // the parent class.
override def drop(n: Int): this.type = throw new UnsupportedOperationException("Method drop is not implemented in ByteIterator") override def drop(n: Int): this.type = throw new UnsupportedOperationException("Method drop is not implemented in ByteIterator")
final override def slice(from: Int, until: Int): this.type = final override def slice(from: Int, until: Int): this.type = {
drop(from).take(until - from) if (from > 0) drop(from).take(until - from)
else take(until)
}
// *must* be overridden by derived classes. This construction is necessary // *must* be overridden by derived classes. This construction is necessary
// to specialize the return type, as the method is already implemented in // to specialize the return type, as the method is already implemented in