From 1d0bdb1d4c3cc988fb6661edf83eff0e974bb5e0 Mon Sep 17 00:00:00 2001
From: alberto <alberto@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 28 Jun 2019 19:22:41 +0000
Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20cadastro=20sincronismo=20b?=
 =?UTF-8?q?ug#14740=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/AdmVenta/Model/trunk/modelWeb@95207 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
index 408b32a38..6653899b8 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
@@ -528,7 +528,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 			 * Não aplica tarifa minina quando configurado no tipo de passagem
 			 * Mantis #10704
 			 */
-			if (tarifaMinima == null || (categoriaDescuento.getIndnaoaplicatarifaminima() != null && categoriaDescuento.getIndnaoaplicatarifaminima())) {
+			if (tarifaMinima == null || (categoriaDescuento != null && categoriaDescuento.getIndnaoaplicatarifaminima() != null && categoriaDescuento.getIndnaoaplicatarifaminima())) {
 				tarifaMinima = BigDecimal.ZERO;
 			}