Changeset 104 for branches/supervisor

Timestamp:

10/16/13 13:01:04 (11 years ago)

Author:

stoda

Message:

MultiMethod? without numWait -> it depends on the timeout

Location:

branches/supervisor

Files:

• src/main/java/omq/client/annotation/MultiMethod.java (modified) (1 diff)
• src/main/java/omq/client/proxy/Proxymq.java (modified) (8 diffs)
• src/main/java/omq/common/message/Request.java (modified) (3 diffs)
• src/test/java/omq/test/multiProcess/NumberClient.java (modified) (1 diff)
• target/classes/log4j.xml (added)
• target/classes/log4j.xml.svntmp (added)

branches/supervisor/src/main/java/omq/client/annotation/MultiMethod.java

@@ -15 +15 @@
 @Target(ElementType.METHOD)
 public @interface MultiMethod {
-        /**
-         * If @MultiMethod is followed by @SyncMethod waitNum indicates how many
-         * responses we will wait for.
-         * 
-         * @return length of the array of responses we are waiting for.
-         */
-        int waitNum() default 1;
 }

branches/supervisor/src/main/java/omq/client/proxy/Proxymq.java

@@ -4 +4 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -201 +203 @@
                                 publishMessage(request, replyQueueName);
                                 if (request.isMulti()) {
-                                        return getResults(corrId, request.getWait(), timeout, type);
+                                        return getResults(corrId, timeout, type);
                                 } else {
                                         return getResult(corrId, timeout, type);
@@ -228 +230 @@
                 String methodName = method.getName();
                 boolean multi = false;
-                int wait = 0;
 
                 if (method.getAnnotation(MultiMethod.class) != null) {
                         multi = true;
-                        wait = method.getAnnotation(MultiMethod.class).waitNum();
                 }
 
@@ -246 +246 @@
                                 timeout = sync.timeout();
                         }
-                        return Request.newSyncRequest(corrId, methodName, arguments, retries, timeout, multi, wait);
+                        return Request.newSyncRequest(corrId, methodName, arguments, retries, timeout, multi);
                 } else {
                         return Request.newAsyncRequest(corrId, methodName, arguments, multi);
@@ -291 +291 @@
          * @param corrId
          *            - Correlation Id of the request
-         * @param wait
-         *            - Array length
          * @param timeout
          *            - Timeout read in @SyncMethod.timeout(). If the timeout is set
@@ -302 +300 @@
          * @throws Exception
          */
-        private Object getResults(String corrId, int wait, long timeout, Class<?> type) throws Exception {
+        private Object getResults(String corrId, long timeout, Class<?> type) throws Exception {
                 Response resp = null;
                 // Get the component type of an array
                 Class<?> actualType = type.getComponentType();
 
-                Object array = Array.newInstance(actualType, wait);
+                List<Object> list = new ArrayList<Object>();
 
                 int i = 0;
@@ -313 +311 @@
                 long start = System.currentTimeMillis();
 
-                while (i < wait) {
+                while (true) {
                         synchronized (results) {
                                 // Due to we are using notifyAll(), we need to control the real
@@ -322 +320 @@
                                 }
                                 if ((timeout - localTimeout) <= 0) {
-                                        throw new TimeoutException("Timeout exception time: " + timeout);
+                                        break;
                                 }
                                 // Remove the corrId to receive new replies
                                 resp = serializer.deserializeResponse(results.remove(corrId), actualType);
-                                Array.set(array, i, resp.getResult());
+                                list.add(resp.getResult());
                         }
                         i++;
                 }
+
+                if (i == 0) {
+                        results.remove(corrId);
+                        throw new TimeoutException("Timeout exception time: " + timeout);
+                }
+
                 synchronized (results) {
                         results.put(corrId, null);
+                }
+
+                Object array = Array.newInstance(actualType, i);
+                i = 0;
+                for (Object o : list) {
+                        Array.set(array, i++, o);
                 }
 

branches/supervisor/src/main/java/omq/common/message/Request.java

@@ -25 +25 @@
 
         private transient boolean multi;
-        private transient int wait;
         private transient long timeout;
         private transient int retries;
@@ -78 +77 @@
          * @param multi
          *            - If the method is multi
-         * @param wait
-         *            - If the method is multi how many responses will be listened
          * @return - new SyncRequest
          */
-        public static Request newSyncRequest(String id, String method, Object[] params, int retries, long timeout, boolean multi, int wait) {
+        public static Request newSyncRequest(String id, String method, Object[] params, int retries, long timeout, boolean multi) {
                 Request req = new Request(id, method, false, params, multi);
                 req.setRetries(retries);
                 req.setTimeout(timeout);
-                req.setWait(wait);
                 return req;
         }
@@ -163 +159 @@
         }
 
-        public int getWait() {
-                return wait;
-        }
-
-        public void setWait(int wait) {
-                this.wait = wait;
-        }
 }

branches/supervisor/src/test/java/omq/test/multiProcess/NumberClient.java

@@ -24 +24 @@
         public void setMultiNumber(int x);
 
-        @MultiMethod(waitNum = 2)
+        @MultiMethod()
         @SyncMethod(timeout = 1000)
         public int[] getMultiNumber();