From 0506bd259325d14a49c52a1e6eb6b49b6a99956f Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Tue, 22 Oct 2019 08:42:23 +0200
Subject: [PATCH] Fix: FolderNotEmptyException is thrown for no good reason

- JPA caches getFiles()
---
 .../filerepository/service/impl/RepositoryServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java b/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
index 5383da8..915066f 100644
--- a/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
+++ b/file-repository-core/src/main/java/org/genesys/filerepository/service/impl/RepositoryServiceImpl.java
@@ -1000,7 +1000,7 @@ public class RepositoryServiceImpl implements RepositoryService, InitializingBea
 
 		RepositoryFolder folder = folderRepository.findByPath(cPath.toString());
 		if (folder != null) {
-			if (folder.getChildren().size() > 0 || folder.getFiles().size() > 0) {
+			if (folder.getChildren().size() > 0 || repositoryFilePersistence.countByFolder(folder) > 0) {
 				throw new FolderNotEmptyException("Folder " + path.toString() + " is not empty.");
 			}
 
-- 
GitLab