This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 892651f6082c54070e82659be2c58dc9505b86e2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 18:40:29 2015 +0100 add new method to close persistence service --- .../java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 17 +++++++++++++++++ .../tutti/ui/swing/action/ExportAndCleanDbAction.java | 7 ++----- .../ifremer/tutti/ui/swing/action/ReimportDbAction.java | 3 +-- .../tutti/ui/swing/action/ReinstallDbAction.java | 4 +--- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index d23d363..85da5a4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -58,6 +58,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; import fr.ifremer.tutti.ui.swing.util.auth.LoginUI; +import fr.ifremer.tutti.util.Jdbcs; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; @@ -99,6 +100,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; +import java.sql.SQLException; import java.util.Date; import java.util.Locale; import java.util.Map; @@ -1178,4 +1180,19 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage } return result; } + + public void closePersistenceService() { + + setDbLoaded(false); + reloadPersistenceService(); + + try { + Jdbcs.shutdown(config); + } catch (SQLException e) { + if (log.isErrorEnabled()) { + log.error("Could not shutdown the database", e); + } + } + + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java index c04b320..0ce92c7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java @@ -96,11 +96,8 @@ public class ExportAndCleanDbAction extends AbstractMainUITuttiAction { // clear all caches getContext().getPersistenceService().clearAllCaches(); - // set to not reload a real db - getContext().setDbLoaded(false); - - // close services + repon a fake persistence service - getContext().reloadPersistenceService(); + // close current persistence service + getContext().closePersistenceService(); // clean db context getContext().clearDbContext(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java index f286037..a0989d5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java @@ -139,8 +139,7 @@ public class ReimportDbAction extends AbstractMainUITuttiAction { // close db progressionModel.increments(t("tutti.reimport.step.closeDb", jdbcUrl)); - getContext().setDbLoaded(false); - getContext().reloadPersistenceService(); + getContext().closePersistenceService(); // backup db progressionModel.increments(t("tutti.reimport.step.backupDb", backupFile)); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java index 244e23d..f981399 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java @@ -118,9 +118,7 @@ public class ReinstallDbAction extends AbstractMainUITuttiAction { // close db progressionModel.increments(t("tutti.reinstallDb.step.closeDb", jdbcUrl)); - - getContext().setDbLoaded(false); - getContext().reloadPersistenceService(); + getContext().closePersistenceService(); // backup db progressionModel.increments(t("tutti.reinstallDb.step.backupDb", backupFile)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.