serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #91 from vaci/copy-any-pointer

Browse source 
set AnyPointer from AnyPointer
This commit is contained in:
David Renshaw 2020-11-10 07:33:20 -05:00 committed by GitHub
commit 449bf8b2b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
compiler/src/test/java/org/capnproto/EncodingTest.java
View file

@ -844,6 +844,17 @@ public class EncodingTest {
Assert.assertEquals(listReader.get(0).getInt8Field(), 11); Assert.assertEquals(listReader.get(0).getInt8Field(), 11);
TestUtil.checkTestMessage(listReader.get(1)); TestUtil.checkTestMessage(listReader.get(1));
} }
@org.junit.Test
public void testCopyAnyPointer() {
MessageBuilder message1 = new MessageBuilder();
Test.TestAllTypes.Builder root1 = message1.initRoot(Test.TestAllTypes.factory);
TestUtil.initTestMessage(root1);
MessageBuilder message2 = new MessageBuilder();
AnyPointer.Builder root2 = message2.initRoot(AnyPointer.factory);
root2.setAs(AnyPointer.factory, message1.getRoot(AnyPointer.factory).asReader());
TestUtil.checkTestMessage(root2.getAs(Test.TestAllTypes.factory));
}
} }

14
runtime/src/main/java/org/capnproto/AnyPointer.java
View file

@ -22,7 +22,10 @@
package org.capnproto; package org.capnproto;
public final class AnyPointer { public final class AnyPointer {
public static final class Factory implements PointerFactory<Builder, Reader> { public static final class Factory
implements PointerFactory<Builder, Reader>,
SetPointerBuilder<Builder, Reader>
{
public final Reader fromPointerReader(SegmentReader segment, int pointer, int nestingLimit) { public final Reader fromPointerReader(SegmentReader segment, int pointer, int nestingLimit) {
return new Reader(segment, pointer, nestingLimit); return new Reader(segment, pointer, nestingLimit);
} }
@ -34,6 +37,15 @@ public final class AnyPointer {
result.clear(); result.clear();
return result; return result;
} }
public void setPointerBuilder(SegmentBuilder segment, int pointer, Reader value) {
if (value.isNull()) {
WireHelpers.zeroObject(segment, pointer);
WireHelpers.zeroPointerAndFars(segment, pointer);
}
else {
WireHelpers.copyPointer(segment, pointer, value.segment, value.pointer, value.nestingLimit);
}
}
} }
public static final Factory factory = new Factory(); public static final Factory factory = new Factory();