vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-26 07:34:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix if a file is deleted before text extraction is finished

Browse Source
This commit is contained in:
jendib 2016-03-24 00:41:31 +01:00
parent ef16561272
commit 274512a58e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/FileDao.java
View File

@ -155,10 +155,12 @@ public class FileDao {
* @param id File ID * @param id File ID
* @return File * @return File
*/ */
public File getById(String id) { public File getActiveById(String id) {
EntityManager em = ThreadLocalContext.get().getEntityManager(); EntityManager em = ThreadLocalContext.get().getEntityManager();
Query q = em.createQuery("select f from File f where f.id = :id and f.deleteDate is null");
q.setParameter("id", id);
try { try {
return em.find(File.class, id); return (File) q.getSingleResult();
} catch (NoResultException e) { } catch (NoResultException e) {
return null; return null;
} }

2
docs-core/src/main/java/com/sismics/docs/core/listener/async/FileCreatedAsyncListener.java
View File

@ -54,7 +54,7 @@ public class FileCreatedAsyncListener {
@Override @Override
public void run() { public void run() {
FileDao fileDao = new FileDao(); FileDao fileDao = new FileDao();
if (fileDao.getById(file.getId()) == null) { if (fileDao.getActiveById(file.getId()) == null) {
// The file has been deleted since the text extraction started, ignore the result // The file has been deleted since the text extraction started, ignore the result
return; return;
} }