From 5305f30bed14f380f1fd6f0b7fc7abf0f4d2ff24 Mon Sep 17 00:00:00 2001
From: maroni <maroni@192.168.1.103>
Date: Fri, 6 Jul 2012 01:22:46 -0300
Subject: [PATCH] =?utf8?q?Modifica=C3=A7=C3=B5es=20no=20sistema=20de=20conex?=
 =?utf8?q?=C3=A3o=20com=20BD=20para=20evitar=20erro=20de=20shared=20chache=20?=
 =?utf8?q?e=20ajuste=20em=20nullpointerexception=20ao=20pular=20a=20etapa=20?=
 =?utf8?q?do=20diagnostico.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../simdecs/comunicacao/BaseComunicacao.java       |    7 +------
 .../simdecs/mediador/NegociacaoPedagogica.java     |   19 +++++++------------
 web/login.xhtml                                    |    2 +-
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/java/org/ufcspa/simdecs/comunicacao/BaseComunicacao.java b/src/java/org/ufcspa/simdecs/comunicacao/BaseComunicacao.java
index 95e6399..b3b33e6 100644
--- a/src/java/org/ufcspa/simdecs/comunicacao/BaseComunicacao.java
+++ b/src/java/org/ufcspa/simdecs/comunicacao/BaseComunicacao.java
@@ -85,10 +85,8 @@ public abstract class BaseComunicacao extends HttpServlet {
         }    
         printDebug("------------------------------------------------------------------------------------");
 
-        EntityManager em = null;
         try {
-            // EntityManager em = DbUtil.getInstance().getEntityManager();
-            em = Persistence.createEntityManagerFactory("SimDeCSPU").createEntityManager();
+            EntityManager em = DbUtil.getInstance().getEntityManager();
             
             executaServico(em, request, response, out);
         } catch(Exception e) {
@@ -115,9 +113,6 @@ public abstract class BaseComunicacao extends HttpServlet {
             
             e.printStackTrace();
         } finally {
-            if (em != null)
-                em.close();
-            
             out.close();
         }
     }
diff --git a/src/java/org/ufcspa/simdecs/mediador/NegociacaoPedagogica.java b/src/java/org/ufcspa/simdecs/mediador/NegociacaoPedagogica.java
index 25f6a3d..915a0c6 100644
--- a/src/java/org/ufcspa/simdecs/mediador/NegociacaoPedagogica.java
+++ b/src/java/org/ufcspa/simdecs/mediador/NegociacaoPedagogica.java
@@ -550,18 +550,13 @@ public class NegociacaoPedagogica {
     }
     
     public NegociacaoPedagogica(long idSessao, Paciente paciente) throws Exception {
-        //em = DbUtil.getInstance().getEntityManager(); 
-        try {
-            em = Persistence.createEntityManagerFactory("SimDeCSPU").createEntityManager();
-            SessaoUsuario sessaoUsuario = em.find(SessaoUsuario.class, idSessao);
-            this.sessaoUsuario = sessaoUsuario;
-            this.paciente = paciente;
-
-            // Busca o log de execução
-            logExecucao = new LogExecucao(sessaoUsuario, paciente, em);
-        } finally {
-            em.close();
-        }
+        em = DbUtil.getInstance().getEntityManager(); 
+        SessaoUsuario sessaoUsuario = em.find(SessaoUsuario.class, idSessao);
+        this.sessaoUsuario = sessaoUsuario;
+        this.paciente = paciente;
+
+        // Busca o log de execução
+        logExecucao = new LogExecucao(sessaoUsuario, paciente, em);
     }
     
     public String getIntervencao(String etapa) throws Exception {        
diff --git a/web/login.xhtml b/web/login.xhtml
index a86dc50..5b139d2 100644
--- a/web/login.xhtml
+++ b/web/login.xhtml
@@ -35,7 +35,7 @@
             <a href="simulador/index.html">Acesso ao Simulador</a>
             <br/>
             <br/>
-            <h:outputText value="Versão 4.2" />
+            <h:outputText value="Versão 4.2.0" />
         </center>
     </h:body>
 </html>
-- 
1.7.6.4