Fix for exception self-suppression in Rest client (#83568) (#84580)

swallez · Fuud · philkra · web-flow · commit 55b212cc40dd · 2022-03-02T13:22:41.000-05:00
Co-authored-by: Philip Krauss &lt;35487337+philkra@users.noreply.github.com&gt;

Co-authored-by: Fedor Bobin &lt;fuudtorrentsru@gmail.com&gt;
Co-authored-by: Philip Krauss &lt;35487337+philkra@users.noreply.github.com&gt;
diff --git a/client/rest/src/main/java/org/elasticsearch/client/RestClient.java b/client/rest/src/main/java/org/elasticsearch/client/RestClient.java
@@ -574,7 +574,7 @@ private static boolean isRetryStatus(int statusCode) {
     }
 
     private static void addSuppressedException(Exception suppressedException, Exception currentException) {
-        if (suppressedException != null) {
+        if (suppressedException != null && suppressedException != currentException) {
             currentException.addSuppressed(suppressedException);
         }
     }
diff --git a/docs/changelog/83568.yaml b/docs/changelog/83568.yaml
@@ -0,0 +1,6 @@
+pr: 83568
+summary: Fix for self-suppression in rest client
+area: Client
+type: bug
+issues:
+ - 42223

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ private static boolean isRetryStatus(int statusCode) {`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`private static void addSuppressedException(Exception suppressedException, Exception currentException) {`
`577`		`- if (suppressedException != null) {`
	`577`	`+ if (suppressedException != null && suppressedException != currentException) {`
`578`	`578`	`currentException.addSuppressed(suppressedException);`
`579`	`579`	`}`
`580`	`580`	`}`