Changeset 419

Timestamp:

05/10/2010 02:30:53 PM (11 years ago)

Author:

pedro.cuba

Message:

Fixed "exit" migrations (know the occupied variable is changed accordingly).

Location:

libs/cmion/cmionMain/src/cmion/level2

Files:

• competencies/Migration.java (modified) (5 diffs)
• migration/MessageDelivered.java (modified) (2 diffs)
• migration/Synchronizer.java (modified) (1 diff)

libs/cmion/cmionMain/src/cmion/level2/competencies/Migration.java

@@ -52 +52 @@
 
 public class Migration extends Competency {
+        
+        public static final String SUCCESS_TAG = "success";
 
         private HashMap<String, Device> deviceList;
@@ -224 +226 @@
                 migrationElements = new ArrayList<Element>();
                 destination = deviceList.get(parameters.get("DeviceName"));
+                
+                if(destination == null){
+                        System.out.println("Unknown Destination: "+parameters.get("DeviceName"));
+                        raise(new SynchronizationFailed());
+                        return false;
+                }
+                
                 migrationDocument = docBuilder.newDocument();
                 raise(new MigrationStart(destination, migrationDocument));
@@ -324 +333 @@
                         if(messageReceived.type.equals("status")){
                                 //TODO send back message indicating if device is occupied by another agent.
-                        }
-                        
-                        if(messageReceived.type.equals("success")){
-                                raise(new MigrationComplete());
-                        }
-                        
-                        if(messageReceived.type.equals("failure")){
-                                raise(new MigrationFailed());
                         }
                         
@@ -341 +342 @@
                                         sync.schedule(new Reply(replySuccess()));
                                 } else {
+                                        System.out.println("Refusing agent because device is occupied.");
                                         sync.schedule(new Reply(replyFailure()));
                                 }
@@ -387 +389 @@
                 public void invoke(IEvent evt) {
                         MessageDelivered delivered = (MessageDelivered) evt;
-                        
-                        Element root = (Element) delivered.message.getElementsByTagName("success").item(0);
-                        
-                        if(root != null){
-                                raise(new MessageDelivered(delivered.message));
+                        Element success = (Element) delivered.message;
+                        
+                        if(success.getTagName().equals(SUCCESS_TAG)){
+                                raise(new MigrationComplete());
                                 occupied = false;
                                 migrationSucceeded();
                         } else {
+                                raise(new MigrationFailed());
                                 migrationFailed();
                         }

libs/cmion/cmionMain/src/cmion/level2/migration/MessageDelivered.java

@@ -1 +1 @@
 package cmion.level2.migration;
 
-import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 import ion.Meta.Event;
@@ -7 +7 @@
 public class MessageDelivered extends Event {
 
-        public final Document message;
+        public final Element message;
         
-        public MessageDelivered(Document message) {
+        public MessageDelivered(Element message) {
                 this.message = message;
         }

libs/cmion/cmionMain/src/cmion/level2/migration/Synchronizer.java

@@ -186 +186 @@
                                 Node node = nodes.item(i);
                                 if(node.getNodeType() == Node.ELEMENT_NODE){
-                                        raise(new MessageReceived((org.w3c.dom.Element)node));
+                                        raise(new MessageDelivered((org.w3c.dom.Element)node));
                                         return;
                                 }