From 3fc1f116e9b81767e5644a80a458edf672c76a66 Mon Sep 17 00:00:00 2001
From: alberto <alberto@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 7 Dec 2018 20:36:44 +0000
Subject: [PATCH] =?UTF-8?q?[BPe]=20Tratamento=20de=20eventos=20em=20contin?=
 =?UTF-8?q?g=C3=AAncia=20bug#12843=20dev:trevezani=20qua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/BD/FlyWay/trunk@87764 d1611594-4594-4d17-8e1d-87c2c4800839
---
 src/com/rjconsultores/ventaboletos/FlyWay.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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.");