Merge branch 'v3_11_x'

Conflicts:
	examples/msg/properties/msg_prop.c
	examples/simdag/properties/sd_prop.c

diff --combined src/bindings/java/surf.i
index b43c4fd,e5721c5..3890a89
--- 1/src/bindings/java/surf.i
--- 2/src/bindings/java/surf.i
+++ b/src/bindings/java/surf.i
@@@ -16,7 -16,6 +16,7 @@@ import org.simgrid.NativeLib
  %}
  %pragma(java) jniclasscode=%{
    static {
 +    NativeLib.nativeInit("simgrid");
      NativeLib.nativeInit("surf-java");
      Runtime.getRuntime().addShutdownHook(
        new Thread() {
@@@ -167,15 -166,15 +167,15 @@@ JAVA_ARRAYSOFCLASSES(NetworkLink)
    long l = xbt_dynar_length($1);
    $result = jenv->NewDoubleArray(l);
    double *lout = (double *)xbt_dynar_to_array($1);
-   jenv->SetDoubleArrayRegion($result, 0, l, (const jdouble*)lout);
-   free(lout);
+   jenv->SetDoubleArrayRegion($result, 0, l, (jdouble*)lout);
+   free(:);
  }
  %typemap(javadirectorin) DoubleDynar "$jniinput"
  %typemap(directorin,descriptor="[D") DoubleDynar %{
    long l = xbt_dynar_length($1);
    $input = jenv->NewDoubleArray(l);
    double *lout = (double *)xbt_dynar_to_array($1);
-   jenv->SetDoubleArrayRegion($input, 0, l, (const jdouble*)lout);
+   jenv->SetDoubleArrayRegion($input, 0, l, (jdouble*)lout);
    free(lout);
  %}
  %typemap(javain) DoubleDynar "$javainput"