From 93c753a61d05faef9f7d20a2eedf77f99a448ebb Mon Sep 17 00:00:00 2001 From: valdevir Date: Thu, 20 Oct 2022 16:56:07 +0000 Subject: [PATCH] fixes bug#AL-1583 qua: dev:Valdir git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/BD/FlyWay/trunk@114872 d1611594-4594-4d17-8e1d-87c2c4800839 --- src/com/rjconsultores/ventaboletos/FlyWay.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/FlyWay.java b/src/com/rjconsultores/ventaboletos/FlyWay.java index 2d8213527..e40929455 100644 --- a/src/com/rjconsultores/ventaboletos/FlyWay.java +++ b/src/com/rjconsultores/ventaboletos/FlyWay.java @@ -18,6 +18,7 @@ import java.util.Map; import javax.sql.DataSource; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.callback.FlywayCallback; @@ -31,6 +32,7 @@ public class FlyWay { final private static String TABELA_FLYWAY = "schema_version_cst"; final private static String AMBIENTE_DEV = "dev"; + final private static String AMBIENTE_CONSULTA = "consulta"; final File JBOSS_DATA = getJBossDataDirectory(); private DataSource dataSource = null; @@ -164,8 +166,8 @@ public class FlyWay { dataSource = flyway.getDataSource(); } - String ambiente = System.getProperty("ambiente"); - if(!AMBIENTE_DEV.equals(ambiente) || Boolean.TRUE.equals(isReloadFlyway)) { + String ambiente = StringUtils.isBlank(System.getProperty("ambiente")) ? "" : System.getProperty("ambiente"); + if(!AMBIENTE_DEV.equals(ambiente.toLowerCase()) || !AMBIENTE_CONSULTA.equals(ambiente.toLowerCase()) || Boolean.TRUE.equals(isReloadFlyway)) { execute(flyway); log.info("Flyway executado."); }else {