X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e9105988280d1e88b5b496d6e2eed4c8d541883..19b3962253112b19308537bc2400de141c119d99:/src/bindings/java/org/simgrid/msg/Mutex.java

diff --git a/src/bindings/java/org/simgrid/msg/Mutex.java b/src/bindings/java/org/simgrid/msg/Mutex.java
index cb16ffb03f..77a72ca8c5 100644
--- a/src/bindings/java/org/simgrid/msg/Mutex.java
+++ b/src/bindings/java/org/simgrid/msg/Mutex.java
@@ -1,37 +1,36 @@
-/* 
- * Copyright 2012 The SimGrid team. All right 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.
- *
- */
+/* Copyright (c) 2012-2014. 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.   
- *
+ * 
+ * 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();
+
+	@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();
 	}	
 }