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 8d4b134..b858c49 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -1,13 +1,11 @@
-/*
- * JNI interface to virtual machine in Simgrid
- * 
- * Copyright (c) 2006-2013. The SimGrid Team.
- * All right reserved. 
- *
- * This program is free software; you can redistribute 
- * it and/or modify it under the terms of the license 
- * (GNU LGPL) which comes with this package.
- */
+/* JNI interface to virtual machine in Simgrid */
+
+/* Copyright (c) 2006-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 package org.simgrid.msg;
 
 import org.simgrid.msg.Host;
@@ -149,14 +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);
+       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; 
        }