[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 9c670b06cb5b8feb7b0b9d09c317e1eab98c7fcb
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 22:10:27 2004 +0000

    	Fixed 3570854.  Don't attempt to convert Null to strings.  We
    	were incorrectly converting to "Null".
    
    	Actually fixed by Scott Kovatch.
    
            Reviewed by Richard.
    
            * bindings/jni/jni_utility.cpp:
            (KJS::Bindings::convertValueToJValue):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6228 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 37c203f..75585ee 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2004-03-15  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3570854.  Don't attempt to convert Null to strings.  We
+	were incorrectly converting to "Null".
+
+	Actually fixed by Scott Kovatch.
+
+        Reviewed by Richard.
+
+        * bindings/jni/jni_utility.cpp:
+        (KJS::Bindings::convertValueToJValue):
+
 === Safari-132 ===
 
 2004-03-11  Richard Williamson   <rjw at apple.com>
diff --git a/JavaScriptCore/bindings/jni/jni_utility.cpp b/JavaScriptCore/bindings/jni/jni_utility.cpp
index 56f234b..dc41e65 100644
--- a/JavaScriptCore/bindings/jni/jni_utility.cpp
+++ b/JavaScriptCore/bindings/jni/jni_utility.cpp
@@ -650,8 +650,9 @@ jvalue KJS::Bindings::convertValueToJValue (KJS::ExecState *exec, KJS::Value val
                 }
             }
             
-            // Now convert value to a string if the target type is a java.lang.string.
-            if (result.l == 0 && strcmp(javaClassName, "java.lang.String") == 0) {
+            // Now convert value to a string if the target type is a java.lang.string, and we're not
+            // converting from a Null.
+            if (result.l == 0 && strcmp(javaClassName, "java.lang.String") == 0 && value.type() != KJS::NullType) {
                 KJS::UString stringValue = value.toString(exec);
                 JNIEnv *env = getJNIEnv();
                 jobject javaString = env->functions->NewString (env, (const jchar *)stringValue.data(), stringValue.size());

-- 
WebKit Debian packaging