Change "ProcessKilledException" to "ProcessKilledError" -> make it not catchable...

(Exception e) statements (because someone's gonna do it).

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f3d7a0..513265f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,7 +102,7 @@ set(JMSG_JAVA_SRC
        org/simgrid/msg/MsgException.java
        org/simgrid/msg/NativeException.java
        org/simgrid/msg/Process.java
-       org/simgrid/msg/ProcessKilledException.java
+       org/simgrid/msg/ProcessKilledError.java
        org/simgrid/msg/ProcessNotFoundException.java
        org/simgrid/msg/Task.java
        org/simgrid/msg/TaskCancelledException.java

diff --git a/org/simgrid/msg/Process.java b/org/simgrid/msg/Process.java
index 264a843..380335a 100644 (file)
--- a/org/simgrid/msg/Process.java
+++ b/org/simgrid/msg/Process.java
@@ -328,7 +328,7 @@ public abstract class Process implements Runnable {
                        Msg.info("Unexpected behavior. Stopping now");
                        System.exit(1);
                }
-                catch(ProcessKilledException pk) {
+                catch(ProcessKilledError pk) {
 
                 }      
        }

diff --git a/org/simgrid/msg/ProcessKilledException.java b/org/simgrid/msg/ProcessKilledError.java
similarity index 67%
rename from org/simgrid/msg/ProcessKilledException.java
rename to org/simgrid/msg/ProcessKilledError.java
index d89e565..6cd1c4a 100644 (file)
--- a/org/simgrid/msg/ProcessKilledException.java
+++ b/org/simgrid/msg/ProcessKilledError.java
@@ -3,9 +3,9 @@ package org.simgrid.msg;
 /** This exception class is only used to interrupt the java user code 
  * when the process gets killed by an external event */
 
-public class ProcessKilledException extends RuntimeException {
+public class ProcessKilledError extends Error {
        private static final long serialVersionUID = 1L;
-       public ProcessKilledException(String s) {
+       public ProcessKilledError(String s) {
                super(s);
        }
 }

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index a31c951..04dd49b 100644 (file)
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -129,7 +129,7 @@ void smx_ctx_java_stop(smx_context_t context)
   if (ctx_java->killed == 1) {
        ctx_java->killed = 0;
        JNIEnv *env = get_current_thread_env();
-       jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledException", bprintf("Process killed :)"));
+       jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", bprintf("Process killed :)"));
        THROWF(cancel_error, 0, "process cancelled");
   }
   else {