merge msg_vm.c - adrien (please note that there is one line (destruction of the tx_pr...

[simgrid.git] / src / bindings / java / org / simgrid / msg / VM.java

diff --git a/src/bindings/java/org/simgrid/msg/VM.java b/src/bindings/java/org/simgrid/msg/VM.java
index 4454960..b858c49 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -147,16 +147,21 @@ public class VM extends Host{
        /**  
         * Invoke native migration routine
        */
-       public native void internalmig(Host destination);
+       public native void internalmig(Host destination) throws Exception; // TODO add throws DoubleMigrationException (i.e. when you call migrate on a VM that is already migrating);
+
 
        
        /** Change the host on which all processes are running
         * (pre-copy is implemented)
         */     
-       public void migrate(Host destination){
-               this.internalmig(destination);
-               // TODO we should test whether the migration has been correctly finalized. 
-               // If and only if it is ok, then we should change the currentHost value. 
+       public void migrate(Host destination) throws HostFailureException{
+               try {
+                       this.internalmig(destination);
+               } catch (Exception e){
+                 Msg.info("an exception occurs during the migration of VM "+this.getName());
+                 throw new HostFailureException();
+               }
+               // If the migration correcly returned, then we should change the currentHost value. 
                this.currentHost = destination; 
        }