From: twisti Date: Tue, 29 Jun 2004 14:37:41 +0000 (+0000) Subject: Print detailMessage in builtin_throw_exception. X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=d244139027e2700d845a967f7994a39a304ef86f;p=cacao.git Print detailMessage in builtin_throw_exception. --- diff --git a/builtin.c b/builtin.c index be563019a..7416494cd 100644 --- a/builtin.c +++ b/builtin.c @@ -34,7 +34,7 @@ calls instead of machine instructions, using the C calling convention. - $Id: builtin.c 1194 2004-06-19 12:59:20Z twisti $ + $Id: builtin.c 1219 2004-06-29 14:37:41Z twisti $ */ @@ -268,9 +268,16 @@ java_objectheader *builtin_throw_exception(java_objectheader *local_exceptionptr char logtext[MAXLOGTEXT]; sprintf(logtext, "Builtin exception thrown: "); if (local_exceptionptr) { + java_lang_Throwable *t = (java_lang_Throwable *) local_exceptionptr; + utf_sprint_classname(logtext + strlen(logtext), local_exceptionptr->vftbl->class->name); + if (t->detailMessage) { + sprintf(logtext + strlen(logtext), ": %s", + javastring_tochar(t->detailMessage)); + } + } else { sprintf(logtext + strlen(logtext), "Error: "); } diff --git a/src/vm/builtin.c b/src/vm/builtin.c index be563019a..7416494cd 100644 --- a/src/vm/builtin.c +++ b/src/vm/builtin.c @@ -34,7 +34,7 @@ calls instead of machine instructions, using the C calling convention. - $Id: builtin.c 1194 2004-06-19 12:59:20Z twisti $ + $Id: builtin.c 1219 2004-06-29 14:37:41Z twisti $ */ @@ -268,9 +268,16 @@ java_objectheader *builtin_throw_exception(java_objectheader *local_exceptionptr char logtext[MAXLOGTEXT]; sprintf(logtext, "Builtin exception thrown: "); if (local_exceptionptr) { + java_lang_Throwable *t = (java_lang_Throwable *) local_exceptionptr; + utf_sprint_classname(logtext + strlen(logtext), local_exceptionptr->vftbl->class->name); + if (t->detailMessage) { + sprintf(logtext + strlen(logtext), ": %s", + javastring_tochar(t->detailMessage)); + } + } else { sprintf(logtext + strlen(logtext), "Error: "); }