X-Git-Url: http://nitlanguage.org?ds=sidebyside

diff --git a/src/compiler/java_compiler.nit b/src/compiler/java_compiler.nit
index 84b5a47..f871f61 100644
--- a/src/compiler/java_compiler.nit
+++ b/src/compiler/java_compiler.nit
@@ -526,8 +526,8 @@ class JavaCompilerVisitor
 				res.add(null_instance)
 				continue
 			end
-			if param.is_vararg and map.vararg_decl > 0 then
-				var vararg = exprs.sub(j, map.vararg_decl)
+			if param.is_vararg and args[i].vararg_decl > 0 then
+				var vararg = exprs.sub(j, args[i].vararg_decl)
 				var elttype = param.mtype
 				var arg = self.vararg_instance(mpropdef, recv, vararg, elttype)
 				res.add(arg)
@@ -1318,7 +1318,7 @@ redef class MClassType
 			return "double"
 		else if mclass.name == "Byte" then
 			return "byte"
-		else if mclass.name == "NativeString" then
+		else if mclass.name == "CString" then
 			return "String"
 		else if mclass.name == "NativeArray" then
 			return "Array"
@@ -1482,8 +1482,7 @@ end
 
 redef class AClassdef
 	private fun compile_to_java(v: JavaCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) do
-		if mpropdef == self.mfree_init then
-			assert mpropdef.mproperty.is_root_init
+		if mpropdef.mproperty.is_root_init then
 			if not mpropdef.is_intro then
 				v.supercall(mpropdef, arguments.first.mtype.as(MClassType), arguments)
 			end