Author: DavidK Date: 2010-02-27 20:55:04 +0100 (Sat, 27 Feb 2010) New Revision: 1929 Modified: trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLImpl.java trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml Log: deleting file slightly changed Modified: trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLImpl.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLImpl.java 2010-02-27 19:30:19 UTC (rev 1928) +++ trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLImpl.java 2010-02-27 19:55:04 UTC (rev 1929) @@ -518,6 +518,7 @@ // mark selected document in DB as disabled Session sess = InitSessionFactory.getInstance().getCurrentSession(); Transaction tx = HibUtils.startTx(sess); + boolean deletedFromFileSystem = false; try { Query q = sess.createQuery( @@ -558,15 +559,20 @@ String path = PropertyManager.getFileFolderPath() + File.separatorChar + companyId.toString() + File.separatorChar + file.getUniqName(); File todel = new File(path); - if (!todel.delete()) { - throw new Exception("File deleting failed- file couldn't be deleted from filesystem"); - } + if (todel.delete()) { + deletedFromFileSystem = true; + } else { + deletedFromFileSystem = false; + } tx.commit(); } catch (Exception e) { tx.rollback(); String message = CommonUtils.prepareErrorMessage(ERROR_FILE_DELETING, "fileId", fileId); throw new ExecuteException(message,e); } + if (!deletedFromFileSystem) { + throw new ExecuteException("File deleting failed- file couldn't be deleted from filesystem (was deleted from DB although):" + fileId); + } } @Override Modified: trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml =================================================================== --- trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml 2010-02-27 19:30:19 UTC (rev 1928) +++ trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml 2010-02-27 19:55:04 UTC (rev 1929) @@ -237,7 +237,7 @@ <a4j:commandButton id= "deleteButton" reRender="DeleteForm" - oncomplete="Richfaces.showModalPanel('DeleteDocument',{left:300, top:300})" + oncomplete="Richfaces.showModalPanel('DeleteDocument')" image="/images/icons/delete.gif"> <f:setPropertyActionListener value="#{file}" target="#{fileListComponentBean.selectedDocument}" /> </a4j:commandButton>