From da26842e1f7b8b0fe5abba7856154478943617aa Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 3 Aug 2016 18:08:43 +0000
Subject: [PATCH] fixed bug #7577

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@58676 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../tarifas/GenerarTarifaOrgaoController.java        | 12 ++++++++----
 .../db/migration/V20160801_1732__dropTarifaUnica.sql |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java
index 9ca16b9e8..1b0919d49 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java
@@ -139,6 +139,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
 	}
 
 	public void onClick$btnGenerarVigencia(Event ev) throws InterruptedException {
+		Boolean limparRutas = false;
 		cmbOrgaoConcedente.getValue();
 		cmbEmpresa.getValue();
 
@@ -151,6 +152,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
 		lsEmpresaSelected = Arrays.asList((Empresa) cmbEmpresa.getSelectedItem().getValue());
 
 		if (listSelectedRutas == null || listSelectedRutas.isEmpty()) {
+			limparRutas = true;
 			listSelectedRutas = lsRuta;
 		}
 
@@ -214,7 +216,9 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
 			}
 
 		}
-
+		if (limparRutas) {
+			listSelectedRutas.clear();
+		}
 	}
 
 	public List<Ruta> getListSelectedRutas() {
@@ -226,7 +230,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
 	}
 
 	public void onClick$btnAddRuta(Event ev) throws InterruptedException {
-		if(esperar){
+		if (esperar) {
 			cmbRuta.setSelectedItem(null);
 			return;
 		}
@@ -250,7 +254,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
 	public void onSelect$cmbEmpresa(Event ev) throws InterruptedException {
 		onSelectEmpresaOrgaoConcedente();
 	}
-	
+
 	public void onSelectEmpresaOrgaoConcedente() {
 		Constraint constraint = cmbEmpresa.getConstraint();
 		cmbEmpresa.setConstraint("");
@@ -259,7 +263,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
 		OrgaoConcedente orgaoSelected = cmbOrgaoConcedente.getSelectedItem() == null ? null : (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue();
 
 		esperar = true;
-		
+
 		lsRuta = rutaService.buscarRutasPorEmpresaOrgaoConcedente(empresaSelected, orgaoSelected);
 
 		int indexToRemove = 0;
diff --git a/src/java/db/migration/V20160801_1732__dropTarifaUnica.sql b/src/java/db/migration/V20160801_1732__dropTarifaUnica.sql
index a1f0b2f3c..c2567545b 100644
--- a/src/java/db/migration/V20160801_1732__dropTarifaUnica.sql
+++ b/src/java/db/migration/V20160801_1732__dropTarifaUnica.sql
@@ -20,9 +20,9 @@ DECLARE
 BEGIN
   SELECT COUNT(*) INTO COUNT_INDEXES
     FROM USER_INDEXES
-    WHERE INDEX_NAME = '"VTABOL"."TARIFA_UNICA"';
+    WHERE INDEX_NAME = 'TARIFA_UNICA';
 
   IF COUNT_INDEXES > 0 THEN
-    EXECUTE IMMEDIATE 'DROP INDEX "VTABOL"."TARIFA_UNICA"';
+    EXECUTE IMMEDIATE 'DROP INDEX TARIFA_UNICA';
   END IF;
 END;
\ No newline at end of file