Fixed test errors

Signed-off-by: Krishna Kondaka <[email protected]>
opensearch-project · Aug 23, 2024 · 0c2a2d2 · 0c2a2d2
1 parent 0740967
commit 0c2a2d2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...h/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java b/...h/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkRetryStrategy.java
@@ -141,7 +141,7 @@ BulkResponse getResponse() {
             return response;
         }
         String getExceptionMessage() {
-            return exception.getMessage();
+            return exception != null ? exception.getMessage() : "-";
         }
     }
 
@@ -199,14 +199,15 @@ public void execute(final AccumulatingBulkRequest bulkRequest) throws Interrupte
         final Backoff backoff = Backoff.exponential(INITIAL_DELAY_MS, MAXIMUM_DELAY_MS).withMaxAttempts(maxRetries);
         BulkOperationRequestResponse operationResponse;
         BulkResponse response = null;
-        String exceptionMessage = "";
         AccumulatingBulkRequest request = bulkRequest;
         int attempt = 1;
         do {
             operationResponse = handleRetry(request, response, attempt);
             if (operationResponse != null) {
                 final long delayMillis = backoff.nextDelayMillis(attempt++);
+                String exceptionMessage = "";
                 request = operationResponse.getBulkRequest();
+                response = operationResponse.getResponse();
                 exceptionMessage = operationResponse.getExceptionMessage();
                 if (delayMillis < 0) {
                     RuntimeException e = new RuntimeException(String.format("Number of retries reached the limit of max retries (configured value %d. Last exception message: %s)", maxRetries, exceptionMessage));