From fe700fcd5e091440618b92dfe0a9455174ff79fe Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 11 Dec 2017 18:53:22 +0000
Subject: [PATCH] fixes bug #10294

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77214 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../EditarPricingEspecificoController.java     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
index 65435e698..60ab9b3d3 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
@@ -201,6 +201,9 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 	}
 	
 	public void onClick$btnNovoPricingAgencia(Event ev) throws InterruptedException {		
+		if(cmbPuntoVenta.getSelectedItem() == null){
+			return;
+		}
 		PricingEspecificoAgencia pricingAgencia  = new PricingEspecificoAgencia((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId());
 		
 		if (pricingEspecifico.getPricingEspecificoAgenciasList().contains(pricingAgencia)) {
@@ -240,6 +243,10 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 	}
 	
 	public void onClick$btnNovoPricingCanal(Event ev) throws InterruptedException {
+		
+		if(cmbPtovta.getSelectedItem() == null){
+			return;
+		}
 		PricingEspecificoCanalVendas pricingCanal  = new PricingEspecificoCanalVendas((TipoPuntoVenta)cmbPtovta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId());
 		
 		if (pricingEspecifico.getPricingEspecificoCanalVendasList().contains(pricingCanal)) {
@@ -439,15 +446,12 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 		fechaFin.getValue();
 		tarifaAbierto.getValue();
 
-		//pricingEspecifico.getPricingEspecificoOcupacionsList().clear();
+		List<PricingEspecificoOcupacion> pricingEspecificoOcupacionList = new ArrayList<PricingEspecificoOcupacion>();
 		for (Object o : pricingListEspOcupacion.getData()) {
-			PricingEspecificoOcupacion p = (PricingEspecificoOcupacion) o;
-//			pricingEspecifico.setPricingEspecificoOcupacionsList(new ArrayList<PricingEspecificoOcupacion>());
-			if(!pricingEspecifico.getPricingEspecificoOcupacionsList().contains(p)){
-				pricingEspecifico.getPricingEspecificoOcupacionsList().add(p);
-			}
-			
+			PricingEspecificoOcupacion p = (PricingEspecificoOcupacion) o;	
+			pricingEspecificoOcupacionList.add(p);	
 		}
+		pricingEspecifico.setPricingEspecificoOcupacionsList(pricingEspecificoOcupacionList);
 		
 		List<PricingEspecificoCanalVendas> pecv =  (List<PricingEspecificoCanalVendas>) pricingListEspCanal.getModel();
 		for (PricingEspecificoCanalVendas pricingEspecificoCanalVendas : pecv) {