Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
h3110n3rv3 committed Feb 3, 2025
1 parent 5c3c9b6 commit a2e8718
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions runtime/rastrace/method_trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -532,11 +532,11 @@ traceMethodArgObject(J9VMThread *thr, UDATA* arg0EA, char* cursor, UDATA length)
&utf8Length);

if (NULL == utf8String) {
j9str_printf(PORTLIB, cursor, length, "(String)@%p - <Memory allocation error>", object);
j9str_printf(cursor, length, "(String)@%p - <Memory allocation error>", object);
} else if (utf8Length > maxStringLength) {
j9str_printf(PORTLIB, cursor, length, "(String)@%p - \"%.*s\"...", object, (U_32)maxStringLength, utf8String);
j9str_printf(cursor, length, "(String)@%p - \"%.*s\"...", object, (U_32)maxStringLength, utf8String);
} else {
j9str_printf(PORTLIB, cursor, length, "(String)@%p - \"%.*s\"", object, (U_32)utf8Length, utf8String);
j9str_printf(cursor, length, "(String)@%p - \"%.*s\"", object, (U_32)utf8Length, utf8String);
}

if (utf8Buffer != utf8String) {
Expand Down

0 comments on commit a2e8718

Please sign in to comment.