support char arrays

joeferner · Jan 28, 2013 · 2080cab · 2080cab
1 parent 50d89a8
commit 2080cab
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 0 deletions.
diff --git a/src-java/node/NodeDynamicProxyClass.class b/src-java/node/NodeDynamicProxyClass.class
diff --git a/src/java.cpp b/src/java.cpp
@@ -470,6 +470,19 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     }
   }
 
+  else if(strcmp(className.c_str(), "char") == 0) {
+    results = env->NewCharArray(arrayObj->Length());
+    for(uint32_t i=0; i<arrayObj->Length(); i++) {
+      v8::Local<v8::Value> item = arrayObj->Get(i);
+      jobject val = v8ToJava(env, item);
+      jclass stringClazz = env->FindClass("java/lang/String");
+      jmethodID string_charAt = env->GetMethodID(stringClazz, "charAt", "(I)C");
+      jchar itemValues[1];
+      itemValues[0] = env->CallCharMethod(val, string_charAt, 0);
+      env->SetCharArrayRegion((jcharArray)results, i, 1, itemValues);
+    }
+  }
+
   else
   {
     jclass clazz = javaFindClass(env, className);

diff --git a/test/Test$SubClass.class b/test/Test$SubClass.class
diff --git a/test/Test$SuperClass.class b/test/Test$SuperClass.class
diff --git a/test/Test.class b/test/Test.class
diff --git a/test/Test.java b/test/Test.java
@@ -24,6 +24,8 @@ public Test() {}
   public static int staticMethodOverload(int a) { return 2; }
   public static int staticMethodOverload(SuperClass a) { return a.getVal(); }
 
+  public static String staticMethodCharArrayToString(char[] a) { return new String(a); }
+
   public static class SuperClass {
     public int getVal() { return 3; }
   }

diff --git a/test/java-callStaticMethod-test.js b/test/java-callStaticMethod-test.js
@@ -127,5 +127,14 @@ exports['Java - Call Static Method'] = nodeunit.testCase({
       test.ok(err.toString().match(/my exception/));
     }
     test.done();
+  },
+
+  "char array": function(test) {
+    var charArray = java.newArray("char", "hello world\n".split(''));
+    java.callStaticMethod("Test", "staticMethodCharArrayToString", charArray, function(err, result) {
+      test.ok(result);
+      test.equal(result, "hello world\n");
+      test.done();
+    });
   }
 });