am b575e4df: Merge change I4a943184 into eclair

Merge commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe' into eclair-mr2

* commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe':
  Avoid trying to throw multiple exceptions at once.
This commit is contained in:
Jack Palevich
2009-10-29 19:28:38 -07:00
committed by Android Git Automerger

View File

@@ -367,10 +367,12 @@ static int get_char(JNIEnv* env, const jchar *s, int spos, int mul,
if (c >= '0' && c <= '9') { if (c >= '0' && c <= '9') {
return (c - '0') * mul; return (c - '0') * mul;
} else { } else {
char msg[100]; if (!*thrown) {
sprintf(msg, "Parse error at pos=%d", spos); char msg[100];
jniThrowException(env, "android/util/TimeFormatException", msg); sprintf(msg, "Parse error at pos=%d", spos);
*thrown = true; jniThrowException(env, "android/util/TimeFormatException", msg);
*thrown = true;
}
return 0; return 0;
} }
} }