Merge branch 'master' into mc

[simgrid.git] / examples / java / cloud / Master.java

diff --git a/examples/java/cloud/Master.java b/examples/java/cloud/Master.java
index 57806fd..d3606c9 100644 (file)
--- a/examples/java/cloud/Master.java
+++ b/examples/java/cloud/Master.java
@@ -34,7 +34,7 @@ public class Master extends Process {
                        vm.start();
                        vms.add(vm);
                        Slave slave = new Slave(vm,i);
-                       Msg.info("Put Worker "+slave.msgName()+ " on "+vm.getName());
+                       Msg.info("Put Worker "+slave.getName()+ " on "+vm.getName());
                        slave.start();
        
                }
@@ -73,7 +73,7 @@ public class Master extends Process {
                Msg.info("Migrate everyone to "+hosts[3].getName());
                for (int i = 0; i < vms.size(); i++) {
                        Msg.info("Migrate "+vms.get(i).getName()+"from"+hosts[i+1].getName()+"to "+hosts[3].getName());
-                       vms.get(i).migrate(hosts[2]);
+                       vms.get(i).migrate(hosts[3]);
                }
                
                
@@ -81,7 +81,6 @@ public class Master extends Process {
                
                for (int i = 0; i < vms.size(); i++) {
                        vms.get(i).shutdown();
-                       vms.get(i).destroy();
                }                               
                Msg.info("Master done.");
        }