Skip to content
Merged
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ public Observable<Row> handleRequest(QueryRequest request, ExecutionContext exec

return executeQuery(sql.getKey(), sql.getValue());
} catch (Throwable t) {
String truncatedMessage = (t.getMessage() == null) ? null : t.getMessage().substring(0, 2048);
return Observable.error(new Throwable(truncatedMessage));
return Observable.error(new Throwable(truncateMessage(t.getMessage(), 2048)));
}
}

Expand Down Expand Up @@ -229,4 +228,12 @@ private Value getNullValueEquivalent(int columnType) {
return NULL_STRING_EQ_STRING_VALUE;
}
}

private String truncateMessage(String message, int length) {
if (message == null) {
return null;
} else {
return message.length() <= length ? message : message.substring(0, length);
}
}
}