From 8bb5d3a25ead9bca777cd216f1fb929da9295ed6 Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Fri, 12 Jan 2024 19:58:06 +1100 Subject: [PATCH] Fix Painless exception handling --- .../main/java/org/elasticsearch/painless/ErrorCauseWrapper.java | 2 +- .../src/main/java/org/elasticsearch/ElasticsearchException.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ErrorCauseWrapper.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/ErrorCauseWrapper.java index 308d6223c666e..c1e1012eb3381 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ErrorCauseWrapper.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/ErrorCauseWrapper.java @@ -36,7 +36,7 @@ private ErrorCauseWrapper(Throwable realCause) { this.realCause = realCause; } - public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { + protected XContentBuilder toXContent(XContentBuilder builder, Params params, int nestedLevel) throws IOException { builder.field("type", getExceptionName(realCause)); builder.field("reason", realCause.getMessage()); return builder; diff --git a/server/src/main/java/org/elasticsearch/ElasticsearchException.java b/server/src/main/java/org/elasticsearch/ElasticsearchException.java index dcbc3553c9fbb..0674bbc67505a 100644 --- a/server/src/main/java/org/elasticsearch/ElasticsearchException.java +++ b/server/src/main/java/org/elasticsearch/ElasticsearchException.java @@ -342,7 +342,7 @@ public static int getId(Class exception) { } @Override - public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { + public final XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { return toXContent(builder, params, 0); }