Changeset 94 for branches

Timestamp:

10/01/13 19:28:26 (11 years ago)

Author:

stoda

Message:

TODO: look if everything works

Location:

branches/supervisor

Files:

• src/main/java/omq/supervisor/SupervisorImpl.java (modified) (2 diffs)
• src/main/java/omq/supervisor/SupervisorThread.java (modified) (1 diff)
• src/test/java/omq/test/supervisor/SleepTest.java (modified) (1 diff)
• target/classes/log4j.xml (deleted)

branches/supervisor/src/main/java/omq/supervisor/SupervisorImpl.java

@@ -91 +91 @@
                                 if (broker.hasObject(reference) && (numObjects - 1) >= minObjects) {
                                         broker.deleteObject(reference);
+                                        break;
                                 }
                         }
@@ -96 +97 @@
                 } catch (Exception io) {
                         // The queue doesn't exist & the channel has been closed
-                }
-
-                for (RemoteBroker broker : brokers) {
-                        if (!broker.hasObject(reference) && minObjects >= numObjects) {
-                                broker.spawnObject(reference, settings.getClassName(), settings.getProps());
-                                numObjects++;
-                                if (minObjects >= numObjects) {
-                                        break;
-                                }
-                        }
                 }
         }

branches/supervisor/src/main/java/omq/supervisor/SupervisorThread.java

@@ -55 +55 @@
                 System.out.println("Num Consumers: " + numConsumers + ", num Messages: " + numMessages);
 
-                if (maxMessages < numMessages || minObjects < numConsumers) {
+                if (maxMessages < numMessages || numConsumers < minObjects ) {
                         System.out.println("SPAWN TIME!!");
                         supervisor.spawnObject(settings);
                         // spawn:
-                        // pregunta a tots i qui no té l'objecte li poses
-                } else if (numMessages < minMessages && minObjects > numConsumers) {
+                        // pregunta a tots i qui no t�� l'objecte li poses
+                } else if (numMessages < minMessages && minObjects < numConsumers) {
+                        System.out.println("Unbinding object!!!");
                         supervisor.unbindObject(settings);
                         // delete:
-                        // pregunta a tots i qui té l'objecte li treus
+                        // pregunta a tots i qui t�� l'objecte li treus
                 }
         }

branches/supervisor/src/test/java/omq/test/supervisor/SleepTest.java

@@ -60 +60 @@
                 Supervisor supervisor = broker.lookup("supervisor", Supervisor.class);
 
-                OmqSettings settings = new OmqSettings("sleep", SleepImpl.class.getName(), env, 20, 20, 2);
+                OmqSettings settings = new OmqSettings("sleep", SleepImpl.class.getName(), env, 1, 20, 20);
                 supervisor.spawnObject(settings);