This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 580ed6a75d6268391b280145aba464ff45a44bb1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 16:56:19 2015 +0200 Ajout de plus de log pour voir essayer de voir comment sont fermées les data source --- .../fr/ird/observe/db/ObserveSwingDataSource.java | 4 +++- .../services/service/DataSourceServiceTopia.java | 28 +++++++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index f3d808f..11b50ce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -33,6 +33,7 @@ import org.nuiton.util.version.Version; import javax.swing.JOptionPane; import javax.swing.event.EventListenerList; +import java.io.Closeable; import java.io.File; import java.util.Locale; import java.util.Set; @@ -42,7 +43,7 @@ import static org.nuiton.i18n.I18n.t; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ObserveSwingDataSource extends AbstractSerializableBean { +public class ObserveSwingDataSource extends AbstractSerializableBean implements Closeable { private static final long serialVersionUID = 1L; @@ -139,6 +140,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { fireOpened(); } + @Override public void close() { Preconditions.checkState(isOpen(), "Connection is not open"); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index 8dcd761..4fbe103 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -99,13 +99,13 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS // On tente une connection à la base ObserveTopiaConfiguration topiaConfiguration = ObserveTopiaConfigurationFactory.forH2Database(h2DataSourceConfiguration.getDirectory(), - h2DataSourceConfiguration.getDbName(), - h2DataSourceConfiguration.getUsername(), - new String(h2DataSourceConfiguration.getPassword()), - false, - false, - false, - false); + h2DataSourceConfiguration.getDbName(), + h2DataSourceConfiguration.getUsername(), + new String(h2DataSourceConfiguration.getPassword()), + false, + false, + false, + false); try { @@ -287,7 +287,13 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS Optional<ObserveTopiaApplicationContext> optionalTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getTopiaApplicationContextIfPresent(dataSourceConfiguration); if (optionalTopiaApplicationContext.isPresent()) { - optionalTopiaApplicationContext.get().close(); + + ObserveTopiaApplicationContext topiaApplicationContext = optionalTopiaApplicationContext.get(); + if (log.isInfoEnabled()) { + log.info("Closing topia application context: " + dataSourceConfiguration); + } + topiaApplicationContext.close(); + } } @@ -456,9 +462,9 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS if (log.isDebugEnabled()) { log.debug("User can read refererential : " + readReferential + ", " + - "write referential : " + writeReferential + ", " + - "read data : " + readData + ", " + - "write data : " + writeData + "."); + "write referential : " + writeReferential + ", " + + "read data : " + readData + ", " + + "write data : " + writeData + "."); } ObserveDataSourceInformation information = new ObserveDataSourceInformation( -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.