From b2caceab1d192e8e280eabaf84ed1c7b29fc8f28 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 25 Feb 2016 13:11:18 +0000 Subject: [PATCH] fixes bug #7163 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@53257 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 9 ++++ .../service/impl/CorridaServiceImpl.java | 52 +++++++++---------- .../service/impl/FiscalServiceImpl.java | 4 ++ 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 670f67753..56377ab42 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -181,6 +181,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO impl listManuais.add(item); } + if (!getConexao().isClosed()) + getConexao().close(); + return listManuais; } @@ -284,6 +287,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO impl listRedZ.add(item); } + if (!getConexao().isClosed()) + getConexao().close(); + return listRedZ; } @@ -504,6 +510,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO impl importacionNaoFiscalVOs.add(importacionNaoFiscal); } + if (!getConexao().isClosed()) + getConexao().close(); + return importacionNaoFiscalVOs; } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java index ed2058442..b0a61a075 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java @@ -506,11 +506,11 @@ public class CorridaServiceImpl implements CorridaService { corrida.setAutobus(null); corrida.setClaseServicio(esquemaCorrida.getClaseServicio()); corrida.setConductor(null); -// if(esquemaCorrida.getIndCorridaExtra()){ -// corrida.setTipoServicio(new Short("2")); -// }else{ - corrida.setTipoServicio(new Short("1")); -// } + // if(esquemaCorrida.getIndCorridaExtra()){ + // corrida.setTipoServicio(new Short("2")); + // }else{ + corrida.setTipoServicio(new Short("1")); + // } corrida.setInfoCorrida(esquemaCorrida.getInfoCorrida()); Integer cantparados = esquemaCorrida.getCantparados(); if (cantparados != null) { @@ -597,7 +597,6 @@ public class CorridaServiceImpl implements CorridaService { corridaTramo.setFechorllegada(llegada.getTime()); horaChegadaAnterior = fecHorallegada; - corridaTramo.setFechortarjetaviaje(null); corridaTramo.setNodo(corridaCtrl.getNodo()); @@ -633,21 +632,21 @@ public class CorridaServiceImpl implements CorridaService { if (husoHorVeranoLlegadaAnterior == null) { corridaTramo.setFechorsalidaH(corridaTramo.getFechorsalida()); } else { - - //Ajusta tambem o tempo de instancia do calculo do horario de verao - if (esquemaTramo.getTiempoEstancia() != null){ + + // Ajusta tambem o tempo de instancia do calculo do horario de verao + if (esquemaTramo.getTiempoEstancia() != null) { GregorianCalendar tmp = new GregorianCalendar(); tmp.setTime(husoHorVeranoLlegadaAnterior); - + tmp.add(Calendar.MINUTE, esquemaTramo.getTiempoEstancia().getMinutes()); tmp.add(Calendar.HOUR_OF_DAY, esquemaTramo.getTiempoEstancia().getHours()); - + log.debug("Tempo Recorrido H + Estancia: " + sdf.format(tmp.getTime())); - + husoHorVeranoLlegadaAnterior = tmp.getTime(); - + } - + corridaTramo.setFechorsalidaH(husoHorVeranoLlegadaAnterior); } @@ -661,8 +660,6 @@ public class CorridaServiceImpl implements CorridaService { corridaTramo.setFechorSalidaOriginalH(corridaTramo.getFechorSalidaOriginal()); } - - if (numSec == 1) { corrida.setFechorSalidaOriginalH(corridaTramo.getFechorsalidaH()); } @@ -1050,7 +1047,7 @@ public class CorridaServiceImpl implements CorridaService { DefaultTransactionDefinition def = new DefaultTransactionDefinition(DefaultTransactionDefinition.PROPAGATION_REQUIRES_NEW); TransactionStatus status = transactionManager.getTransaction(def); - List lsEsquemaCorrida = esquemaCorridaService.buscaDentroVigenciaQtdeDiasNotNull(dataDeOriginal); + List lsEsquemaCorrida = esquemaCorridaService.buscaDentroVigenciaQtdeDiasNotNull(dataDeOriginal); for (EsquemaCorrida esquemaCorrida : lsEsquemaCorrida) { log.debug("esquemaCorrida=" + esquemaCorrida.getEsquemacorridaId()); @@ -1078,23 +1075,23 @@ public class CorridaServiceImpl implements CorridaService { dataAte = esquemaCorrida.getEsquemaOperacional().getFecfinvigencia(); } - try { - while (DateUtil.compareOnlyDate(dataDe, dataAte) <= 0) { + try { + while (DateUtil.compareOnlyDate(dataDe, dataAte) <= 0) { Boolean isFeriado = this.isFeriado(new java.sql.Date(dataDe.getTime()), esquemaCorrida); - generarCorrida(esquemaCorrida, dataDe, false, isFeriado); + generarCorrida(esquemaCorrida, dataDe, false, isFeriado); calendarData.setTime(dataDe); calendarData.add(Calendar.DATE, 1); - dataDe = calendarData.getTime(); - } + dataDe = calendarData.getTime(); + } log.info("commit bloco corridas"); - transactionManager.commit(status); + transactionManager.commit(status); status = transactionManager.getTransaction(def); } catch (Throwable ex) { log.error("", ex); - log.error(" Erro ao gerar corrida = " + esquemaCorrida.getNumCorrida() + " esquemaCorrida = " + esquemaCorrida.getEsquemacorridaId()); + log.error(" Erro ao gerar corrida = " + esquemaCorrida.getNumCorrida() + " esquemaCorrida = " + esquemaCorrida.getEsquemacorridaId()); transactionManager.rollback(status); - status = transactionManager.getTransaction(def); - } + status = transactionManager.getTransaction(def); + } } if (!status.isCompleted()) { @@ -1336,6 +1333,9 @@ public class CorridaServiceImpl implements CorridaService { } + if (!conexao.isClosed()) + conexao.close(); + } catch (SQLException e) { log.error("", e); } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java index 00859d3f9..8d1875661 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java @@ -600,6 +600,10 @@ public class FiscalServiceImpl implements FiscalService { gravarArq.print(fechamento + QUEBRA_LINHA); gravarArq.close(); + + if (!conn.isClosed()) + conn.close(); + return arquivo; } catch (IOException e) {