X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c3066090245b1d56a9927723543cbc93dcb0d9ee..4d02714ee138a3bd9b02e0064b7a2aa26407e9e8:/src/xbt/exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 94fc91f197..41db24db88 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -65,7 +65,6 @@ const char* xbt_ex_catname(xbt_errcat_t cat)
     default:
       return "INVALID ERROR";
   }
-  return "INVALID ERROR";
 }
 
 namespace simgrid {
@@ -146,8 +145,9 @@ static void handler()
     std::abort();
   }
 
-  catch (simgrid::kernel::context::StopRequest& e) {
-    XBT_ERROR("Received a StopRequest at the top-level exception handler. Maybe a Java->C++ call that is not protected "
+  catch (simgrid::ForcefulKillException const& e) {
+    XBT_ERROR("Received a ForcefulKillException at the top-level exception handler. Maybe a Java->C++ call that is not "
+              "protected "
               "in a try/catch?");
     show_backtrace(bt);
   }