X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aeb67d26a90a4fbc05a2ee596c8f627bb7aa615b..f9143fc186eb0d357c8e15eae823f92c64b63347:/src/msg/msg_mailbox.c

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index 2afd75054c..48d2b824c1 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -191,7 +191,10 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t *task,
         ret = MSG_TRANSFER_FAILURE;
         break;      
       default:
-        xbt_die("Unhandled SIMIX network exception");       
+        ret = MSG_OK;
+        RETHROW;
+        break;
+        /*xbt_die("Unhandled SIMIX network exception");*/
     }
     xbt_ex_free(e);
     MSG_RETURN(ret);        
@@ -223,7 +226,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
 
   t_simdata->comm = NULL;
 
-  t_simdata->refcount++;
+  /*t_simdata->refcount++;*/
   local_host = ((simdata_process_t) process->simdata)->m_host;
   msg_global->sent_msg++;
 
@@ -256,12 +259,15 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
         ret = MSG_TRANSFER_FAILURE;
         break;      
       default:
-        xbt_die("Unhandled SIMIX network exception");       
+        ret = MSG_OK;
+        RETHROW;
+        break;
+        /*xbt_die("Unhandled SIMIX network exception");*/
     }
     xbt_ex_free(e);
     MSG_RETURN(ret);        
   }
 
-  t_simdata->refcount--;
+ /* t_simdata->refcount--;*/
   MSG_RETURN (MSG_OK);
 }