Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 68463971 by Tony CHEMIT at 2017-06-13T11:17:01-04:00 Essaie de correction des problèmes de timezone (see #769) - - - - - 2 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java - entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java @@ -21,11 +21,11 @@ */ package fr.ird.observe.application.swing; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.util.Arrays; import java.util.Date; +import java.util.TimeZone; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n.n; @@ -52,6 +52,22 @@ public class RunObserve extends ObserveRunner { public static void main(String... args) { + String property = System.getProperty("user.timezone"); + System.setProperty("user.timezone", "UTC"); + TimeZone timeZone = TimeZone.getDefault(); + TimeZone.setDefault(null); + + try { + Class.forName("org.h2.Driver"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } finally { + + if (property != null) { + System.setProperty("user.timezone", property); + } + TimeZone.setDefault(timeZone); + } log.info("ObServe client launch at " + new Date() + " args: " + Arrays.toString(args)); new RunObserve(args).launch(); ===================================== entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java ===================================== --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java @@ -47,7 +47,7 @@ public class ObserveTopiaConfiguration extends BeanTopiaConfiguration { hibernateExtraConfiguration.put("hibernate.hikari.maximumPoolSize", "10"); hibernateExtraConfiguration.put("hibernate.hikari.autoCommit", "false"); hibernateExtraConfiguration.put("hibernate.hikari.registerMbeans", "true"); - hibernateExtraConfiguration.put("hibernate.jdbc.time_zone", "UTC"); +// hibernateExtraConfiguration.put("hibernate.jdbc.time_zone", "UTC"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.CONNECTION_PROVIDER, "org.hibernate.c3p0.internal.C3P0ConnectionProvider"); // hibernateExtraConfiguration.put(HibernateAvailableSettings.C3P0_MAX_SIZE, "500"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/68463971a5e4ed99e617c7a6223c... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/68463971a5e4ed99e617c7a6223c... You're receiving this email because of your account on gitlab.com.