From 6a2ad6479b19c072d39926172886040644f878a5 Mon Sep 17 00:00:00 2001 From: Diogo Neves Date: Wed, 4 May 2011 11:08:38 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1672 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../src/java/utils/JSFUtils.java | 3 --- .../PlanosActuacao/src/java/utils/Utils.java | 23 +++++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/trunk/PlanosActuacao/src/java/utils/JSFUtils.java b/trunk/PlanosActuacao/src/java/utils/JSFUtils.java index 11b54276..6b63b573 100644 --- a/trunk/PlanosActuacao/src/java/utils/JSFUtils.java +++ b/trunk/PlanosActuacao/src/java/utils/JSFUtils.java @@ -110,8 +110,5 @@ public class JSFUtils { Map parameters = fc.getCurrentInstance().getExternalContext().getRequestParameterMap(); return (String) parameters.get(parameter); } - - - } diff --git a/trunk/PlanosActuacao/src/java/utils/Utils.java b/trunk/PlanosActuacao/src/java/utils/Utils.java index 5772973d..98c8e9d2 100644 --- a/trunk/PlanosActuacao/src/java/utils/Utils.java +++ b/trunk/PlanosActuacao/src/java/utils/Utils.java @@ -118,18 +118,21 @@ public class Utils { ServletContext paContext = session.getServletContext(); ServletContext aatContext = paContext.getContext( "/AnaliseAcidentesTrabalho" ); - Map< String, Object > mapData = ( Map< String, Object > ) aatContext.getAttribute( aatSessionID ); - if ( mapData != null ) + if ( aatContext != null && aatSessionID != null ) { - HttpSession aatSession = ( HttpSession ) mapData.get( "session" ); - try + Map< String, Object > mapData = ( Map< String, Object > ) aatContext.getAttribute( aatSessionID ); + if ( mapData != null ) { - aatSession.invalidate(); - } - catch ( IllegalStateException e ) - { -// ErrorLogger.logException( e ); - System.out.println( "Session already invalidated." ); + HttpSession aatSession = ( HttpSession ) mapData.get( "session" ); + try + { + aatSession.invalidate(); + } + catch ( IllegalStateException e ) + { + // ErrorLogger.logException( e ); + System.out.println( "Session already invalidated." ); + } } } }