From 59362a082beeb32140f1090259476022fae3567a Mon Sep 17 00:00:00 2001
From: "thiago.clemente" <thiago.clemente@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 14 Oct 2019 15:48:02 +0000
Subject: [PATCH] fixes bug#16425 dev: qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@98233 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../web/gui/controladores/tarifas/CalcularPeajeController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java
index 21019db74..a800dee3a 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java
@@ -235,7 +235,8 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
 	
 	private void adicionaNaListaOrgaoConcedente(Integer orgaoConcedenteId) {
 		OrgaoConcedente concedente = orgaoConcedenteService.obtenerID(orgaoConcedenteId);
-		if( concedente.getActivo() ) {
+		// Mantis 16425 - NullPointerException
+		if (concedente != null && concedente.getActivo()) {
 			lsOrgaoConcedente.add(concedente);
 		}
 	}