[BPe] Tratamento de eventos em contingência

bug#12843
dev:trevezani
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/BD/FlyWay/trunk@87764 d1611594-4594-4d17-8e1d-87c2c4800839
master
alberto 2018-12-07 20:36:44 +00:00
parent 91f5e2e6d2
commit 3fc1f116e9
1 changed files with 11 additions and 3 deletions

View File

@ -30,7 +30,7 @@ public class FlyWay {
private static final FlyWay INSTANCE = new FlyWay(); private static final FlyWay INSTANCE = new FlyWay();
final private static String TABELA_FLYWAY = "schema_version_cst"; final private static String TABELA_FLYWAY = "schema_version_cst";
final File JBOSS_DATA = new File(System.getProperty("jboss.server.data.dir")); final File JBOSS_DATA = getJBossDataDirectory();
private DataSource dataSource = null; private DataSource dataSource = null;
@ -43,11 +43,19 @@ public class FlyWay {
private FlyWay() { private FlyWay() {
} }
public static FlyWay getInstance() { public static FlyWay getInstance() {
return INSTANCE; return INSTANCE;
} }
private File getJBossDataDirectory() {
try {
return new File(System.getProperty("jboss.server.data.dir"));
} catch (Exception e) {
return null;
}
}
public void defineLocation(final String location) { public void defineLocation(final String location) {
this.location = location; this.location = location;
} }
@ -185,7 +193,7 @@ public class FlyWay {
try { try {
flyway.migrate(); flyway.migrate();
} catch (final Exception e) { } catch (final Exception e) {
if (errorCallback.getScriptError() != null) { if (errorCallback.getScriptError() != null && JBOSS_DATA != null) {
reexecute = true; reexecute = true;
log.error("[Flyway] Erro ao executar o script: " + errorCallback.getScriptError() + ". Este script sera desabilitado na tabela FLYWAY_SCRIPTS."); log.error("[Flyway] Erro ao executar o script: " + errorCallback.getScriptError() + ". Este script sera desabilitado na tabela FLYWAY_SCRIPTS.");