Merge change I4a943184 into eclair

* changes: Avoid trying to throw multiple exceptions at once.
2009-10-29 13:02:53 -04:00
parent 22dad5928d 4a94318454
commit b575e4dffe
1 changed files with 6 additions and 4 deletions
--- a/core/jni/android_text_format_Time.cpp
+++ b/core/jni/android_text_format_Time.cpp
@@ -367,10 +367,12 @@ static int get_char(JNIEnv* env, const jchar *s, int spos, int mul,
    if (c >= '0' && c <= '9') {
        return (c - '0') * mul;
    } else {
-        char msg[100];
-        sprintf(msg, "Parse error at pos=%d", spos);
-        jniThrowException(env, "android/util/TimeFormatException", msg);
-        *thrown = true;
+        if (!*thrown) {
+            char msg[100];
+            sprintf(msg, "Parse error at pos=%d", spos);
+            jniThrowException(env, "android/util/TimeFormatException", msg);
+            *thrown = true;
+        }
        return 0;
    }
 }