From 37516ab6d64259cb7e036e9c7a2ae2f203293236 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Mon, 27 Oct 2014 08:54:41 -0400 Subject: [PATCH] fix bug --- compiler/src/test/scala/org/capnproto/TestUtil.scala | 6 +++--- runtime/src/main/java/org/capnproto/WireHelpers.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/src/test/scala/org/capnproto/TestUtil.scala b/compiler/src/test/scala/org/capnproto/TestUtil.scala index 712d036..e2897a2 100644 --- a/compiler/src/test/scala/org/capnproto/TestUtil.scala +++ b/compiler/src/test/scala/org/capnproto/TestUtil.scala @@ -163,9 +163,9 @@ object TestUtil { val structList = builder.getStructList(); assert(3 == structList.size()); - //assert(structList.get(0).getTextField().toString() == "structlist 1") - //assert(structList.get(1).getTextField().toString() == "structlist 2") - //assert(structList.get(2).getTextField().toString() == "structlist 3") + assert(structList.get(0).getTextField().toString() == "structlist 1") + assert(structList.get(1).getTextField().toString() == "structlist 2") + assert(structList.get(2).getTextField().toString() == "structlist 3") val enumList = builder.getEnumList(); (enumList.get(0)) should equal (TestEnum.FOO); diff --git a/runtime/src/main/java/org/capnproto/WireHelpers.java b/runtime/src/main/java/org/capnproto/WireHelpers.java index 40a2415..446b9d1 100644 --- a/runtime/src/main/java/org/capnproto/WireHelpers.java +++ b/runtime/src/main/java/org/capnproto/WireHelpers.java @@ -350,7 +350,7 @@ final class WireHelpers { if (oldDataSize >= elementSize.data && oldPointerCount >= elementSize.pointers) { //# Old size is at least as large as we need. Ship it. - return factory.constructBuilder(resolved.segment, resolved.ptr * Constants.BYTES_PER_WORD, + return factory.constructBuilder(resolved.segment, oldPtr * Constants.BYTES_PER_WORD, elementCount, oldStep * Constants.BITS_PER_WORD, oldDataSize * Constants.BITS_PER_WORD, oldPointerCount);