From e65b934db0350953223701281e55850086d06834 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 4 Sep 2014 11:41:37 -0400 Subject: [PATCH] slight simplifications --- .../src/main/java/org/capnproto/benchmark/CarSales.java | 5 ++--- runtime/src/main/java/org/capnproto/BuilderArena.java | 2 +- runtime/src/main/java/org/capnproto/WireHelpers.java | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/benchmark/src/main/java/org/capnproto/benchmark/CarSales.java b/benchmark/src/main/java/org/capnproto/benchmark/CarSales.java index d0ac3bd..6622d47 100644 --- a/benchmark/src/main/java/org/capnproto/benchmark/CarSales.java +++ b/benchmark/src/main/java/org/capnproto/benchmark/CarSales.java @@ -101,9 +101,8 @@ public class CarSales public final void handleRequest(ParkingLot.Reader request, TotalValue.Builder response) { long result = 0; - StructList.Reader cars = request.getCars(); - for (int i =0; i < cars.size(); ++i) { - result += carValue(cars.get(i)); + for (Car.Reader car : request.getCars()) { + result += carValue(car); } response.setAmount(result); } diff --git a/runtime/src/main/java/org/capnproto/BuilderArena.java b/runtime/src/main/java/org/capnproto/BuilderArena.java index 56e5c7e..b9da6c3 100644 --- a/runtime/src/main/java/org/capnproto/BuilderArena.java +++ b/runtime/src/main/java/org/capnproto/BuilderArena.java @@ -90,7 +90,7 @@ public final class BuilderArena implements Arena { ByteBuffer[] result = new ByteBuffer[this.segments.size()]; for (int ii = 0; ii < this.segments.size(); ++ii) { SegmentBuilder segment = segments.get(ii); - segment.buffer.reset(); + segment.buffer.rewind(); ByteBuffer slice = segment.buffer.slice(); slice.limit(segment.currentSize() * Constants.BYTES_PER_WORD); result[ii] = slice; diff --git a/runtime/src/main/java/org/capnproto/WireHelpers.java b/runtime/src/main/java/org/capnproto/WireHelpers.java index afd3995..75bc9d8 100644 --- a/runtime/src/main/java/org/capnproto/WireHelpers.java +++ b/runtime/src/main/java/org/capnproto/WireHelpers.java @@ -369,7 +369,6 @@ final class WireHelpers { int refOffset, byte expectedElementSize, int nestingLimit) { - long ref = WirePointer.get(segment.buffer, refOffset); if (WirePointer.isNull(ref)) {