Browse Source

fix delete all condition

Shinsuke Sugaya 9 years ago
parent
commit
82fa93efb0
1 changed files with 12 additions and 10 deletions
  1. 12 10
      src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java

+ 12 - 10
src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java

@@ -217,24 +217,26 @@ public class CrawlingInfoService implements Serializable {
                     cb.specify().columnId();
                 });
         final List<String> idList = activeSessionList.stream().map(session -> session.getId()).collect(Collectors.toList());
-        if (!idList.isEmpty()) {
-            crawlingInfoParamBhv.queryDelete(cb1 -> {
-                cb1.query().filtered((cq, cf) -> {
-                    cq.matchAll();
+        crawlingInfoParamBhv.queryDelete(cb1 -> {
+            cb1.query().filtered((cq, cf) -> {
+                cq.matchAll();
+                if (!idList.isEmpty()) {
                     cf.not(subCf -> {
                         subCf.setCrawlingInfoId_InScope(idList);
                     });
-                });
+                }
             });
-            crawlingInfoBhv.queryDelete(cb2 -> {
-                cb2.query().filtered((cq, cf) -> {
-                    cq.matchAll();
+        });
+        crawlingInfoBhv.queryDelete(cb2 -> {
+            cb2.query().filtered((cq, cf) -> {
+                cq.matchAll();
+                if (!idList.isEmpty()) {
                     cf.not(subCf -> {
                         subCf.setId_InScope(idList);
                     });
-                });
+                }
             });
-        }
+        });
     }
 
     public void importCsv(final Reader reader) {