fix: prevent memory leak (#189)

resolves #188
jeremylong · Jul 9, 2024 · 4f66082 · 4f66082
1 parent 2cb06fd
commit 4f66082
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...clients/src/main/java/io/github/jeremylong/openvulnerability/client/nvd/NvdCveClient.java b/...clients/src/main/java/io/github/jeremylong/openvulnerability/client/nvd/NvdCveClient.java
@@ -326,6 +326,14 @@ public boolean hasNext() {
      */
     @Override
     public Collection<DefCveItem> next() {
+        return _next(0);
+    }
+
+    private Collection<DefCveItem> _next(int retryCount) {
+        if (retryCount > 5) {
+            throw new NvdApiRetryExceededException(
+                    "NVD Update Failed: attempted to retrieve data from the NVD unsuccessfully five times.");
+        }
         if (firstCall) {
             futures.add(callApi(0, 0));
         }
@@ -335,7 +343,7 @@ public Collection<DefCveItem> next() {
             call = getCompletedFuture();
             if (call == null) {
                 if (hasNext()) {
-                    return next();
+                    return _next(retryCount + 1);
                 }
             } else {
                 SimpleHttpResponse response = call.getResponse();
@@ -354,7 +362,7 @@ public Collection<DefCveItem> next() {
                     } catch (JsonProcessingException e) {
                         LOG.debug("Error processing NVD data", e);
                         // Re-try on what might be temporarily streaming errors
-                        return next();
+                        return _next(retryCount + 1);
                     }
                     this.totalAvailable = current.getTotalResults();
                     lastUpdated = findLastUpdated(lastUpdated, current.getVulnerabilities());
@@ -381,7 +389,7 @@ public Collection<DefCveItem> next() {
             // in rare cases we get an error from the NVD - log the error and only fail if we retry too many times
             LOG.debug("Error retrieving the NVD data", e);
             if (hasNext()) {
-                return next();
+                return _next(retryCount + 1);
             }
             close();
         }