Skip to content

Commit 7fc4fb0

Browse files
committedMar 21, 2024
Always return a task description even when it cannot be serialized.
Signed-off-by: dblock <dblock@amazon.com>
1 parent 53c0ce3 commit 7fc4fb0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed
 

‎server/src/main/java/org/opensearch/action/search/SearchTask.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ public SearchTask(
8080

8181
@Override
8282
public final String getDescription() {
83-
return descriptionSupplier.get();
83+
try {
84+
return descriptionSupplier.get();
85+
} catch(UnsupportedOperationException e) {
86+
return e.getMessage();
87+
}
8488
}
8589

8690
@Override

‎server/src/test/java/org/opensearch/search/geo/GeoPointShapeQueryTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ public void testQueryLinearRing() throws Exception {
143143
e.getCause().getMessage(),
144144
containsString("Field [" + defaultGeoFieldName + "] does not support LINEARRING queries")
145145
);
146-
} catch (UnsupportedOperationException e) {
147-
assertThat(e.getMessage(), containsString("line ring cannot be serialized using GeoJson"));
148146
}
149147
}
150148

0 commit comments

Comments
 (0)