diff options
Diffstat (limited to 'tools/gnu/classpath/tools/javah/JniHelper.java')
| -rw-r--r-- | tools/gnu/classpath/tools/javah/JniHelper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/gnu/classpath/tools/javah/JniHelper.java b/tools/gnu/classpath/tools/javah/JniHelper.java index 3104cea5a..7c508997e 100644 --- a/tools/gnu/classpath/tools/javah/JniHelper.java +++ b/tools/gnu/classpath/tools/javah/JniHelper.java @@ -69,12 +69,12 @@ public class JniHelper { Type elt = type.getElementType(); int eltSort = elt.getSort(); - if (eltSort != Type.OBJECT && eltSort != Type.ARRAY) + if (type.getDimensions() == 1 && eltSort != Type.OBJECT) return getName(classpath, elt) + "Array"; - return "jarray"; + return "jobjectArray"; } - assert type.getSort() == Type.OBJECT; + // assert type.getSort() == Type.OBJECT; String className = type.getClassName(); // FIXME: is this correct? if (className.equals("java/lang/Class") |