[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit a7720dfde80f9d5e366cccc13f01aa61942ebd57
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 1 23:11:22 2003 +0000

    	Fixed mistake in method signatures used to get boolean and integer fields.
    
            Reviewed by Chris.
    
            * bindings/jni/jni_runtime.cpp:
            (JavaField::valueFromInstance):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5644 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 865215b..37b100e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,14 @@
 2003-12-01  Richard Williamson   <rjw at apple.com>
 
+	Fixed mistake in method signatures used to get boolean and integer fields.
+
+        Reviewed by Chris.
+
+        * bindings/jni/jni_runtime.cpp:
+        (JavaField::valueFromInstance):
+
+2003-12-01  Richard Williamson   <rjw at apple.com>
+
 Fixed parameter passing to applet.  Child elements are NOT valid in setStyle().  So we now create the widget before needed with createWidgetIfNecessary.  This either happens when doing the first layout, or when JavaScript first references the applet element.
 
 Fixed early delete of the the main applet instance.  When the JS collector cleaned up the last JS object referring to the applet instance we were deleting the java instance.  This caused the applet instance cached on the applet element to be invalid.  The applet instance is the only Java object not to be cleaned up by the JS collector.
diff --git a/JavaScriptCore/bindings/jni/jni_runtime.cpp b/JavaScriptCore/bindings/jni/jni_runtime.cpp
index 637e966..e0e36df 100644
--- a/JavaScriptCore/bindings/jni/jni_runtime.cpp
+++ b/JavaScriptCore/bindings/jni/jni_runtime.cpp
@@ -63,7 +63,7 @@ KJS::Value JavaField::valueFromInstance(const Instance *i) const
         break;
             
         case boolean_type: {
-            jboolean value = callJNIBooleanMethod(fieldJInstance, "getBoolean", "(Ljava/lang/Object;)B", jinstance);
+            jboolean value = callJNIBooleanMethod(fieldJInstance, "getBoolean", "(Ljava/lang/Object;)Z", jinstance);
             return KJS::Boolean((bool)value);
         }
         break;
@@ -74,7 +74,7 @@ KJS::Value JavaField::valueFromInstance(const Instance *i) const
         
         case int_type:
             jint value;
-            value = callJNIIntMethod(fieldJInstance, "getInt", "(Ljava/lang/Object;)D", jinstance);
+            value = callJNIIntMethod(fieldJInstance, "getInt", "(Ljava/lang/Object;)I", jinstance);
             return Number((int)value);
 
         case long_type:

-- 
WebKit Debian packaging