diff --git a/src/com/rjconsultores/ventaboletos/FlyWay.java b/src/com/rjconsultores/ventaboletos/FlyWay.java index 3308d80f9..30dd3870a 100644 --- a/src/com/rjconsultores/ventaboletos/FlyWay.java +++ b/src/com/rjconsultores/ventaboletos/FlyWay.java @@ -30,7 +30,7 @@ public class FlyWay { private static final FlyWay INSTANCE = new FlyWay(); 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; @@ -43,11 +43,19 @@ public class FlyWay { private FlyWay() { } - + public static FlyWay getInstance() { 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) { this.location = location; } @@ -185,7 +193,7 @@ public class FlyWay { try { flyway.migrate(); } catch (final Exception e) { - if (errorCallback.getScriptError() != null) { + if (errorCallback.getScriptError() != null && JBOSS_DATA != null) { reexecute = true; log.error("[Flyway] Erro ao executar o script: " + errorCallback.getScriptError() + ". Este script sera desabilitado na tabela FLYWAY_SCRIPTS.");