X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=datafilecollector%2Fsrc%2Fmain%2Fjava%2Forg%2Foran%2Fdatafile%2Fhttp%2FDfcHttpClient.java;h=fd56ee9aa371e9f06bcc7992ecfebe48ffb892ea;hb=a93caaf7243d896161775d590f1ab322dd63ee16;hp=f9411551250740560f0b21fe0d507ea5d497dc9d;hpb=41a1c82b8b1b30644c85b90487f013ccc8ff7f92;p=nonrtric%2Fplt%2Franpm.git

diff --git a/datafilecollector/src/main/java/org/oran/datafile/http/DfcHttpClient.java b/datafilecollector/src/main/java/org/oran/datafile/http/DfcHttpClient.java
index f941155..fd56ee9 100644
--- a/datafilecollector/src/main/java/org/oran/datafile/http/DfcHttpClient.java
+++ b/datafilecollector/src/main/java/org/oran/datafile/http/DfcHttpClient.java
@@ -92,12 +92,13 @@ public class DfcHttpClient implements FileCollectClient {
         try {
             latch.await();
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new DatafileTaskException("Interrupted exception after datafile download - ", e);
         }
 
         if (isDownloadFailed(errorMessage)) {
-            if (errorMessage.get() instanceof NonRetryableDatafileTaskException) {
-                throw (NonRetryableDatafileTaskException) errorMessage.get();
+            if (errorMessage.get() instanceof NonRetryableDatafileTaskException nonRetryableException) {
+                throw nonRetryableException;
             }
             throw (DatafileTaskException) errorMessage.get();
         }