Skip to content

XWIKI-24060: A badly parsed logged TransactionException can break the… #5377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucaa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

XWIKI-24060: A badly parsed logged TransactionException can break the… #5377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions .../xwiki-platform-store-transaction/src/main/java/org/xwiki/store/TransactionException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public TransactionException(final String message,
@Override
public synchronized Throwable getCause()
{
return this.causes.isEmpty() ? super.getCause() : this.causes.get(0);
return (this.causes == null || this.causes.isEmpty()) ? super.getCause() : this.causes.get(0);
}

/**
Expand Down Expand Up @@ -208,20 +208,22 @@ private void printInfo(final PrintWriter writeTo, final boolean includeStackTrac
}
writeTo.println("Caused by:");

for (Throwable cause : causes) {

writeTo.println(cause.getClass().getName());
writeTo.print(TAB);
writeTo.print(("" + cause.getMessage()).replaceAll(NEWLINE, NEWLINE + TAB));
writeTo.print(NEWLINE);

if (includeStackTrace) {
// Include the stack trace tabbed in for each so they are recognizable as different.
// TODO End the stack trace at the frame which caused the TransactionException to throw.
final Writer stw = new StringWriter();
final PrintWriter stpw = new PrintWriter(stw);
cause.printStackTrace(stpw);
writeTo.print(stw.toString().replaceAll(NEWLINE, NEWLINE + TAB));
if (causes != null) {
for (Throwable cause : causes) {

writeTo.println(cause.getClass().getName());
writeTo.print(TAB);
writeTo.print(("" + cause.getMessage()).replaceAll(NEWLINE, NEWLINE + TAB));
writeTo.print(NEWLINE);

if (includeStackTrace) {
// Include the stack trace tabbed in for each so they are recognizable as different.
// TODO End the stack trace at the frame which caused the TransactionException to throw.
final Writer stw = new StringWriter();
final PrintWriter stpw = new PrintWriter(stw);
cause.printStackTrace(stpw);
writeTo.print(stw.toString().replaceAll(NEWLINE, NEWLINE + TAB));
}
}
}
if (includeStackTrace) {
Expand Down