A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg_synchro.cpp
diff --git
a/src/bindings/java/jmsg_synchro.cpp
b/src/bindings/java/jmsg_synchro.cpp
index
ca24ac8
..
0ae09a7
100644
(file)
--- a/
src/bindings/java/jmsg_synchro.cpp
+++ b/
src/bindings/java/jmsg_synchro.cpp
@@
-29,15
+29,12
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_init(JNIEnv * env, jobject obj
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_acquire(JNIEnv * env, jobject obj) {
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_acquire(JNIEnv * env, jobject obj) {
- xbt_mutex_t mutex;
-
- mutex = (xbt_mutex_t) (uintptr_t) env->GetLongField(obj, jsyncro_field_Mutex_bind);
- xbt_ex_t e;
- TRY {
+ xbt_mutex_t mutex = (xbt_mutex_t) (uintptr_t) env->GetLongField(obj, jsyncro_field_Mutex_bind);
+ try {
xbt_mutex_acquire(mutex);
}
xbt_mutex_acquire(mutex);
}
-
CATCH(
e) {
- xbt_ex_free(e);
+
catch(xbt_ex&
e) {
+ // Nothing to do
}
}
}
}