Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 221f6c43 by Tony CHEMIT at 2017-03-20T10:52:21+01:00 [Report from 5.x] Message d'erreur à chaque fermeture de l'application (See #747) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java @@ -51,24 +51,22 @@ public class AtCloseApplicationLocalDatabaseBackupTask extends LocalDatabaseBack return; } - boolean mustClose = false; ObserveSwingDataSource mainDataSource = applicationContext.getDataSourcesManager().getMainDataSource(); - if (mainDataSource == null || !mainDataSource.isLocal()) { - - mainDataSource = applicationContext.getDataSourcesManager().newLocalDatasource(applicationContext.getConfig()); - mustClose = true; + if (mainDataSource == null) { + if (log.isInfoEnabled()) { + log.info("Skip, no database open."); + } + return; } - - try { - File file = doBackup(applicationContext, mainDataSource); - applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); - } finally { - - if (mustClose) { - mainDataSource.close(); + if (!mainDataSource.isLocal()) { + if (log.isInfoEnabled()) { + log.info("Skip, open database is not local."); } + return; } + File file = doBackup(applicationContext, mainDataSource); + applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/221f6c4355d5d5f856df1a37a1fc...