Changeset 57

Timestamp:

06/25/13 12:10:16 (11 years ago)

Author:

stoda

Message:

New function created: getResults which returns a list

Location:

trunk

Files:

• src/main/java/omq/client/proxy/Proxymq.java (modified) (2 diffs)
• src/main/java/omq/server/RemoteObject.java (modified) (1 diff)
• src/test/java/omq/test/multiProcess/MultiProcessTest.java (modified) (1 diff)
• target/classes/log4j.xml.svntmp (added)

trunk/src/main/java/omq/client/proxy/Proxymq.java

@@ -5 +5 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -256 +258 @@
         }
 
+        @SuppressWarnings("unused")
+        private Object getResults(String corrId, int wait, long timeout, Class<?> type) throws Exception {
+                Response resp = null;
+                List<Object> list = new ArrayList<Object>();
+
+                int i = 0;
+                long localTimeout = timeout;
+                long start = System.currentTimeMillis();
+
+                while (i < wait) {
+                        synchronized (results) {
+                                // Due to we are using notifyAll(), we need to control the real
+                                // time
+                                while (!results.containsKey(corrId) && (timeout - localTimeout) >= 0) {
+                                        results.wait(localTimeout);
+                                        localTimeout = System.currentTimeMillis() - start;
+                                }
+                                if ((timeout - localTimeout) <= 0) {
+                                        throw new TimeoutException("Timeout exception time: " + timeout);
+                                }
+                                // Remove the corrId to receive new replies
+                                resp = serializer.deserializeResponse(results.remove(corrId), type);
+                                list.add(resp.getResult());
+
+                        }
+                        i++;
+                }
+                synchronized (results) {
+                        results.put(corrId, null);
+                }
+
+                return list;
+        }
+
         /**
          * 

trunk/src/main/java/omq/server/RemoteObject.java

@@ -225 +225 @@
                 // Multi info
                 String multiExchange = multi + exchange;
+                //TODO: change this
                 String multiQueue = UID + System.currentTimeMillis();
 

trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java

@@ -99 +99 @@
                 Thread.sleep(200);
                 int a = remoteNumber.getNumer();
+                int b = remoteNumber.getNumer();
                 assertEquals(x, a);
+                assertEquals(x, b);
                 remoteNumber.setMultiNumber(0);
                 Thread.sleep(200);