X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a139e0a3a07e70888bd65987da21a495a2eedfb..60a8b1bd9132280e41cbf066a01273bbe97ac3d8:/src/smx_context_java.c?ds=sidebyside

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index aa2d0c2462..622e1030a1 100644
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -8,7 +8,7 @@
 
 
 #include <xbt/function_types.h>
-#include <simix/simix.h>
+#include <simgrid/simix.h>
 #include "smx_context_java.h"
 #include "xbt/dynar.h"
 
@@ -97,11 +97,13 @@ static void smx_ctx_java_free(smx_context_t context)
   smx_ctx_base_free(context);
 }
 
+
 void smx_ctx_java_stop(smx_context_t context)
 {
-  xbt_assert(context == my_current_context,
-      "The context to stop must be the current one");
+ xbt_assert(context == my_current_context,
+     "The context to stop must be the current one");
   /* I am the current process and I am dying */
+  
   smx_ctx_base_stop(context);
 
   XBT_DEBUG("I am dying");
@@ -109,7 +111,7 @@ void smx_ctx_java_stop(smx_context_t context)
   /* suspend myself again, smx_ctx_java_free() will destroy me later
    * from maeastro */
   jprocess_unschedule(context);
-  xbt_die("This function was not supposed to return");
+  XBT_DEBUG("Java stop finished");
 }
 
 static void smx_ctx_java_suspend(smx_context_t context)