Changeset 102 for branches/supervisor/src/main

Timestamp:

10/14/13 16:38:34 (11 years ago)

Author:

stoda

Message:

All tests working

TODO sometimes exceptiontest fails

Location:

branches/supervisor/src/main/java/omq

Files:

• common/util/OmqConnectionFactory.java (modified) (1 diff)
• common/util/ParameterQueue.java (modified) (1 diff)
• server/InvocationThread.java (modified) (1 diff)
• server/RemoteThreadPool.java (modified) (3 diffs)

branches/supervisor/src/main/java/omq/common/util/OmqConnectionFactory.java

@@ -57 +57 @@
                                 working = true;
                         } catch (Exception e) {
+//                              e.printStackTrace();
                                 logger.error(e);
                                 long milis = 2000;

branches/supervisor/src/main/java/omq/common/util/ParameterQueue.java

@@ -132 +132 @@
          */
 
-        /**
-         * Set how many threads will be created to invoke remote methods
-         */
-        public static String NUM_THREADS = "omq.num_threads";
 
         /**

branches/supervisor/src/main/java/omq/server/InvocationThread.java

@@ -157 +157 @@
 
                 }
+                logger.info("ObjectMQ ('" + obj.getRef() + "') InvocationThread " + Thread.currentThread().getId() + " is killed");
         }
 

branches/supervisor/src/main/java/omq/server/RemoteThreadPool.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -102 +103 @@
                 long now = System.currentTimeMillis();
 
-                int i = 0;
-                for (InvocationThread worker : workers) {
-                        // Ensure there are at least minThreads available
-                        if (workers.size() == minPoolThreads) {
-                                break;
-                        }
+                ListIterator<InvocationThread> lIter = workers.listIterator();
+                while (workers.size() > minPoolThreads && lIter.hasNext()) {
+                        InvocationThread worker = lIter.next();
                         long lastExec = worker.getLastExecution();
                         System.out.println("last - now = " + (now - lastExec) + " keep alive = " + keepAliveTime);
@@ -114 +112 @@
                                 try {
                                         worker.kill();
-                                        workers.remove(i);
+                                        lIter.remove();
                                 } catch (IOException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
+                                        logger.error(e);
                                 }
 
                         }
-                        i++;
                 }
         }