Merge pull request #275 from dcanar9/master

Changed widget cleanup loop condition
hygieia · May 11, 2022 · ce4b6b9 · ce4b6b9
2 parents 434f545 + b864e6f
commit ce4b6b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>api</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>3.4.36</version>
+    <version>3.4.37</version>
     <description>Hygieia Rest API Layer</description>
     <url>https://github.com/Hygieia/api</url>
 

diff --git a/src/main/java/com/capitalone/dashboard/service/DashboardServiceImpl.java b/src/main/java/com/capitalone/dashboard/service/DashboardServiceImpl.java
@@ -1013,9 +1013,9 @@ public String removeWidgetDuplicatesHelper(String title, boolean dryRun){
             Pageable pageable = new PageRequest(0, settings.getBatchSize());
             Page<Dashboard> page = findDashboardsByPage("", pageable);
 
-            while(page.hasNext()){
-                pageable = pageable.next();
+            while(page.hasContent()){
                 removeWidgetDuplicates(page.getContent(), dryRun);
+                pageable = pageable.next();
                 page = findDashboardsByPage("", pageable);
             }
         }