X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..2d1f6b9a46d52289c1b52de4f0a7698f0085711a:/src/bindings/java/org/simgrid/msg/Mutex.java?ds=sidebyside

diff --git a/src/bindings/java/org/simgrid/msg/Mutex.java b/src/bindings/java/org/simgrid/msg/Mutex.java
index 96dca06a4b..f3d9c4723f 100644
--- a/src/bindings/java/org/simgrid/msg/Mutex.java
+++ b/src/bindings/java/org/simgrid/msg/Mutex.java
@@ -1,35 +1,37 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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. */
 
 package org.simgrid.msg;
-/** A mutex  implemented on top of SimGrid synchronization mechanisms. 
- * You can use it exactly the same way that you use the mutexes, 
- * but to handle the interactions between the processes within the simulation.   
+/** A mutex  implemented on top of SimGrid synchronization mechanisms.
+ * You can use it exactly the same way that you use the mutexes,
+ * but to handle the interactions between the processes within the simulation.
  *
+ * Don't mix simgrid synchronization with Java native one, or it will deadlock!
  */
 public class Mutex {
 	private long bind; // The C object -- don't touch it
-	
+
 	public Mutex() {
 		init();
 	}
-	protected void finalize() {
-		exit();
+
+	/** @deprecated (from Java9 onwards) */
+	@Deprecated @Override
+	protected void finalize() throws Throwable {
+		nativeFinalize();
 	}
-	private native void exit();
+	private native void nativeFinalize();
 	private native void init();
 	public native void acquire();
 	public native void release();
-	
-	/**
-	 * Class initializer, to initialize various JNI stuff
-	 */
+
+	/** Class initializer, to initialize various JNI stuff */
 	public static native void nativeInit();
 	static {
-		Msg.nativeInit();
+		org.simgrid.NativeLib.nativeInit();
 		nativeInit();
 	}	
 }