From 326c9e5a8bffc2fb5b1a733887797c4cad5196d4 Mon Sep 17 00:00:00 2001 From: degomme Date: Sat, 21 Jun 2014 13:41:51 +0200 Subject: [PATCH] Fix java tests : this dynar may be empty, don't try to iterate on it --- src/bindings/java/jmsg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bindings/java/jmsg.c b/src/bindings/java/jmsg.c index 4e0671781b..ecb2108691 100644 --- a/src/bindings/java/jmsg.c +++ b/src/bindings/java/jmsg.c @@ -180,11 +180,12 @@ JNIEXPORT void JNICALL /* Cleanup java storages */ storages = MSG_storages_as_dynar(); - for (index = 0; index < xbt_dynar_length(storages) - 1; index++) { - jstorage = (jobject) xbt_lib_get_level(xbt_dynar_get_as(storages,index,msg_storage_t), JAVA_STORAGE_LEVEL); - if (jstorage) - jstorage_unref(env, jstorage); - + if(!xbt_dynar_is_empty(storages)){ + for (index = 0; index < xbt_dynar_length(storages) - 1; index++) { + jstorage = (jobject) xbt_lib_get_level(xbt_dynar_get_as(storages,index,msg_storage_t), JAVA_STORAGE_LEVEL); + if (jstorage) + jstorage_unref(env, jstorage); + } } xbt_dynar_free(&storages); -- 2.20.1