From: Jonathan Rouzaud-Cornabas <jonathan.rouzaud-cornabas@ens-lyon.fr>
Date: Thu, 17 Jan 2013 10:29:37 +0000 (+0100)
Subject: Merge branch 'vmtrace'
X-Git-Tag: v3_9_90~569^2~19^2~8
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/410c20fdb9b68068548b9f4686eae70898a2b0ba

Merge branch 'vmtrace'
---

410c20fdb9b68068548b9f4686eae70898a2b0ba
diff --cc org/simgrid/msg/Task.java
index a81e8fcaef,e5e5fbf543..59c103bcee
--- a/org/simgrid/msg/Task.java
+++ b/org/simgrid/msg/Task.java
@@@ -277,7 -289,18 +289,19 @@@ public class Task 
  	 */
  	public static native void nativeInit();
  	static {
 +		Msg.nativeInit();
  		nativeInit();
  	}
+ 
+ 	public double getMessageSize() {
+ 		return this.messageSize;
+ 	}
+ 
+ 	public Long getId() {
+ 		return id;
+ 	}
+ 
+ 	public void setId(Long id) {
+ 		this.id = id;
+ 	}
  }