Harvester / CSW / Infinite loop #1355.

geonetwork · Dec 15, 2015 · 92f8a77 · 92f8a77 · etj · Jan 15, 2016
1 parent e121742
commit 92f8a77
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/Harvester.java
@@ -305,8 +305,12 @@ private Set<RecordInfo> search(CswServer server, Search s) throws Exception {
                 log.warning("Declared number of returned records (" + returnedCount + ") does not match actual record count (" + foundCnt + ")");
             }
 
+
             // As indicated in CSW: A value of 0 means all records have been returned.
-            if (nextRecord == 0) {
+            // And in case the CSW does not advertised the correct nextRecord
+            // check that we do not try to go over the last page.
+            if (nextRecord == 0 ||
+                start + GETRECORDS_REQUEST_MAXRECORDS > matchedCount) {
                 break;
             }