Allow java.lang.Hashtables to be passed into PHP as arrays.

2 files changed, 23 insertions, 0 deletions

diff --git a/ext/java/java.c b/ext/java/java.c
index e74d060bbe..9eb19ae91e 100644
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -730,6 +730,19 @@ JNIEXPORT jlong JNICALL Java_net_php_reflect_nextElement
   return (jlong)(long)result;
 }
 
+JNIEXPORT jlong JNICALL Java_net_php_reflect_hashUpdate
+  (JNIEnv *jenv, jclass self, jlong array, jbyteArray key)
+{
+  pval *result;
+  pval pkey;
+  pval *handle = (pval*)(long)array;
+  ALLOC_ZVAL(result);
+  Java_net_php_reflect_setResultFromString(jenv, self, (jlong)(long)&pkey, key);
+  zend_hash_update(handle->value.ht, pkey.value.str.val, pkey.value.str.len+1,
+    &result, sizeof(zval *), NULL);
+  return (jlong)(long)result;
+}
+
 JNIEXPORT void JNICALL Java_net_php_reflect_setException
   (JNIEnv *jenv, jclass self, jlong result, jbyteArray value)
 {
diff --git a/ext/java/reflect.java b/ext/java/reflect.java
index 4f1142c506..d5e9393dc2 100644
--- a/ext/java/reflect.java
+++ b/ext/java/reflect.java
@@ -45,6 +45,7 @@ public class reflect {
   private static native void setResultFromObject(long result, Object value);
   private static native void setResultFromArray(long result);
   private static native long nextElement(long array);
+  private static native long hashUpdate(long array, byte key[]);
   private static native void setException(long result, byte value[]);
   public  static native void setEnv();
 
@@ -81,6 +82,15 @@ public class reflect {
         setResult(nextElement(result), Array.get(value, i));
       }
 
+    } else if (value instanceof java.util.Hashtable) {
+
+      Hashtable ht = (Hashtable) value; 
+      setResultFromArray(result);
+      for (Enumeration e = ht.keys(); e.hasMoreElements(); ) {
+        Object key = e.nextElement();
+        setResult(hashUpdate(result, key.toString().getBytes()), ht.get(key));
+      }
+
     } else {
 
       setResultFromObject(result, value);