[jffi-next] 01/02: Fix alternative version of invokeStruct() for object parameters

[Tim Potter]

This is an automated email from the git hooks/post-receive script.

tpot-guest pushed a commit to tag 0.6.2
in repository jffi-next.

commit 6d815fd31127a61304a81a306e929bd96120e818
Author: Wayne Meissner <wmeissner at gmail.com>
Date:   Sun Oct 18 12:42:06 2009 +1000

    Fix alternative version of invokeStruct() for object parameters
---
 src/com/kenai/jffi/Invoker.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/com/kenai/jffi/Invoker.java b/src/com/kenai/jffi/Invoker.java
index 718a9a2..dce3900 100644
--- a/src/com/kenai/jffi/Invoker.java
+++ b/src/com/kenai/jffi/Invoker.java
@@ -252,14 +252,8 @@ public abstract class Invoker {
      */
     public final byte[] invokeStruct(Function function, HeapInvocationBuffer buffer) {
         byte[] returnBuffer = new byte[function.getReturnType().size()];
-        ObjectBuffer objectBuffer = buffer.objectBuffer();
-        if (objectBuffer != null) {
-            foreign.invokeArrayWithObjectsReturnStruct(function.getContextAddress(),
-                    buffer.array(), objectBuffer.objectCount(), objectBuffer.info(), objectBuffer.objects(),
-                    returnBuffer, 0);
-        } else {
-            foreign.invokeArrayReturnStruct(function.getContextAddress(), buffer.array(), returnBuffer, 0);
-        }
+
+        invokeStruct(function, buffer, returnBuffer, 0);
 
         return returnBuffer;
     }
@@ -273,7 +267,14 @@ public abstract class Invoker {
      * @param offset The offset within returnBuffer to place the return value.
      */
     public final void invokeStruct(Function function, HeapInvocationBuffer buffer, byte[] returnBuffer, int offset) {
-        foreign.invokeArrayReturnStruct(function.getContextAddress(), buffer.array(), returnBuffer, offset);
+        ObjectBuffer objectBuffer = buffer.objectBuffer();
+        if (objectBuffer != null) {
+            foreign.invokeArrayWithObjectsReturnStruct(function.getContextAddress(),
+                    buffer.array(), objectBuffer.objectCount(), objectBuffer.info(), objectBuffer.objects(),
+                    returnBuffer, offset);
+        } else {
+            foreign.invokeArrayReturnStruct(function.getContextAddress(), buffer.array(), returnBuffer, offset);
+        }
     }
 
     public final Object invokeObject(Function function, HeapInvocationBuffer buffer) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jffi-next.git