X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/591d1f1de204ef7303e6d02c88ae4c7f59c564de..f3b82f616359ba02069f0e0f70391a691b9ba91c:/src/bindings/java/jmsg_rngstream.cpp

diff --git a/src/bindings/java/jmsg_rngstream.cpp b/src/bindings/java/jmsg_rngstream.cpp
index b14662d6c1..2dda4cad9a 100644
--- a/src/bindings/java/jmsg_rngstream.cpp
+++ b/src/bindings/java/jmsg_rngstream.cpp
@@ -6,6 +6,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <xbt/sysdep.h>
+
 #include "jmsg_rngstream.h"
 #include "jxbt_utilities.h"
 
@@ -15,7 +17,7 @@ RngStream jrngstream_to_native(JNIEnv *env, jobject jrngstream) {
   RngStream rngstream = (RngStream)(intptr_t)env->GetLongField(jrngstream, jrngstream_bind);
   if (!rngstream) {
     jxbt_throw_notbound(env, "rngstream", jrngstream);
-    return NULL;
+    return nullptr;
   }
   return rngstream;
 }
@@ -38,21 +40,27 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_create(JNIEnv *env, jobjec
 JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_nativeFinalize(JNIEnv *env, jobject jrngstream) {
   RngStream rngstream = jrngstream_to_native(env, jrngstream);
   RngStream_DeleteStream(&rngstream);
-  env->SetLongField(jrngstream, jrngstream_bind, (intptr_t)NULL);
+  env->SetLongField(jrngstream, jrngstream_bind, (intptr_t)nullptr);
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_simgrid_msg_RngStream_setPackageSeed(JNIEnv *env, jobject jrngstream, jintArray jseed) {
-  jint buffer[6];
 
-  env->GetIntArrayRegion(jseed, 0, 6, buffer);
-
-  RngStream rngstream = jrngstream_to_native(env, jrngstream);
-  if (!rngstream)
+  if (jseed == nullptr) {
+    jxbt_throw_null(env, xbt_strdup("seed argument is null"));
     return JNI_FALSE;
+  }
+
+  jint buffer[6];
+  env->GetIntArrayRegion(jseed, 0, 6, buffer);
 
-  int result = RngStream_SetPackageSeed((unsigned long*)buffer);
+  // The C API expects unsigned long which are wider than int on LP64.
+  // We need to convert:
+  unsigned long seed[6];
+  for (int i = 0; i != 6; ++i)
+    seed[i] = buffer[i];
 
+  int result = RngStream_SetPackageSeed(seed);
   return result == -1 ? JNI_FALSE : JNI_TRUE;
 }