DBus : fix return value in method with callbacks

Author: pquiring

src/javaforce/ipc/DBus.java

@@ -1064,14 +1064,15 @@ private void method_call() throws Exception {
           //to avoid deadlock this must be done on a new thread : TODO : create a thread pool
           String _member = member;
           String _sender = sender;
+          int _msg_serial = msg_serial;  //field value may change with next inbound msg
           new Thread() {
             public void run() {
               try {
                 Object ret = ep.dispatch(_member, args);
-                write_msg(MSG_RETURN, _sender, nextSerial(), msg_serial, _member, new Object[] {ret});
+                write_msg(MSG_RETURN, _sender, nextSerial(), _msg_serial, _member, new Object[] {ret});
               } catch (Exception e) {
                 if (debug) JFLog.log(e);
-                write_msg(MSG_ERROR, _sender, nextSerial(), msg_serial, _member, new Object[] {e.toString()});
+                write_msg(MSG_ERROR, _sender, nextSerial(), _msg_serial, _member, new Object[] {e.toString()});
               }
             }
           }.start();

src/javaforce/ipc/IPC.java

@@ -12,6 +12,9 @@ public interface IPC {
   /** Disconnect from IPC service. */
   public boolean disconnect();
 
+  /** Return name on message bus. */
+  public String getBusName();
+
   /** Invoke RPC on specified end point. */
   public Object invoke(String dest, String method, Object... args) throws Exception;
 

src/javaforce/tests/TestIPC.java

@@ -15,6 +15,7 @@
 public class TestIPC {
 
   private static boolean debug = false;
+  private static boolean debug_callback = true;
 
   private static boolean use_tcp = false;
   private static int tcp_port = 8001;
@@ -39,7 +40,9 @@ private static void server() {
       } else {
         transport = DBus.createTransport();
       }
-      IPC ipc = new DBus(new TestEndPoint("javaforce.TestIPC.Server"), transport);
+      TestEndPoint ep = new TestEndPoint("javaforce.TestIPC.Server");
+      IPC ipc = new DBus(ep, transport);
+      ep.setIPC(ipc);
       if (!ipc.connect()) {
         JFLog.log("IPC.connect() failed");
         return;
@@ -90,15 +93,18 @@ public void run() {
         } else {
           transport = DBus.createTransport();
         }
-        ipc = new DBus(new TestEndPoint(null), transport);
+        TestEndPoint ep = new TestEndPoint(null);
+        ipc = new DBus(ep, transport);
         if (!ipc.connect()) {
           JFLog.log("IPC.connect() failed");
           return;
         }
+        ep.setIPC(ipc);
         while (true) {
           try {
             ping();
             modify();
+            callback();
           } catch (Exception e) {
             JFLog.log(e);
           }
@@ -135,6 +141,16 @@ public void modify() throws Exception {
         success++;
       }
     }
+    public void callback() throws Exception {
+      Object result = ipc.invoke("javaforce.TestIPC.Server", "process", ipc.getBusName(), 3);
+      if (result == null) {
+        if (debug) JFLog.log("result == null");
+        error++;
+      } else {
+        if (debug) JFLog.log("result = " + result);
+        success++;
+      }
+    }
   }
 
   public static class TestEndPoint implements EndPoint {
@@ -145,6 +161,7 @@ public TestEndPoint(String name) {
 
     private String name;
     private Dispatcher dispatcher;
+    private IPC ipc;
 
     public String getEndPointName() {
       return name;
@@ -154,7 +171,11 @@ public Object dispatch(String method, Object[] args) throws Exception {
       return dispatcher.dispatch(method, args);
     }
 
-    public static class Methods {
+    public void setIPC(IPC ipc) {
+      this.ipc = ipc;
+    }
+
+    public class Methods {
       public boolean ping(int value) {
         if (debug) JFLog.log(String.format("ping(0x%x)", value));
         return true;
@@ -166,6 +187,22 @@ public byte[] modify(byte[] data) {
         data[2] = 0x66;
         return data;
       }
+      public boolean process(String name, int cnt) {
+        if (ipc != null) {
+          for(int a=0;a<cnt;a++) {
+            try {
+              ipc.invoke(name, "callback", "count=" + a);
+            } catch (Exception e) {
+              JFLog.log(e);
+            }
+          }
+        }
+        return true;
+      }
+      public boolean callback(String value) {
+        if (debug_callback) JFLog.log("callback:" + value);
+        return true;
+      }
     }
   }
 }