From b556a5ff8f958db2ee4c99dbebe07192605f57d4 Mon Sep 17 00:00:00 2001
From: edgar <edgar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 22 Dec 2016 11:26:29 +0000
Subject: [PATCH] fixes bug #8206

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@63968 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/ConexionConfHibernateDAO.java      |  2 +-
 .../rjconsultores/ventaboletos/entidad/Conexion.java | 12 ++++++++----
 .../ventaboletos/service/ConexionService.java        |  2 ++
 .../service/impl/ConexionServiceImpl.java            |  9 +++++++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java
index d11e27302..25cd1a015 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionConfHibernateDAO.java
@@ -38,7 +38,7 @@ public class ConexionConfHibernateDAO extends GenericHibernateDAO<ConexionConf,
 
 		Criteria ctrl = c.createCriteria("conexionCtrl");
 		ctrl.add(Restrictions.eq("conexionctrlId", conexionCtrlId));
-
+		
 		return (ConexionConf) c.uniqueResult();
 	}
 
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Conexion.java b/src/com/rjconsultores/ventaboletos/entidad/Conexion.java
index 06a0aed95..1505a62f2 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Conexion.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Conexion.java
@@ -51,7 +51,7 @@ public class Conexion implements Serializable {
 	private Long conexionctrlId;
 	@Column(name = "CORRIDA_ID")
 	private Long corridaId;
-	
+
 	public Long getCorridaId() {
 		return corridaId;
 	}
@@ -128,10 +128,14 @@ public class Conexion implements Serializable {
 			return false;
 		}
 		Conexion other = (Conexion) object;
-		if ((this.conexionId == null && other.conexionId != null) || (this.conexionId != null && !this.conexionId.equals(other.conexionId))) {
-			return false;
+
+		if (this.conexionId == null && other.getConexionId() == null) {
+			return this.numgrupo == other.getNumgrupo()
+					&& this.getOrigenId() == other.getOrigenId()
+					&& this.getNumsecuencia() == other.getNumsecuencia()
+					&& this.getDestinoId() == other.destinoId;
 		}
-		return true;
+		return conexionId == other.getConexionId();
 	}
 
 	@Override
diff --git a/src/com/rjconsultores/ventaboletos/service/ConexionService.java b/src/com/rjconsultores/ventaboletos/service/ConexionService.java
index 2343b77d2..7753e9ec8 100644
--- a/src/com/rjconsultores/ventaboletos/service/ConexionService.java
+++ b/src/com/rjconsultores/ventaboletos/service/ConexionService.java
@@ -25,4 +25,6 @@ public interface ConexionService {
 
 	public List<ConexionVO> buscarConexionesValidas();
 	
+	public void borrar(List<Conexion> lsConexion);
+	
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java
index de41fda84..b18c33157 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConexionServiceImpl.java
@@ -69,4 +69,13 @@ public class ConexionServiceImpl implements ConexionService {
 
 		conexionDAO.actualizacion(conexion);
 	}
+
+	@Override
+	@Transactional
+	public void borrar(List<Conexion> lsConexion) {
+		for (Conexion conexion : lsConexion) {
+			borrar(conexion);
+		}
+
+	}
 }