From b27c5d685d17dd29ffa7853a815c11135af0b29d Mon Sep 17 00:00:00 2001
From: David Renshaw <david@sandstorm.io>
Date: Tue, 12 Jan 2016 22:25:35 -0500
Subject: [PATCH] Fix problem in transferPointer() that would have become a bug
 once orphans are implemented. See
 https://github.com/sandstorm-io/capnproto/commit/4d4f831a3d71fc483035971fb6763da221bddcfe

---
 runtime/src/main/java/org/capnproto/WireHelpers.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/src/main/java/org/capnproto/WireHelpers.java b/runtime/src/main/java/org/capnproto/WireHelpers.java
index b3cd9c2..ab8552d 100644
--- a/runtime/src/main/java/org/capnproto/WireHelpers.java
+++ b/runtime/src/main/java/org/capnproto/WireHelpers.java
@@ -342,11 +342,11 @@ final class WireHelpers {
             } else {
                 WirePointer.setKindAndTarget(dstSegment.buffer, dstOffset,
                                              WirePointer.kind(src), srcTargetOffset);
-
-                // We can just copy the upper 32 bits.
-                dstSegment.buffer.putInt(dstOffset * Constants.BYTES_PER_WORD + 4,
-                                         srcSegment.buffer.getInt(srcOffset * Constants.BYTES_PER_WORD + 4));
             }
+            // We can just copy the upper 32 bits.
+            dstSegment.buffer.putInt(dstOffset * Constants.BYTES_PER_WORD + 4,
+                                     srcSegment.buffer.getInt(srcOffset * Constants.BYTES_PER_WORD + 4));
+
         } else {
             //# Need to create a far pointer. Try to allocate it in the same segment as the source,
             //# so that it doesn't need to be a double-far.