Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

1 changed file:

Changes:

  • application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java
    ... ... @@ -51,24 +51,22 @@ public class AtCloseApplicationLocalDatabaseBackupTask extends LocalDatabaseBack
    51 51 
                 return;
    52 52 
             }
    53 53
    54 
    -        boolean mustClose = false;
    55 54 
             ObserveSwingDataSource mainDataSource = applicationContext.getDataSourcesManager().getMainDataSource();
    56 
    -        if (mainDataSource == null || !mainDataSource.isLocal()) {
    57 
    -
    58 
    -            mainDataSource = applicationContext.getDataSourcesManager().newLocalDatasource(applicationContext.getConfig());
    59 
    -            mustClose = true;
    55 
    +        if (mainDataSource == null) {
    56 
    +            if (log.isInfoEnabled()) {
    57 
    +                log.info("Skip, no database open.");
    58 
    +            }
    59 
    +            return;
    60 60 
             }
    61 
    -
    62 
    -        try {
    63 
    -            File file = doBackup(applicationContext, mainDataSource);
    64 
    -            applicationContext.getBackupsManager().addAutomaticBackup(file.toPath());
    65 
    -        } finally {
    66 
    -
    67 
    -            if (mustClose) {
    68 
    -                mainDataSource.close();
    61 
    +        if (!mainDataSource.isLocal()) {
    62 
    +            if (log.isInfoEnabled()) {
    63 
    +                log.info("Skip, open database is not local.");
    69 64 
                 }
    65 
    +            return;
    70 66 
             }
    71 67
    68 
    +        File file = doBackup(applicationContext, mainDataSource);
    69 
    +        applicationContext.getBackupsManager().addAutomaticBackup(file.toPath());
    72 70
    73 71 
         }
    74 72

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.